wip

app/Filament/Company/Resources/Accounting/BudgetResource.php

@@ -27,6 +27,10 @@ class BudgetResource extends Resource
 
     protected static ?string $navigationIcon = 'heroicon-o-rectangle-stack';
 
+    protected static ?string $recordTitleAttribute = 'name';
+
+    protected static bool $isGloballySearchable = false;
+
     public static function form(Form $form): Form
     {
         return $form
@@ -238,7 +242,6 @@ class BudgetResource extends Resource
             ->actions([
                 Tables\Actions\ActionGroup::make([
                     Tables\Actions\ViewAction::make(),
-                    Tables\Actions\EditAction::make(),
                     Tables\Actions\EditAction::make('editAllocations')
                         ->name('editAllocations')
                         ->url(null)
@@ -534,8 +537,6 @@ class BudgetResource extends Resource
             'index' => Pages\ListBudgets::route('/'),
             'create' => Pages\CreateBudget::route('/create'),
             'view' => Pages\ViewBudget::route('/{record}'),
-            'edit' => Pages\EditBudget::route('/{record}/edit'),
-            'allocations' => Pages\ManageAllocations::route('/{record}/allocations'),
         ];
     }
 }

app/Filament/Company/Resources/Accounting/BudgetResource/Pages/EditBudget.php

@@ -1,182 +0,0 @@
-<?php
-
-namespace App\Filament\Company\Resources\Accounting\BudgetResource\Pages;
-
-use App\Enums\Accounting\BudgetIntervalType;
-use App\Filament\Company\Resources\Accounting\BudgetResource;
-use App\Filament\Forms\Components\CustomTableRepeater;
-use App\Models\Accounting\Budget;
-use App\Models\Accounting\BudgetAllocation;
-use App\Models\Accounting\BudgetItem;
-use Awcodes\TableRepeater\Header;
-use Filament\Actions;
-use Filament\Forms;
-use Filament\Forms\Form;
-use Filament\Resources\Pages\EditRecord;
-use Filament\Support\Enums\Alignment;
-use Filament\Support\Enums\MaxWidth;
-use Filament\Support\RawJs;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Support\Carbon;
-
-class EditBudget extends EditRecord
-{
-    protected static string $resource = BudgetResource::class;
-
-    protected function getHeaderActions(): array
-    {
-        return [
-            Actions\ViewAction::make(),
-            Actions\DeleteAction::make(),
-        ];
-    }
-
-    public function getMaxContentWidth(): MaxWidth | string | null
-    {
-        return 'max-w-8xl';
-    }
-
-    public function form(Form $form): Form
-    {
-        /** @var Budget $budget */
-        $budget = $this->record;
-        $periods = $budget->getPeriods();
-
-        $headers = [
-            Header::make('Account')
-                ->label('Account')
-                ->width('200px'),
-        ];
-
-        foreach ($periods as $period) {
-            $headers[] = Header::make($period)
-                ->label($period)
-                ->width('120px')
-                ->align(Alignment::Center);
-        }
-
-        return $form->schema([
-            Forms\Components\Section::make('Budget Details')
-                ->schema([
-                    Forms\Components\TextInput::make('name')
-                        ->required(),
-                    Forms\Components\Select::make('interval_type')
-                        ->disabled(), // Can't change interval type after creation
-                    Forms\Components\DatePicker::make('start_date')
-                        ->disabled(),
-                    Forms\Components\DatePicker::make('end_date')
-                        ->disabled(),
-                    Forms\Components\Textarea::make('notes'),
-                ]),
-
-            Forms\Components\Section::make('Budget Allocations')
-                ->schema([
-                    CustomTableRepeater::make('budgetItems')
-                        ->relationship()
-                        ->headers($headers)
-                        ->schema([
-                            Forms\Components\Placeholder::make('account')
-                                ->hiddenLabel()
-                                ->content(fn ($record) => $record->account->name ?? ''),
-
-                            // Create a field for each period
-                            ...collect($periods)->map(function ($period) {
-                                return Forms\Components\TextInput::make("allocations.{$period}")
-                                    ->mask(RawJs::make('$money($input)'))
-                                    ->stripCharacters(',')
-                                    ->numeric()
-                                    ->afterStateHydrated(function ($component, $state, $record) use ($period) {
-                                        // Find the allocation for this period
-                                        $allocation = $record->allocations->firstWhere('period', $period);
-                                        $component->state($allocation ? $allocation->amount : 0);
-                                    })
-                                    ->dehydrated(false); // We'll handle saving manually
-                            })->toArray(),
-                        ])
-                        ->spreadsheet()
-                        ->itemLabel(fn ($record) => $record->account->name ?? 'Budget Item')
-                        ->deletable(false)
-                        ->reorderable(false)
-                        ->addable(false) // Don't allow adding new budget items
-                        ->columnSpanFull(),
-                ]),
-        ]);
-    }
-
-    //    protected function mutateFormDataBeforeFill(array $data): array
-    //    {
-    //        /** @var Budget $budget */
-    //        $budget = $this->record;
-    //
-    //        $data['budgetItems'] = $budget->budgetItems->map(function (BudgetItem $budgetItem) {
-    //            return [
-    //                'id' => $budgetItem->id,
-    //                'account_id' => $budgetItem->account_id,
-    //                'total_amount' => $budgetItem->allocations->sum('amount'), // Calculate total dynamically
-    //                'amounts' => $budgetItem->allocations->mapWithKeys(static function (BudgetAllocation $allocation) {
-    //                    return [$allocation->period => $allocation->amount]; // Use the correct period label
-    //                })->toArray(),
-    //            ];
-    //        })->toArray();
-    //
-    //        return $data;
-    //    }
-
-    protected function handleRecordUpdate(Model $record, array $data): Model
-    {
-        /** @var Budget $budget */
-        $budget = $record;
-
-        $budget->update([
-            'name' => $data['name'],
-            'interval_type' => $data['interval_type'],
-            'start_date' => $data['start_date'],
-            'end_date' => $data['end_date'],
-            'notes' => $data['notes'] ?? null,
-        ]);
-
-        $budgetItemIds = [];
-
-        foreach ($data['budgetItems'] as $itemData) {
-            /** @var BudgetItem $budgetItem */
-            $budgetItem = $budget->budgetItems()->updateOrCreate(
-                ['id' => $itemData['id'] ?? null],
-                ['account_id' => $itemData['account_id']]
-            );
-
-            $budgetItemIds[] = $budgetItem->id;
-
-            $budgetItem->allocations()->delete();
-
-            $allocationStart = Carbon::parse($data['start_date']);
-
-            foreach ($itemData['amounts'] as $periodLabel => $amount) {
-                $allocationEnd = self::calculateEndDate($allocationStart, BudgetIntervalType::parse($data['interval_type']));
-
-                // Recreate allocations
-                $budgetItem->allocations()->create([
-                    'period' => $periodLabel,
-                    'interval_type' => $data['interval_type'],
-                    'start_date' => $allocationStart->toDateString(),
-                    'end_date' => $allocationEnd->toDateString(),
-                    'amount' => $amount,
-                ]);
-
-                $allocationStart = $allocationEnd->addDay();
-            }
-        }
-
-        $budget->budgetItems()->whereNotIn('id', $budgetItemIds)->delete();
-
-        return $budget;
-    }
-
-    private static function calculateEndDate(Carbon $startDate, BudgetIntervalType $intervalType): Carbon
-    {
-        return match ($intervalType) {
-            BudgetIntervalType::Month => $startDate->copy()->endOfMonth(),
-            BudgetIntervalType::Quarter => $startDate->copy()->endOfQuarter(),
-            BudgetIntervalType::Year => $startDate->copy()->endOfYear(),
-        };
-    }
-}

app/Filament/Company/Resources/Accounting/BudgetResource/Pages/ManageAllocations.php

@@ -1,73 +0,0 @@
-<?php
-
-namespace App\Filament\Company\Resources\Accounting\BudgetResource\Pages;
-
-use App\Filament\Company\Resources\Accounting\BudgetResource;
-use Filament\Forms;
-use Filament\Forms\Form;
-use Filament\Resources\Pages\ManageRelatedRecords;
-use Filament\Tables;
-use Filament\Tables\Table;
-
-class ManageAllocations extends ManageRelatedRecords
-{
-    protected static string $resource = BudgetResource::class;
-
-    protected static string $relationship = 'allocations';
-
-    protected static ?string $navigationIcon = 'heroicon-o-rectangle-stack';
-
-    public static function getNavigationLabel(): string
-    {
-        return 'Allocations';
-    }
-
-    public function form(Form $form): Form
-    {
-        return $form
-            ->schema([
-                Forms\Components\TextInput::make('account_id')
-                    ->required()
-                    ->maxLength(255),
-            ]);
-    }
-
-    public function table(Table $table): Table
-    {
-        return $table
-            ->recordTitleAttribute('account_id')
-            ->columns([
-                Tables\Columns\TextColumn::make('budgetItem.account.name')
-                    ->label('Account')
-                    ->sortable()
-                    ->searchable(),
-
-                Tables\Columns\TextColumn::make('period')
-                    ->label('Period')
-                    ->sortable(),
-
-                Tables\Columns\TextColumn::make('amount')
-                    ->label('Amount')
-                    ->money()
-                    ->sortable(),
-            ])
-            ->filters([
-                //
-            ])
-            ->headerActions([
-                Tables\Actions\CreateAction::make(),
-                Tables\Actions\AssociateAction::make(),
-            ])
-            ->actions([
-                Tables\Actions\EditAction::make(),
-                Tables\Actions\DissociateAction::make(),
-                Tables\Actions\DeleteAction::make(),
-            ])
-            ->bulkActions([
-                Tables\Actions\BulkActionGroup::make([
-                    Tables\Actions\DissociateBulkAction::make(),
-                    Tables\Actions\DeleteBulkAction::make(),
-                ]),
-            ]);
-    }
-}

app/Filament/Company/Resources/Accounting/BudgetResource/Pages/ViewBudget.php

@@ -3,7 +3,6 @@
 namespace App\Filament\Company\Resources\Accounting\BudgetResource\Pages;
 
 use App\Filament\Company\Resources\Accounting\BudgetResource;
-use Filament\Actions;
 use Filament\Forms\Form;
 use Filament\Infolists\Infolist;
 use Filament\Resources\Pages\ViewRecord;
@@ -21,7 +20,7 @@ class ViewBudget extends ViewRecord
     protected function getHeaderActions(): array
     {
         return [
-            Actions\EditAction::make(),
+            //
         ];
     }
 

app/Filament/Company/Resources/Accounting/BudgetResource/RelationManagers/BudgetItemsRelationManager.php

@@ -3,6 +3,7 @@
 namespace App\Filament\Company\Resources\Accounting\BudgetResource\RelationManagers;
 
 use App\Filament\Tables\Columns\DeferredTextInputColumn;
+use App\Models\Accounting\Budget;
 use App\Models\Accounting\BudgetAllocation;
 use App\Models\Accounting\BudgetItem;
 use App\Utilities\Currency\CurrencyConverter;
@@ -18,7 +19,6 @@ use Filament\Tables\Grouping\Group;
 use Filament\Tables\Table;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
-use Livewire\Attributes\On;
 
 class BudgetItemsRelationManager extends RelationManager
 {
@@ -26,39 +26,31 @@ class BudgetItemsRelationManager extends RelationManager
 
     protected static bool $isLazy = false;
 
-    // Store changes that are pending
     public array $batchChanges = [];
 
-    #[On('batch-column-changed')]
     public function handleBatchColumnChanged($data): void
     {
-        // Store the changed value
         $key = "{$data['recordKey']}.{$data['name']}";
         $this->batchChanges[$key] = $data['value'];
     }
 
-    #[On('save-batch-changes')]
     public function saveBatchChanges(): void
     {
         foreach ($this->batchChanges as $key => $value) {
-            // Parse the composite key
             [$recordKey, $column] = explode('.', $key, 2);
 
-            // Extract period from the column name (e.g., "allocations_by_period.2023-Q1")
-            preg_match('/allocations_by_period\.(.+)/', $column, $matches);
-            $period = $matches[1] ?? null;
+            preg_match('/amount_(.+)/', $column, $matches);
+            $period = str_replace('_', ' ', $matches[1] ?? '');
 
             if (! $period) {
                 continue;
             }
 
-            // Find the record
             $record = BudgetItem::find($recordKey);
             if (! $record) {
                 continue;
             }
 
-            // Update the allocation
             $allocation = $record->allocations->firstWhere('period', $period);
             if ($allocation) {
                 $allocation->update(['amount' => $value]);
@@ -66,15 +58,12 @@ class BudgetItemsRelationManager extends RelationManager
                 $record->allocations()->create([
                     'period' => $period,
                     'amount' => $value,
-                    // Add other required fields
                 ]);
             }
         }
 
-        // Clear the batch changes
         $this->batchChanges = [];
 
-        // Notify the user
         Notification::make()
             ->title('Budget allocations updated')
             ->success()
@@ -83,7 +72,6 @@ class BudgetItemsRelationManager extends RelationManager
 
     protected function calculateTotalSum(array $budgetItemIds): int
     {
-        // Get all applicable periods
         $periods = BudgetAllocation::whereIn('budget_item_id', $budgetItemIds)
             ->pluck('period')
             ->unique()
@@ -91,8 +79,6 @@ class BudgetItemsRelationManager extends RelationManager
             ->toArray();
 
         $total = 0;
-
-        // Sum up each period
         foreach ($periods as $period) {
             $total += $this->calculatePeriodSum($budgetItemIds, $period);
         }
@@ -102,26 +88,20 @@ class BudgetItemsRelationManager extends RelationManager
 
     protected function calculatePeriodSum(array $budgetItemIds, string $period): int
     {
-        // First get database values
         $dbTotal = BudgetAllocation::whereIn('budget_item_id', $budgetItemIds)
             ->where('period', $period)
             ->sum('amount');
 
-        // Now add any batch changes
         $batchTotal = 0;
         foreach ($budgetItemIds as $itemId) {
-            $key = "{$itemId}.allocations_by_period.{$period}";
+            $key = "{$itemId}.amount_" . str_replace(['-', '.', ' '], '_', $period);
             if (isset($this->batchChanges[$key])) {
-                // Get the current value from batch changes
                 $batchValue = CurrencyConverter::convertToCents($this->batchChanges[$key]);
-
-                // Find if there's a current allocation in DB
                 $existingAmount = BudgetAllocation::where('budget_item_id', $itemId)
                     ->where('period', $period)
                     ->first()
-                    ->getRawOriginal('amount');
+                    ?->getRawOriginal('amount') ?? 0;
 
-                // Add the difference to our running total
                 $batchTotal += ($batchValue - $existingAmount);
             }
         }
@@ -131,59 +111,44 @@ class BudgetItemsRelationManager extends RelationManager
 
     public function table(Table $table): Table
     {
+        /** @var Budget $budget */
         $budget = $this->getOwnerRecord();
-
-        // Get distinct periods for this budget
-        $periods = BudgetAllocation::query()
-            ->join('budget_items', 'budget_allocations.budget_item_id', '=', 'budget_items.id')
-            ->where('budget_items.budget_id', $budget->id)
-            ->orderBy('start_date')
-            ->pluck('period')
-            ->unique()
-            ->values()
-            ->toArray();
+        $periods = $budget->getPeriods();
 
         return $table
             ->recordTitleAttribute('account_id')
             ->paginated(false)
-            ->modifyQueryUsing(
-                fn (Builder $query) => $query->with(['account', 'allocations'])
-            )
-            ->headerActions([
-                Action::make('saveBatchChanges')
-                    ->label('Save All Changes')
-                    ->action('saveBatchChanges')
-                    ->color('primary')
-                    ->icon('heroicon-o-check-circle'),
-            ])
+            ->heading(null)
+            ->modifyQueryUsing(function (Builder $query) use ($periods) {
+                $query->select('budget_items.*')
+                    ->leftJoin('budget_allocations', 'budget_allocations.budget_item_id', '=', 'budget_items.id');
+
+                foreach ($periods as $period) {
+                    $alias = 'amount_' . str_replace(['-', '.', ' '], '_', $period);
+                    $query->selectRaw(
+                        "SUM(CASE WHEN budget_allocations.period = ? THEN budget_allocations.amount ELSE 0 END) as {$alias}",
+                        [$period]
+                    );
+                }
+
+                return $query->groupBy('budget_items.id');
+            })
             ->groups([
                 Group::make('account.category')
                     ->titlePrefixedWithLabel(false)
                     ->collapsible(),
             ])
+            ->recordClasses(['budget-items-relation-manager'])
             ->defaultGroup('account.category')
-            ->bulkActions([
-                BulkAction::make('clearAllocations')
-                    ->label('Clear Allocations')
-                    ->icon('heroicon-o-trash')
-                    ->color('danger')
-                    ->requiresConfirmation()
-                    ->deselectRecordsAfterCompletion()
-                    ->action(function (Collection $records) use ($periods) {
-                        foreach ($records as $record) {
-                            foreach ($periods as $period) {
-                                $periodKey = "{$record->getKey()}.allocations_by_period.{$period}";
-                                $this->batchChanges[$periodKey] = CurrencyConverter::convertCentsToFormatSimple(0);
-                            }
-
-                            $totalKey = "{$record->getKey()}.total";
-                            $this->batchChanges[$totalKey] = CurrencyConverter::convertCentsToFormatSimple(0);
-                        }
-                    }),
+            ->headerActions([
+                Action::make('saveBatchChanges')
+                    ->label('Save all changes')
+                    ->action('saveBatchChanges')
+                    ->color('primary'),
             ])
-            ->columns(array_merge([
+            ->columns([
                 TextColumn::make('account.name')
-                    ->label('Accounts')
+                    ->label('Account')
                     ->limit(30)
                     ->searchable(),
                 DeferredTextInputColumn::make('total')
@@ -195,9 +160,9 @@ class BudgetItemsRelationManager extends RelationManager
                             return $this->batchChanges["{$record->getKey()}.{$column->getName()}"];
                         }
 
-                        $total = $record->allocations->sum(function (BudgetAllocation $budgetAllocation) {
-                            return $budgetAllocation->getRawOriginal('amount');
-                        });
+                        $total = $record->allocations->sum(
+                            fn (BudgetAllocation $allocation) => $allocation->getRawOriginal('amount')
+                        );
 
                         return CurrencyConverter::convertCentsToFormatSimple($total);
                     })
@@ -219,9 +184,6 @@ class BudgetItemsRelationManager extends RelationManager
                     ->action(
                         Action::make('disperse')
                             ->label('Disperse')
-                            ->icon('heroicon-m-chevron-double-right')
-                            ->color('primary')
-                            ->iconButton()
                             ->action(function (BudgetItem $record) use ($periods) {
                                 if (empty($periods)) {
                                     return;
@@ -246,7 +208,7 @@ class BudgetItemsRelationManager extends RelationManager
 
                                 if ($totalCents <= 0) {
                                     foreach ($periods as $period) {
-                                        $periodKey = "{$record->getKey()}.allocations_by_period.{$period}";
+                                        $periodKey = "{$record->getKey()}.amount_" . str_replace(['-', '.', ' '], '_', $period);
                                         $this->batchChanges[$periodKey] = CurrencyConverter::convertCentsToFormatSimple(0);
                                     }
 
@@ -260,36 +222,50 @@ class BudgetItemsRelationManager extends RelationManager
                                     $amount = $baseAmount + ($index === 0 ? $remainder : 0);
                                     $formattedAmount = CurrencyConverter::convertCentsToFormatSimple($amount);
 
-                                    $periodKey = "{$record->getKey()}.allocations_by_period.{$period}";
+                                    $periodKey = "{$record->getKey()}." . 'amount_' . str_replace(['-', '.', ' '], '_', $period);
                                     $this->batchChanges[$periodKey] = $formattedAmount;
                                 }
                             }),
                     ),
-            ], collect($periods)->map(
-                fn ($period) => DeferredTextInputColumn::make("allocations_by_period.{$period}")
-                    ->label($period)
-                    ->alignRight()
-                    ->mask(RawJs::make('$money($input)'))
-                    ->summarize(
-                        Summarizer::make()
-                            ->using(function (\Illuminate\Database\Query\Builder $query) use ($period) {
-                                $budgetItemIds = $query->pluck('id')->toArray();
-                                $total = $this->calculatePeriodSum($budgetItemIds, $period);
-
-                                return CurrencyConverter::convertCentsToFormatSimple($total);
-                            })
-                    )
-                    ->getStateUsing(function ($record, DeferredTextInputColumn $column) use ($period) {
-                        $key = "{$record->getKey()}.{$column->getName()}";
-
-                        // Check if batch change exists
-                        if (isset($this->batchChanges[$key])) {
-                            return $this->batchChanges[$key];
+                ...array_map(function (string $period) {
+                    $alias = 'amount_' . str_replace(['-', '.', ' '], '_', $period); // Also replace space
+
+                    return DeferredTextInputColumn::make($alias)
+                        ->label($period)
+                        ->alignRight()
+                        ->batchMode()
+                        ->mask(RawJs::make('$money($input)'))
+                        ->getStateUsing(function ($record) use ($alias) {
+                            $key = "{$record->getKey()}.{$alias}";
+
+                            return $this->batchChanges[$key] ?? CurrencyConverter::convertCentsToFormatSimple($record->{$alias} ?? 0);
+                        })
+                        ->summarize(
+                            Summarizer::make()
+                                ->using(function (\Illuminate\Database\Query\Builder $query) use ($period) {
+                                    $budgetItemIds = $query->pluck('id')->toArray();
+                                    $total = $this->calculatePeriodSum($budgetItemIds, $period);
+
+                                    return CurrencyConverter::convertCentsToFormatSimple($total);
+                                })
+                        );
+                }, $periods),
+            ])
+            ->bulkActions([
+                BulkAction::make('clearAllocations')
+                    ->label('Clear Allocations')
+                    ->icon('heroicon-o-trash')
+                    ->color('danger')
+                    ->requiresConfirmation()
+                    ->deselectRecordsAfterCompletion()
+                    ->action(function (Collection $records) use ($periods) {
+                        foreach ($records as $record) {
+                            foreach ($periods as $period) {
+                                $periodKey = "{$record->getKey()}.amount_" . str_replace(['-', '.', ' '], '_', $period);
+                                $this->batchChanges[$periodKey] = CurrencyConverter::convertCentsToFormatSimple(0);
+                            }
                         }
-
-                        return $record->allocations->firstWhere('period', $period)?->amount;
-                    })
-                    ->batchMode(),
-            )->all()));
+                    }),
+            ]);
     }
 }

app/Models/Accounting/Budget.php

@@ -81,19 +81,13 @@ class Budget extends Model
         return $this->hasManyThrough(BudgetAllocation::class, BudgetItem::class);
     }
 
-    /**
-     * Get all periods for this budget in chronological order.
-     */
     public function getPeriods(): array
     {
-        return $this->budgetItems()
-            ->with('allocations')
-            ->get()
-            ->flatMap(fn ($item) => $item->allocations)
-            ->sortBy('start_date')
+        return $this->allocations()
+            ->select('period')
+            ->distinct()
+            ->orderBy('period')
             ->pluck('period')
-            ->unique()
-            ->values()
             ->toArray();
     }
 

app/Models/Accounting/BudgetItem.php

@@ -23,13 +23,6 @@ class BudgetItem extends Model
         'updated_by',
     ];
 
-    protected $appends = ['allocations_by_period'];
-
-    public function getAllocationsByPeriodAttribute(): array
-    {
-        return $this->allocations->pluck('amount', 'period')->toArray();
-    }
-
     public function budget(): BelongsTo
     {
         return $this->belongsTo(Budget::class);

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

@@ -69,18 +69,63 @@
     width: max-content;
 }
 
+.fi-ta-table:has(.budget-items-relation-manager) {
+    .fi-ta-row {
+        @apply divide-x divide-gray-200 dark:divide-gray-700;
+    }
+
+    .fi-ta-summary-row-heading {
+        @apply px-3 py-3 !important;
+    }
+
+    .fi-ta-text-summary {
+        @apply px-3 py-3 !important;
+
+        > span {
+            @apply font-medium text-gray-950 dark:text-white;
+        }
+    }
+
+    .fi-ta-text {
+        @apply px-3 py-0 !important;
+    }
+
+    .fi-ta-text-input {
+        @apply px-0 py-0 !important;
+    }
+
+    .fi-ta-icon {
+        @apply px-3 py-0 !important;
+    }
+
+    .fi-ta-text-input {
+        .fi-input-wrp,
+        .fi-input {
+            @apply ring-0 bg-transparent shadow-none rounded-none !important;
+        }
+    }
+
+    .fi-ta-cell:focus-within {
+        outline: 2px solid #2563eb;
+        outline-offset: -2px;
+        z-index: 1;
+    }
+
+    .fi-ta-col-wrp button:focus {
+        outline: none !important;
+        box-shadow: none !important;
+    }
+}
+
+
 /* Excel/Spreadsheet styling */
 .is-spreadsheet {
-    /* Container styles */
-
     .table-repeater-container {
         border: 1px solid #e5e7eb !important;
         border-radius: 0 !important;
         @apply ring-0 !important;
     }
 
-    /* Header styles */
-
     .table-repeater-header {
         background-color: #f8f9fa !important;
     }
@@ -92,21 +137,15 @@
         padding: 8px 12px !important;
     }
 
-    /* Cell styles */
-
     .table-repeater-column {
         border: 1px solid #e5e7eb !important;
         padding: 8px 12px !important;
     }
 
-    /* Input styles */
-
     .table-repeater-column input {
         text-align: right !important;
     }
 
-    /* Flatten inputs */
-
     .fi-input-wrapper,
     .fi-input {
         padding: 0 !important;
@@ -121,8 +160,6 @@
         @apply bg-transparent !important;
     }
 
-    /* Focus states */
-
     .table-repeater-column:focus-within {
         outline: 2px solid #2563eb !important;
         outline-offset: -2px !important;
@@ -136,14 +173,10 @@
         outline: none !important;
     }
 
-    /* Row styling */
-
     .table-repeater-row:nth-child(even) {
         background-color: #f9fafb;
     }
 
-    /* Form control spacing */
-
     .fi-fo-field-wrp:has(.fi-fo-checkbox-list),
     .fi-fo-field-wrp:has(.fi-checkbox-input),
     .fi-fo-field-wrp:has(.fi-fo-radio) {

resources/views/filament/tables/columns/deferred-text-input-column.blade.php

@@ -106,12 +106,10 @@
                     $getExtraInputAttributeBag()
                         ->merge([
                             'x-on:change' . ($type === 'number' ? '.debounce.1s' : null) => $batchMode ? '
-                                $wire.dispatch(\'batch-column-changed\', {
-                                    data: {
-                                        name: name,
-                                        recordKey: recordKey,
-                                        value: $event.target.value
-                                    }
+                                $wire.handleBatchColumnChanged({
+                                    name: name,
+                                    recordKey: recordKey,
+                                    value: $event.target.value
                                 })
                             ' : '
                                 isLoading = true
@@ -130,7 +128,7 @@
 
                                 isLoading = false
                             ',
-                            'x-on:keydown.enter' => $batchMode ? '$wire.dispatch(\'save-batch-changes\')' : '',
+                            'x-on:keydown.enter' => $batchMode ? '$wire.saveBatchChanges()' : null,
                             'x-mask' . ($mask instanceof \Filament\Support\RawJs ? ':dynamic' : '') => filled($mask) ? $mask : null,
                         ])
                         ->class([