Fix select-all checkbox to respect delay setting

rappasoft · Dec 9, 2024 · 3827c62 · 3827c62
1 parent a28d2d8
commit 3827c62
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 17 deletions.
diff --git a/resources/js/partials/tableWrapper.js b/resources/js/partials/tableWrapper.js
@@ -21,14 +21,7 @@ function tableWrapper() {
                 this.clearSelected();
                 this.selectAllStatus = false;
             } else {
-                if (this.delaySelectAll)
-                {   
-                    this.setAllItemsSelected();
-                }
-                else
-                {
-                    this.setAllSelected();
-                }
+                this.setAllSelected();
             }
         },
         setAllItemsSelected() {
@@ -42,13 +35,10 @@ function tableWrapper() {
             if (!showBulkActionsAlpine) {
                 return;
             }
-            if (this.delaySelectAll)
-            {   
+            if (this.delaySelectAll) {
                 this.selectAllStatus = true;
                 this.selectAllOnPage();
-            }
-            else
-            {
+            } else {
                 wire.setAllSelected();
             }
         },
@@ -79,4 +69,4 @@ function tableWrapper() {
     }));
 }
 
-export default tableWrapper;
+export default tableWrapper;
diff --git a/resources/js/partials/tableWrapper.min.js b/resources/js/partials/tableWrapper.min.js
diff --git a/resources/views/components/table/th/bulk-actions.blade.php b/resources/views/components/table/th/bulk-actions.blade.php
@@ -19,9 +19,17 @@
         >
             <input
                 x-init="$watch('indeterminateCheckbox', value => $el.indeterminate = value); $watch('selectedItems', value => newSelectCount = value.length);"
-                x-on:click="if(selectedItems.length == paginationTotalItemCount) { $el.indeterminate = false; $wire.clearSelected(); bulkActionHeaderChecked = false; } else { bulkActionHeaderChecked = true; $el.indeterminate = false; $wire.setAllSelected(); }"
+                x-on:click="if(selectAllStatus || selectedItems.length == paginationTotalItemCount) {
+                    $el.indeterminate = false;
+                    $wire.clearSelected();
+                    bulkActionHeaderChecked = false;
+                } else {
+                    bulkActionHeaderChecked = true;
+                    $el.indeterminate = false;
+                    setAllSelected();
+                }"
                 type="checkbox"
-                :checked="selectedItems.length == paginationTotalItemCount"
+                :checked="selectAllStatus || selectedItems.length == paginationTotalItemCount"
                 {{
                     $attributes->merge($bulkActionsThCheckboxAttributes)->class([
                         'rounded border-gray-300 text-indigo-600 shadow-sm transition duration-150 ease-in-out focus:border-indigo-300 focus:ring focus:ring-indigo-200 focus:ring-opacity-50 dark:bg-gray-900 dark:text-white dark:border-gray-600 dark:hover:bg-gray-600 dark:focus:bg-gray-600' => ($theme === 'tailwind') && ($bulkActionsThCheckboxAttributes['default'] ?? true),