Merge branch '4.x' into 5.x

packages/forms/resources/views/components/builder/block-picker.blade.php

@@ -13,6 +13,7 @@
     use Filament\Support\Enums\Alignment;
     use Filament\Support\Enums\GridDirection;
     use Filament\Support\View\ComponentAttributeBag as FilamentComponentAttributeBag;
+    use Illuminate\Support\Js;
 @endphp
 
 <x-filament::dropdown
@@ -44,8 +45,6 @@
         >
             @foreach ($blocks as $block)
                 @php
-                    use Illuminate\Support\Js;
-
                     $blockIcon = $block->getIcon();
 
                     $wireClickActionArguments = ['block' => $block->getName()];

packages/tables/resources/views/index.blade.php

@@ -1,4 +1,5 @@
 @php
+    use Filament\Actions\Action;
     use Filament\Actions\ActionGroup;
     use Filament\Actions\BulkAction;
     use Filament\Actions\BulkActionGroup;
@@ -25,6 +26,7 @@
     use Illuminate\Contracts\Pagination\CursorPaginator;
     use Illuminate\Contracts\Pagination\LengthAwarePaginator;
     use Illuminate\Contracts\Pagination\Paginator;
+    use Illuminate\Contracts\Support\Htmlable;
     use Illuminate\Database\Query\Builder;
     use Illuminate\Support\Number;
     use Illuminate\Support\Str;
@@ -901,8 +903,6 @@
                 >
                     @if ($records !== null)
                         @php
-                            use Illuminate\Contracts\Pagination\LengthAwarePaginator;
-
                             // The total across all pages, not the current page's count — and since the total is
                             // stable across pages, the live region only announces when the result set really
                             // changes, not on every pagination click. Non-length-aware paginators fall back to
@@ -925,8 +925,6 @@
                     @if ($hasContentLayout && ($records !== null) && count($records))
                         @if (! $isReordering)
                             @php
-                                use Filament\Tables\Columns\Column;
-
                                 $sortableColumns = array_filter(
                                     $columns,
                                     fn (Column $column): bool => $column->isSortable(),
@@ -1444,8 +1442,6 @@
                         @endif
                     @elseif ((! ($content || $hasColumnsLayout)) && ($records !== null))
                         @php
-                            use Filament\Tables\Columns\Column;
-
                             $sortableColumns = $isStackedOnMobile ? array_filter(
                                 $columns,
                                 fn (Column $column): bool => $column->isSortable(),
@@ -1764,8 +1760,6 @@
                                             {{ $headerCellView }}
                                         @else
                                             @php
-                                                use Illuminate\Contracts\Support\Htmlable;
-
                                                 $columnName = $column->getName();
                                                 $columnLabel = $column->getLabel();
                                                 $columnAlignment = $column->getAlignment();
@@ -2330,8 +2324,6 @@
 
                                                     @foreach ($columns as $column)
                                                         @php
-                                                            use Filament\Actions\Action;
-
                                                             $column->record($record);
                                                             $column->rowLoop($loop->parent);
                                                             $column->recordKey($recordKey);

packages/widgets/resources/views/components/widgets.blade.php

@@ -9,6 +9,8 @@
 ])
 
 @php
+    use Filament\Widgets\WidgetConfiguration;
+
     if (is_array($columns)) {
         $columns['lg'] ??= ($columns ? (is_array($columns) ? null : $columns) : 2);
     }
@@ -16,8 +18,6 @@
 
 <div {{ $attributes->grid($columns)->class(['fi-wi']) }}>
     @php
-        use Filament\Widgets\WidgetConfiguration;
-
         $normalizeWidgetClass = function (string | WidgetConfiguration $widget): string {
             if ($widget instanceof WidgetConfiguration) {
                 return $widget->widget;

tests/src/Actions/ModalTest.php

@@ -23,9 +23,10 @@ describe('browser interactions', function (): void {
         $browser
             ->click('[data-testid="modal-less-parent-trigger"]')
             ->assertVisible('[data-testid="modal-less-parent-child-modal"]')
-            ->assertNoAccessibilityIssues()
             ->click('[data-testid="modal-less-parent-child-modal"] .fi-modal-footer-actions button >> text=Cancel')
             ->assertMissing('[data-testid="modal-less-parent-child-modal"]')
+            ->wait(0.5)
+            ->assertNoAccessibilityIssues()
             ->click('[data-testid="action-after-child-trigger"]')
             ->assertSeeIn('[data-testid="action-after-child-result"]', 'ran')
             ->assertNoSmoke();