Merge pull request #12860 from dev-idkwhoami/fix/visual-bug-when-usin…

…g-select-current-page-only-with-grouping Fix: Visual bug when using selectCurrentPageOnly in combination with grouping
filamentphp · May 20, 2024 · 1108fd6 · 1108fd6
2 parents 25e0563 + 380dd2a
commit 1108fd6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/packages/tables/resources/views/components/selection/group-checkbox.blade.php b/packages/tables/resources/views/components/selection/group-checkbox.blade.php
@@ -1,10 +1,12 @@
 @props([
  'key',
+ 'page' => null,
  'title',
 ])
 
 {{-- format-ignore-start --}}
 <x-filament-tables::selection.checkbox
+ :wire:key="$this->getId() . 'table.bulk_select_group.checkbox.' . $page"
  :label="__('filament-tables::table.fields.bulk_select_group.label', ['title' => $title])"
  :x-bind:checked="'
  const recordsInGroup = getRecordsInGroupOnPage(' . \Illuminate\Support\Js::from($key) . ')

diff --git a/packages/tables/resources/views/index.blade.php b/packages/tables/resources/views/index.blade.php
@@ -68,6 +68,7 @@
  $columnsCount = count($columns);
  $reorderRecordsTriggerAction = $getReorderRecordsTriggerAction($isReordering);
  $toggleColumnsTriggerAction = $getToggleColumnsTriggerAction();
+ $page = $this->getTablePage();
 
  if (count($actions) && (! $isReordering)) {
  $columnsCount++;
@@ -260,7 +261,7 @@ class="fi-ta-header-toolbar flex items-center justify-between gap-x-4 px-4 py-3
  <x-filament-tables::selection.indicator
  :all-selectable-records-count="$allSelectableRecordsCount"
  :colspan="$columnsCount"
- :page="$this->getTablePage()"
+ :page="$page"
  :select-current-page-only="$selectsCurrentPageOnly"
  x-bind:hidden="! selectedRecords.length"
  x-show="selectedRecords.length"
@@ -459,6 +460,7 @@ class="col-span-full"
  <x-slot name="start">
  <div class="px-3">
  <x-filament-tables::selection.group-checkbox
+ :page="$page"
  :key="$recordGroupKey"
  :title="$recordGroupTitle"
  />
@@ -999,6 +1001,7 @@ class="bg-gray-50 dark:bg-white/5"
 
  <x-filament-tables::selection.group-cell>
  <x-filament-tables::selection.group-checkbox
+ :page="$page"
  :key="$recordGroupKey"
  :title="$recordGroupTitle"
  />
@@ -1020,6 +1023,7 @@ class="p-0"
  @if ($isSelectionEnabled && $recordCheckboxPosition === RecordCheckboxPosition::AfterCells)
  <x-filament-tables::selection.group-cell>
  <x-filament-tables::selection.group-checkbox
+ :page="$page"
  :key="$recordGroupKey"
  :title="$recordGroupTitle"
  />