Merge pull request #414 from amvisor/fix_restore_sort

thyseus · web-flow · commit 2cedad7046f5 · 2022-03-16T15:11:25.000+01:00
fix wrong restore sort direction
diff --git a/src/Http/Livewire/LivewireDatatable.php b/src/Http/Livewire/LivewireDatatable.php
@@ -618,8 +618,8 @@ public function initialiseSort()
             return in_array($column['type'], Column::UNSORTABLE_TYPES) || $column['hidden'];
         })->keys()->first();
 
-        $this->getSessionStoredSort();
         $this->direction = $this->defaultSort() && $this->defaultSort()['direction'] === 'asc';
+        $this->getSessionStoredSort();
     }
 
     public function initialiseHiddenColumns()

Original file line number	Diff line number	Diff line change
`@@ -618,8 +618,8 @@ public function initialiseSort()`
`618`	`618`	`return in_array($column['type'], Column::UNSORTABLE_TYPES) \|\| $column['hidden'];`
`619`	`619`	`})->keys()->first();`
`620`	`620`
`621`		`- $this->getSessionStoredSort();`
`622`	`621`	`$this->direction = $this->defaultSort() && $this->defaultSort()['direction'] === 'asc';`
	`622`	`+ $this->getSessionStoredSort();`
`623`	`623`	`}`
`624`	`624`
`625`	`625`	`public function initialiseHiddenColumns()`