Merge pull request #4853 from AAbosham/2.x

filamentphp · Nov 6, 2022 · 3e82250 · 3e82250
2 parents b7e0a81 + 2297a6a
commit 3e82250
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 11 deletions.
diff --git a/packages/tables/resources/views/columns/badge-column.blade.php b/packages/tables/resources/views/columns/badge-column.blade.php
@@ -19,9 +19,12 @@
     'filament-tables-badge-column flex',
     'px-4 py-3' => ! $isInline(),
     match ($getAlignment()) {
-        'left' => 'justify-start',
+        'start' => 'justify-start',
         'center' => 'justify-center',
-        'right' => 'justify-end',
+        'end' => 'justify-end',
+        'left' => 'justify-start rtl:flex-row-reverse',
+        'center' => 'justify-center',
+        'right' => 'justify-end rtl:flex-row-reverse',
         default => null,
     },
 ]) }}>

diff --git a/packages/tables/resources/views/columns/layout/stack.blade.php b/packages/tables/resources/views/columns/layout/stack.blade.php
@@ -5,7 +5,10 @@
             ->class([
                 'flex flex-col',
                 match ($getAlignment()) {
+                    'start' => 'items-start',
                     'center' => 'items-center',
+                    'end' => 'items-end',
+                    'left' => 'items-start',
                     'right' => 'items-end',
                     default => 'items-start',
                 },

diff --git a/packages/tables/resources/views/columns/tags-column.blade.php b/packages/tables/resources/views/columns/tags-column.blade.php
@@ -6,9 +6,12 @@
     'filament-tables-tags-column flex flex-wrap items-center gap-1',
     'px-4 py-3' => ! $isInline(),
     match ($getAlignment()) {
-        'left' => 'justify-start',
+        'start' => 'justify-start',
         'center' => 'justify-center',
-        'right' => 'justify-end',
+        'end' => 'justify-end',
+        'left' => 'justify-start rtl:flex-row-reverse',
+        'center' => 'justify-center',
+        'right' => 'justify-end rtl:flex-row-reverse',
         default => null,
     },
 ]) }}>
@@ -22,7 +25,7 @@
     @endforeach
 
     @if ($hasActiveLimit())
-        <span class="text-xs ml-1">
+        <span class="ml-1 text-xs">
             {{ trans_choice('tables::table.columns.tags.more', count($getTags()) - $getLimit()) }}
         </span>
     @endif

diff --git a/packages/tables/resources/views/components/columns/column.blade.php b/packages/tables/resources/views/components/columns/column.blade.php
@@ -22,9 +22,11 @@
     {{ $attributes->class([
         'filament-tables-column-wrapper',
         match ($alignment) {
-            'start', 'left' => 'text-start',
+            'start' => 'text-start',
             'center' => 'text-center',
-            'end', 'right' => 'text-end',
+            'end' => 'text-end',
+            'left' => 'text-left',
+            'right' => 'text-right',
             'justify' => 'text-justify',
             default => null,
         },

diff --git a/packages/tables/resources/views/components/header-cell.blade.php b/packages/tables/resources/views/components/header-cell.blade.php
@@ -18,9 +18,12 @@
             'dark:text-gray-300' => config('tables.dark_mode'),
             'cursor-default' => ! $sortable,
             match ($alignment) {
-                'left' => 'justify-start',
+                'start' => 'justify-start',
                 'center' => 'justify-center',
-                'right' => 'justify-end',
+                'end' => 'justify-end',
+                'left' => 'justify-start rtl:flex-row-reverse',
+                'center' => 'justify-center',
+                'right' => 'justify-end rtl:flex-row-reverse',
                 default => null,
             },
         ])

diff --git a/packages/tables/src/Columns/Concerns/HasAlignment.php b/packages/tables/src/Columns/Concerns/HasAlignment.php
@@ -37,12 +37,12 @@ public function alignJustify(bool | Closure $condition = true): static
 
     public function alignLeft(bool | Closure $condition = true): static
     {
-        return $this->alignStart($condition);
+        return $this->alignment(static fn (): ?string => $condition ? 'left' : null);
     }
 
     public function alignRight(bool | Closure $condition = true): static
     {
-        return $this->alignEnd($condition);
+        return $this->alignment(static fn (): ?string => $condition ? 'right' : null);
     }
 
     public function getAlignment(): ?string