Merge branch '4.x' into optimize-table-blade-components

.github/FUNDING.yml

@@ -1,2 +1,2 @@
-github: [danharrin, zepfietje]
+github: [danharrin]
 polar: filamentphp

packages/actions/docs/06-prebuilt-actions/09-export.md

@@ -551,7 +551,7 @@ public static function getCsvDelimiter(): string
 
 You can only specify a single character, otherwise an exception will be thrown.
 
-## Styling XLSX cells
+## Customizing XLSX files
 
 If you want to style the cells of the XLSX file, you may override the `getXlsxCellStyle()` method on the exporter class, returning an [OpenSpout `Style` object](https://github.com/openspout/openspout/blob/4.x/docs/documentation.md#styling):
 
@@ -588,6 +588,21 @@ public function getXlsxHeaderCellStyle(): ?Style
 }
 ```
 
+Alternatively, if you want to pass "options" to the [OpenSpout XLSX `Writer`](https://github.com/openspout/openspout/blob/4.x/docs/documentation.md#column-widths), you can return an `OpenSpout\Writer\XLSX\Options` instance from the `getXlsxWriterOptions()` method of the exporter class:
+
+```php
+use OpenSpout\Writer\XLSX\Options;
+
+public function getXlsxWriterOptions(): ?Options
+{
+    $options = new Options();
+    $options->setColumnWidth(10, 1);
+    $options->setColumnWidthForRange(12, 2, 3);
+
+    return $options;
+}
+```
+
 ## Customizing the export job
 
 The default job for processing exports is `Filament\Actions\Exports\Jobs\PrepareCsvExport`. If you want to extend this class and override any of its methods, you may replace the original class in the `register()` method of a service provider:

packages/actions/src/Concerns/CanExportRecords.php

@@ -171,6 +171,7 @@ protected function setUp(): void
             );
 
             $export->file_disk = $action->getFileDisk() ?? $exporter->getFileDisk();
+            // Temporary save to obtain the sequence number of the export file.
             $export->save();
 
             $export->file_name = $action->getFileName($export) ?? $exporter->getFileName($export);

packages/actions/src/Exports/Exporter.php

@@ -10,6 +10,7 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Queue\Middleware\WithoutOverlapping;
 use OpenSpout\Common\Entity\Style\Style;
+use OpenSpout\Writer\XLSX\Options;
 
 abstract class Exporter
 {
@@ -194,6 +195,11 @@ public function getXlsxHeaderCellStyle(): ?Style
         return null;
     }
 
+    public function getXlsxWriterOptions(): ?Options
+    {
+        return null;
+    }
+
     public static function modifyQuery(Builder $query): Builder
     {
         return $query;

packages/actions/src/Exports/Jobs/CreateXlsxFile.php

@@ -47,7 +47,7 @@ public function handle(): void
     {
         $disk = $this->export->getFileDisk();
 
-        $writer = app(Writer::class);
+        $writer = app(Writer::class, ['options' => $this->exporter->getXlsxWriterOptions()]);
         $writer->openToFile($temporaryFile = tempnam(sys_get_temp_dir(), $this->export->file_name));
 
         $csvDelimiter = $this->exporter::getCsvDelimiter();

packages/actions/src/Exports/Jobs/PrepareCsvExport.php

@@ -72,11 +72,22 @@ public function handle(): void
                 ->reject(fn (array $order): bool => in_array($order['column'] ?? null, [$keyName, $qualifiedKeyName]))
                 ->unique('column');
 
+            /** @var array<string, mixed> $originalBindings */
+            $originalBindings = $query->getRawBindings();
+
             $query->reorder($qualifiedKeyName);
 
             foreach ($originalOrders as $order) {
                 $query->orderBy($order['column'], $order['direction']);
             }
+
+            $newBindings = $query->getRawBindings();
+
+            foreach ($originalBindings as $key => $value) {
+                if ($binding = array_diff($value, $newBindings[$key])) {
+                    $query->addBinding($binding, $key);
+                }
+            }
         }
 
         $exportCsvJob = $this->getExportCsvJob();

packages/actions/src/Testing/TestsActions.php

@@ -108,6 +108,10 @@ public function callAction(): Closure
                 return $this;
             }
 
+            if (store($this->instance())->has('redirect')) {
+                return $this;
+            }
+
             /** @phpstan-ignore-next-line */
             $this->setActionData($data);
 

packages/forms/docs/02-fields/10-rich-editor.md

@@ -67,3 +67,14 @@ RichEditor::make('content')
     ->fileAttachmentsDirectory('attachments')
     ->fileAttachmentsVisibility('private')
 ```
+
+## Disabling Grammarly checks
+
+If the user has Grammarly installed and you would like to prevent it from analyzing the contents of the editor, you can use the `disableGrammarly()` method:
+
+```php
+use Filament\Forms\Components\RichEditor;
+
+RichEditor::make('content')
+    ->disableGrammarly()
+```

packages/forms/docs/02-fields/12-repeater.md

@@ -79,6 +79,21 @@ Repeater::make('members')
     ->addActionLabel('Add member')
 ```
 
+### Aligning the add action button
+
+By default, the add action is aligned in the center. You may adjust this using the `addActionAlignment()` method, passing an `Alignment` option of `Alignment::Start` or `Alignment::End`:
+
+```php
+use Filament\Forms\Components\Repeater;
+use Filament\Support\Enums\Alignment;
+
+Repeater::make('members')
+    ->schema([
+        // ...
+    ])
+    ->addActionAlignment(Alignment::Start)
+```
+
 ### Preventing the user from adding items
 
 You may prevent the user from adding items to the repeater using the `addable(false)` method:

packages/forms/resources/views/components/repeater/index.blade.php

@@ -1,5 +1,6 @@
 @php
     use Filament\Actions\Action;
+    use Filament\Support\Enums\Alignment;
 
     $containers = $getChildComponentContainers();
 
@@ -238,7 +239,17 @@ class="absolute -top-3 left-3 px-1 text-sm font-medium"
         @endif
 
         @if ($isAddable && $addAction->isVisible())
-            <div class="flex justify-center">
+            <div
+                @class([
+                    'flex',
+                    match ($getAddActionAlignment()) {
+                        Alignment::Start, Alignment::Left => 'justify-start',
+                        Alignment::Center, null => 'justify-center',
+                        Alignment::End, Alignment::Right => 'justify-end',
+                        default => $alignment,
+                    },
+                ])
+            >
                 {{ $addAction }}
             </div>
         @endif

packages/forms/resources/views/components/rich-editor.blade.php

@@ -498,6 +498,11 @@ class="trix-button trix-button--dialog"
                     @endif
                     x-ref="trix"
                     wire:ignore
+                    @if ($isGrammarlyDisabled())
+                        data-gramm="false"
+                        data-gramm_editor="false"
+                        data-enable-grammarly="false"
+                    @endif
                     {{
                         $getExtraInputAttributeBag()->class([
                             'prose min-h-[theme(spacing.48)] max-w-none !border-none px-3 py-1.5 text-base text-gray-950 dark:prose-invert focus-visible:outline-none dark:text-white sm:text-sm sm:leading-6',

packages/forms/src/Components/Concerns/CanDisableGrammarly.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace Filament\Forms\Components\Concerns;
+
+use Closure;
+
+trait CanDisableGrammarly
+{
+    protected bool | Closure $isGrammarlyDisabled = false;
+
+    public function disableGrammarly(bool | Closure $condition = true): static
+    {
+        $this->isGrammarlyDisabled = $condition;
+
+        return $this;
+    }
+
+    public function isGrammarlyDisabled(): bool
+    {
+        return (bool) $this->evaluate($this->isGrammarlyDisabled);
+    }
+}

packages/forms/src/Components/Field.php

@@ -16,6 +16,7 @@ class Field extends Component implements Contracts\HasValidationRules
     use Concerns\CanBeAutofocused;
     use Concerns\CanBeMarkedAsRequired;
     use Concerns\CanBeValidated;
+    use Concerns\CanDisableGrammarly;
     use Concerns\HasEnum;
     use Concerns\HasExtraFieldWrapperAttributes;
     use Concerns\HasHelperText;

packages/forms/src/Components/Repeater.php

@@ -11,6 +11,7 @@
 use Filament\Schema\Schema;
 use Filament\Support\Concerns\HasReorderAnimationDuration;
 use Filament\Support\Enums\ActionSize;
+use Filament\Support\Enums\Alignment;
 use Filament\Support\Facades\FilamentIcon;
 use Illuminate\Contracts\Support\Htmlable;
 use Illuminate\Database\Eloquent\Collection;
@@ -58,6 +59,8 @@ class Repeater extends Field implements CanConcealComponents, HasExtraItemAction
 
     protected Field | Closure | null $simpleField = null;
 
+    protected Alignment | string | Closure | null $addActionAlignment = null;
+
     protected ?Closure $modifyRelationshipQueryUsing = null;
 
     protected ?Closure $modifyAddActionUsing = null;
@@ -201,6 +204,24 @@ public function getAddAction(): Action
         return $action;
     }
 
+    public function addActionAlignment(Alignment | string | Closure | null $addActionAlignment): static
+    {
+        $this->addActionAlignment = $addActionAlignment;
+
+        return $this;
+    }
+
+    public function getAddActionAlignment(): Alignment | string | null
+    {
+        $alignment = $this->evaluate($this->addActionAlignment);
+
+        if (is_string($alignment)) {
+            $alignment = Alignment::tryFrom($alignment) ?? $alignment;
+        }
+
+        return $alignment;
+    }
+
     public function addAction(?Closure $callback): static
     {
         $this->modifyAddActionUsing = $callback;
@@ -919,7 +940,9 @@ public function relationship(string | Closure | null $name = null, ?Closure $mod
                 ->get()
                 ->each(static fn (Model $record) => $record->delete());
 
-            $childComponentContainers = $component->getChildComponentContainers();
+            $childComponentContainers = $component->getChildComponentContainers(
+                withHidden: $component->shouldSaveRelationshipsWhenHidden(),
+            );
 
             $itemOrder = 1;
             $orderColumn = $component->getOrderColumn();

packages/notifications/docs/02-database-notifications.md

@@ -142,19 +142,16 @@ DatabaseNotifications::pollingInterval(null);
 
 Alternatively, the package has a native integration with [Laravel Echo](https://laravel.com/docs/broadcasting#client-side-installation). Make sure Echo is installed, as well as a [server-side websockets integration](https://laravel.com/docs/broadcasting#server-side-installation) like Pusher.
 
-Once websockets are set up, after sending a database notification you may dispatch a `DatabaseNotificationsSent` event, which will immediately fetch new notifications for that user:
+Once websockets are set up, you can automatically dispatch a `DatabaseNotificationsSent` event by setting the `isEventDispatched` parameter to `true` when sending the notification. This will trigger the immediate fetching of new notifications for the user:
 
 ```php
-use Filament\Notifications\Events\DatabaseNotificationsSent;
 use Filament\Notifications\Notification;
 
 $recipient = auth()->user();
 
 Notification::make()
     ->title('Saved successfully')
-    ->sendToDatabase($recipient);
-
-event(new DatabaseNotificationsSent($recipient));
+    ->sendToDatabase($recipient, isEventDispatched: true);
 ```
 
 ## Marking database notifications as read

packages/panels/resources/css/base.css

@@ -0,0 +1,10 @@
+@layer base {
+    :root.dark {
+        color-scheme: dark;
+    }
+
+    /* When scrolling to validation error, do not hide element behind the top bar */
+    [data-field-wrapper] {
+        scroll-margin-top: 8rem;
+    }
+}

packages/panels/resources/css/index.css

@@ -1,15 +1,6 @@
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
-@tailwind variants;
+@import 'tailwindcss/base';
+@import 'tailwindcss/components';
+@import 'tailwindcss/utilities';
+@import 'tailwindcss/variants';
 
-@layer base {
-    :root.dark {
-        color-scheme: dark;
-    }
-
-    /* When scrolling to validation error, do not hide element behind the top bar */
-    [data-field-wrapper] {
-        scroll-margin-top: 8rem;
-    }
-}
+@import 'base.css';

packages/schema/docs/02-layout/08-custom.md

@@ -28,7 +28,7 @@ You may create your own custom component classes and views, which you can reuse
 
 > If you're just creating a simple custom component to use once, you could instead use a [view component](#view-components) to render any custom Blade file.
 
-To create a custom column class and view, you may use the following command:
+To create a custom component class and view, you may use the following command:
 
 ```bash
 php artisan make:filament-schema-layout Wizard

packages/schema/src/Components/Concerns/HasState.php

@@ -299,11 +299,11 @@ public function dehydrateState(array &$state, bool $isDehydrated = true): void
             }
         }
 
-        foreach ($this->getChildComponentContainers() as $container) {
-            if ($container->isHidden()) {
-                continue;
-            }
+        if ($this->isHiddenAndNotDehydrated()) {
+            return;
+        }
 
+        foreach ($this->getChildComponentContainers(withHidden: true) as $container) {
             $container->dehydrateState($state, $isDehydrated);
         }
     }

packages/support/composer.json

@@ -15,7 +15,7 @@
         "illuminate/contracts": "^10.45|^11.0",
         "illuminate/support": "^10.45|^11.0",
         "illuminate/view": "^10.45|^11.0",
-        "kirschbaum-development/eloquent-power-joins": "^3.0",
+        "kirschbaum-development/eloquent-power-joins": "^3.0|^4.0",
         "livewire/livewire": "^3.4.10 <= 3.5.6",
         "ryangjchandler/blade-capture-directive": "^0.2|^0.3|^1.0",
         "spatie/color": "^1.5",