Tweaks to sorting pill direction label

Author: lrljoe

resources/views/components/tools/sorting-pills.blade.php

@@ -17,7 +17,7 @@
                         wire:key="{{ $tableName }}-sorting-pill-{{ $columnSelectName }}"
                         class="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium leading-4 bg-indigo-100 text-indigo-800 capitalize dark:bg-indigo-200 dark:text-indigo-900"
                     >
-                        {{ $column->getSortingPillTitle() }}: {{ $column->getSortingPillDirection($this, $direction) }}
+                        {{ $column->getSortingPillTitle() }}: {{ $column->getSortingPillDirectionLabel($direction, $this->getDefaultSortingLabelAsc, $this->getDefaultSortingLabelDesc) }}
 
                         <button
                             wire:click="clearSort('{{ $columnSelectName }}')"
@@ -58,7 +58,7 @@ class="focus:outline-none active:outline-none"
                         wire:key="{{ $tableName . '-sorting-pill-' . $columnSelectName }}"
                         class="badge badge-pill badge-info d-inline-flex align-items-center"
                     >
-                        {{ $column->getSortingPillTitle() }}: {{ $column->getSortingPillDirection($this, $direction) }}
+                        {{ $column->getSortingPillTitle() }}: {{ $column->getSortingPillDirectionLabel($direction, $this->getDefaultSortingLabelAsc, $this->getDefaultSortingLabelDesc) }}
 
                         <a
                             href="#"
@@ -98,7 +98,7 @@ class="badge badge-pill badge-light"
                         wire:key="{{ $tableName }}-sorting-pill-{{ $columnSelectName }}"
                         class="badge rounded-pill bg-info d-inline-flex align-items-center"
                     >
-                        {{ $column->getSortingPillTitle() }}: {{ $column->getSortingPillDirection($this, $direction) }}
+                        {{ $column->getSortingPillTitle() }}: {{ $column->getSortingPillDirectionLabel($direction, $this->getDefaultSortingLabelAsc, $this->getDefaultSortingLabelDesc) }}
 
                         <a
                             href="#"

src/Traits/Helpers/SortingHelpers.php

@@ -151,11 +151,13 @@ public function sortingPillsAreDisabled(): bool
         return $this->getSortingPillsStatus() === false;
     }
 
+    #[Computed]
     public function getDefaultSortingLabelAsc(): string
     {
         return $this->defaultSortingLabelAsc;
     }
 
+    #[Computed]
     public function getDefaultSortingLabelDesc(): string
     {
         return $this->defaultSortingLabelDesc;

src/Views/Traits/Columns/IsSortable.php

@@ -102,6 +102,20 @@ public function getCustomSortingPillDirections(string $direction): string
         return __('livewire-tables::not_applicable');
     }
 
+    public function getCustomSortingPillDirectionsLabel(string $direction, string $defaultLabelAsc, string $defaultLabelDesc): string
+    {
+        if ($direction === 'asc') {
+            return $this->sortingPillDirectionAsc ?? $defaultLabelAsc;
+        }
+
+        if ($direction === 'desc') {
+            return $this->sortingPillDirectionDesc ?? $defaultLabelDesc;
+        }
+
+        return __('livewire-tables::not_applicable');
+    }
+
+
     public function getSortingPillDirection(DataTableComponent $component, string $direction): string
     {
         if ($this->hasCustomSortingPillDirections()) {
@@ -111,6 +125,15 @@ public function getSortingPillDirection(DataTableComponent $component, string $d
         return $direction === 'asc' ? $component->getDefaultSortingLabelAsc() : $component->getDefaultSortingLabelDesc();
     }
 
+    public function getSortingPillDirectionLabel(string $direction, string $defaultLabelAsc, string $defaultLabelDesc): string
+    {
+        if ($this->hasCustomSortingPillDirections()) {
+            return $this->getCustomSortingPillDirectionsLabel($direction, $defaultLabelAsc, $defaultLabelDesc);
+        }
+
+        return $direction === 'asc' ? $defaultLabelAsc : $defaultLabelDesc;
+    }
+
     /**
      * Used in resources/views/components/table/th.blade.php
      */