wip

app/Filament/Company/Resources/Purchases/BillResource.php

@@ -16,6 +16,7 @@ use App\Filament\Forms\Components\CreateAdjustmentSelect;
 use App\Filament\Forms\Components\CreateCurrencySelect;
 use App\Filament\Forms\Components\CreateOfferingSelect;
 use App\Filament\Forms\Components\CreateVendorSelect;
+use App\Filament\Forms\Components\CustomTableRepeater;
 use App\Filament\Forms\Components\DocumentTotals;
 use App\Filament\Tables\Actions\ReplicateBulkAction;
 use App\Filament\Tables\Columns;
@@ -29,7 +30,6 @@ use App\Models\Common\Vendor;
 use App\Utilities\Currency\CurrencyAccessor;
 use App\Utilities\Currency\CurrencyConverter;
 use App\Utilities\RateCalculator;
-use Awcodes\TableRepeater\Components\TableRepeater;
 use Awcodes\TableRepeater\Header;
 use Closure;
 use Filament\Forms;
@@ -178,10 +178,14 @@ class BillResource extends Resource
                                     ->live(),
                             ])->grow(true),
                         ])->from('md'),
-                        TableRepeater::make('lineItems')
+                        CustomTableRepeater::make('lineItems')
+                            ->hiddenLabel()
                             ->relationship()
                             ->saveRelationshipsUsing(null)
                             ->dehydrated(true)
+                            ->reorderable()
+                            ->reorderAtStart()
+                            ->cloneable()
                             ->headers(function (Forms\Get $get) use ($settings) {
                                 $hasDiscounts = DocumentDiscountMethod::parse($get('discount_method'))->isPerLineItem();
 

app/Filament/Company/Resources/Sales/ClientResource.php

@@ -252,7 +252,7 @@ class ClientResource extends Resource
                 Tables\Columns\TextColumn::make('name')
                     ->searchable()
                     ->sortable()
-                    ->description(static fn (Client $client) => $client->primaryContact->full_name),
+                    ->description(static fn (Client $client) => $client->primaryContact?->full_name),
                 Tables\Columns\TextColumn::make('primaryContact.email')
                     ->label('Email')
                     ->searchable()
@@ -260,7 +260,7 @@ class ClientResource extends Resource
                 Tables\Columns\TextColumn::make('primaryContact.phones')
                     ->label('Phone')
                     ->toggleable()
-                    ->state(static fn (Client $client) => $client->primaryContact->first_available_phone),
+                    ->state(static fn (Client $client) => $client->primaryContact?->first_available_phone),
                 Tables\Columns\TextColumn::make('billingAddress.address_string')
                     ->label('Billing address')
                     ->searchable()

app/Filament/Company/Resources/Sales/EstimateResource.php

@@ -16,6 +16,7 @@ use App\Filament\Forms\Components\CreateAdjustmentSelect;
 use App\Filament\Forms\Components\CreateClientSelect;
 use App\Filament\Forms\Components\CreateCurrencySelect;
 use App\Filament\Forms\Components\CreateOfferingSelect;
+use App\Filament\Forms\Components\CustomTableRepeater;
 use App\Filament\Forms\Components\DocumentFooterSection;
 use App\Filament\Forms\Components\DocumentHeaderSection;
 use App\Filament\Forms\Components\DocumentTotals;
@@ -30,7 +31,6 @@ use App\Models\Common\Offering;
 use App\Utilities\Currency\CurrencyAccessor;
 use App\Utilities\Currency\CurrencyConverter;
 use App\Utilities\RateCalculator;
-use Awcodes\TableRepeater\Components\TableRepeater;
 use Awcodes\TableRepeater\Header;
 use Filament\Forms;
 use Filament\Forms\Form;
@@ -176,10 +176,14 @@ class EstimateResource extends Resource
                                     ->live(),
                             ])->grow(true),
                         ])->from('md'),
-                        TableRepeater::make('lineItems')
+                        CustomTableRepeater::make('lineItems')
+                            ->hiddenLabel()
                             ->relationship()
                             ->saveRelationshipsUsing(null)
                             ->dehydrated(true)
+                            ->reorderable()
+                            ->reorderAtStart()
+                            ->cloneable()
                             ->headers(function (Forms\Get $get) use ($settings) {
                                 $hasDiscounts = DocumentDiscountMethod::parse($get('discount_method'))->isPerLineItem();
 

app/Filament/Company/Resources/Sales/InvoiceResource.php

@@ -18,6 +18,7 @@ use App\Filament\Forms\Components\CreateAdjustmentSelect;
 use App\Filament\Forms\Components\CreateClientSelect;
 use App\Filament\Forms\Components\CreateCurrencySelect;
 use App\Filament\Forms\Components\CreateOfferingSelect;
+use App\Filament\Forms\Components\CustomTableRepeater;
 use App\Filament\Forms\Components\DocumentFooterSection;
 use App\Filament\Forms\Components\DocumentHeaderSection;
 use App\Filament\Forms\Components\DocumentTotals;
@@ -33,7 +34,6 @@ use App\Models\Common\Offering;
 use App\Utilities\Currency\CurrencyAccessor;
 use App\Utilities\Currency\CurrencyConverter;
 use App\Utilities\RateCalculator;
-use Awcodes\TableRepeater\Components\TableRepeater;
 use Awcodes\TableRepeater\Header;
 use Closure;
 use Filament\Forms;
@@ -177,7 +177,7 @@ class InvoiceResource extends Resource
                                 Forms\Components\Select::make('discount_method')
                                     ->label('Discount method')
                                     ->options(DocumentDiscountMethod::class)
-                                    ->selectablePlaceholder(false)
+                                    ->softRequired()
                                     ->default($settings->discount_method)
                                     ->afterStateUpdated(function ($state, Forms\Set $set) {
                                         $discountMethod = DocumentDiscountMethod::parse($state);
@@ -189,28 +189,31 @@ class InvoiceResource extends Resource
                                     ->live(),
                             ])->grow(true),
                         ])->from('md'),
-                        TableRepeater::make('lineItems')
+                        CustomTableRepeater::make('lineItems')
+                            ->hiddenLabel()
                             ->relationship()
                             ->saveRelationshipsUsing(null)
                             ->dehydrated(true)
+                            ->reorderable()
+                            ->reorderAtStart()
+                            ->cloneable()
+                            ->addActionLabel('Add an item')
                             ->headers(function (Forms\Get $get) use ($settings) {
                                 $hasDiscounts = DocumentDiscountMethod::parse($get('discount_method'))->isPerLineItem();
 
                                 $headers = [
                                     Header::make($settings->resolveColumnLabel('item_name', 'Items'))
-                                        ->width($hasDiscounts ? '15%' : '20%'),
-                                    Header::make('Description')
-                                        ->width($hasDiscounts ? '15%' : '20%'),
+                                        ->width('30%'),
                                     Header::make($settings->resolveColumnLabel('unit_name', 'Quantity'))
                                         ->width('10%'),
                                     Header::make($settings->resolveColumnLabel('price_name', 'Price'))
                                         ->width('10%'),
-                                    Header::make('Taxes')
-                                        ->width($hasDiscounts ? '20%' : '30%'),
                                 ];
 
                                 if ($hasDiscounts) {
-                                    $headers[] = Header::make('Discounts')->width('20%');
+                                    $headers[] = Header::make('Adjustments')->width('30%');
+                                } else {
+                                    $headers[] = Header::make('Taxes')->width('30%');
                                 }
 
                                 $headers[] = Header::make($settings->resolveColumnLabel('amount_name', 'Amount'))
@@ -220,61 +223,68 @@ class InvoiceResource extends Resource
                                 return $headers;
                             })
                             ->schema([
-                                CreateOfferingSelect::make('offering_id')
-                                    ->label('Item')
-                                    ->required()
-                                    ->live()
-                                    ->sellable()
-                                    ->afterStateUpdated(function (Forms\Set $set, Forms\Get $get, $state, ?DocumentLineItem $record) {
-                                        $offeringId = $state;
-                                        $discountMethod = DocumentDiscountMethod::parse($get('../../discount_method'));
-                                        $isPerLineItem = $discountMethod->isPerLineItem();
+                                Forms\Components\Group::make([
+                                    CreateOfferingSelect::make('offering_id')
+                                        ->label('Item')
+                                        ->hiddenLabel()
+                                        ->placeholder('Select item')
+                                        ->required()
+                                        ->live()
+                                        ->inlineSuffix()
+                                        ->sellable()
+                                        ->afterStateUpdated(function (Forms\Set $set, Forms\Get $get, $state, ?DocumentLineItem $record) {
+                                            $offeringId = $state;
+                                            $discountMethod = DocumentDiscountMethod::parse($get('../../discount_method'));
+                                            $isPerLineItem = $discountMethod->isPerLineItem();
+
+                                            $existingTaxIds = [];
+                                            $existingDiscountIds = [];
+
+                                            if ($record) {
+                                                $existingTaxIds = $record->salesTaxes()->pluck('adjustments.id')->toArray();
+                                                if ($isPerLineItem) {
+                                                    $existingDiscountIds = $record->salesDiscounts()->pluck('adjustments.id')->toArray();
+                                                }
+                                            }
 
-                                        $existingTaxIds = [];
-                                        $existingDiscountIds = [];
+                                            $with = [
+                                                'salesTaxes' => static function ($query) use ($existingTaxIds) {
+                                                    $query->where(static function ($query) use ($existingTaxIds) {
+                                                        $query->where('status', AdjustmentStatus::Active)
+                                                            ->orWhereIn('adjustments.id', $existingTaxIds);
+                                                    });
+                                                },
+                                            ];
 
-                                        if ($record) {
-                                            $existingTaxIds = $record->salesTaxes()->pluck('adjustments.id')->toArray();
                                             if ($isPerLineItem) {
-                                                $existingDiscountIds = $record->salesDiscounts()->pluck('adjustments.id')->toArray();
+                                                $with['salesDiscounts'] = static function ($query) use ($existingDiscountIds) {
+                                                    $query->where(static function ($query) use ($existingDiscountIds) {
+                                                        $query->where('status', AdjustmentStatus::Active)
+                                                            ->orWhereIn('adjustments.id', $existingDiscountIds);
+                                                    });
+                                                };
                                             }
-                                        }
 
-                                        $with = [
-                                            'salesTaxes' => static function ($query) use ($existingTaxIds) {
-                                                $query->where(static function ($query) use ($existingTaxIds) {
-                                                    $query->where('status', AdjustmentStatus::Active)
-                                                        ->orWhereIn('adjustments.id', $existingTaxIds);
-                                                });
-                                            },
-                                        ];
-
-                                        if ($isPerLineItem) {
-                                            $with['salesDiscounts'] = static function ($query) use ($existingDiscountIds) {
-                                                $query->where(static function ($query) use ($existingDiscountIds) {
-                                                    $query->where('status', AdjustmentStatus::Active)
-                                                        ->orWhereIn('adjustments.id', $existingDiscountIds);
-                                                });
-                                            };
-                                        }
+                                            $offeringRecord = Offering::with($with)->find($offeringId);
 
-                                        $offeringRecord = Offering::with($with)->find($offeringId);
-
-                                        if (! $offeringRecord) {
-                                            return;
-                                        }
+                                            if (! $offeringRecord) {
+                                                return;
+                                            }
 
-                                        $unitPrice = CurrencyConverter::convertToFloat($offeringRecord->price, $get('../../currency_code') ?? CurrencyAccessor::getDefaultCurrency());
+                                            $unitPrice = CurrencyConverter::convertToFloat($offeringRecord->price, $get('../../currency_code') ?? CurrencyAccessor::getDefaultCurrency());
 
-                                        $set('description', $offeringRecord->description);
-                                        $set('unit_price', $unitPrice);
-                                        $set('salesTaxes', $offeringRecord->salesTaxes->pluck('id')->toArray());
+                                            $set('description', $offeringRecord->description);
+                                            $set('unit_price', $unitPrice);
+                                            $set('salesTaxes', $offeringRecord->salesTaxes->pluck('id')->toArray());
 
-                                        if ($isPerLineItem) {
-                                            $set('salesDiscounts', $offeringRecord->salesDiscounts->pluck('id')->toArray());
-                                        }
-                                    }),
-                                Forms\Components\TextInput::make('description'),
+                                            if ($isPerLineItem) {
+                                                $set('salesDiscounts', $offeringRecord->salesDiscounts->pluck('id')->toArray());
+                                            }
+                                        }),
+                                    Forms\Components\TextInput::make('description')
+                                        ->placeholder('Enter item description')
+                                        ->hiddenLabel(),
+                                ])->columnSpan(1),
                                 Forms\Components\TextInput::make('quantity')
                                     ->required()
                                     ->numeric()
@@ -287,32 +297,40 @@ class InvoiceResource extends Resource
                                     ->live()
                                     ->maxValue(9999999999.99)
                                     ->default(0),
-                                CreateAdjustmentSelect::make('salesTaxes')
-                                    ->label('Taxes')
-                                    ->category(AdjustmentCategory::Tax)
-                                    ->type(AdjustmentType::Sales)
-                                    ->adjustmentsRelationship('salesTaxes')
-                                    ->saveRelationshipsUsing(null)
-                                    ->dehydrated(true)
-                                    ->preload()
-                                    ->multiple()
-                                    ->live()
-                                    ->searchable(),
-                                CreateAdjustmentSelect::make('salesDiscounts')
-                                    ->label('Discounts')
-                                    ->category(AdjustmentCategory::Discount)
-                                    ->type(AdjustmentType::Sales)
-                                    ->adjustmentsRelationship('salesDiscounts')
-                                    ->saveRelationshipsUsing(null)
-                                    ->dehydrated(true)
-                                    ->multiple()
-                                    ->live()
-                                    ->hidden(function (Forms\Get $get) {
-                                        $discountMethod = DocumentDiscountMethod::parse($get('../../discount_method'));
+                                Forms\Components\Group::make([
+                                    CreateAdjustmentSelect::make('salesTaxes')
+                                        ->label('Taxes')
+                                        ->hiddenLabel()
+                                        ->placeholder('Select taxes')
+                                        ->category(AdjustmentCategory::Tax)
+                                        ->type(AdjustmentType::Sales)
+                                        ->adjustmentsRelationship('salesTaxes')
+                                        ->saveRelationshipsUsing(null)
+                                        ->dehydrated(true)
+                                        ->inlineSuffix()
+                                        ->preload()
+                                        ->multiple()
+                                        ->live()
+                                        ->searchable(),
+                                    CreateAdjustmentSelect::make('salesDiscounts')
+                                        ->label('Discounts')
+                                        ->hiddenLabel()
+                                        ->placeholder('Select discounts')
+                                        ->category(AdjustmentCategory::Discount)
+                                        ->type(AdjustmentType::Sales)
+                                        ->adjustmentsRelationship('salesDiscounts')
+                                        ->saveRelationshipsUsing(null)
+                                        ->dehydrated(true)
+                                        ->inlineSuffix()
+                                        ->multiple()
+                                        ->live()
+                                        ->hidden(function (Forms\Get $get) {
+                                            $discountMethod = DocumentDiscountMethod::parse($get('../../discount_method'));
 
-                                        return $discountMethod->isPerDocument();
-                                    })
-                                    ->searchable(),
+                                            return $discountMethod->isPerDocument();
+                                        })
+                                        ->searchable(),
+                                ])->columnSpan(1),
                                 Forms\Components\Placeholder::make('total')
                                     ->hiddenLabel()
                                     ->extraAttributes(['class' => 'text-left sm:text-right'])

app/Filament/Company/Resources/Sales/RecurringInvoiceResource.php

@@ -15,6 +15,7 @@ use App\Filament\Forms\Components\CreateAdjustmentSelect;
 use App\Filament\Forms\Components\CreateClientSelect;
 use App\Filament\Forms\Components\CreateCurrencySelect;
 use App\Filament\Forms\Components\CreateOfferingSelect;
+use App\Filament\Forms\Components\CustomTableRepeater;
 use App\Filament\Forms\Components\DocumentFooterSection;
 use App\Filament\Forms\Components\DocumentHeaderSection;
 use App\Filament\Forms\Components\DocumentTotals;
@@ -27,7 +28,6 @@ use App\Models\Common\Offering;
 use App\Utilities\Currency\CurrencyAccessor;
 use App\Utilities\Currency\CurrencyConverter;
 use App\Utilities\RateCalculator;
-use Awcodes\TableRepeater\Components\TableRepeater;
 use Awcodes\TableRepeater\Header;
 use Filament\Forms;
 use Filament\Forms\Form;
@@ -102,10 +102,14 @@ class RecurringInvoiceResource extends Resource
                                     ->live(),
                             ])->grow(true),
                         ])->from('md'),
-                        TableRepeater::make('lineItems')
+                        CustomTableRepeater::make('lineItems')
+                            ->hiddenLabel()
                             ->relationship()
                             ->saveRelationshipsUsing(null)
                             ->dehydrated(true)
+                            ->reorderable()
+                            ->reorderAtStart()
+                            ->cloneable()
                             ->headers(function (Forms\Get $get) use ($settings) {
                                 $hasDiscounts = DocumentDiscountMethod::parse($get('discount_method'))->isPerLineItem();
 

app/Filament/Forms/Components/CustomTableRepeater.php

@@ -4,10 +4,13 @@ namespace App\Filament\Forms\Components;
 
 use Awcodes\TableRepeater\Components\TableRepeater;
 use Closure;
+use Filament\Forms\Components\Actions\Action;
 
 class CustomTableRepeater extends TableRepeater
 {
-    protected bool | Closure | null $spreadsheet = null;
+    protected bool | Closure $spreadsheet = false;
+
+    protected bool | Closure $reorderAtStart = false;
 
     public function spreadsheet(bool | Closure $condition = true): static
     {
@@ -18,7 +21,19 @@ class CustomTableRepeater extends TableRepeater
 
     public function isSpreadsheet(): bool
     {
-        return $this->evaluate($this->spreadsheet) ?? false;
+        return (bool) $this->evaluate($this->spreadsheet);
+    }
+
+    public function reorderAtStart(bool | Closure $condition = true): static
+    {
+        $this->reorderAtStart = $condition;
+
+        return $this;
+    }
+
+    public function isReorderAtStart(): bool
+    {
+        return $this->evaluate($this->reorderAtStart) && $this->isReorderable();
     }
 
     protected function setUp(): void
@@ -34,5 +49,18 @@ class CustomTableRepeater extends TableRepeater
 
             return $attributes;
         });
+
+        $this->reorderAction(function (Action $action) {
+            if ($this->isReorderAtStart()) {
+                $action->icon('heroicon-m-bars-3');
+            }
+
+            return $action;
+        });
+    }
+
+    public function getView(): string
+    {
+        return 'filament.forms.components.custom-table-repeater';
     }
 }

app/Providers/Filament/CompanyPanelProvider.php

@@ -298,18 +298,9 @@ class CompanyPanelProvider extends PanelProvider
     protected function configureSelect(): void
     {
         Select::configureUsing(function (Select $select): void {
-            $isSelectable = fn (): bool => ! $this->hasRequiredRule($select);
-
             $select
                 ->native(false)
-                ->selectablePlaceholder($isSelectable);
+                ->selectablePlaceholder(fn (Select $component) => ! $component->isRequired());
         });
     }
-
-    protected function hasRequiredRule(Select $component): bool
-    {
-        $rules = $component->getValidationRules();
-
-        return in_array('required', $rules, true);
-    }
 }

resources/css/filament/company/form-fields.css

@@ -44,39 +44,43 @@
 /* Table Repeater Styles */
 :not(.is-spreadsheet) {
     .table-repeater-container {
-        @apply rounded-none ring-0;
-    }
-
-    .table-repeater-component {
-        @apply space-y-10;
-    }
-
-    .table-repeater-component ul {
-        @apply justify-start;
+        @apply border border-gray-300 dark:border-gray-600 rounded-sm;
     }
 
     .table-repeater-row {
-        @apply divide-x-0 !important;
+        @apply hover:bg-gray-50 dark:hover:bg-gray-700/50 transition-colors;
     }
 
     .table-repeater-column {
-        @apply py-2 !important;
+        @apply p-3 text-sm text-gray-900 dark:text-gray-100;
     }
 
     .table-repeater-header {
-        @apply rounded-t-none !important;
+        @apply bg-gray-50 dark:bg-gray-700/50 border-b border-gray-300 dark:border-gray-600;
     }
 
-    .table-repeater-rows-wrapper {
-        @apply divide-gray-300 last:border-b last:border-gray-300 dark:divide-white/20 dark:last:border-white/20;
+    .table-repeater-row {
+        @apply divide-x-0 !important;
     }
 
     .table-repeater-header tr {
-        @apply divide-x-0 text-base sm:text-sm sm:leading-6 !important;
+        @apply divide-x-0 text-sm;
     }
 
     .table-repeater-header-column {
-        @apply ps-3 pe-3 font-semibold bg-gray-200 dark:bg-gray-800 rounded-none !important;
+        @apply p-3 font-semibold bg-gray-50 dark:bg-gray-700/50;
+    }
+
+    /* Chrome, Safari, Edge, Opera */
+    input::-webkit-outer-spin-button,
+    input::-webkit-inner-spin-button {
+        -webkit-appearance: none;
+        margin: 0;
+    }
+
+    /* Firefox */
+    input[type=number] {
+        -moz-appearance: textfield;
     }
 }
 
@@ -165,37 +169,6 @@
     }
 }
 
-/* Responsive behavior */
-@media (max-width: theme('screens.sm')) {
-    .table-repeater-component.break-point-sm .table-repeater-container {
-        overflow-x: visible;
-    }
-}
-
-@media (max-width: theme('screens.md')) {
-    .table-repeater-component.break-point-md .table-repeater-container {
-        overflow-x: visible;
-    }
-}
-
-@media (max-width: theme('screens.lg')) {
-    .table-repeater-component.break-point-lg .table-repeater-container {
-        overflow-x: visible;
-    }
-}
-
-@media (max-width: theme('screens.xl')) {
-    .table-repeater-component.break-point-xl .table-repeater-container {
-        overflow-x: visible;
-    }
-}
-
-@media (max-width: theme('screens.2xl')) {
-    .table-repeater-component.break-point-2xl .table-repeater-container {
-        overflow-x: visible;
-    }
-}
-
 .is-spreadsheet .table-repeater-column .fi-input-wrp-suffix {
     padding-right: 0 !important;
 }

resources/views/filament/forms/components/custom-table-repeater.blade.php

@@ -0,0 +1,251 @@
+@php
+    use Filament\Forms\Components\Actions\Action;
+    use Filament\Support\Enums\Alignment;
+    use Filament\Support\Enums\MaxWidth;
+
+    $containers = $getChildComponentContainers();
+
+    $addAction = $getAction($getAddActionName());
+    $cloneAction = $getAction($getCloneActionName());
+    $deleteAction = $getAction($getDeleteActionName());
+    $moveDownAction = $getAction($getMoveDownActionName());
+    $moveUpAction = $getAction($getMoveUpActionName());
+    $reorderAction = $getAction($getReorderActionName());
+    $isReorderableWithButtons = $isReorderableWithButtons();
+    $extraItemActions = $getExtraItemActions();
+    $extraActions = $getExtraActions();
+    $visibleExtraItemActions = [];
+    $visibleExtraActions = [];
+
+    $headers = $getHeaders();
+    $renderHeader = $shouldRenderHeader();
+    $stackAt = $getStackAt();
+    $hasContainers = count($containers) > 0;
+    $emptyLabel = $getEmptyLabel();
+    $streamlined = $isStreamlined();
+
+    $reorderAtStart = $isReorderAtStart();
+
+    $statePath = $getStatePath();
+
+    foreach ($extraActions as $extraAction) {
+        $visibleExtraActions = array_filter(
+            $extraActions,
+            fn (Action $action): bool => $action->isVisible(),
+        );
+    }
+
+    foreach ($extraItemActions as $extraItemAction) {
+        $visibleExtraItemActions = array_filter(
+            $extraItemActions,
+            fn (Action $action): bool => $action->isVisible(),
+        );
+    }
+
+    $hasActions = $reorderAction->isVisible()
+        || $cloneAction->isVisible()
+        || $deleteAction->isVisible()
+        || $moveUpAction->isVisible()
+        || $moveDownAction->isVisible()
+        || filled($visibleExtraItemActions);
+@endphp
+
+<x-dynamic-component :component="$getFieldWrapperView()" :field="$field">
+    <div
+        x-data="{}"
+        {{ $attributes->merge($getExtraAttributes())->class([
+            'table-repeater-component space-y-6 relative',
+            'streamlined' => $streamlined,
+            match ($stackAt) {
+                'sm', MaxWidth::Small => 'break-point-sm',
+                'lg', MaxWidth::Large => 'break-point-lg',
+                'xl', MaxWidth::ExtraLarge => 'break-point-xl',
+                '2xl', MaxWidth::TwoExtraLarge => 'break-point-2xl',
+                default => 'break-point-md',
+            }
+        ]) }}
+    >
+        @if (count($containers) || $emptyLabel !== false)
+            <div class="table-repeater-container rounded-xl relative ring-1 ring-gray-950/5 dark:ring-white/20">
+                <table class="w-full">
+                    <thead @class([
+                        'table-repeater-header-hidden sr-only' => ! $renderHeader,
+                        'table-repeater-header rounded-t-xl overflow-hidden border-b border-gray-950/5 dark:border-white/20' => $renderHeader,
+                    ])>
+                    <tr class="text-xs md:divide-x rtl:divide-x-reverse md:divide-gray-950/5 dark:md:divide-white/20">
+                        {{-- Move actions column to start if reorderAtStart is true --}}
+                        @if ($hasActions && count($containers) && $reorderAtStart)
+                            <th class="table-repeater-header-column w-px first:rounded-tl-xl rtl:first:rounded-tr-xl rtl:first:rounded-tl-none p-2 bg-gray-100 dark:bg-gray-900/60">
+                                <span class="sr-only">
+                                    {{ trans('table-repeater::components.repeater.row_actions.label') }}
+                                </span>
+                            </th>
+                        @endif
+
+                        @foreach ($headers as $key => $header)
+                            <th
+                                @class([
+                                    'table-repeater-header-column p-2 font-medium first:rounded-tl-xl rtl:first:rounded-tr-xl rtl:first:rounded-tl-none last:rounded-tr-xl bg-gray-100 dark:text-gray-300 dark:bg-gray-900/60',
+                                    match($header->getAlignment()) {
+                                      'center', Alignment::Center => 'text-center',
+                                      'right', 'end', Alignment::Right, Alignment::End => 'text-end',
+                                      default => 'text-start'
+                                    }
+                                ])
+                                style="width: {{ $header->getWidth() }}"
+                            >
+                                {{ $header->getLabel() }}
+                                @if ($header->isRequired())
+                                    <span class="whitespace-nowrap">
+                                        <sup class="font-medium text-danger-700 dark:text-danger-400">*</sup>
+                                    </span>
+                                @endif
+                            </th>
+                        @endforeach
+
+                        @if ($hasActions && count($containers))
+                            <th class="table-repeater-header-column w-px last:rounded-tr-xl rtl:last:rounded-tr-none rtl:last:rounded-tl-xl p-2 bg-gray-100 dark:bg-gray-900/60">
+                                <span class="sr-only">
+                                    {{ trans('table-repeater::components.repeater.row_actions.label') }}
+                                </span>
+                            </th>
+                        @endif
+                    </tr>
+                    </thead>
+                    <tbody
+                        x-sortable
+                        wire:end.stop="{{ 'mountFormComponentAction(\'' . $statePath . '\', \'reorder\', { items: $event.target.sortable.toArray() })' }}"
+                        class="table-repeater-rows-wrapper divide-y divide-gray-950/5 dark:divide-white/20"
+                    >
+                    @if (count($containers))
+                        @foreach ($containers as $uuid => $row)
+                            @php
+                                $visibleExtraItemActions = array_filter(
+                                    $extraItemActions,
+                                    fn (Action $action): bool => $action(['item' => $uuid])->isVisible(),
+                                );
+                            @endphp
+                            <tr
+                                wire:key="{{ $this->getId() }}.{{ $row->getStatePath() }}.{{ $field::class }}.item"
+                                x-sortable-item="{{ $uuid }}"
+                                class="table-repeater-row"
+                            >
+                                {{-- Add reorder action column at start if reorderAtStart is true --}}
+                                @if ($hasActions && $reorderAtStart && $reorderAction->isVisible())
+                                    <td class="table-repeater-column p-2 w-px align-top">
+                                        <ul class="flex items-center table-repeater-row-actions gap-x-3 px-2">
+                                            <li x-sortable-handle class="shrink-0">
+                                                {{ $reorderAction }}
+                                            </li>
+                                        </ul>
+                                    </td>
+                                @endif
+
+                                @php($counter = 0)
+                                @foreach($row->getComponents() as $cell)
+                                    @if($cell instanceof \Filament\Forms\Components\Hidden || $cell->isHidden())
+                                        {{ $cell }}
+                                    @else
+                                        <td
+                                            @class([
+                                                'table-repeater-column align-top',
+                                                'p-2' => ! $streamlined,
+                                                'has-hidden-label' => $cell->isLabelHidden(),
+                                                match($headers[$counter++]->getAlignment()) {
+                                                  'center', Alignment::Center => 'text-center',
+                                                  'right', 'end', Alignment::Right, Alignment::End => 'text-end',
+                                                  default => 'text-start'
+                                                }
+                                            ])
+                                            style="width: {{ $cell->getMaxWidth() ?? 'auto' }}"
+                                        >
+                                            {{ $cell }}
+                                        </td>
+                                    @endif
+                                @endforeach
+
+                                @if ($hasActions)
+                                    <td class="table-repeater-column p-2 w-px align-top">
+                                        <ul class="flex items-center table-repeater-row-actions gap-x-3 px-2">
+                                            @foreach ($visibleExtraItemActions as $extraItemAction)
+                                                <li>
+                                                    {{ $extraItemAction(['item' => $uuid]) }}
+                                                </li>
+                                            @endforeach
+
+                                            @if ($reorderAction->isVisible() && ! $reorderAtStart)
+                                                <li x-sortable-handle class="shrink-0">
+                                                    {{ $reorderAction }}
+                                                </li>
+                                            @endif
+
+                                            @if ($isReorderableWithButtons)
+                                                @if (! $loop->first)
+                                                    <li>
+                                                        {{ $moveUpAction(['item' => $uuid]) }}
+                                                    </li>
+                                                @endif
+
+                                                @if (! $loop->last)
+                                                    <li>
+                                                        {{ $moveDownAction(['item' => $uuid]) }}
+                                                    </li>
+                                                @endif
+                                            @endif
+
+                                            @if ($cloneAction->isVisible())
+                                                <li>
+                                                    {{ $cloneAction(['item' => $uuid]) }}
+                                                </li>
+                                            @endif
+
+                                            @if ($deleteAction->isVisible())
+                                                <li>
+                                                    {{ $deleteAction(['item' => $uuid]) }}
+                                                </li>
+                                            @endif
+                                        </ul>
+                                    </td>
+                                @endif
+                            </tr>
+                        @endforeach
+                    @else
+                        <tr class="table-repeater-row table-repeater-empty-row">
+                            <td colspan="{{ count($headers) + intval($hasActions) }}"
+                                class="table-repeater-column table-repeater-empty-column p-4 w-px text-center italic">
+                                {{ $emptyLabel ?: trans('table-repeater::components.repeater.empty.label') }}
+                            </td>
+                        </tr>
+                    @endif
+                    </tbody>
+                </table>
+            </div>
+        @endif
+
+        @if ($addAction->isVisible() || filled($visibleExtraActions))
+            <ul
+                @class([
+                    'relative flex gap-4',
+                    match ($getAddActionAlignment()) {
+                        Alignment::Start, Alignment::Left => 'justify-start',
+                        Alignment::End, Alignment::Right => 'justify-end',
+                        default =>  'justify-center',
+                    },
+                ])
+            >
+                @if ($addAction->isVisible())
+                    <li>
+                        {{ $addAction }}
+                    </li>
+                @endif
+                @if (filled($visibleExtraActions))
+                    @foreach ($visibleExtraActions as $extraAction)
+                        <li>
+                            {{ ($extraAction) }}
+                        </li>
+                    @endforeach
+                @endif
+            </ul>
+        @endif
+    </div>
+</x-dynamic-component>