Move sorts to LW3 Approach

LowerRockLabs · Jul 20, 2023 · d7ccabf · d7ccabf
1 parent bbb6be4
commit d7ccabf
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/src/DataTableComponent.php b/src/DataTableComponent.php
@@ -64,7 +64,6 @@ protected function generateDataTableFingerprint(): string
     public function boot(): void
     {
         $this->{$this->tableName} = [
-            'sorts' => $this->{$this->tableName}['sorts'] ?? [],
             'filters' => $this->{$this->tableName}['filters'] ?? [],
             'columns' => $this->{$this->tableName}['columns'] ?? [],
         ];

diff --git a/src/Traits/Helpers/SortingHelpers.php b/src/Traits/Helpers/SortingHelpers.php
@@ -19,7 +19,7 @@ public function getSingleSortingStatus(): bool
      */
     public function getSorts(): array
     {
-        return $this->{$this->getTableName()}['sorts'] ?? [];
+        return $this->sorts ?? [];
     }
 
     /**
@@ -28,17 +28,17 @@ public function getSorts(): array
      */
     public function setSorts(array $sorts): array
     {
-        return $this->{$this->getTableName()}['sorts'] = $sorts;
+        return $this->sorts = $sorts;
     }
 
     public function getSort(string $field): ?string
     {
-        return $this->{$this->getTableName()}['sorts'][$field] ?? null;
+        return $this->sorts[$field] ?? null;
     }
 
     public function setSort(string $field, string $direction): string
     {
-        return $this->{$this->getTableName()}['sorts'][$field] = $direction;
+        return $this->sorts[$field] = $direction;
     }
 
     public function hasSorts(): bool
@@ -56,12 +56,12 @@ public function hasSort(string $field): bool
      */
     public function clearSorts(): void
     {
-        $this->{$this->getTableName()}['sorts'] = [];
+        $this->sorts = [];
     }
 
     public function clearSort(string $field): void
     {
-        unset($this->{$this->getTableName()}['sorts'][$field]);
+        unset($this->sorts[$field]);
     }
 
     public function setSortAsc(string $field): string

diff --git a/src/Traits/WithSorting.php b/src/Traits/WithSorting.php
@@ -3,6 +3,7 @@
 namespace Rappasoft\LaravelLivewireTables\Traits;
 
 use Illuminate\Database\Eloquent\Builder;
+use Livewire\Attributes\Url;
 use Rappasoft\LaravelLivewireTables\Traits\Configuration\SortingConfiguration;
 use Rappasoft\LaravelLivewireTables\Traits\Helpers\SortingHelpers;
 
@@ -11,6 +12,7 @@ trait WithSorting
     use SortingConfiguration,
         SortingHelpers;
 
+    #[Url(history: true, as: 'sorts')]
     public array $sorts = [];
 
     public bool $sortingStatus = true;