From e5512a448e4ff67e090a8cc2838acc713a35baf5 Mon Sep 17 00:00:00 2001
From: "Ralph J. Smit" <59207045+ralphjsmit@users.noreply.github.com>
Date: Mon, 6 Jan 2025 09:50:49 +0100
Subject: [PATCH 01/16] Fix order by subqueries

---
 packages/support/src/Services/RelationshipJoiner.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/support/src/Services/RelationshipJoiner.php b/packages/support/src/Services/RelationshipJoiner.php
index 6f6fade8b0..5828c0bbee 100644
--- a/packages/support/src/Services/RelationshipJoiner.php
+++ b/packages/support/src/Services/RelationshipJoiner.php
@@ -95,7 +95,7 @@ class RelationshipJoiner
                     continue;
                 }
 
-                if (str($order['column'])->startsWith("{$relationshipQuery->getModel()->getTable()}.")) {
+                if (is_string($order['column']) && str($order['column'])->startsWith("{$relationshipQuery->getModel()->getTable()}.")) {
                     continue;
                 }
 

From f15369ea3f0dc03764e88d34aed1769efb01d25c Mon Sep 17 00:00:00 2001
From: "Ralph J. Smit" <59207045+ralphjsmit@users.noreply.github.com>
Date: Mon, 6 Jan 2025 10:15:26 +0100
Subject: [PATCH 02/16] Improve RelationshipJoiner orderBy support

---
 .../src/Services/RelationshipJoiner.php        | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/packages/support/src/Services/RelationshipJoiner.php b/packages/support/src/Services/RelationshipJoiner.php
index 5828c0bbee..cef705f15f 100644
--- a/packages/support/src/Services/RelationshipJoiner.php
+++ b/packages/support/src/Services/RelationshipJoiner.php
@@ -5,6 +5,7 @@ namespace Filament\Support\Services;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\Relation;
+use Illuminate\Database\Query\Expression;
 use Illuminate\Database\Query\JoinClause;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
@@ -91,15 +92,26 @@ class RelationshipJoiner
 
             /** @phpstan-ignore-next-line */
             foreach (($relationshipQuery->getQuery()->orders ?? []) as $order) {
-                if (! array_key_exists('column', $order)) {
+                // Regular orders: { column: string, direction: 'asc' | 'desc' }
+                // Raw orders: { type: 'Raw', sql: string }
+                // Sub-query orders look like: { column: Illuminate\Database\Query\Expression, direction: 'asc' | 'desc' }
+                if (! array_key_exists('column', $order) && ! array_key_exists('sql', $order)) {
                     continue;
                 }
 
-                if (is_string($order['column']) && str($order['column'])->startsWith("{$relationshipQuery->getModel()->getTable()}.")) {
+                $columnValue = $order['column'] ?? new Expression($order['sql']);
+
+                if ($columnValue instanceof Expression && str($columnValue->getValue($relationship->getGrammar()))->contains('?')) {
+                    // Heuristic to determine if the expression contains (a) binding(s), if so, as of
+                    // yet we cannot reliably determine (which) bindings are used in the expression.
                     continue;
                 }
 
-                $relationshipQuery->addSelect($order['column']);
+                if (str($columnValue instanceof Expression ? $columnValue->getValue($relationship->getGrammar()) : $columnValue)->startsWith("{$relationshipQuery->getModel()->getTable()}.")) {
+                    continue;
+                }
+
+                $relationshipQuery->addSelect($columnValue);
             }
         }
 

From f63d15544ff0f8deb4cf805f6a78dceef4df7e50 Mon Sep 17 00:00:00 2001
From: "Ralph J. Smit" <59207045+ralphjsmit@users.noreply.github.com>
Date: Mon, 6 Jan 2025 10:55:43 +0100
Subject: [PATCH 03/16] Update RelationshipJoiner.php

---
 packages/support/src/Services/RelationshipJoiner.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/support/src/Services/RelationshipJoiner.php b/packages/support/src/Services/RelationshipJoiner.php
index cef705f15f..1b38318e49 100644
--- a/packages/support/src/Services/RelationshipJoiner.php
+++ b/packages/support/src/Services/RelationshipJoiner.php
@@ -93,8 +93,8 @@ class RelationshipJoiner
             /** @phpstan-ignore-next-line */
             foreach (($relationshipQuery->getQuery()->orders ?? []) as $order) {
                 // Regular orders: { column: string, direction: 'asc' | 'desc' }
-                // Raw orders: { type: 'Raw', sql: string }
                 // Sub-query orders look like: { column: Illuminate\Database\Query\Expression, direction: 'asc' | 'desc' }
+                // Raw orders: { type: 'Raw', sql: string }
                 if (! array_key_exists('column', $order) && ! array_key_exists('sql', $order)) {
                     continue;
                 }

From 5b9b970440c8ab124e8709ebae26cf95f9ded725 Mon Sep 17 00:00:00 2001
From: "Ralph J. Smit" <59207045+ralphjsmit@users.noreply.github.com>
Date: Mon, 6 Jan 2025 10:55:59 +0100
Subject: [PATCH 04/16] Update RelationshipJoiner.php

---
 packages/support/src/Services/RelationshipJoiner.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/support/src/Services/RelationshipJoiner.php b/packages/support/src/Services/RelationshipJoiner.php
index 1b38318e49..57ea8157a9 100644
--- a/packages/support/src/Services/RelationshipJoiner.php
+++ b/packages/support/src/Services/RelationshipJoiner.php
@@ -93,7 +93,7 @@ class RelationshipJoiner
             /** @phpstan-ignore-next-line */
             foreach (($relationshipQuery->getQuery()->orders ?? []) as $order) {
                 // Regular orders: { column: string, direction: 'asc' | 'desc' }
-                // Sub-query orders look like: { column: Illuminate\Database\Query\Expression, direction: 'asc' | 'desc' }
+                // Sub-query orders: { column: Illuminate\Database\Query\Expression, direction: 'asc' | 'desc' }
                 // Raw orders: { type: 'Raw', sql: string }
                 if (! array_key_exists('column', $order) && ! array_key_exists('sql', $order)) {
                     continue;

From 693a0e3c09511aafe16ef006312167691da01ab8 Mon Sep 17 00:00:00 2001
From: "Ralph J. Smit" <59207045+ralphjsmit@users.noreply.github.com>
Date: Mon, 6 Jan 2025 11:02:48 +0100
Subject: [PATCH 05/16] Style

---
 packages/support/src/Services/RelationshipJoiner.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/support/src/Services/RelationshipJoiner.php b/packages/support/src/Services/RelationshipJoiner.php
index 57ea8157a9..441d53562b 100644
--- a/packages/support/src/Services/RelationshipJoiner.php
+++ b/packages/support/src/Services/RelationshipJoiner.php
@@ -101,13 +101,19 @@ class RelationshipJoiner
 
                 $columnValue = $order['column'] ?? new Expression($order['sql']);
 
-                if ($columnValue instanceof Expression && str($columnValue->getValue($relationship->getGrammar()))->contains('?')) {
+                if (
+                    $columnValue instanceof Expression
+                    && str($columnValue->getValue($relationship->getGrammar()))->contains('?')
+                ) {
                     // Heuristic to determine if the expression contains (a) binding(s), if so, as of
                     // yet we cannot reliably determine (which) bindings are used in the expression.
                     continue;
                 }
 
-                if (str($columnValue instanceof Expression ? $columnValue->getValue($relationship->getGrammar()) : $columnValue)->startsWith("{$relationshipQuery->getModel()->getTable()}.")) {
+                if (
+                    str($columnValue instanceof Expression ? $columnValue->getValue($relationship->getGrammar()) : $columnValue)
+                        ->startsWith("{$relationshipQuery->getModel()->getTable()}.")
+                ) {
                     continue;
                 }
 

From bf1704ed32f449533e82b58dc24321baa27edbb7 Mon Sep 17 00:00:00 2001
From: Tina Hammar <tinahammar@gmail.com>
Date: Tue, 14 Jan 2025 12:52:05 +0100
Subject: [PATCH 06/16] prevent click through on table editable columns

---
 .../views/columns/checkbox-column.blade.php   | 39 +++++-----
 .../views/columns/select-column.blade.php     | 48 ++++++-------
 .../views/columns/text-input-column.blade.php | 54 +++++++-------
 .../views/columns/toggle-column.blade.php     | 71 ++++++++++---------
 4 files changed, 107 insertions(+), 105 deletions(-)

diff --git a/packages/tables/resources/views/columns/checkbox-column.blade.php b/packages/tables/resources/views/columns/checkbox-column.blade.php
index 3e9fd5cbc1..3f58d5e53d 100644
--- a/packages/tables/resources/views/columns/checkbox-column.blade.php
+++ b/packages/tables/resources/views/columns/checkbox-column.blade.php
@@ -4,7 +4,7 @@
 @endphp
 
 <div
-    x-data="{
+        x-data="{
         error: undefined,
 
         isLoading: false,
@@ -15,7 +15,8 @@
 
         state: @js($state),
     }"
-    x-init="
+        x-on:click.stop.prevent=""
+        x-init="
         () => {
             Livewire.hook('commit', ({ component, commit, succeed, fail, respond }) => {
                 succeed(({ snapshot, effect }) => {
@@ -40,23 +41,23 @@
             })
         }
     "
-    {{
-        $attributes
-            ->merge($getExtraAttributes(), escape: false)
-            ->class([
-                'fi-ta-checkbox flex items-center',
-                'px-3 py-4' => ! $isInline(),
-            ])
-    }}
+        {{
+            $attributes
+                ->merge($getExtraAttributes(), escape: false)
+                ->class([
+                    'fi-ta-checkbox flex items-center',
+                    'px-3 py-4' => ! $isInline(),
+                ])
+        }}
 >
-    <input type="hidden" value="{{ $state ? 1 : 0 }}" x-ref="newState" />
+    <input type="hidden" value="{{ $state ? 1 : 0 }}" x-ref="newState"/>
 
     <x-filament::input.checkbox
-        alpine-valid="! error"
-        :disabled="$isDisabled"
-        :x-bind:disabled="$isDisabled ? null : 'isLoading'"
-        x-model="state"
-        x-on:change="
+            alpine-valid="! error"
+            :disabled="$isDisabled"
+            :x-bind:disabled="$isDisabled ? null : 'isLoading'"
+            x-model="state"
+            x-on:change="
             isLoading = true
 
             const response = await $wire.updateTableColumnState(
@@ -69,7 +70,7 @@
 
             isLoading = false
         "
-        x-tooltip="
+            x-tooltip="
             error === undefined
                 ? false
                 : {
@@ -77,8 +78,8 @@
                     theme: $store.theme,
                 }
         "
-        x-on:click.stop=""
-        :attributes="
+            x-on:click.stop=""
+            :attributes="
             \Filament\Support\prepare_inherited_attributes($attributes)
                 ->merge($getExtraInputAttributes(), escape: false)
         "
diff --git a/packages/tables/resources/views/columns/select-column.blade.php b/packages/tables/resources/views/columns/select-column.blade.php
index 5bb242751c..6a7da28c55 100644
--- a/packages/tables/resources/views/columns/select-column.blade.php
+++ b/packages/tables/resources/views/columns/select-column.blade.php
@@ -10,7 +10,7 @@
 @endphp
 
 <div
-    x-data="{
+        x-data="{
         error: undefined,
 
         isLoading: false,
@@ -21,7 +21,7 @@
 
         state: @js($state),
     }"
-    x-init="
+        x-init="
         () => {
             Livewire.hook('commit', ({ component, commit, succeed, fail, respond }) => {
                 succeed(({ snapshot, effect }) => {
@@ -46,25 +46,25 @@
             })
         }
     "
-    {{
-        $attributes
-            ->merge($getExtraAttributes(), escape: false)
-            ->class([
-                'fi-ta-select w-full min-w-48',
-                'px-3 py-4' => ! $isInline(),
-            ])
-    }}
+        {{
+            $attributes
+                ->merge($getExtraAttributes(), escape: false)
+                ->class([
+                    'fi-ta-select w-full min-w-48',
+                    'px-3 py-4' => ! $isInline(),
+                ])
+        }}
 >
     <input
-        type="hidden"
-        value="{{ str($state)->replace('"', '\\"') }}"
-        x-ref="newState"
+            type="hidden"
+            value="{{ str($state)->replace('"', '\\"') }}"
+            x-ref="newState"
     />
 
     <x-filament::input.wrapper
-        :alpine-disabled="'isLoading || ' . \Illuminate\Support\Js::from($isDisabled)"
-        alpine-valid="error === undefined"
-        x-tooltip="
+            :alpine-disabled="'isLoading || ' . \Illuminate\Support\Js::from($isDisabled)"
+            alpine-valid="error === undefined"
+            x-tooltip="
             error === undefined
                 ? false
                 : {
@@ -72,13 +72,13 @@
                     theme: $store.theme,
                 }
         "
-        x-on:click.stop=""
+            x-on:click.stop.prevent=""
     >
         <x-filament::input.select
-            :disabled="$isDisabled"
-            :x-bind:disabled="$isDisabled ? null : 'isLoading'"
-            x-model="state"
-            x-on:change="
+                :disabled="$isDisabled"
+                :x-bind:disabled="$isDisabled ? null : 'isLoading'"
+                x-model="state"
+                x-on:change="
                 isLoading = true
 
                 const response = await $wire.updateTableColumnState(
@@ -95,7 +95,7 @@
 
                 isLoading = false
             "
-            :attributes="\Filament\Support\prepare_inherited_attributes($getExtraInputAttributeBag())"
+                :attributes="\Filament\Support\prepare_inherited_attributes($getExtraInputAttributeBag())"
         >
             @if ($canSelectPlaceholder)
                 <option value="">{{ $getPlaceholder() }}</option>
@@ -103,8 +103,8 @@
 
             @foreach ($getOptions() as $value => $label)
                 <option
-                    @disabled($isOptionDisabled($value, $label))
-                    value="{{ $value }}"
+                        @disabled($isOptionDisabled($value, $label))
+                        value="{{ $value }}"
                 >
                     {{ $label }}
                 </option>
diff --git a/packages/tables/resources/views/columns/text-input-column.blade.php b/packages/tables/resources/views/columns/text-input-column.blade.php
index 50e2928b19..58af241d72 100644
--- a/packages/tables/resources/views/columns/text-input-column.blade.php
+++ b/packages/tables/resources/views/columns/text-input-column.blade.php
@@ -19,7 +19,7 @@
 @endphp
 
 <div
-    x-data="{
+        x-data="{
         error: undefined,
 
         isEditing: false,
@@ -32,7 +32,7 @@
 
         state: @js($state),
     }"
-    x-init="
+        x-init="
         () => {
             Livewire.hook('commit', ({ component, commit, succeed, fail, respond }) => {
                 succeed(({ snapshot, effect }) => {
@@ -61,25 +61,25 @@
             })
         }
     "
-    {{
-        $attributes
-            ->merge($getExtraAttributes(), escape: false)
-            ->class([
-                'fi-ta-text-input w-full min-w-48',
-                'px-3 py-4' => ! $isInline(),
-            ])
-    }}
+        {{
+            $attributes
+                ->merge($getExtraAttributes(), escape: false)
+                ->class([
+                    'fi-ta-text-input w-full min-w-48',
+                    'px-3 py-4' => ! $isInline(),
+                ])
+        }}
 >
     <input
-        type="hidden"
-        value="{{ str($state)->replace('"', '\\"') }}"
-        x-ref="newState"
+            type="hidden"
+            value="{{ str($state)->replace('"', '\\"') }}"
+            x-ref="newState"
     />
 
     <x-filament::input.wrapper
-        :alpine-disabled="'isLoading || ' . \Illuminate\Support\Js::from($isDisabled)"
-        alpine-valid="error === undefined"
-        x-tooltip="
+            :alpine-disabled="'isLoading || ' . \Illuminate\Support\Js::from($isDisabled)"
+            alpine-valid="error === undefined"
+            x-tooltip="
             error === undefined
                 ? false
                 : {
@@ -87,20 +87,20 @@
                     theme: $store.theme,
                 }
         "
-        x-on:click.stop=""
+            x-on:click.stop.prevent=""
     >
         {{-- format-ignore-start --}}
         <x-filament::input
-            :disabled="$isDisabled"
-            :input-mode="$getInputMode()"
-            :placeholder="$getPlaceholder()"
-            :step="$getStep()"
-            :type="$type"
-            :x-bind:disabled="$isDisabled ? null : 'isLoading'"
-            x-model="state"
-            x-on:blur="isEditing = false"
-            x-on:focus="isEditing = true"
-            :attributes="
+                :disabled="$isDisabled"
+                :input-mode="$getInputMode()"
+                :placeholder="$getPlaceholder()"
+                :step="$getStep()"
+                :type="$type"
+                :x-bind:disabled="$isDisabled ? null : 'isLoading'"
+                x-model="state"
+                x-on:blur="isEditing = false"
+                x-on:focus="isEditing = true"
+                :attributes="
                 \Filament\Support\prepare_inherited_attributes(
                     $getExtraInputAttributeBag()
                         ->merge([
diff --git a/packages/tables/resources/views/columns/toggle-column.blade.php b/packages/tables/resources/views/columns/toggle-column.blade.php
index 7c66b35dc5..2038cebfe1 100644
--- a/packages/tables/resources/views/columns/toggle-column.blade.php
+++ b/packages/tables/resources/views/columns/toggle-column.blade.php
@@ -4,23 +4,23 @@
 @endphp
 
 <div
-    wire:key="{{ $this->getId() }}.table.record.{{ $recordKey }}.column.{{ $getName() }}.toggle-column.{{ $state ? 'true' : 'false' }}"
+        wire:key="{{ $this->getId() }}.table.record.{{ $recordKey }}.column.{{ $getName() }}.toggle-column.{{ $state ? 'true' : 'false' }}"
 >
     <div
-        x-data="{
+            x-data="{
             error: undefined,
             state: @js((bool) $state),
             isLoading: false,
         }"
-        wire:ignore
-        {{
-            $attributes
-                ->merge($getExtraAttributes(), escape: false)
-                ->class([
-                    'fi-ta-toggle',
-                    'px-3 py-4' => ! $isInline(),
-                ])
-        }}
+            wire:ignore
+            {{
+                $attributes
+                    ->merge($getExtraAttributes(), escape: false)
+                    ->class([
+                        'fi-ta-toggle',
+                        'px-3 py-4' => ! $isInline(),
+                    ])
+            }}
     >
         @php
             $offColor = $getOffColor() ?? 'gray';
@@ -28,12 +28,13 @@
         @endphp
 
         <div
-            role="switch"
-            aria-checked="false"
-            x-bind:aria-checked="state.toString()"
-            @if (! $isDisabled)
-                x-on:click.stop="
-                    if (isLoading) {
+                role="switch"
+                aria-checked="false"
+                x-bind:aria-checked="state.toString()"
+                wire:loading.attr="disabled"
+                @if (! $isDisabled)
+                    x-on:click.stop.prevent="
+                    if (isLoading || $el.hasAttribute('disabled')) {
                         return
                     }
 
@@ -72,8 +73,8 @@
                               theme: $store.theme,
                           }
                 "
-            @endif
-            x-bind:class="
+                @endif
+                x-bind:class="
                 (state
                     ? '{{
                         \Illuminate\Support\Arr::toCssClasses([
@@ -95,7 +96,7 @@
                     }}') +
                     (isLoading ? ' opacity-70 pointer-events-none' : '')
             "
-            x-bind:style="
+                x-bind:style="
                 state
                     ? '{{
                         \Filament\Support\get_color_css_variables(
@@ -112,29 +113,29 @@
                         )
                     }}'
             "
-            @class([
-                'relative inline-flex h-6 w-11 shrink-0 cursor-pointer rounded-full border-2 border-transparent outline-none transition-colors duration-200 ease-in-out',
-                'pointer-events-none opacity-70' => $isDisabled,
-            ])
+                @class([
+                    'relative inline-flex h-6 w-11 shrink-0 cursor-pointer rounded-full border-2 border-transparent outline-none transition-colors duration-200 ease-in-out',
+                    'pointer-events-none opacity-70' => $isDisabled,
+                ])
         >
             <span
-                class="pointer-events-none relative inline-block h-5 w-5 transform rounded-full bg-white shadow ring-0 transition duration-200 ease-in-out"
-                x-bind:class="{
+                    class="pointer-events-none relative inline-block h-5 w-5 transform rounded-full bg-white shadow ring-0 transition duration-200 ease-in-out"
+                    x-bind:class="{
                     'translate-x-5 rtl:-translate-x-5': state,
                     'translate-x-0': ! state,
                 }"
             >
                 <span
-                    class="absolute inset-0 flex h-full w-full items-center justify-center transition-opacity"
-                    aria-hidden="true"
-                    x-bind:class="{
+                        class="absolute inset-0 flex h-full w-full items-center justify-center transition-opacity"
+                        aria-hidden="true"
+                        x-bind:class="{
                         'opacity-0 ease-out duration-100': state,
                         'opacity-100 ease-in duration-200': ! state,
                     }"
                 >
                     @if ($hasOffIcon())
                         <x-filament::icon
-                            :icon="$getOffIcon()"
+                                :icon="$getOffIcon()"
                             @class([
                                 'fi-ta-toggle-off-icon h-3 w-3',
                                 match ($offColor) {
@@ -147,17 +148,17 @@
                 </span>
 
                 <span
-                    class="absolute inset-0 flex h-full w-full items-center justify-center transition-opacity"
-                    aria-hidden="true"
-                    x-bind:class="{
+                        class="absolute inset-0 flex h-full w-full items-center justify-center transition-opacity"
+                        aria-hidden="true"
+                        x-bind:class="{
                         'opacity-100 ease-in duration-200': state,
                         'opacity-0 ease-out duration-100': ! state,
                     }"
                 >
                     @if ($hasOnIcon())
                         <x-filament::icon
-                            :icon="$getOnIcon()"
-                            x-cloak="x-cloak"
+                                :icon="$getOnIcon()"
+                                x-cloak="x-cloak"
                             @class([
                                 'fi-ta-toggle-on-icon h-3 w-3',
                                 match ($onColor) {

From f7544dec870d576125557f3537330dceabb8cc01 Mon Sep 17 00:00:00 2001
From: tanthammar <tanthammar@users.noreply.github.com>
Date: Tue, 14 Jan 2025 11:59:41 +0000
Subject: [PATCH 07/16] chore: fix code style

---
 .../views/columns/checkbox-column.blade.php   | 40 +++++------
 .../views/columns/select-column.blade.php     | 48 ++++++-------
 .../views/columns/text-input-column.blade.php | 34 ++++-----
 .../views/columns/toggle-column.blade.php     | 70 +++++++++----------
 4 files changed, 96 insertions(+), 96 deletions(-)

diff --git a/packages/tables/resources/views/columns/checkbox-column.blade.php b/packages/tables/resources/views/columns/checkbox-column.blade.php
index 3f58d5e53d..6159296684 100644
--- a/packages/tables/resources/views/columns/checkbox-column.blade.php
+++ b/packages/tables/resources/views/columns/checkbox-column.blade.php
@@ -4,7 +4,7 @@
 @endphp
 
 <div
-        x-data="{
+    x-data="{
         error: undefined,
 
         isLoading: false,
@@ -15,8 +15,8 @@
 
         state: @js($state),
     }"
-        x-on:click.stop.prevent=""
-        x-init="
+    x-on:click.stop.prevent=""
+    x-init="
         () => {
             Livewire.hook('commit', ({ component, commit, succeed, fail, respond }) => {
                 succeed(({ snapshot, effect }) => {
@@ -41,23 +41,23 @@
             })
         }
     "
-        {{
-            $attributes
-                ->merge($getExtraAttributes(), escape: false)
-                ->class([
-                    'fi-ta-checkbox flex items-center',
-                    'px-3 py-4' => ! $isInline(),
-                ])
-        }}
+    {{
+        $attributes
+            ->merge($getExtraAttributes(), escape: false)
+            ->class([
+                'fi-ta-checkbox flex items-center',
+                'px-3 py-4' => ! $isInline(),
+            ])
+    }}
 >
-    <input type="hidden" value="{{ $state ? 1 : 0 }}" x-ref="newState"/>
+    <input type="hidden" value="{{ $state ? 1 : 0 }}" x-ref="newState" />
 
     <x-filament::input.checkbox
-            alpine-valid="! error"
-            :disabled="$isDisabled"
-            :x-bind:disabled="$isDisabled ? null : 'isLoading'"
-            x-model="state"
-            x-on:change="
+        alpine-valid="! error"
+        :disabled="$isDisabled"
+        :x-bind:disabled="$isDisabled ? null : 'isLoading'"
+        x-model="state"
+        x-on:change="
             isLoading = true
 
             const response = await $wire.updateTableColumnState(
@@ -70,7 +70,7 @@
 
             isLoading = false
         "
-            x-tooltip="
+        x-tooltip="
             error === undefined
                 ? false
                 : {
@@ -78,8 +78,8 @@
                     theme: $store.theme,
                 }
         "
-            x-on:click.stop=""
-            :attributes="
+        x-on:click.stop=""
+        :attributes="
             \Filament\Support\prepare_inherited_attributes($attributes)
                 ->merge($getExtraInputAttributes(), escape: false)
         "
diff --git a/packages/tables/resources/views/columns/select-column.blade.php b/packages/tables/resources/views/columns/select-column.blade.php
index 6a7da28c55..95154d8edc 100644
--- a/packages/tables/resources/views/columns/select-column.blade.php
+++ b/packages/tables/resources/views/columns/select-column.blade.php
@@ -10,7 +10,7 @@
 @endphp
 
 <div
-        x-data="{
+    x-data="{
         error: undefined,
 
         isLoading: false,
@@ -21,7 +21,7 @@
 
         state: @js($state),
     }"
-        x-init="
+    x-init="
         () => {
             Livewire.hook('commit', ({ component, commit, succeed, fail, respond }) => {
                 succeed(({ snapshot, effect }) => {
@@ -46,25 +46,25 @@
             })
         }
     "
-        {{
-            $attributes
-                ->merge($getExtraAttributes(), escape: false)
-                ->class([
-                    'fi-ta-select w-full min-w-48',
-                    'px-3 py-4' => ! $isInline(),
-                ])
-        }}
+    {{
+        $attributes
+            ->merge($getExtraAttributes(), escape: false)
+            ->class([
+                'fi-ta-select w-full min-w-48',
+                'px-3 py-4' => ! $isInline(),
+            ])
+    }}
 >
     <input
-            type="hidden"
-            value="{{ str($state)->replace('"', '\\"') }}"
-            x-ref="newState"
+        type="hidden"
+        value="{{ str($state)->replace('"', '\\"') }}"
+        x-ref="newState"
     />
 
     <x-filament::input.wrapper
-            :alpine-disabled="'isLoading || ' . \Illuminate\Support\Js::from($isDisabled)"
-            alpine-valid="error === undefined"
-            x-tooltip="
+        :alpine-disabled="'isLoading || ' . \Illuminate\Support\Js::from($isDisabled)"
+        alpine-valid="error === undefined"
+        x-tooltip="
             error === undefined
                 ? false
                 : {
@@ -72,13 +72,13 @@
                     theme: $store.theme,
                 }
         "
-            x-on:click.stop.prevent=""
+        x-on:click.stop.prevent=""
     >
         <x-filament::input.select
-                :disabled="$isDisabled"
-                :x-bind:disabled="$isDisabled ? null : 'isLoading'"
-                x-model="state"
-                x-on:change="
+            :disabled="$isDisabled"
+            :x-bind:disabled="$isDisabled ? null : 'isLoading'"
+            x-model="state"
+            x-on:change="
                 isLoading = true
 
                 const response = await $wire.updateTableColumnState(
@@ -95,7 +95,7 @@
 
                 isLoading = false
             "
-                :attributes="\Filament\Support\prepare_inherited_attributes($getExtraInputAttributeBag())"
+            :attributes="\Filament\Support\prepare_inherited_attributes($getExtraInputAttributeBag())"
         >
             @if ($canSelectPlaceholder)
                 <option value="">{{ $getPlaceholder() }}</option>
@@ -103,8 +103,8 @@
 
             @foreach ($getOptions() as $value => $label)
                 <option
-                        @disabled($isOptionDisabled($value, $label))
-                        value="{{ $value }}"
+                    @disabled($isOptionDisabled($value, $label))
+                    value="{{ $value }}"
                 >
                     {{ $label }}
                 </option>
diff --git a/packages/tables/resources/views/columns/text-input-column.blade.php b/packages/tables/resources/views/columns/text-input-column.blade.php
index 58af241d72..45077826f2 100644
--- a/packages/tables/resources/views/columns/text-input-column.blade.php
+++ b/packages/tables/resources/views/columns/text-input-column.blade.php
@@ -19,7 +19,7 @@
 @endphp
 
 <div
-        x-data="{
+    x-data="{
         error: undefined,
 
         isEditing: false,
@@ -32,7 +32,7 @@
 
         state: @js($state),
     }"
-        x-init="
+    x-init="
         () => {
             Livewire.hook('commit', ({ component, commit, succeed, fail, respond }) => {
                 succeed(({ snapshot, effect }) => {
@@ -61,25 +61,25 @@
             })
         }
     "
-        {{
-            $attributes
-                ->merge($getExtraAttributes(), escape: false)
-                ->class([
-                    'fi-ta-text-input w-full min-w-48',
-                    'px-3 py-4' => ! $isInline(),
-                ])
-        }}
+    {{
+        $attributes
+            ->merge($getExtraAttributes(), escape: false)
+            ->class([
+                'fi-ta-text-input w-full min-w-48',
+                'px-3 py-4' => ! $isInline(),
+            ])
+    }}
 >
     <input
-            type="hidden"
-            value="{{ str($state)->replace('"', '\\"') }}"
-            x-ref="newState"
+        type="hidden"
+        value="{{ str($state)->replace('"', '\\"') }}"
+        x-ref="newState"
     />
 
     <x-filament::input.wrapper
-            :alpine-disabled="'isLoading || ' . \Illuminate\Support\Js::from($isDisabled)"
-            alpine-valid="error === undefined"
-            x-tooltip="
+        :alpine-disabled="'isLoading || ' . \Illuminate\Support\Js::from($isDisabled)"
+        alpine-valid="error === undefined"
+        x-tooltip="
             error === undefined
                 ? false
                 : {
@@ -87,7 +87,7 @@
                     theme: $store.theme,
                 }
         "
-            x-on:click.stop.prevent=""
+        x-on:click.stop.prevent=""
     >
         {{-- format-ignore-start --}}
         <x-filament::input
diff --git a/packages/tables/resources/views/columns/toggle-column.blade.php b/packages/tables/resources/views/columns/toggle-column.blade.php
index 2038cebfe1..70c220ecd6 100644
--- a/packages/tables/resources/views/columns/toggle-column.blade.php
+++ b/packages/tables/resources/views/columns/toggle-column.blade.php
@@ -4,23 +4,23 @@
 @endphp
 
 <div
-        wire:key="{{ $this->getId() }}.table.record.{{ $recordKey }}.column.{{ $getName() }}.toggle-column.{{ $state ? 'true' : 'false' }}"
+    wire:key="{{ $this->getId() }}.table.record.{{ $recordKey }}.column.{{ $getName() }}.toggle-column.{{ $state ? 'true' : 'false' }}"
 >
     <div
-            x-data="{
+        x-data="{
             error: undefined,
             state: @js((bool) $state),
             isLoading: false,
         }"
-            wire:ignore
-            {{
-                $attributes
-                    ->merge($getExtraAttributes(), escape: false)
-                    ->class([
-                        'fi-ta-toggle',
-                        'px-3 py-4' => ! $isInline(),
-                    ])
-            }}
+        wire:ignore
+        {{
+            $attributes
+                ->merge($getExtraAttributes(), escape: false)
+                ->class([
+                    'fi-ta-toggle',
+                    'px-3 py-4' => ! $isInline(),
+                ])
+        }}
     >
         @php
             $offColor = $getOffColor() ?? 'gray';
@@ -28,12 +28,12 @@
         @endphp
 
         <div
-                role="switch"
-                aria-checked="false"
-                x-bind:aria-checked="state.toString()"
-                wire:loading.attr="disabled"
-                @if (! $isDisabled)
-                    x-on:click.stop.prevent="
+            role="switch"
+            aria-checked="false"
+            x-bind:aria-checked="state.toString()"
+            wire:loading.attr="disabled"
+            @if (! $isDisabled)
+                x-on:click.stop.prevent="
                     if (isLoading || $el.hasAttribute('disabled')) {
                         return
                     }
@@ -73,8 +73,8 @@
                               theme: $store.theme,
                           }
                 "
-                @endif
-                x-bind:class="
+            @endif
+            x-bind:class="
                 (state
                     ? '{{
                         \Illuminate\Support\Arr::toCssClasses([
@@ -96,7 +96,7 @@
                     }}') +
                     (isLoading ? ' opacity-70 pointer-events-none' : '')
             "
-                x-bind:style="
+            x-bind:style="
                 state
                     ? '{{
                         \Filament\Support\get_color_css_variables(
@@ -113,29 +113,29 @@
                         )
                     }}'
             "
-                @class([
-                    'relative inline-flex h-6 w-11 shrink-0 cursor-pointer rounded-full border-2 border-transparent outline-none transition-colors duration-200 ease-in-out',
-                    'pointer-events-none opacity-70' => $isDisabled,
-                ])
+            @class([
+                'relative inline-flex h-6 w-11 shrink-0 cursor-pointer rounded-full border-2 border-transparent outline-none transition-colors duration-200 ease-in-out',
+                'pointer-events-none opacity-70' => $isDisabled,
+            ])
         >
             <span
-                    class="pointer-events-none relative inline-block h-5 w-5 transform rounded-full bg-white shadow ring-0 transition duration-200 ease-in-out"
-                    x-bind:class="{
+                class="pointer-events-none relative inline-block h-5 w-5 transform rounded-full bg-white shadow ring-0 transition duration-200 ease-in-out"
+                x-bind:class="{
                     'translate-x-5 rtl:-translate-x-5': state,
                     'translate-x-0': ! state,
                 }"
             >
                 <span
-                        class="absolute inset-0 flex h-full w-full items-center justify-center transition-opacity"
-                        aria-hidden="true"
-                        x-bind:class="{
+                    class="absolute inset-0 flex h-full w-full items-center justify-center transition-opacity"
+                    aria-hidden="true"
+                    x-bind:class="{
                         'opacity-0 ease-out duration-100': state,
                         'opacity-100 ease-in duration-200': ! state,
                     }"
                 >
                     @if ($hasOffIcon())
                         <x-filament::icon
-                                :icon="$getOffIcon()"
+                            :icon="$getOffIcon()"
                             @class([
                                 'fi-ta-toggle-off-icon h-3 w-3',
                                 match ($offColor) {
@@ -148,17 +148,17 @@
                 </span>
 
                 <span
-                        class="absolute inset-0 flex h-full w-full items-center justify-center transition-opacity"
-                        aria-hidden="true"
-                        x-bind:class="{
+                    class="absolute inset-0 flex h-full w-full items-center justify-center transition-opacity"
+                    aria-hidden="true"
+                    x-bind:class="{
                         'opacity-100 ease-in duration-200': state,
                         'opacity-0 ease-out duration-100': ! state,
                     }"
                 >
                     @if ($hasOnIcon())
                         <x-filament::icon
-                                :icon="$getOnIcon()"
-                                x-cloak="x-cloak"
+                            :icon="$getOnIcon()"
+                            x-cloak="x-cloak"
                             @class([
                                 'fi-ta-toggle-on-icon h-3 w-3',
                                 match ($onColor) {

From 3c58dc99a8a17dec60ba06d3727580fabda96e1b Mon Sep 17 00:00:00 2001
From: Tina Hammar <tinahammar@gmail.com>
Date: Tue, 14 Jan 2025 13:02:40 +0100
Subject: [PATCH 08/16] pint

---
 .../views/columns/checkbox-column.blade.php   | 40 +++++------
 .../views/columns/select-column.blade.php     | 48 ++++++-------
 .../views/columns/text-input-column.blade.php | 34 ++++-----
 .../views/columns/toggle-column.blade.php     | 70 +++++++++----------
 4 files changed, 96 insertions(+), 96 deletions(-)

diff --git a/packages/tables/resources/views/columns/checkbox-column.blade.php b/packages/tables/resources/views/columns/checkbox-column.blade.php
index 3f58d5e53d..6159296684 100644
--- a/packages/tables/resources/views/columns/checkbox-column.blade.php
+++ b/packages/tables/resources/views/columns/checkbox-column.blade.php
@@ -4,7 +4,7 @@
 @endphp
 
 <div
-        x-data="{
+    x-data="{
         error: undefined,
 
         isLoading: false,
@@ -15,8 +15,8 @@
 
         state: @js($state),
     }"
-        x-on:click.stop.prevent=""
-        x-init="
+    x-on:click.stop.prevent=""
+    x-init="
         () => {
             Livewire.hook('commit', ({ component, commit, succeed, fail, respond }) => {
                 succeed(({ snapshot, effect }) => {
@@ -41,23 +41,23 @@
             })
         }
     "
-        {{
-            $attributes
-                ->merge($getExtraAttributes(), escape: false)
-                ->class([
-                    'fi-ta-checkbox flex items-center',
-                    'px-3 py-4' => ! $isInline(),
-                ])
-        }}
+    {{
+        $attributes
+            ->merge($getExtraAttributes(), escape: false)
+            ->class([
+                'fi-ta-checkbox flex items-center',
+                'px-3 py-4' => ! $isInline(),
+            ])
+    }}
 >
-    <input type="hidden" value="{{ $state ? 1 : 0 }}" x-ref="newState"/>
+    <input type="hidden" value="{{ $state ? 1 : 0 }}" x-ref="newState" />
 
     <x-filament::input.checkbox
-            alpine-valid="! error"
-            :disabled="$isDisabled"
-            :x-bind:disabled="$isDisabled ? null : 'isLoading'"
-            x-model="state"
-            x-on:change="
+        alpine-valid="! error"
+        :disabled="$isDisabled"
+        :x-bind:disabled="$isDisabled ? null : 'isLoading'"
+        x-model="state"
+        x-on:change="
             isLoading = true
 
             const response = await $wire.updateTableColumnState(
@@ -70,7 +70,7 @@
 
             isLoading = false
         "
-            x-tooltip="
+        x-tooltip="
             error === undefined
                 ? false
                 : {
@@ -78,8 +78,8 @@
                     theme: $store.theme,
                 }
         "
-            x-on:click.stop=""
-            :attributes="
+        x-on:click.stop=""
+        :attributes="
             \Filament\Support\prepare_inherited_attributes($attributes)
                 ->merge($getExtraInputAttributes(), escape: false)
         "
diff --git a/packages/tables/resources/views/columns/select-column.blade.php b/packages/tables/resources/views/columns/select-column.blade.php
index 6a7da28c55..95154d8edc 100644
--- a/packages/tables/resources/views/columns/select-column.blade.php
+++ b/packages/tables/resources/views/columns/select-column.blade.php
@@ -10,7 +10,7 @@
 @endphp
 
 <div
-        x-data="{
+    x-data="{
         error: undefined,
 
         isLoading: false,
@@ -21,7 +21,7 @@
 
         state: @js($state),
     }"
-        x-init="
+    x-init="
         () => {
             Livewire.hook('commit', ({ component, commit, succeed, fail, respond }) => {
                 succeed(({ snapshot, effect }) => {
@@ -46,25 +46,25 @@
             })
         }
     "
-        {{
-            $attributes
-                ->merge($getExtraAttributes(), escape: false)
-                ->class([
-                    'fi-ta-select w-full min-w-48',
-                    'px-3 py-4' => ! $isInline(),
-                ])
-        }}
+    {{
+        $attributes
+            ->merge($getExtraAttributes(), escape: false)
+            ->class([
+                'fi-ta-select w-full min-w-48',
+                'px-3 py-4' => ! $isInline(),
+            ])
+    }}
 >
     <input
-            type="hidden"
-            value="{{ str($state)->replace('"', '\\"') }}"
-            x-ref="newState"
+        type="hidden"
+        value="{{ str($state)->replace('"', '\\"') }}"
+        x-ref="newState"
     />
 
     <x-filament::input.wrapper
-            :alpine-disabled="'isLoading || ' . \Illuminate\Support\Js::from($isDisabled)"
-            alpine-valid="error === undefined"
-            x-tooltip="
+        :alpine-disabled="'isLoading || ' . \Illuminate\Support\Js::from($isDisabled)"
+        alpine-valid="error === undefined"
+        x-tooltip="
             error === undefined
                 ? false
                 : {
@@ -72,13 +72,13 @@
                     theme: $store.theme,
                 }
         "
-            x-on:click.stop.prevent=""
+        x-on:click.stop.prevent=""
     >
         <x-filament::input.select
-                :disabled="$isDisabled"
-                :x-bind:disabled="$isDisabled ? null : 'isLoading'"
-                x-model="state"
-                x-on:change="
+            :disabled="$isDisabled"
+            :x-bind:disabled="$isDisabled ? null : 'isLoading'"
+            x-model="state"
+            x-on:change="
                 isLoading = true
 
                 const response = await $wire.updateTableColumnState(
@@ -95,7 +95,7 @@
 
                 isLoading = false
             "
-                :attributes="\Filament\Support\prepare_inherited_attributes($getExtraInputAttributeBag())"
+            :attributes="\Filament\Support\prepare_inherited_attributes($getExtraInputAttributeBag())"
         >
             @if ($canSelectPlaceholder)
                 <option value="">{{ $getPlaceholder() }}</option>
@@ -103,8 +103,8 @@
 
             @foreach ($getOptions() as $value => $label)
                 <option
-                        @disabled($isOptionDisabled($value, $label))
-                        value="{{ $value }}"
+                    @disabled($isOptionDisabled($value, $label))
+                    value="{{ $value }}"
                 >
                     {{ $label }}
                 </option>
diff --git a/packages/tables/resources/views/columns/text-input-column.blade.php b/packages/tables/resources/views/columns/text-input-column.blade.php
index 58af241d72..45077826f2 100644
--- a/packages/tables/resources/views/columns/text-input-column.blade.php
+++ b/packages/tables/resources/views/columns/text-input-column.blade.php
@@ -19,7 +19,7 @@
 @endphp
 
 <div
-        x-data="{
+    x-data="{
         error: undefined,
 
         isEditing: false,
@@ -32,7 +32,7 @@
 
         state: @js($state),
     }"
-        x-init="
+    x-init="
         () => {
             Livewire.hook('commit', ({ component, commit, succeed, fail, respond }) => {
                 succeed(({ snapshot, effect }) => {
@@ -61,25 +61,25 @@
             })
         }
     "
-        {{
-            $attributes
-                ->merge($getExtraAttributes(), escape: false)
-                ->class([
-                    'fi-ta-text-input w-full min-w-48',
-                    'px-3 py-4' => ! $isInline(),
-                ])
-        }}
+    {{
+        $attributes
+            ->merge($getExtraAttributes(), escape: false)
+            ->class([
+                'fi-ta-text-input w-full min-w-48',
+                'px-3 py-4' => ! $isInline(),
+            ])
+    }}
 >
     <input
-            type="hidden"
-            value="{{ str($state)->replace('"', '\\"') }}"
-            x-ref="newState"
+        type="hidden"
+        value="{{ str($state)->replace('"', '\\"') }}"
+        x-ref="newState"
     />
 
     <x-filament::input.wrapper
-            :alpine-disabled="'isLoading || ' . \Illuminate\Support\Js::from($isDisabled)"
-            alpine-valid="error === undefined"
-            x-tooltip="
+        :alpine-disabled="'isLoading || ' . \Illuminate\Support\Js::from($isDisabled)"
+        alpine-valid="error === undefined"
+        x-tooltip="
             error === undefined
                 ? false
                 : {
@@ -87,7 +87,7 @@
                     theme: $store.theme,
                 }
         "
-            x-on:click.stop.prevent=""
+        x-on:click.stop.prevent=""
     >
         {{-- format-ignore-start --}}
         <x-filament::input
diff --git a/packages/tables/resources/views/columns/toggle-column.blade.php b/packages/tables/resources/views/columns/toggle-column.blade.php
index 2038cebfe1..70c220ecd6 100644
--- a/packages/tables/resources/views/columns/toggle-column.blade.php
+++ b/packages/tables/resources/views/columns/toggle-column.blade.php
@@ -4,23 +4,23 @@
 @endphp
 
 <div
-        wire:key="{{ $this->getId() }}.table.record.{{ $recordKey }}.column.{{ $getName() }}.toggle-column.{{ $state ? 'true' : 'false' }}"
+    wire:key="{{ $this->getId() }}.table.record.{{ $recordKey }}.column.{{ $getName() }}.toggle-column.{{ $state ? 'true' : 'false' }}"
 >
     <div
-            x-data="{
+        x-data="{
             error: undefined,
             state: @js((bool) $state),
             isLoading: false,
         }"
-            wire:ignore
-            {{
-                $attributes
-                    ->merge($getExtraAttributes(), escape: false)
-                    ->class([
-                        'fi-ta-toggle',
-                        'px-3 py-4' => ! $isInline(),
-                    ])
-            }}
+        wire:ignore
+        {{
+            $attributes
+                ->merge($getExtraAttributes(), escape: false)
+                ->class([
+                    'fi-ta-toggle',
+                    'px-3 py-4' => ! $isInline(),
+                ])
+        }}
     >
         @php
             $offColor = $getOffColor() ?? 'gray';
@@ -28,12 +28,12 @@
         @endphp
 
         <div
-                role="switch"
-                aria-checked="false"
-                x-bind:aria-checked="state.toString()"
-                wire:loading.attr="disabled"
-                @if (! $isDisabled)
-                    x-on:click.stop.prevent="
+            role="switch"
+            aria-checked="false"
+            x-bind:aria-checked="state.toString()"
+            wire:loading.attr="disabled"
+            @if (! $isDisabled)
+                x-on:click.stop.prevent="
                     if (isLoading || $el.hasAttribute('disabled')) {
                         return
                     }
@@ -73,8 +73,8 @@
                               theme: $store.theme,
                           }
                 "
-                @endif
-                x-bind:class="
+            @endif
+            x-bind:class="
                 (state
                     ? '{{
                         \Illuminate\Support\Arr::toCssClasses([
@@ -96,7 +96,7 @@
                     }}') +
                     (isLoading ? ' opacity-70 pointer-events-none' : '')
             "
-                x-bind:style="
+            x-bind:style="
                 state
                     ? '{{
                         \Filament\Support\get_color_css_variables(
@@ -113,29 +113,29 @@
                         )
                     }}'
             "
-                @class([
-                    'relative inline-flex h-6 w-11 shrink-0 cursor-pointer rounded-full border-2 border-transparent outline-none transition-colors duration-200 ease-in-out',
-                    'pointer-events-none opacity-70' => $isDisabled,
-                ])
+            @class([
+                'relative inline-flex h-6 w-11 shrink-0 cursor-pointer rounded-full border-2 border-transparent outline-none transition-colors duration-200 ease-in-out',
+                'pointer-events-none opacity-70' => $isDisabled,
+            ])
         >
             <span
-                    class="pointer-events-none relative inline-block h-5 w-5 transform rounded-full bg-white shadow ring-0 transition duration-200 ease-in-out"
-                    x-bind:class="{
+                class="pointer-events-none relative inline-block h-5 w-5 transform rounded-full bg-white shadow ring-0 transition duration-200 ease-in-out"
+                x-bind:class="{
                     'translate-x-5 rtl:-translate-x-5': state,
                     'translate-x-0': ! state,
                 }"
             >
                 <span
-                        class="absolute inset-0 flex h-full w-full items-center justify-center transition-opacity"
-                        aria-hidden="true"
-                        x-bind:class="{
+                    class="absolute inset-0 flex h-full w-full items-center justify-center transition-opacity"
+                    aria-hidden="true"
+                    x-bind:class="{
                         'opacity-0 ease-out duration-100': state,
                         'opacity-100 ease-in duration-200': ! state,
                     }"
                 >
                     @if ($hasOffIcon())
                         <x-filament::icon
-                                :icon="$getOffIcon()"
+                            :icon="$getOffIcon()"
                             @class([
                                 'fi-ta-toggle-off-icon h-3 w-3',
                                 match ($offColor) {
@@ -148,17 +148,17 @@
                 </span>
 
                 <span
-                        class="absolute inset-0 flex h-full w-full items-center justify-center transition-opacity"
-                        aria-hidden="true"
-                        x-bind:class="{
+                    class="absolute inset-0 flex h-full w-full items-center justify-center transition-opacity"
+                    aria-hidden="true"
+                    x-bind:class="{
                         'opacity-100 ease-in duration-200': state,
                         'opacity-0 ease-out duration-100': ! state,
                     }"
                 >
                     @if ($hasOnIcon())
                         <x-filament::icon
-                                :icon="$getOnIcon()"
-                                x-cloak="x-cloak"
+                            :icon="$getOnIcon()"
+                            x-cloak="x-cloak"
                             @class([
                                 'fi-ta-toggle-on-icon h-3 w-3',
                                 match ($onColor) {

From 9b9faa41f6e4209abb13dd784d81e9e2c3ea4f6b Mon Sep 17 00:00:00 2001
From: Tina Hammar <tinahammar@gmail.com>
Date: Tue, 14 Jan 2025 13:04:48 +0100
Subject: [PATCH 09/16] Update text-input-column.blade.php

---
 .../views/columns/text-input-column.blade.php | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/packages/tables/resources/views/columns/text-input-column.blade.php b/packages/tables/resources/views/columns/text-input-column.blade.php
index 45077826f2..58af241d72 100644
--- a/packages/tables/resources/views/columns/text-input-column.blade.php
+++ b/packages/tables/resources/views/columns/text-input-column.blade.php
@@ -19,7 +19,7 @@
 @endphp
 
 <div
-    x-data="{
+        x-data="{
         error: undefined,
 
         isEditing: false,
@@ -32,7 +32,7 @@
 
         state: @js($state),
     }"
-    x-init="
+        x-init="
         () => {
             Livewire.hook('commit', ({ component, commit, succeed, fail, respond }) => {
                 succeed(({ snapshot, effect }) => {
@@ -61,25 +61,25 @@
             })
         }
     "
-    {{
-        $attributes
-            ->merge($getExtraAttributes(), escape: false)
-            ->class([
-                'fi-ta-text-input w-full min-w-48',
-                'px-3 py-4' => ! $isInline(),
-            ])
-    }}
+        {{
+            $attributes
+                ->merge($getExtraAttributes(), escape: false)
+                ->class([
+                    'fi-ta-text-input w-full min-w-48',
+                    'px-3 py-4' => ! $isInline(),
+                ])
+        }}
 >
     <input
-        type="hidden"
-        value="{{ str($state)->replace('"', '\\"') }}"
-        x-ref="newState"
+            type="hidden"
+            value="{{ str($state)->replace('"', '\\"') }}"
+            x-ref="newState"
     />
 
     <x-filament::input.wrapper
-        :alpine-disabled="'isLoading || ' . \Illuminate\Support\Js::from($isDisabled)"
-        alpine-valid="error === undefined"
-        x-tooltip="
+            :alpine-disabled="'isLoading || ' . \Illuminate\Support\Js::from($isDisabled)"
+            alpine-valid="error === undefined"
+            x-tooltip="
             error === undefined
                 ? false
                 : {
@@ -87,7 +87,7 @@
                     theme: $store.theme,
                 }
         "
-        x-on:click.stop.prevent=""
+            x-on:click.stop.prevent=""
     >
         {{-- format-ignore-start --}}
         <x-filament::input

From 74fa5095c12738fa7af0d90e1b3d4df04c95f63e Mon Sep 17 00:00:00 2001
From: Tina Hammar <tinahammar@gmail.com>
Date: Tue, 14 Jan 2025 13:09:52 +0100
Subject: [PATCH 10/16] Update text-input-column.blade.php

---
 .../views/columns/text-input-column.blade.php        | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/tables/resources/views/columns/text-input-column.blade.php b/packages/tables/resources/views/columns/text-input-column.blade.php
index 58af241d72..346ac6c50b 100644
--- a/packages/tables/resources/views/columns/text-input-column.blade.php
+++ b/packages/tables/resources/views/columns/text-input-column.blade.php
@@ -80,12 +80,12 @@
             :alpine-disabled="'isLoading || ' . \Illuminate\Support\Js::from($isDisabled)"
             alpine-valid="error === undefined"
             x-tooltip="
-            error === undefined
-                ? false
-                : {
-                    content: error,
-                    theme: $store.theme,
-                }
+        error === undefined
+            ? false
+            : {
+                content: error,
+                theme: $store.theme,
+            }
         "
             x-on:click.stop.prevent=""
     >

From a3f19e18cb170563fd7b53569f93835f16b34a4d Mon Sep 17 00:00:00 2001
From: tanthammar <tanthammar@users.noreply.github.com>
Date: Tue, 14 Jan 2025 12:17:27 +0000
Subject: [PATCH 11/16] chore: fix code style

---
 .../views/columns/text-input-column.blade.php | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/packages/tables/resources/views/columns/text-input-column.blade.php b/packages/tables/resources/views/columns/text-input-column.blade.php
index 346ac6c50b..16510c652e 100644
--- a/packages/tables/resources/views/columns/text-input-column.blade.php
+++ b/packages/tables/resources/views/columns/text-input-column.blade.php
@@ -19,7 +19,7 @@
 @endphp
 
 <div
-        x-data="{
+    x-data="{
         error: undefined,
 
         isEditing: false,
@@ -32,7 +32,7 @@
 
         state: @js($state),
     }"
-        x-init="
+    x-init="
         () => {
             Livewire.hook('commit', ({ component, commit, succeed, fail, respond }) => {
                 succeed(({ snapshot, effect }) => {
@@ -61,25 +61,25 @@
             })
         }
     "
-        {{
-            $attributes
-                ->merge($getExtraAttributes(), escape: false)
-                ->class([
-                    'fi-ta-text-input w-full min-w-48',
-                    'px-3 py-4' => ! $isInline(),
-                ])
-        }}
+    {{
+        $attributes
+            ->merge($getExtraAttributes(), escape: false)
+            ->class([
+                'fi-ta-text-input w-full min-w-48',
+                'px-3 py-4' => ! $isInline(),
+            ])
+    }}
 >
     <input
-            type="hidden"
-            value="{{ str($state)->replace('"', '\\"') }}"
-            x-ref="newState"
+        type="hidden"
+        value="{{ str($state)->replace('"', '\\"') }}"
+        x-ref="newState"
     />
 
     <x-filament::input.wrapper
-            :alpine-disabled="'isLoading || ' . \Illuminate\Support\Js::from($isDisabled)"
-            alpine-valid="error === undefined"
-            x-tooltip="
+        :alpine-disabled="'isLoading || ' . \Illuminate\Support\Js::from($isDisabled)"
+        alpine-valid="error === undefined"
+        x-tooltip="
         error === undefined
             ? false
             : {
@@ -87,7 +87,7 @@
                 theme: $store.theme,
             }
         "
-            x-on:click.stop.prevent=""
+        x-on:click.stop.prevent=""
     >
         {{-- format-ignore-start --}}
         <x-filament::input

From d13c357e5dc0dffa38712815c538a13b032e4709 Mon Sep 17 00:00:00 2001
From: "Ralph J. Smit" <59207045+ralphjsmit@users.noreply.github.com>
Date: Wed, 15 Jan 2025 21:31:24 +0100
Subject: [PATCH 12/16] WIP

---
 .../migrations/create_team_user_table.php     | 24 +++++
 tests/src/Models/User.php                     |  6 ++
 .../Services/RelationshipJoinerTest.php       | 88 +++++++++++++++++++
 3 files changed, 118 insertions(+)
 create mode 100644 tests/database/migrations/create_team_user_table.php
 create mode 100644 tests/src/Support/Services/RelationshipJoinerTest.php

diff --git a/tests/database/migrations/create_team_user_table.php b/tests/database/migrations/create_team_user_table.php
new file mode 100644
index 0000000000..40347a989b
--- /dev/null
+++ b/tests/database/migrations/create_team_user_table.php
@@ -0,0 +1,24 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    public function up(): void
+    {
+        Schema::create('team_user', function (Blueprint $table): void {
+            $table->id();
+			$table->foreignId('team_id')->constrained();
+			$table->foreignId('user_id')->constrained();
+			$table->string('role')->nullable();
+            $table->timestamps();
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::dropIfExists('team_user');
+    }
+};
diff --git a/tests/src/Models/User.php b/tests/src/Models/User.php
index 82e98a060b..184f85e375 100644
--- a/tests/src/Models/User.php
+++ b/tests/src/Models/User.php
@@ -9,6 +9,7 @@ use Filament\Tests\Database\Factories\UserFactory;
 use Illuminate\Contracts\Auth\MustVerifyEmail;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
@@ -36,6 +37,11 @@ class User extends Authenticatable implements FilamentUser, HasTenants, MustVeri
         return $this->hasMany(Post::class, 'author_id');
     }
 
+    public function teams(): BelongsToMany
+    {
+        return $this->belongsToMany(Team::class);
+    }
+
     protected static function newFactory()
     {
         return UserFactory::new();
diff --git a/tests/src/Support/Services/RelationshipJoinerTest.php b/tests/src/Support/Services/RelationshipJoinerTest.php
new file mode 100644
index 0000000000..88d9321b93
--- /dev/null
+++ b/tests/src/Support/Services/RelationshipJoinerTest.php
@@ -0,0 +1,88 @@
+<?php
+
+use Filament\Support\Services\RelationshipJoiner;
+use Filament\Tests\Models\Team;
+use Filament\Tests\Models\User;
+use Filament\Tests\TestCase;
+use Illuminate\Database\Query\Expression;
+
+uses(TestCase::class);
+
+it('can prepare query for no constraints', function () {
+    $user = User::factory()->create();
+
+    expect($user->teams()->toBase())
+        ->distinct->toBeFalse()
+        ->getColumns()->toBe([])
+        ->orders->toBeNull();
+
+    $query = app(RelationshipJoiner::class)->prepareQueryForNoConstraints($user->teams());
+
+    expect($query->toBase())
+        ->distinct->toBeTrue()
+        ->getColumns()->toBe(['teams.*'])
+        ->orders->toBeNull();
+
+    $query = app(RelationshipJoiner::class)->prepareQueryForNoConstraints(
+        $user
+            ->teams()
+            ->orderBy('id')
+            ->orderBy((new Team)->qualifyColumn('name'))
+            ->orderBy('team_user.role')
+    );
+
+    expect($query->toBase())
+        ->distinct->toBeTrue()
+        ->getColumns()->toBe([
+            (new Team)->qualifyColumn('*'), // Default select...
+            'id', // Select without a qualified table also included just to be sure...
+            // Select for `team.name` not included as that is already included in the `team.*`...
+            'team_user.role', // Select for a qualitified other table included...
+        ])
+        ->orders->toBe([
+            [
+                'column' => 'id',
+                'direction' => 'asc',
+            ],
+            [
+                'column' => 'teams.name',
+                'direction' => 'asc',
+            ],
+            [
+                'column' => 'team_user.role',
+                'direction' => 'asc',
+            ],
+        ]);
+
+    $query = app(RelationshipJoiner::class)->prepareQueryForNoConstraints(
+        $user->teams()->orderByRaw("CASE WHEN role = 'admin' THEN 1 ELSE 2 END")
+    );
+
+    expect($query->toBase())
+        ->distinct->toBeTrue()
+        ->getColumns()->toBe([
+            (new Team)->qualifyColumn('*'),
+            "CASE WHEN role = 'admin' THEN 1 ELSE 2 END", // Select added from `orderByRaw`...
+        ])
+        ->orders->toBe([
+            [
+                'type' => 'Raw',
+                'sql' => "CASE WHEN role = 'admin' THEN 1 ELSE 2 END",
+            ],
+        ]);
+
+    $query = app(RelationshipJoiner::class)->prepareQueryForNoConstraints(
+		$user->teams()->orderBy(new Expression("CASE WHEN role = 'some_other_role' THEN 1 ELSE 2 END"))
+    );
+
+    expect($query->toBase())
+        ->distinct->toBeTrue()
+        ->getColumns()->toBe([
+            (new Team)->qualifyColumn('*'),
+            "CASE WHEN role = 'user' THEN 1 ELSE 2 END", // Select added from `orderByRaw`...
+        ])
+	    ->orders->toHaveCount(1)
+	    ->and($query->toBase()->orders[0])
+	    ->column->getValue($user->teams()->getGrammar())->toBe("CASE WHEN role = 'some_other_role' THEN 1 ELSE 2 END")
+	    ->direction->toBe('asc');
+});

From 557e90519614ba3c0255b155a4b14f1af85c2d00 Mon Sep 17 00:00:00 2001
From: "Ralph J. Smit" <59207045+ralphjsmit@users.noreply.github.com>
Date: Wed, 15 Jan 2025 21:32:28 +0100
Subject: [PATCH 13/16] Style

---
 tests/database/migrations/create_team_user_table.php |  6 +++---
 .../src/Support/Services/RelationshipJoinerTest.php  | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/tests/database/migrations/create_team_user_table.php b/tests/database/migrations/create_team_user_table.php
index 40347a989b..9565ec19e0 100644
--- a/tests/database/migrations/create_team_user_table.php
+++ b/tests/database/migrations/create_team_user_table.php
@@ -10,9 +10,9 @@ return new class extends Migration
     {
         Schema::create('team_user', function (Blueprint $table): void {
             $table->id();
-			$table->foreignId('team_id')->constrained();
-			$table->foreignId('user_id')->constrained();
-			$table->string('role')->nullable();
+            $table->foreignId('team_id')->constrained();
+            $table->foreignId('user_id')->constrained();
+            $table->string('role')->nullable();
             $table->timestamps();
         });
     }
diff --git a/tests/src/Support/Services/RelationshipJoinerTest.php b/tests/src/Support/Services/RelationshipJoinerTest.php
index 88d9321b93..94c2b8c45d 100644
--- a/tests/src/Support/Services/RelationshipJoinerTest.php
+++ b/tests/src/Support/Services/RelationshipJoinerTest.php
@@ -8,7 +8,7 @@ use Illuminate\Database\Query\Expression;
 
 uses(TestCase::class);
 
-it('can prepare query for no constraints', function () {
+it('can prepare query for no constraints for a BelongsToMany relationship', function () {
     $user = User::factory()->create();
 
     expect($user->teams()->toBase())
@@ -72,7 +72,7 @@ it('can prepare query for no constraints', function () {
         ]);
 
     $query = app(RelationshipJoiner::class)->prepareQueryForNoConstraints(
-		$user->teams()->orderBy(new Expression("CASE WHEN role = 'some_other_role' THEN 1 ELSE 2 END"))
+        $user->teams()->orderBy(new Expression("CASE WHEN role = 'some_other_role' THEN 1 ELSE 2 END"))
     );
 
     expect($query->toBase())
@@ -81,8 +81,8 @@ it('can prepare query for no constraints', function () {
             (new Team)->qualifyColumn('*'),
             "CASE WHEN role = 'user' THEN 1 ELSE 2 END", // Select added from `orderByRaw`...
         ])
-	    ->orders->toHaveCount(1)
-	    ->and($query->toBase()->orders[0])
-	    ->column->getValue($user->teams()->getGrammar())->toBe("CASE WHEN role = 'some_other_role' THEN 1 ELSE 2 END")
-	    ->direction->toBe('asc');
+        ->orders->toHaveCount(1)
+        ->and($query->toBase()->orders[0])
+        ->column->getValue($user->teams()->getGrammar())->toBe("CASE WHEN role = 'some_other_role' THEN 1 ELSE 2 END")
+        ->direction->toBe('asc');
 });

From b8bba48cca3e2859a8ac3728204ddd11f39d32a3 Mon Sep 17 00:00:00 2001
From: "Ralph J. Smit" <59207045+ralphjsmit@users.noreply.github.com>
Date: Wed, 15 Jan 2025 21:33:20 +0100
Subject: [PATCH 14/16] Update name

---
 .../Services/RelationshipJoinerTest.php        | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/tests/src/Support/Services/RelationshipJoinerTest.php b/tests/src/Support/Services/RelationshipJoinerTest.php
index 94c2b8c45d..a7b1455b8a 100644
--- a/tests/src/Support/Services/RelationshipJoinerTest.php
+++ b/tests/src/Support/Services/RelationshipJoinerTest.php
@@ -16,14 +16,14 @@ it('can prepare query for no constraints for a BelongsToMany relationship', func
         ->getColumns()->toBe([])
         ->orders->toBeNull();
 
-    $query = app(RelationshipJoiner::class)->prepareQueryForNoConstraints($user->teams());
+    $preparedQuery = app(RelationshipJoiner::class)->prepareQueryForNoConstraints($user->teams());
 
-    expect($query->toBase())
+    expect($preparedQuery->toBase())
         ->distinct->toBeTrue()
         ->getColumns()->toBe(['teams.*'])
         ->orders->toBeNull();
 
-    $query = app(RelationshipJoiner::class)->prepareQueryForNoConstraints(
+    $preparedQuery = app(RelationshipJoiner::class)->prepareQueryForNoConstraints(
         $user
             ->teams()
             ->orderBy('id')
@@ -31,7 +31,7 @@ it('can prepare query for no constraints for a BelongsToMany relationship', func
             ->orderBy('team_user.role')
     );
 
-    expect($query->toBase())
+    expect($preparedQuery->toBase())
         ->distinct->toBeTrue()
         ->getColumns()->toBe([
             (new Team)->qualifyColumn('*'), // Default select...
@@ -54,11 +54,11 @@ it('can prepare query for no constraints for a BelongsToMany relationship', func
             ],
         ]);
 
-    $query = app(RelationshipJoiner::class)->prepareQueryForNoConstraints(
+    $preparedQuery = app(RelationshipJoiner::class)->prepareQueryForNoConstraints(
         $user->teams()->orderByRaw("CASE WHEN role = 'admin' THEN 1 ELSE 2 END")
     );
 
-    expect($query->toBase())
+    expect($preparedQuery->toBase())
         ->distinct->toBeTrue()
         ->getColumns()->toBe([
             (new Team)->qualifyColumn('*'),
@@ -71,18 +71,18 @@ it('can prepare query for no constraints for a BelongsToMany relationship', func
             ],
         ]);
 
-    $query = app(RelationshipJoiner::class)->prepareQueryForNoConstraints(
+    $preparedQuery = app(RelationshipJoiner::class)->prepareQueryForNoConstraints(
         $user->teams()->orderBy(new Expression("CASE WHEN role = 'some_other_role' THEN 1 ELSE 2 END"))
     );
 
-    expect($query->toBase())
+    expect($preparedQuery->toBase())
         ->distinct->toBeTrue()
         ->getColumns()->toBe([
             (new Team)->qualifyColumn('*'),
             "CASE WHEN role = 'user' THEN 1 ELSE 2 END", // Select added from `orderByRaw`...
         ])
         ->orders->toHaveCount(1)
-        ->and($query->toBase()->orders[0])
+        ->and($preparedQuery->toBase()->orders[0])
         ->column->getValue($user->teams()->getGrammar())->toBe("CASE WHEN role = 'some_other_role' THEN 1 ELSE 2 END")
         ->direction->toBe('asc');
 });

From c7155f1429e3af6f752614db892dd1e574d459c7 Mon Sep 17 00:00:00 2001
From: "Ralph J. Smit" <59207045+ralphjsmit@users.noreply.github.com>
Date: Thu, 16 Jan 2025 09:29:25 +0100
Subject: [PATCH 15/16] Fix failing test

---
 tests/src/Support/Services/RelationshipJoinerTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/src/Support/Services/RelationshipJoinerTest.php b/tests/src/Support/Services/RelationshipJoinerTest.php
index a7b1455b8a..bae862a727 100644
--- a/tests/src/Support/Services/RelationshipJoinerTest.php
+++ b/tests/src/Support/Services/RelationshipJoinerTest.php
@@ -79,7 +79,7 @@ it('can prepare query for no constraints for a BelongsToMany relationship', func
         ->distinct->toBeTrue()
         ->getColumns()->toBe([
             (new Team)->qualifyColumn('*'),
-            "CASE WHEN role = 'user' THEN 1 ELSE 2 END", // Select added from `orderByRaw`...
+            "CASE WHEN role = 'some_other_role' THEN 1 ELSE 2 END", // Select added from `orderByRaw`...
         ])
         ->orders->toHaveCount(1)
         ->and($preparedQuery->toBase()->orders[0])

From 0e2d848ee462e68c093996634af7ee8ce657205c Mon Sep 17 00:00:00 2001
From: Dan Harrin <git@danharrin.com>
Date: Wed, 22 Jan 2025 08:53:58 +0000
Subject: [PATCH 16/16] Update text-input-column.blade.php

---
 .../views/columns/text-input-column.blade.php | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/packages/tables/resources/views/columns/text-input-column.blade.php b/packages/tables/resources/views/columns/text-input-column.blade.php
index 16510c652e..e9d3ea303c 100644
--- a/packages/tables/resources/views/columns/text-input-column.blade.php
+++ b/packages/tables/resources/views/columns/text-input-column.blade.php
@@ -80,27 +80,27 @@
         :alpine-disabled="'isLoading || ' . \Illuminate\Support\Js::from($isDisabled)"
         alpine-valid="error === undefined"
         x-tooltip="
-        error === undefined
-            ? false
-            : {
-                content: error,
-                theme: $store.theme,
-            }
+            error === undefined
+                ? false
+                : {
+                    content: error,
+                    theme: $store.theme,
+                }
         "
         x-on:click.stop.prevent=""
     >
         {{-- format-ignore-start --}}
         <x-filament::input
-                :disabled="$isDisabled"
-                :input-mode="$getInputMode()"
-                :placeholder="$getPlaceholder()"
-                :step="$getStep()"
-                :type="$type"
-                :x-bind:disabled="$isDisabled ? null : 'isLoading'"
-                x-model="state"
-                x-on:blur="isEditing = false"
-                x-on:focus="isEditing = true"
-                :attributes="
+            :disabled="$isDisabled"
+            :input-mode="$getInputMode()"
+            :placeholder="$getPlaceholder()"
+            :step="$getStep()"
+            :type="$type"
+            :x-bind:disabled="$isDisabled ? null : 'isLoading'"
+            x-model="state"
+            x-on:blur="isEditing = false"
+            x-on:focus="isEditing = true"
+            :attributes="
                 \Filament\Support\prepare_inherited_attributes(
                     $getExtraInputAttributeBag()
                         ->merge([