Merge pull request MedicOneSystems#387 from amvisor/table-reset

improvements of table reset

Author: thyseus

src/Http/Livewire/LivewireDatatable.php

@@ -126,9 +126,7 @@ public function applyToTable($options)
 
         if (isset($options['hiddenColumns']) && is_array($options['hiddenColumns'])) {
             // first display all columns,
-            foreach ($this->columns as $key => $column) {
-                $this->columns[$key]['hidden'] = false;
-            }
+            $this->resetHiddenColumns();
 
             // then hide all columns that should be hidden:
             foreach ($options['hiddenColumns'] as $columnToHide) {
@@ -166,6 +164,7 @@ public function applyToTable($options)
     public function resetTable()
     {
         $this->perPage = config('livewire-datatables.default_per_page', 10);
+        $this->sort = $this->defaultSort();
         $this->search = null;
         $this->setPage(1);
         $this->activeSelectFilters = [];
@@ -175,9 +174,21 @@ public function resetTable()
         $this->activeBooleanFilters = [];
         $this->activeNumberFilters = [];
         $this->hide = null;
+        $this->resetHiddenColumns();
         $this->selected = [];
     }
 
+    /**
+     * Display all columns, also those that are currently hidden.
+     * Should get called when resetting the table.
+     */
+    public function resetHiddenColumns()
+    {
+        foreach ($this->columns as $key => $column) {
+            $this->columns[$key]['hidden'] = false;
+        }
+    }
+
     public function updatedSearch()
     {
         $this->setPage(1);