Merge branch '4.x' into 5.x

Author: danharrin

.prettierignore

@@ -4,4 +4,5 @@
 composer.lock
 docs-assets
 packages/panels/resources/boost
+tests/src/Panels/Commands/Fixture
 tests/src/Upgrade/Fixture

docs/08-styling/01-overview.md

@@ -128,7 +128,17 @@ By default, this command will use NPM to install dependencies. If you want to us
 php artisan make:filament-theme --pm=bun
 ````
 
-This command generates a CSS file in the `resources/css/filament` directory.
+This command will:
+
+1. Install the required Tailwind CSS dependencies
+2. Generate a CSS file in `resources/css/filament/{panel}/theme.css`
+3. Attempt to automatically add the theme to your `vite.config.js` input array
+4. Attempt to automatically register `->viteTheme()` in your panel provider
+5. Offer to compile the theme with Vite
+
+If the command cannot automatically configure your files (due to non-standard formatting), it will display manual instructions instead. In that case, follow these steps:
+
+### Manual configuration
 
 Add the theme's CSS file to the Laravel plugin's `input` array in `vite.config.js`:
 
@@ -139,7 +149,7 @@ input: [
 ]
 ```
 
-Now, register the Vite-compiled theme CSS file in the panel's provider:
+Register the Vite-compiled theme CSS file in the panel's provider:
 
 ```php
 use Filament\Panel;
@@ -152,14 +162,14 @@ public function panel(Panel $panel): Panel
 }
 ```
 
-Finally, compile the theme with Vite:
+Then compile the theme with Vite:
 
 ```bash
 npm run build
 ```
 
 <Aside variant="info">
-    Check the command output for the exact file path (e.g., `app/theme.css`), as it may vary depending on your panel's ID.
+    Check the command output for the exact file path (e.g., `admin/theme.css`), as it may vary depending on your panel's ID.
 </Aside>
 
 You can now customize the theme by editing the CSS file in `resources/css/filament`.

packages/actions/src/Action.php

@@ -473,7 +473,7 @@ public function getContext(): array
             (! $table)
             || (! $record instanceof Model)
             || blank($table->getModel())
-            || ($record::class === $table->getModel())
+            || is_a($record::class, $table->getModel(), true)
         ) && filled($recordKey = $this->resolveRecordKey($record))) {
             $context['recordKey'] = $recordKey;
         }

packages/panels/src/Commands/MakeThemeCommand.php

@@ -7,12 +7,15 @@
 use Filament\Support\Commands\Exceptions\FailureCommandOutput;
 use Filament\Support\Commands\Exceptions\SuccessCommandOutput;
 use Illuminate\Console\Command;
+use Illuminate\Filesystem\Filesystem;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputOption;
 
+use function Laravel\Prompts\confirm;
+
 #[AsCommand(name: 'make:filament-theme', aliases: [
     'filament:make-theme',
     'filament:theme',
@@ -28,6 +31,10 @@ class MakeThemeCommand extends Command
 
     protected string $pm;
 
+    protected Filesystem $filesystem;
+
+    protected string $themePath;
+
     /**
      * @var array<string>
      */
@@ -76,12 +83,16 @@ protected function getOptions(): array
         ];
     }
 
-    public function handle(): int
+    public function handle(Filesystem $filesystem): int
     {
+        $this->filesystem = $filesystem;
+
         try {
             $this->configurePanel(question: 'Which panel would you like to create this theme for?');
             $this->configurePackageManager();
 
+            $this->themePath = "resources/css/filament/{$this->panel->getId()}/theme.css";
+
             $this->installDependencies();
             $this->createThemeSourceFiles();
 
@@ -92,12 +103,32 @@ public function handle(): int
             return static::SUCCESS;
         }
 
-        $this->components->warn('Action is required to complete the theme setup:');
-        $this->components->bulletList([
-            "First, add a new item to the Laravel plugin's `input` array in `vite.config.js`: `resources/css/filament/{$this->panel->getId()}/theme.css`.",
-            "Next, register the theme in the {$this->panel->getId()} panel provider using `->viteTheme('resources/css/filament/{$this->panel->getId()}/theme.css')`",
-            "Finally, run `{$this->pm} run build` to compile the theme.",
-        ]);
+        $pendingActions = [];
+
+        // Try to register in `vite.config.js`
+        if (! $this->registerInViteConfig()) {
+            $pendingActions[] = "Add a new item to the Laravel plugin's `input` array in `vite.config.js`: `{$this->themePath}`.";
+        }
+
+        // Try to register in panel provider
+        if (! $this->registerInPanelProvider()) {
+            $pendingActions[] = "Register the theme in the {$this->panel->getId()} panel provider using `->viteTheme('{$this->themePath}')`";
+        }
+
+        // Show pending manual actions if any
+        if (count($pendingActions) > 0) {
+            $this->components->warn('Action is required to complete the theme setup:');
+            $this->components->bulletList($pendingActions);
+            $this->newLine();
+        }
+
+        // Offer to compile the theme
+        if (confirm('Would you like to compile the theme now?', default: true)) {
+            $this->components->info('Compiling theme...');
+            passthru("{$this->pm} run build");
+        } else {
+            $this->components->info("Run `{$this->pm} run build` to compile the theme.");
+        }
 
         return static::SUCCESS;
     }
@@ -163,14 +194,140 @@ protected function abortIfNotVite(): void
             return;
         }
 
+        $panelId = $this->panel->getId();
+        $publicPath = "public/css/filament/{$panelId}/theme.css";
+
         $this->components->warn('Action is required to complete the theme setup:');
         $this->components->bulletList([
-            "It looks like you don't have Vite installed. Please use your asset bundling system of choice to compile `resources/css/filament/{$this->panel->getId()}/theme.css` into `public/css/filament/{$this->panel->getId()}/theme.css`.",
+            "It looks like you don't have Vite installed. Please use your asset bundling system of choice to compile `{$this->themePath}` into `{$publicPath}`.",
             "If you're not currently using a bundler, we recommend using Vite. Alternatively, you can use the Tailwind CLI with the following command:",
-            "npx @tailwindcss/cli --input ./resources/css/filament/{$this->panel->getId()}/theme.css --output ./public/css/filament/{$this->panel->getId()}/theme.css --config ./resources/css/filament/{$this->panel->getId()}/tailwind.config.js --minify",
-            "Make sure to register the theme in the {$this->panel->getId()} panel provider using `->theme(asset('css/filament/{$this->panel->getId()}/theme.css'))`",
+            "npx @tailwindcss/cli --input ./{$this->themePath} --output ./{$publicPath} --minify",
+            "Make sure to register the theme in the {$panelId} panel provider using `->theme(asset('css/filament/{$panelId}/theme.css'))`",
         ]);
 
         throw new SuccessCommandOutput;
     }
+
+    protected function registerInViteConfig(): bool
+    {
+        $viteConfigPath = base_path('vite.config.js');
+
+        if (! $this->filesystem->exists($viteConfigPath)) {
+            return false;
+        }
+
+        $contents = $this->filesystem->get($viteConfigPath);
+
+        // Check if already registered
+        if (str_contains($contents, $this->themePath)) {
+            $this->components->info('Theme already registered in vite.config.js.');
+
+            return true;
+        }
+
+        // Look for the laravel plugin input array pattern
+        // Match: input: ['...', '...'] or input: ["...", "..."]
+        $pattern = '/(\binput\s*:\s*\[)([^\]]*?)(\])/s';
+
+        if (! preg_match($pattern, $contents, $matches)) {
+            return false;
+        }
+
+        $inputArrayContents = $matches[2];
+
+        // Verify the array contains recognizable Laravel paths (resources/css or resources/js)
+        if (! preg_match('/[\'"]resources\/(css|js)\//', $inputArrayContents)) {
+            return false;
+        }
+
+        // Detect quote style from existing entries
+        $quoteStyle = str_contains($inputArrayContents, "'") ? "'" : '"';
+
+        // Find the last quoted string in the array (with optional trailing comma and whitespace)
+        if (! preg_match('/^(.*[\'"][^\'"]+[\'"]),?(\s*)$/s', $inputArrayContents, $lastEntryMatch)) {
+            return false;
+        }
+
+        $beforeTrailing = $lastEntryMatch[1];
+        $trailingWhitespace = $lastEntryMatch[2];
+
+        // Build new input array contents - add comma after existing entry, then new entry
+        $newEntry = "{$quoteStyle}{$this->themePath}{$quoteStyle}";
+
+        // If multiline (has newlines), preserve the formatting
+        if (str_contains($trailingWhitespace, "\n")) {
+            // Extract the indentation from existing array entries (look for newline followed by spaces and a quote)
+            preg_match('/\n(\s+)[\'"]/', $inputArrayContents, $indentMatch);
+            $indent = $indentMatch[1] ?? '            ';
+            $newInputArrayContents = $beforeTrailing . ",\n{$indent}{$newEntry}," . $trailingWhitespace;
+        } else {
+            // Single line - just append with comma
+            $newInputArrayContents = $beforeTrailing . ", {$newEntry}" . $trailingWhitespace;
+        }
+
+        $newContents = preg_replace(
+            $pattern,
+            '$1' . str_replace(['\\', '$'], ['\\\\', '\\$'], $newInputArrayContents) . '$3',
+            $contents,
+            1
+        );
+
+        if ($newContents === null || $newContents === $contents) {
+            return false;
+        }
+
+        $this->filesystem->put($viteConfigPath, $newContents);
+        $this->components->info('Added theme to vite.config.js input array.');
+
+        return true;
+    }
+
+    protected function registerInPanelProvider(): bool
+    {
+        $panelId = $this->panel->getId();
+
+        // Find the panel provider file
+        $providerPath = app_path('Providers/Filament/' . Str::studly($panelId) . 'PanelProvider.php');
+
+        if (! $this->filesystem->exists($providerPath)) {
+            return false;
+        }
+
+        $contents = $this->filesystem->get($providerPath);
+
+        // Check if already registered
+        if (str_contains($contents, 'viteTheme(')) {
+            $this->components->info('viteTheme() already configured in panel provider.');
+
+            return true;
+        }
+
+        // Look for ->id('panelId') to confirm we're in the right file
+        $idPattern = '/(->id\s*\(\s*[\'"]' . preg_quote($panelId, '/') . '[\'"]\s*\))(\s*\n)/';
+        if (! preg_match($idPattern, $contents)) {
+            return false;
+        }
+
+        // Try to insert after ->path() first, then fall back to ->id()
+        $pathPattern = '/(->path\s*\(\s*[\'"][^\'"]*[\'"]\s*\))(\s*\n)/';
+
+        if (preg_match($pathPattern, $contents)) {
+            $pattern = $pathPattern;
+        } else {
+            // No ->path() found, insert after ->id() instead
+            $pattern = $idPattern;
+        }
+
+        $replacement = '$1' . "\n            ->viteTheme('{$this->themePath}')" . '$2';
+        $newContents = preg_replace($pattern, $replacement, $contents, 1);
+
+        if ($newContents === null || $newContents === $contents) {
+            return false;
+        }
+
+        $this->filesystem->put($providerPath, $newContents);
+        $this->components->info('Added viteTheme() to panel provider.');
+
+        return true;
+    }
 }

packages/panels/src/Panel/Concerns/HasTheme.php

@@ -32,6 +32,14 @@ public function viteTheme(string | array $theme, ?string $buildDirectory = null)
         return $this;
     }
 
+    /**
+     * @return string | array<string> | null
+     */
+    public function getViteTheme(): string | array | null
+    {
+        return $this->viteTheme;
+    }
+
     public function theme(string | Htmlable | Theme $theme): static
     {
         $this->theme = $theme;
@@ -41,8 +49,8 @@ public function theme(string | Htmlable | Theme $theme): static
 
     public function getTheme(): Theme
     {
-        if (filled($this->viteTheme)) {
-            $this->theme = app(Vite::class)($this->viteTheme, $this->viteThemeBuildDirectory);
+        if (filled($viteTheme = $this->getViteTheme())) {
+            $this->theme = app(Vite::class)($viteTheme, $this->viteThemeBuildDirectory);
         }
 
         if (blank($this->theme)) {

packages/spatie-laravel-media-library-plugin/README.md

@@ -38,7 +38,7 @@ The media library file upload supports all the customization options of the [ori
 
 ### Passing a collection
 
-Optionally, you may pass a [`collection()`](https://spatie.be/docs/laravel-medialibrary/working-with-media-collections/simple-media-collections) allows you to group files into categories:
+Optionally, you may pass a [`collection()`](https://spatie.be/docs/laravel-medialibrary/working-with-media-collections/simple-media-collections) that allows you to group files into categories:
 
 ```php
 use Filament\Forms\Components\SpatieMediaLibraryFileUpload;

packages/spatie-laravel-tags-plugin/README.md

@@ -26,7 +26,7 @@ You must also [prepare your Eloquent model](https://spatie.be/docs/laravel-tags/
 
 ## Form component
 
-This guide assumes that you've already set up your model attach tags as per [Spatie's documentation](https://spatie.be/docs/laravel-tags/basic-usage/using-tags).
+This guide assumes that you've already set up your model to attach tags as per [Spatie's documentation](https://spatie.be/docs/laravel-tags/basic-usage/using-tags).
 
 You may use the field in the same way as the [original tags input](https://filamentphp.com/docs/forms/tags-input) field:
 
@@ -36,7 +36,7 @@ use Filament\Forms\Components\SpatieTagsInput;
 SpatieTagsInput::make('tags')
 ```
 
-Optionally, you may pass a [`type()`](https://spatie.be/docs/laravel-tags/advanced-usage/using-types) allows you to group tags into collections:
+Optionally, you may pass a [`type()`](https://spatie.be/docs/laravel-tags/advanced-usage/using-types) that allows you to group tags into collections:
 
 ```php
 use Filament\Forms\Components\SpatieTagsInput;

packages/tables/src/Concerns/CanSortRecords.php

@@ -85,9 +85,11 @@ protected function applySortingToTableQuery(Builder $query): Builder
             return $query->orderBy($this->getTable()->getReorderColumn(), $this->getTable()->getReorderDirection());
         }
 
+        $tableSortColumn = $this->getTableSortColumn();
+
         if (
-            $this->getTableSortColumn() &&
-            $column = $this->getTable()->getSortableVisibleColumn($this->getTableSortColumn())
+            $tableSortColumn &&
+            $column = $this->getTable()->getSortableVisibleColumn($tableSortColumn)
         ) {
             $sortDirection = $this->getTableSortDirection() === 'desc' ? 'desc' : 'asc';
 
@@ -99,11 +101,14 @@ protected function applySortingToTableQuery(Builder $query): Builder
 
         if (
             is_string($defaultSort) &&
-            ($defaultSort !== $this->getTableSortColumn()) &&
+            ($defaultSort !== $tableSortColumn) &&
             ($sortColumn = $this->getTable()->getSortableVisibleColumn($defaultSort))
         ) {
             $sortColumn->applySort($query, $sortDirection);
-        } elseif (is_string($defaultSort)) {
+        } elseif (
+            is_string($defaultSort) &&
+            $defaultSort !== $tableSortColumn
+        ) {
             $query->orderBy($defaultSort, $sortDirection);
         }
 

packages/widgets/docs/03-charts.md

@@ -338,7 +338,7 @@ window.filamentChartJsPlugins.push(ChartDataLabels)
 
 This is equivalent to including the plugins "inline" via `new Chart(..., { plugins: [...] })` when instantiating a Chart.js chart.
 
-It's important to initialise the array if it has not been already, before pushing onto it. This ensures that mutliple JavaScript files (especially those from Filament plugins) that register Chart.js plugins do not overwrite each other, regardless of the order they are booted in.
+It's important to initialise the array if it has not been already, before pushing onto it. This ensures that multiple JavaScript files (especially those from Filament plugins) that register Chart.js plugins do not overwrite each other, regardless of the order they are booted in.
 
 You can push as many plugins to the array as you would like to install, you do not need a separate file to import each plugin.
 

pint-strict-imports.json

@@ -14,5 +14,6 @@
         "types_spaces": {
             "space": "single"
         }
-    }
+    },
+    "exclude": ["tests/src/Panels/Commands/Fixture"]
 }