Merge pull request #1 from inmanturbo/column-select

Column select

Author: inmanturbo

resources/views/components/tools/toolbar.blade.php

@@ -253,7 +253,7 @@ class="inline-flex items-center px-2 py-1 disabled:opacity-50 disabled:cursor-wa
                                         >
                                             <input
                                                 class="text-indigo-600 transition duration-150 ease-in-out border-gray-300 rounded shadow-sm 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 disabled:opacity-50 disabled:cursor-wait"
-                                                @if(count($component->selectedColumns) === count($component->getDefaultVisibleColumns()))
+                                                @if($component->allDefaultVisibleColumnsAreSelected())
                                                     checked
                                                     wire:click="deselectAllColumns"
                                                 @else
@@ -524,7 +524,7 @@ class="dropdown-menu dropdown-menu-right w-100 mt-0 mt-md-3"
                                     class="mb-1"
                                 >
                                     <input
-                                        @if(count($component->selectedColumns) === count($component->getDefaultVisibleColumns()))
+                                        @if($component->allDefaultVisibleColumnsAreSelected())
                                             checked
                                             wire:click="deselectAllColumns"
                                         @else
@@ -786,7 +786,7 @@ class="dropdown-menu dropdown-menu-end w-100"
                                     class="mb-1"
                                 >
                                     <input
-                                        @if(count($component->selectedColumns) === count($component->getDefaultVisibleColumns()))
+                                        @if($component->allDefaultVisibleColumnsAreSelected())
                                             checked
                                             wire:click="deselectAllColumns"
                                         @else

src/Traits/WithColumnSelect.php

@@ -70,11 +70,21 @@ public function deselectAllColumns()
     public function updatedSelectedColumns(): void
     {
         // The query string isn't needed if it's the same as the default
-        if(count($this->selectedColumns) === count($this->getDefaultVisibleColumns())){
+        if ($this->allDefaultVisibleColumnsAreSelected() && $this->allSelectedColumnsAreVisibleByDefault()) {
             $this->selectAllColumns();
-        }else{
+        } else {
             $this->{$this->tableName}['columns'] = $this->selectedColumns;
             session([$this->getColumnSelectSessionKey() => $this->{$this->tableName}['columns']]);
         }
     }
+
+    public function allDefaultVisibleColumnsAreSelected(): bool
+    {
+        return count(array_intersect($this->selectedColumns, $this->getDefaultVisibleColumns())) === count($this->getDefaultVisibleColumns());
+    }
+
+    public function allSelectedColumnsAreVisibleByDefault(): bool
+    {
+        return count(array_intersect($this->selectedColumns, $this->getDefaultVisibleColumns())) === count($this->selectedColumns);
+    }
 }