Fixes for Sorting Pill Labels

Author: lrljoe

src/Views/Traits/Columns/IsSortable.php

@@ -89,20 +89,20 @@ public function hasCustomSortingPillDirections(): bool
         return $this->sortingPillDirectionAsc !== null && $this->sortingPillDirectionDesc !== null;
     }
 
-    public function getCustomSortingPillDirections(string $direction): string
+    public function getCustomSortingPillDirections(string $direction, ?string $defaultLabelAsc = 'A-Z', ?string $defaultLabelDesc = 'Z-A'): string
     {
         if ($direction === 'asc') {
-            return $this->sortingPillDirectionAsc;
+            return $this->sortingPillDirectionAsc ?? $defaultLabelAsc;
         }
 
         if ($direction === 'desc') {
-            return $this->sortingPillDirectionDesc;
+            return $this->sortingPillDirectionDesc ?? $defaultLabelDesc;
         }
 
         return __('livewire-tables::not_applicable');
     }
 
-    public function getCustomSortingPillDirectionsLabel(string $direction, string $defaultLabelAsc, string $defaultLabelDesc): string
+    public function getCustomSortingPillDirectionsLabel(string $direction, ?string $defaultLabelAsc = 'A-Z', ?string $defaultLabelDesc = 'Z-A'): string
     {
         if ($direction === 'asc') {
             return $this->sortingPillDirectionAsc ?? $defaultLabelAsc;
@@ -118,13 +118,13 @@ public function getCustomSortingPillDirectionsLabel(string $direction, string $d
     public function getSortingPillDirection(DataTableComponent $component, string $direction): string
     {
         if ($this->hasCustomSortingPillDirections()) {
-            return $this->getCustomSortingPillDirections($direction);
+            return $this->getCustomSortingPillDirections($direction, $component->getDefaultSortingLabelAsc(), $component->getDefaultSortingLabelDesc());
         }
 
         return $direction === 'asc' ? $component->getDefaultSortingLabelAsc() : $component->getDefaultSortingLabelDesc();
     }
 
-    public function getSortingPillDirectionLabel(string $direction, string $defaultLabelAsc, string $defaultLabelDesc): string
+    public function getSortingPillDirectionLabel(string $direction, ?string $defaultLabelAsc = 'A-Z', ?string $defaultLabelDesc = 'Z-A'): string
     {
         if ($this->hasCustomSortingPillDirections()) {
             return $this->getCustomSortingPillDirectionsLabel($direction, $defaultLabelAsc, $defaultLabelDesc);

tests/Views/Traits/Helpers/ColumnHelpersTest.php

@@ -114,8 +114,8 @@ public function test_can_get_standard_sorting_pill_directions(): void
 
         $this->assertFalse($column->hasCustomSortingPillDirections());
 
-        $this->assertSame(__('livewire-tables::not_applicable'), $column->getCustomSortingPillDirections('asc'));
-        $this->assertSame(__('livewire-tables::not_applicable'), $column->getCustomSortingPillDirections('desc'));
+        $this->assertSame($this->basicTable->getDefaultSortingLabelAsc(), $column->getCustomSortingPillDirections('asc'));
+        $this->assertSame($this->basicTable->getDefaultSortingLabelDesc(), $column->getCustomSortingPillDirections('desc'));
     }
 
     public function test_can_set_custom_sorting_pill_directions(): void