Merge pull request #12853 from dev-idkwhoami/fix/select-current-page-…

…only-select-all-link-behavior Fix: Incorrectly hiding the 'Select all X' table link
filamentphp · May 20, 2024 · 29add93 · 29add93
2 parents 7db11d8 + 221ea5b
commit 29add93
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/packages/tables/resources/views/components/selection/indicator.blade.php b/packages/tables/resources/views/components/selection/indicator.blade.php
@@ -2,7 +2,9 @@
     'allSelectableRecordsCount',
     'deselectAllRecordsAction' => 'deselectAllRecords',
     'end' => null,
+    'page' => null,
     'selectAllRecordsAction' => 'selectAllRecords',
+    'selectCurrentPageOnly' => false,
     'selectedRecordsCount',
     'selectedRecordsPropertyName' => 'selectedRecords',
 ])
@@ -41,10 +43,11 @@ class="text-sm font-medium leading-6 text-gray-700 dark:text-gray-200"
         <div class="flex gap-x-3">
             <x-filament::link
                 color="primary"
-                :id="$this->getId() . '.table.selection.indicator.record-count.' . $allSelectableRecordsCount"
                 tag="button"
                 :x-on:click="$selectAllRecordsAction"
-                :x-show="$allSelectableRecordsCount . ' !== ' . $selectedRecordsPropertyName . '.length'"
+                :x-show="$selectCurrentPageOnly ? '! areRecordsSelected(getRecordsOnPage())' : $allSelectableRecordsCount . ' !== ' . $selectedRecordsPropertyName . '.length'"
+                {{-- Make sure the Alpine attributes get re-evaluated after a Livewire request: --}}
+                :wire:key="$this->getId() . 'table.selection.indicator.actions.select-all.' . $allSelectableRecordsCount . '.' . $page"
             >
                 {{ trans_choice('filament-tables::table.selection_indicator.actions.select_all.label', $allSelectableRecordsCount) }}
             </x-filament::link>

diff --git a/packages/tables/resources/views/index.blade.php b/packages/tables/resources/views/index.blade.php
@@ -47,6 +47,7 @@
     $isGlobalSearchVisible = $isSearchable();
     $isSearchOnBlur = $isSearchOnBlur();
     $isSelectionEnabled = $isSelectionEnabled() && (! $isGroupsOnly);
+    $selectsCurrentPageOnly = $selectsCurrentPageOnly();
     $recordCheckboxPosition = $getRecordCheckboxPosition();
     $isStriped = $isStriped();
     $isLoaded = $isLoaded();
@@ -259,6 +260,8 @@ 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()"
+                :select-current-page-only="$selectsCurrentPageOnly"
                 x-bind:hidden="! selectedRecords.length"
                 x-show="selectedRecords.length"
             />