v3 - Apply Reorder Sorting When Reordering (#1402)

* Fix for reorder sort not applying * Fix styling --------- Co-authored-by: lrljoe <[email protected]>
rappasoft · Oct 8, 2023 · 429b54f · 429b54f
1 parent 323deee
commit 429b54f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@ All notable changes to `laravel-livewire-tables` will be documented in this file
 - Removes superfluous @endphp from the DateRangeFilter blade
 - Removes reference to remote/published 3rd party assets
 - Add setFilterLabelAttributes Capability Per-Filter
+- Fix for reorder sort not applying automatically
 
 ## [3.0.0-beta.0] - 3.x Initial Release
 - Amending Documentation for Reordering

diff --git a/src/Traits/WithData.php b/src/Traits/WithData.php
@@ -47,7 +47,12 @@ protected function executeQuery(): Collection|CursorPaginator|Paginator|LengthAw
         // Moved these from baseQuery to here to avoid pulling all fields when cloning baseQuery.
         $this->setBuilder($this->selectFields());
 
-        $this->applySorting();
+        if ($this->currentlyReorderingIsEnabled()) {
+            $this->setBuilder($this->getBuilder()->orderBy($this->getDefaultReorderColumn(), $this->getDefaultReorderDirection()));
+        } else {
+            $this->applySorting();
+
+        }
 
         if ($this->paginationIsEnabled()) {
             if ($this->isPaginationMethod('standard')) {