From 748a5334a0fb17142c17ffb298dd42b874c330f6 Mon Sep 17 00:00:00 2001 From: Manuk Date: Sun, 15 Nov 2026 23:14:02 +0400 Subject: [PATCH 1/2] fix(columns): render the wire:key callers pass to columns and cards --- resources/views/livewire/card.blade.php | 6 +++--- resources/views/livewire/column.blade.php | 4 ++-- .../views/modern/livewire/column.blade.php | 2 +- tests/Browser/ModernBoardTest.php | 19 +++++++++++++++++++ tests/Feature/LivewireBoardTest.php | 9 +++++++++ 5 files changed, 34 insertions(+), 6 deletions(-) diff --git a/resources/views/livewire/card.blade.php b/resources/views/livewire/card.blade.php index 22a26a20a..be665b944 100644 --- a/resources/views/livewire/card.blade.php +++ b/resources/views/livewire/card.blade.php @@ -1,4 +1,4 @@ -@props(['columnId', 'record']) +@props(['columnId', 'record', 'config' => []]) @php $processedRecordActions = $this->getBoard()->getBoardRecordActions($record); @@ -33,13 +33,13 @@ @endphp
class([ 'flowforge-card mb-3 bg-white dark:bg-gray-900 rounded-lg shadow-sm border border-gray-200 dark:border-gray-700 overflow-hidden transition-all duration-200 hover:shadow-md', 'cursor-pointer' => $hasActions || $hasCardAction, 'cursor-pointer transition-all duration-100 ease-in-out hover:shadow-lg hover:border-gray-400 active:shadow-md' => $hasCardAction, 'cursor-grab hover:cursor-grabbing' => $hasPositionIdentifier, 'cursor-default' => !$hasActions && !$hasCardAction && !$hasPositionIdentifier, - ]) + ]) }} x-sortable-item="{{ $record['id'] }}" data-card-id="{{ $record['id'] }}" @if($hasPositionIdentifier) diff --git a/resources/views/livewire/column.blade.php b/resources/views/livewire/column.blade.php index 016027d0b..8c8b7ed34 100644 --- a/resources/views/livewire/column.blade.php +++ b/resources/views/livewire/column.blade.php @@ -12,11 +12,11 @@ @endphp
class([ 'flowforge-column flex-shrink-0 border border-gray-200 dark:border-gray-700 shadow-sm dark:shadow-md rounded-xl flex flex-col max-h-full overflow-hidden', 'w-[300px] min-w-[300px]' => ! $isCollapsed, 'flowforge-column-collapsed w-12 min-w-12' => $isCollapsed, - ]) + ]) }} {{-- SortableJS stops propagation inside its own container, so the header and footer of a rail need their own hook to register as hovered. --}} x-on:dragenter="dragOverColumn = @js($columnId)" diff --git a/resources/views/modern/livewire/column.blade.php b/resources/views/modern/livewire/column.blade.php index 7ef2438a1..6e6c0a82e 100644 --- a/resources/views/modern/livewire/column.blade.php +++ b/resources/views/modern/livewire/column.blade.php @@ -16,7 +16,7 @@ @endphp
class('ff-column') }} data-column-root="{{ $columnId }}" data-column-total="{{ $column['limitTotal'] ?? $total }}" @if (($column['limit'] ?? null) !== null) data-column-limit="{{ $column['limit'] }}" @endif diff --git a/tests/Browser/ModernBoardTest.php b/tests/Browser/ModernBoardTest.php index ac6b28fd4..1cc895fce 100644 --- a/tests/Browser/ModernBoardTest.php +++ b/tests/Browser/ModernBoardTest.php @@ -854,6 +854,25 @@ function boardTraySampler(int $budgetMilliseconds): string expect($page->script("document.querySelector('{$root}').hasAttribute('data-collapsed')"))->toBeFalse(); }); +test('the add card spinner stays in its own column after a column is inserted before it', function () { + boardSeed(); + $page = boardPage('/modern/test-collapsible-board'); + + $page->script("Livewire.find(document.querySelector('[data-column-root]').closest('[wire\\\\:id]').getAttribute('wire:id')).\$set('showAllColumns', true)"); + $page->assertSee('Hidden Column'); + boardHoldUpdates($page); + $page->script("document.querySelector('[data-column-root=\"in_progress\"] .ff-add-row').click()"); + Pointer::on($page)->wait(400); + + expect($page->script(<<<'JS' + [...document.querySelectorAll('.fi-loading-indicator')] + .filter((spinner) => spinner.getClientRects().length > 0) + .map((spinner) => spinner.closest('[data-column-root]')?.dataset.columnRoot) + JS))->toBe(['in_progress']); + + boardReleaseUpdates($page); +}); + test('a collapsed column widens while a card hovers it and accepts the drop', function () { [$a] = boardSeed(); $page = boardPage('/modern/test-collapsible-board'); diff --git a/tests/Feature/LivewireBoardTest.php b/tests/Feature/LivewireBoardTest.php index 6838eac98..a3cef4329 100644 --- a/tests/Feature/LivewireBoardTest.php +++ b/tests/Feature/LivewireBoardTest.php @@ -26,6 +26,15 @@ ->assertDontSeeHtml('todo()->create(); + + Livewire::test(TestBoard::class) + ->assertSeeHtml('wire:key="column-todo"') + ->assertSeeHtml('wire:key="column-in_progress"') + ->assertSeeHtml("wire:key=\"card-{$task->getKey()}\""); + }); + test('renders board with unhidden column', function () { Livewire::test(TestBoard::class) ->assertStatus(200) From 786ed270aaf4bf258871b271b6eadcf5266cc159 Mon Sep 17 00:00:00 2001 From: Manuk Date: Sun, 15 Nov 2026 23:16:18 +0400 Subject: [PATCH 2/2] test(columns): pin column and card keys in the modern suite --- tests/Feature/LivewireBoardTest.php | 9 --------- tests/Modern/Feature/LivewireBoardTest.php | 13 +++++++++++++ 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/tests/Feature/LivewireBoardTest.php b/tests/Feature/LivewireBoardTest.php index a3cef4329..6838eac98 100644 --- a/tests/Feature/LivewireBoardTest.php +++ b/tests/Feature/LivewireBoardTest.php @@ -26,15 +26,6 @@ ->assertDontSeeHtml('todo()->create(); - - Livewire::test(TestBoard::class) - ->assertSeeHtml('wire:key="column-todo"') - ->assertSeeHtml('wire:key="column-in_progress"') - ->assertSeeHtml("wire:key=\"card-{$task->getKey()}\""); - }); - test('renders board with unhidden column', function () { Livewire::test(TestBoard::class) ->assertStatus(200) diff --git a/tests/Modern/Feature/LivewireBoardTest.php b/tests/Modern/Feature/LivewireBoardTest.php index 5199a52f5..8ff3769fc 100644 --- a/tests/Modern/Feature/LivewireBoardTest.php +++ b/tests/Modern/Feature/LivewireBoardTest.php @@ -6,6 +6,7 @@ use Relaticle\Flowforge\Services\DecimalPosition; use Relaticle\Flowforge\Tests\Fixtures\Modern\Task; use Relaticle\Flowforge\Tests\Fixtures\Modern\TestBoard; +use Relaticle\Flowforge\Tests\Fixtures\TestBoard as ClassicTestBoard; describe('board rendering', function () { test('renders board with all columns', function () { @@ -26,6 +27,18 @@ ->assertDontSeeHtml('todo()->create(); + + Livewire::test($board) + ->assertSeeHtml('wire:key="column-todo"') + ->assertSeeHtml('wire:key="column-in_progress"') + ->assertSeeHtml("wire:key=\"{$cardKey}{$task->getKey()}\""); + })->with([ + 'modern' => [TestBoard::class, 'card-board-'], + 'classic' => [ClassicTestBoard::class, 'card-'], + ]); + test('renders board with unhidden column', function () { Livewire::test(TestBoard::class) ->assertStatus(200)