From 71f0972132fa9b02f489402b55ddab817436fe2c Mon Sep 17 00:00:00 2001 From: Dan Harrin Date: Thu, 30 Jan 2025 11:16:59 +0000 Subject: [PATCH] Rename max width enum --- docs/09-upgrade-guide.md | 2 +- packages/actions/docs/03-modals.md | 4 +- packages/actions/docs/04-grouping-actions.md | 4 +- packages/actions/src/ActionGroup.php | 4 +- packages/actions/src/AssociateAction.php | 4 +- packages/actions/src/AttachAction.php | 4 +- .../actions/src/Concerns/CanOpenModal.php | 14 ++--- packages/actions/src/Concerns/HasDropdown.php | 12 ++--- packages/forms/src/Components/Builder.php | 8 +-- packages/panels/docs/03-pages.md | 6 +-- packages/panels/docs/08-configuration.md | 8 +-- .../views/components/layout/index.blade.php | 52 ++++++++++--------- .../views/components/layout/simple.blade.php | 46 ++++++++-------- .../DisableEmailCodeAuthenticationAction.php | 4 +- .../SetUpEmailCodeAuthenticationAction.php | 4 +- ...bleGoogleTwoFactorAuthenticationAction.php | 4 +- ...actorAuthenticationRecoveryCodesAction.php | 6 +-- ...tUpGoogleTwoFactorAuthenticationAction.php | 4 +- packages/panels/src/Facades/Filament.php | 4 +- packages/panels/src/FilamentManager.php | 6 +-- packages/panels/src/Pages/BasePage.php | 6 +-- .../panels/src/Pages/Concerns/HasMaxWidth.php | 4 +- .../src/Panel/Concerns/HasMaxContentWidth.php | 14 ++--- .../schemas/resources/views/schema.blade.php | 24 ++++----- .../src/Components/Concerns/HasMaxWidth.php | 8 +-- .../views/components/dropdown/index.blade.php | 8 +-- .../views/components/modal/index.blade.php | 12 ++--- .../src/Enums/{MaxWidth.php => Width.php} | 2 +- packages/tables/docs/03-filters/06-layout.md | 4 +- .../src/Table/Concerns/CanToggleColumns.php | 14 ++--- .../tables/src/Table/Concerns/HasFilters.php | 14 ++--- packages/upgrade/bin/filament-v4 | 6 +-- packages/upgrade/src/rector.php | 1 + 33 files changed, 160 insertions(+), 157 deletions(-) rename packages/support/src/Enums/{MaxWidth.php => Width.php} (97%) diff --git a/docs/09-upgrade-guide.md b/docs/09-upgrade-guide.md index 44977cef749..7a38de44a31 100644 --- a/docs/09-upgrade-guide.md +++ b/docs/09-upgrade-guide.md @@ -162,7 +162,7 @@ In v4, Filament automatically scopes all queries in a panel to the current tenan The `$maxContentWidth` property on page classes has a new type. It is now able to accept `MaxWidth` enum values, as well as strings and null: ```php -use Filament\Support\Enums\MaxWidth; +use Filament\Support\Enums\Width; protected MaxWidth | string | null $maxContentWidth = null; ``` diff --git a/packages/actions/docs/03-modals.md b/packages/actions/docs/03-modals.md index fc908180058..fdb79115c0e 100644 --- a/packages/actions/docs/03-modals.md +++ b/packages/actions/docs/03-modals.md @@ -345,7 +345,7 @@ You can change the width of the modal by using the `modalWidth()` method. Option ```php use Filament\Actions\Action; -use Filament\Support\Enums\MaxWidth; +use Filament\Support\Enums\Width; Action::make('updateAuthor') ->form([ @@ -354,7 +354,7 @@ Action::make('updateAuthor') ->action(function (array $data): void { // ... }) - ->modalWidth(MaxWidth::FiveExtraLarge) + ->modalWidth(Width::FiveExtraLarge) ``` ## Executing code when the modal opens diff --git a/packages/actions/docs/04-grouping-actions.md b/packages/actions/docs/04-grouping-actions.md index 3d923081dec..6fae0b8a44a 100644 --- a/packages/actions/docs/04-grouping-actions.md +++ b/packages/actions/docs/04-grouping-actions.md @@ -82,12 +82,12 @@ The dropdown may be set to a width by using the `dropdownWidth()` method. Option ```php use Filament\Actions\ActionGroup; -use Filament\Support\Enums\MaxWidth; +use Filament\Support\Enums\Width; ActionGroup::make([ // Array of actions ]) - ->dropdownWidth(MaxWidth::ExtraSmall) + ->dropdownWidth(Width::ExtraSmall) ``` ## Controlling the maximum height of the dropdown diff --git a/packages/actions/src/ActionGroup.php b/packages/actions/src/ActionGroup.php index 11a4295217e..82b51248116 100644 --- a/packages/actions/src/ActionGroup.php +++ b/packages/actions/src/ActionGroup.php @@ -12,7 +12,7 @@ use Filament\Support\Concerns\HasExtraAttributes; use Filament\Support\Concerns\HasIcon; use Filament\Support\Concerns\HasTooltip; -use Filament\Support\Enums\MaxWidth; +use Filament\Support\Enums\Width; use Filament\Support\Facades\FilamentIcon; use Illuminate\Contracts\Support\Arrayable; use Illuminate\Contracts\View\View; @@ -377,7 +377,7 @@ public function toEmbeddedHtml(): string $panelAttributes = (new ComponentAttributeBag) ->class([ 'fi-dropdown-panel', - ($width instanceof MaxWidth) ? "fi-width-{$width->value}" : (is_string($width) ? $width : 'fi-width-default'), + ($width instanceof Width) ? "fi-width-{$width->value}" : (is_string($width) ? $width : 'fi-width-default'), 'fi-scrollable' => $maxHeight, ]) ->style([ diff --git a/packages/actions/src/AssociateAction.php b/packages/actions/src/AssociateAction.php index 218395588ec..d7ffd4963b7 100644 --- a/packages/actions/src/AssociateAction.php +++ b/packages/actions/src/AssociateAction.php @@ -6,7 +6,7 @@ use Filament\Actions\Concerns\CanCustomizeProcess; use Filament\Forms\Components\Select; use Filament\Schemas\Schema; -use Filament\Support\Enums\MaxWidth; +use Filament\Support\Enums\Width; use Filament\Tables\Table; use Illuminate\Database\Connection; use Illuminate\Database\Eloquent\Builder; @@ -55,7 +55,7 @@ protected function setUp(): void $this->modalSubmitActionLabel(__('filament-actions::associate.single.modal.actions.associate.label')); - $this->modalWidth(MaxWidth::Large); + $this->modalWidth(Width::Large); $this->extraModalFooterActions(function (): array { return $this->canAssociateAnother ? [ diff --git a/packages/actions/src/AttachAction.php b/packages/actions/src/AttachAction.php index dad8714ed2f..e8cfcfe2156 100644 --- a/packages/actions/src/AttachAction.php +++ b/packages/actions/src/AttachAction.php @@ -6,7 +6,7 @@ use Filament\Actions\Concerns\CanCustomizeProcess; use Filament\Forms\Components\Select; use Filament\Schemas\Schema; -use Filament\Support\Enums\MaxWidth; +use Filament\Support\Enums\Width; use Filament\Support\Services\RelationshipJoiner; use Filament\Tables\Table; use Illuminate\Database\Connection; @@ -55,7 +55,7 @@ protected function setUp(): void $this->modalSubmitActionLabel(__('filament-actions::attach.single.modal.actions.attach.label')); - $this->modalWidth(MaxWidth::Large); + $this->modalWidth(Width::Large); $this->extraModalFooterActions(function (): array { return $this->canAttachAnother() ? [ diff --git a/packages/actions/src/Concerns/CanOpenModal.php b/packages/actions/src/Concerns/CanOpenModal.php index 425f71a3e93..42fe8a7f3a8 100644 --- a/packages/actions/src/Concerns/CanOpenModal.php +++ b/packages/actions/src/Concerns/CanOpenModal.php @@ -5,7 +5,7 @@ use Closure; use Filament\Actions\Action; use Filament\Support\Enums\Alignment; -use Filament\Support\Enums\MaxWidth; +use Filament\Support\Enums\Width; use Filament\Support\Facades\FilamentIcon; use Filament\Support\View\Components\Modal; use Illuminate\Contracts\Support\Htmlable; @@ -69,7 +69,7 @@ trait CanOpenModal protected string | Htmlable | Closure | null $modalDescription = null; - protected MaxWidth | string | Closure | null $modalWidth = null; + protected Width | string | Closure | null $modalWidth = null; protected bool | Closure | null $hasModal = null; @@ -309,7 +309,7 @@ public function modalSubheading(string | Htmlable | Closure | null $subheading = return $this; } - public function modalWidth(MaxWidth | string | Closure | null $width = null): static + public function modalWidth(Width | string | Closure | null $width = null): static { $this->modalWidth = $width; @@ -507,7 +507,7 @@ public function getModalAlignment(): Alignment | string return $alignment; } - if ($this->isConfirmationRequired() || in_array($this->getModalWidth(), [MaxWidth::ExtraSmall, MaxWidth::Small, 'xs', 'sm'])) { + if ($this->isConfirmationRequired() || in_array($this->getModalWidth(), [Width::ExtraSmall, Width::Small, 'xs', 'sm'])) { return Alignment::Center; } @@ -585,17 +585,17 @@ public function hasModalDescription(): bool return filled($this->getModalDescription()); } - public function getModalWidth(): MaxWidth | string + public function getModalWidth(): Width | string { if ($width = $this->evaluate($this->modalWidth)) { return $width; } if ($this->isConfirmationRequired()) { - return MaxWidth::Medium; + return Width::Medium; } - return MaxWidth::FourExtraLarge; + return Width::FourExtraLarge; } public function isModalFooterSticky(): bool diff --git a/packages/actions/src/Concerns/HasDropdown.php b/packages/actions/src/Concerns/HasDropdown.php index fa6868f69d6..3a1c8cd34cf 100644 --- a/packages/actions/src/Concerns/HasDropdown.php +++ b/packages/actions/src/Concerns/HasDropdown.php @@ -3,7 +3,7 @@ namespace Filament\Actions\Concerns; use Closure; -use Filament\Support\Enums\MaxWidth; +use Filament\Support\Enums\Width; trait HasDropdown { @@ -15,7 +15,7 @@ trait HasDropdown protected int | Closure | null $dropdownOffset = null; - protected MaxWidth | string | Closure | null $dropdownWidth = null; + protected Width | string | Closure | null $dropdownWidth = null; public function dropdown(bool | Closure $condition = true): static { @@ -45,7 +45,7 @@ public function dropdownOffset(int | Closure | null $offset): static return $this; } - public function dropdownWidth(MaxWidth | string | Closure | null $width): static + public function dropdownWidth(Width | string | Closure | null $width): static { $this->dropdownWidth = $width; @@ -67,12 +67,12 @@ public function getDropdownOffset(): ?int return $this->evaluate($this->dropdownOffset); } - public function getDropdownWidth(): MaxWidth | string | null + public function getDropdownWidth(): Width | string | null { $width = $this->evaluate($this->dropdownWidth); - if (! ($width instanceof MaxWidth)) { - $width = MaxWidth::tryFrom($width) ?? $width; + if (! ($width instanceof Width)) { + $width = Width::tryFrom($width) ?? $width; } return $width; diff --git a/packages/forms/src/Components/Builder.php b/packages/forms/src/Components/Builder.php index a7dab71e94b..50b8665d88a 100644 --- a/packages/forms/src/Components/Builder.php +++ b/packages/forms/src/Components/Builder.php @@ -12,7 +12,7 @@ use Filament\Support\Concerns\HasReorderAnimationDuration; use Filament\Support\Enums\ActionSize; use Filament\Support\Enums\Alignment; -use Filament\Support\Enums\MaxWidth; +use Filament\Support\Enums\Width; use Filament\Support\Facades\FilamentIcon; use Illuminate\Support\Arr; use Illuminate\Support\Str; @@ -93,7 +93,7 @@ class Builder extends Field implements CanConcealComponents, HasExtraItemActions */ protected ?array $blockPickerColumns = []; - protected MaxWidth | string | Closure | null $blockPickerWidth = null; + protected Width | string | Closure | null $blockPickerWidth = null; protected function setUp(): void { @@ -1088,14 +1088,14 @@ public function getBlockPickerColumns(?string $breakpoint = null): array | int | return $columns; } - public function blockPickerWidth(MaxWidth | string | Closure | null $width): static + public function blockPickerWidth(Width | string | Closure | null $width): static { $this->blockPickerWidth = $width; return $this; } - public function getBlockPickerWidth(): MaxWidth | string | null + public function getBlockPickerWidth(): Width | string | null { $width = $this->evaluate($this->blockPickerWidth); diff --git a/packages/panels/docs/03-pages.md b/packages/panels/docs/03-pages.md index adfbc6ddb74..3d348988995 100644 --- a/packages/panels/docs/03-pages.md +++ b/packages/panels/docs/03-pages.md @@ -319,11 +319,11 @@ This example assumes you have a Blade view at `resources/views/filament/settings By default, Filament will restrict the width of the content on the page, so it doesn't become too wide on large screens. To change this, you may override the `getMaxContentWidth()` method. Options correspond to [Tailwind's max-width scale](https://tailwindcss.com/docs/max-width). The options are `ExtraSmall`, `Small`, `Medium`, `Large`, `ExtraLarge`, `TwoExtraLarge`, `ThreeExtraLarge`, `FourExtraLarge`, `FiveExtraLarge`, `SixExtraLarge`, `SevenExtraLarge`, `Full`, `MinContent`, `MaxContent`, `FitContent`, `Prose`, `ScreenSmall`, `ScreenMedium`, `ScreenLarge`, `ScreenExtraLarge` and `ScreenTwoExtraLarge`. The default is `SevenExtraLarge`: ```php -use Filament\Support\Enums\MaxWidth; +use Filament\Support\Enums\Width; -public function getMaxContentWidth(): MaxWidth +public function getMaxContentWidth(): Width { - return MaxWidth::Full; + return Width::Full; } ``` diff --git a/packages/panels/docs/08-configuration.md b/packages/panels/docs/08-configuration.md index 6fabc7c7d34..e753a0b11bb 100644 --- a/packages/panels/docs/08-configuration.md +++ b/packages/panels/docs/08-configuration.md @@ -105,13 +105,13 @@ By default, Filament will restrict the width of the content on the page, so it d ```php use Filament\Panel; -use Filament\Support\Enums\MaxWidth; +use Filament\Support\Enums\Width; public function panel(Panel $panel): Panel { return $panel // ... - ->maxContentWidth(MaxWidth::Full); + ->maxContentWidth(Width::Full); } ``` @@ -119,13 +119,13 @@ If you'd like to set the max content width for pages of the type `SimplePage`, l ```php use Filament\Panel; -use Filament\Support\Enums\MaxWidth; +use Filament\Support\Enums\Width; public function panel(Panel $panel): Panel { return $panel // ... - ->simplePageMaxContentWidth(MaxWidth::Small); + ->simplePageMaxContentWidth(Width::Small); } ``` diff --git a/packages/panels/resources/views/components/layout/index.blade.php b/packages/panels/resources/views/components/layout/index.blade.php index 38d25aca343..32c56e54ecc 100644 --- a/packages/panels/resources/views/components/layout/index.blade.php +++ b/packages/panels/resources/views/components/layout/index.blade.php @@ -1,5 +1,5 @@ @php - use Filament\Support\Enums\MaxWidth; + use Filament\Support\Enums\Width; @endphp @@ -22,13 +22,15 @@ class="fi-layout flex min-h-screen w-full flex-row-reverse overflow-x-clip" x-bind:class="{ 'fi-main-ctn-sidebar-open': $store.sidebar.isOpen, }" - x-bind:style="'display: flex; opacity:1;'" {{-- Mimics `x-cloak`, as using `x-cloak` causes visual issues with chart widgets --}} + x-bind:style="'display: flex; opacity:1;'" + {{-- Mimics `x-cloak`, as using `x-cloak` causes visual issues with chart widgets --}} @elseif (filament()->isSidebarFullyCollapsibleOnDesktop()) x-data="{}" x-bind:class="{ 'fi-main-ctn-sidebar-open': $store.sidebar.isOpen, }" - x-bind:style="'display: flex; opacity:1;'" {{-- Mimics `x-cloak`, as using `x-cloak` causes visual issues with chart widgets --}} + x-bind:style="'display: flex; opacity:1;'" + {{-- Mimics `x-cloak`, as using `x-cloak` causes visual issues with chart widgets --}} @elseif (! (filament()->isSidebarCollapsibleOnDesktop() || filament()->isSidebarFullyCollapsibleOnDesktop() || filament()->hasTopNavigation() || (! filament()->hasNavigation()))) x-data="{}" x-bind:style="'display: flex; opacity:1;'" {{-- Mimics `x-cloak`, as using `x-cloak` causes visual issues with chart widgets --}} @@ -43,28 +45,28 @@ class="fi-layout flex min-h-screen w-full flex-row-reverse overflow-x-clip"
getMaxContentWidth() ?? MaxWidth::SevenExtraLarge)) { - MaxWidth::ExtraSmall, 'xs' => 'max-w-xs', - MaxWidth::Small, 'sm' => 'max-w-sm', - MaxWidth::Medium, 'md' => 'max-w-md', - MaxWidth::Large, 'lg' => 'max-w-lg', - MaxWidth::ExtraLarge, 'xl' => 'max-w-xl', - MaxWidth::TwoExtraLarge, '2xl' => 'max-w-2xl', - MaxWidth::ThreeExtraLarge, '3xl' => 'max-w-3xl', - MaxWidth::FourExtraLarge, '4xl' => 'max-w-4xl', - MaxWidth::FiveExtraLarge, '5xl' => 'max-w-5xl', - MaxWidth::SixExtraLarge, '6xl' => 'max-w-6xl', - MaxWidth::SevenExtraLarge, '7xl' => 'max-w-7xl', - MaxWidth::Full, 'full' => 'max-w-full', - MaxWidth::MinContent, 'min' => 'max-w-min', - MaxWidth::MaxContent, 'max' => 'max-w-max', - MaxWidth::FitContent, 'fit' => 'max-w-fit', - MaxWidth::Prose, 'prose' => 'max-w-prose', - MaxWidth::ScreenSmall, 'screen-sm' => 'max-w-(--breakpoint-sm)', - MaxWidth::ScreenMedium, 'screen-md' => 'max-w-(--breakpoint-md)', - MaxWidth::ScreenLarge, 'screen-lg' => 'max-w-(--breakpoint-lg)', - MaxWidth::ScreenExtraLarge, 'screen-xl' => 'max-w-(--breakpoint-xl)', - MaxWidth::ScreenTwoExtraLarge, 'screen-2xl' => 'max-w-(--breakpoint-2xl)', + match ($maxContentWidth ??= (filament()->getMaxContentWidth() ?? Width::SevenExtraLarge)) { + Width::ExtraSmall, 'xs' => 'max-w-xs', + Width::Small, 'sm' => 'max-w-sm', + Width::Medium, 'md' => 'max-w-md', + Width::Large, 'lg' => 'max-w-lg', + Width::ExtraLarge, 'xl' => 'max-w-xl', + Width::TwoExtraLarge, '2xl' => 'max-w-2xl', + Width::ThreeExtraLarge, '3xl' => 'max-w-3xl', + Width::FourExtraLarge, '4xl' => 'max-w-4xl', + Width::FiveExtraLarge, '5xl' => 'max-w-5xl', + Width::SixExtraLarge, '6xl' => 'max-w-6xl', + Width::SevenExtraLarge, '7xl' => 'max-w-7xl', + Width::Full, 'full' => 'max-w-full', + Width::MinContent, 'min' => 'max-w-min', + Width::MaxContent, 'max' => 'max-w-max', + Width::FitContent, 'fit' => 'max-w-fit', + Width::Prose, 'prose' => 'max-w-prose', + Width::ScreenSmall, 'screen-sm' => 'max-w-(--breakpoint-sm)', + Width::ScreenMedium, 'screen-md' => 'max-w-(--breakpoint-md)', + Width::ScreenLarge, 'screen-lg' => 'max-w-(--breakpoint-lg)', + Width::ScreenExtraLarge, 'screen-xl' => 'max-w-(--breakpoint-xl)', + Width::ScreenTwoExtraLarge, 'screen-2xl' => 'max-w-(--breakpoint-2xl)', default => $maxContentWidth, }, ]) diff --git a/packages/panels/resources/views/components/layout/simple.blade.php b/packages/panels/resources/views/components/layout/simple.blade.php index f7b6f8a0ba9..2ab7d7e8752 100644 --- a/packages/panels/resources/views/components/layout/simple.blade.php +++ b/packages/panels/resources/views/components/layout/simple.blade.php @@ -1,5 +1,5 @@ @php - use Filament\Support\Enums\MaxWidth; + use Filament\Support\Enums\Width; @endphp @@ -32,28 +32,28 @@ class="fi-simple-main-ctn flex w-full grow items-center justify-center"
getSimplePageMaxContentWidth() ?? MaxWidth::Large)) { - MaxWidth::ExtraSmall, 'xs' => 'max-w-xs', - MaxWidth::Small, 'sm' => 'max-w-sm', - MaxWidth::Medium, 'md' => 'max-w-md', - MaxWidth::Large, 'lg' => 'max-w-lg', - MaxWidth::ExtraLarge, 'xl' => 'max-w-xl', - MaxWidth::TwoExtraLarge, '2xl' => 'max-w-2xl', - MaxWidth::ThreeExtraLarge, '3xl' => 'max-w-3xl', - MaxWidth::FourExtraLarge, '4xl' => 'max-w-4xl', - MaxWidth::FiveExtraLarge, '5xl' => 'max-w-5xl', - MaxWidth::SixExtraLarge, '6xl' => 'max-w-6xl', - MaxWidth::SevenExtraLarge, '7xl' => 'max-w-7xl', - MaxWidth::Full, 'full' => 'max-w-full', - MaxWidth::MinContent, 'min' => 'max-w-min', - MaxWidth::MaxContent, 'max' => 'max-w-max', - MaxWidth::FitContent, 'fit' => 'max-w-fit', - MaxWidth::Prose, 'prose' => 'max-w-prose', - MaxWidth::ScreenSmall, 'screen-sm' => 'max-w-(--breakpoint-sm)', - MaxWidth::ScreenMedium, 'screen-md' => 'max-w-(--breakpoint-md)', - MaxWidth::ScreenLarge, 'screen-lg' => 'max-w-(--breakpoint-lg)', - MaxWidth::ScreenExtraLarge, 'screen-xl' => 'max-w-(--breakpoint-xl)', - MaxWidth::ScreenTwoExtraLarge, 'screen-2xl' => 'max-w-(--breakpoint-2xl)', + match ($maxWidth ??= (filament()->getSimplePageMaxContentWidth() ?? Width::Large)) { + Width::ExtraSmall, 'xs' => 'max-w-xs', + Width::Small, 'sm' => 'max-w-sm', + Width::Medium, 'md' => 'max-w-md', + Width::Large, 'lg' => 'max-w-lg', + Width::ExtraLarge, 'xl' => 'max-w-xl', + Width::TwoExtraLarge, '2xl' => 'max-w-2xl', + Width::ThreeExtraLarge, '3xl' => 'max-w-3xl', + Width::FourExtraLarge, '4xl' => 'max-w-4xl', + Width::FiveExtraLarge, '5xl' => 'max-w-5xl', + Width::SixExtraLarge, '6xl' => 'max-w-6xl', + Width::SevenExtraLarge, '7xl' => 'max-w-7xl', + Width::Full, 'full' => 'max-w-full', + Width::MinContent, 'min' => 'max-w-min', + Width::MaxContent, 'max' => 'max-w-max', + Width::FitContent, 'fit' => 'max-w-fit', + Width::Prose, 'prose' => 'max-w-prose', + Width::ScreenSmall, 'screen-sm' => 'max-w-(--breakpoint-sm)', + Width::ScreenMedium, 'screen-md' => 'max-w-(--breakpoint-md)', + Width::ScreenLarge, 'screen-lg' => 'max-w-(--breakpoint-lg)', + Width::ScreenExtraLarge, 'screen-xl' => 'max-w-(--breakpoint-xl)', + Width::ScreenTwoExtraLarge, 'screen-2xl' => 'max-w-(--breakpoint-2xl)', default => $maxWidth, }, ]) diff --git a/packages/panels/src/Auth/MultiFactor/EmailCode/Actions/DisableEmailCodeAuthenticationAction.php b/packages/panels/src/Auth/MultiFactor/EmailCode/Actions/DisableEmailCodeAuthenticationAction.php index f58d90cf905..a7df9063df5 100644 --- a/packages/panels/src/Auth/MultiFactor/EmailCode/Actions/DisableEmailCodeAuthenticationAction.php +++ b/packages/panels/src/Auth/MultiFactor/EmailCode/Actions/DisableEmailCodeAuthenticationAction.php @@ -9,7 +9,7 @@ use Filament\Facades\Filament; use Filament\Forms\Components\OneTimeCodeInput; use Filament\Notifications\Notification; -use Filament\Support\Enums\MaxWidth; +use Filament\Support\Enums\Width; use Illuminate\Support\Facades\DB; class DisableEmailCodeAuthenticationAction @@ -27,7 +27,7 @@ public static function make(EmailCodeAuthentication $emailCodeAuthentication): A $emailCodeAuthentication->sendCode($user); }) - ->modalWidth(MaxWidth::Medium) + ->modalWidth(Width::Medium) ->modalIcon('heroicon-o-lock-open') ->modalHeading(__('filament-panels::auth/multi-factor/email-code/actions/disable.modal.heading')) ->modalDescription(__('filament-panels::auth/multi-factor/email-code/actions/disable.modal.description')) diff --git a/packages/panels/src/Auth/MultiFactor/EmailCode/Actions/SetUpEmailCodeAuthenticationAction.php b/packages/panels/src/Auth/MultiFactor/EmailCode/Actions/SetUpEmailCodeAuthenticationAction.php index e642e99d8db..95152703a95 100644 --- a/packages/panels/src/Auth/MultiFactor/EmailCode/Actions/SetUpEmailCodeAuthenticationAction.php +++ b/packages/panels/src/Auth/MultiFactor/EmailCode/Actions/SetUpEmailCodeAuthenticationAction.php @@ -10,7 +10,7 @@ use Filament\Facades\Filament; use Filament\Forms\Components\OneTimeCodeInput; use Filament\Notifications\Notification; -use Filament\Support\Enums\MaxWidth; +use Filament\Support\Enums\Width; use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Facades\DB; @@ -36,7 +36,7 @@ public static function make(EmailCodeAuthentication $emailCodeAuthentication): A $emailCodeAuthentication->sendCode($user, $secret); }) - ->modalWidth(MaxWidth::Large) + ->modalWidth(Width::Large) ->modalIcon('heroicon-o-lock-closed') ->modalIconColor('primary') ->modalHeading(__('filament-panels::auth/multi-factor/email-code/actions/set-up.modal.heading')) diff --git a/packages/panels/src/Auth/MultiFactor/GoogleTwoFactor/Actions/DisableGoogleTwoFactorAuthenticationAction.php b/packages/panels/src/Auth/MultiFactor/GoogleTwoFactor/Actions/DisableGoogleTwoFactorAuthenticationAction.php index 9c6dc52188b..1a42bd1ea61 100644 --- a/packages/panels/src/Auth/MultiFactor/GoogleTwoFactor/Actions/DisableGoogleTwoFactorAuthenticationAction.php +++ b/packages/panels/src/Auth/MultiFactor/GoogleTwoFactor/Actions/DisableGoogleTwoFactorAuthenticationAction.php @@ -13,7 +13,7 @@ use Filament\Notifications\Notification; use Filament\Schemas\Components\Utilities\Get; use Filament\Schemas\Components\Utilities\Set; -use Filament\Support\Enums\MaxWidth; +use Filament\Support\Enums\Width; use Illuminate\Support\Facades\DB; class DisableGoogleTwoFactorAuthenticationAction @@ -27,7 +27,7 @@ public static function make(GoogleTwoFactorAuthentication $googleTwoFactorAuthen ->color('danger') ->icon('heroicon-m-lock-open') ->link() - ->modalWidth(MaxWidth::Medium) + ->modalWidth(Width::Medium) ->modalIcon('heroicon-o-lock-open') ->modalHeading(__('filament-panels::auth/multi-factor/google-two-factor/actions/disable.modal.heading')) ->modalDescription(__('filament-panels::auth/multi-factor/google-two-factor/actions/disable.modal.description')) diff --git a/packages/panels/src/Auth/MultiFactor/GoogleTwoFactor/Actions/RegenerateGoogleTwoFactorAuthenticationRecoveryCodesAction.php b/packages/panels/src/Auth/MultiFactor/GoogleTwoFactor/Actions/RegenerateGoogleTwoFactorAuthenticationRecoveryCodesAction.php index 802b750df6e..38ee030927d 100644 --- a/packages/panels/src/Auth/MultiFactor/GoogleTwoFactor/Actions/RegenerateGoogleTwoFactorAuthenticationRecoveryCodesAction.php +++ b/packages/panels/src/Auth/MultiFactor/GoogleTwoFactor/Actions/RegenerateGoogleTwoFactorAuthenticationRecoveryCodesAction.php @@ -16,7 +16,7 @@ use Filament\Schemas\Components\Text; use Filament\Schemas\Components\UnorderedList; use Filament\Support\Enums\FontFamily; -use Filament\Support\Enums\MaxWidth; +use Filament\Support\Enums\Width; use Illuminate\Contracts\Support\Htmlable; use Illuminate\Support\HtmlString; use Illuminate\Support\Js; @@ -30,7 +30,7 @@ public static function make(GoogleTwoFactorAuthentication $googleTwoFactorAuthen ->color('gray') ->icon('heroicon-m-arrow-path') ->link() - ->modalWidth(MaxWidth::Large) + ->modalWidth(Width::Large) ->modalIcon('heroicon-o-arrow-path') ->modalIconColor('primary') ->modalHeading(__('filament-panels::auth/multi-factor/google-two-factor/actions/regenerate-recovery-codes.modal.heading')) @@ -122,7 +122,7 @@ public static function make(GoogleTwoFactorAuthentication $googleTwoFactorAuthen ]) ->dense(), ]) - ->modalWidth(MaxWidth::Large) + ->modalWidth(Width::Large) ->closeModalByClickingAway(false) ->closeModalByEscaping(false) ->modalCloseButton(false) diff --git a/packages/panels/src/Auth/MultiFactor/GoogleTwoFactor/Actions/SetUpGoogleTwoFactorAuthenticationAction.php b/packages/panels/src/Auth/MultiFactor/GoogleTwoFactor/Actions/SetUpGoogleTwoFactorAuthenticationAction.php index dafdf30e025..37c96b9f811 100644 --- a/packages/panels/src/Auth/MultiFactor/GoogleTwoFactor/Actions/SetUpGoogleTwoFactorAuthenticationAction.php +++ b/packages/panels/src/Auth/MultiFactor/GoogleTwoFactor/Actions/SetUpGoogleTwoFactorAuthenticationAction.php @@ -20,7 +20,7 @@ use Filament\Schemas\Components\UnorderedList; use Filament\Support\Enums\FontFamily; use Filament\Support\Enums\FontWeight; -use Filament\Support\Enums\MaxWidth; +use Filament\Support\Enums\Width; use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Contracts\Support\Htmlable; use Illuminate\Support\Facades\Blade; @@ -48,7 +48,7 @@ public static function make(GoogleTwoFactorAuthentication $googleTwoFactorAuthen ]), ]); }) - ->modalWidth(MaxWidth::Large) + ->modalWidth(Width::Large) ->modalIcon('heroicon-o-lock-closed') ->modalIconColor('primary') ->modalHeading(__('filament-panels::auth/multi-factor/google-two-factor/actions/set-up.modal.heading')) diff --git a/packages/panels/src/Facades/Filament.php b/packages/panels/src/Facades/Filament.php index e8ed8f5a0c5..857a043def9 100644 --- a/packages/panels/src/Facades/Filament.php +++ b/packages/panels/src/Facades/Filament.php @@ -17,7 +17,7 @@ use Filament\Panel; use Filament\PanelRegistry; use Filament\Support\Assets\Theme; -use Filament\Support\Enums\MaxWidth; +use Filament\Support\Enums\Width; use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Contracts\Auth\CanResetPassword; use Illuminate\Contracts\Auth\MustVerifyEmail; @@ -68,7 +68,7 @@ * @method static string | null getHomeUrl() * @method static string | null getLoginUrl(array $parameters = []) * @method static string getLogoutUrl(array $parameters = []) - * @method static MaxWidth | string | null getMaxContentWidth() + * @method static Width | string | null getMaxContentWidth() * @method static string | null getModelResource(string | Model $model) * @method static array getMultiFactorAuthenticationProviders() * @method static string getNameForDefaultAvatar(Model | Authenticatable $user) diff --git a/packages/panels/src/FilamentManager.php b/packages/panels/src/FilamentManager.php index 6ce823bdf99..0b059a6cd93 100644 --- a/packages/panels/src/FilamentManager.php +++ b/packages/panels/src/FilamentManager.php @@ -21,7 +21,7 @@ use Filament\Navigation\NavigationItem; use Filament\Pages\Enums\SubNavigationPosition; use Filament\Support\Assets\Theme; -use Filament\Support\Enums\MaxWidth; +use Filament\Support\Enums\Width; use Filament\Support\Facades\FilamentAsset; use Filament\Support\Facades\FilamentView; use Filament\Widgets\Widget; @@ -277,12 +277,12 @@ public function getLogoutUrl(array $parameters = []): string return $this->getCurrentOrDefaultPanel()->getLogoutUrl($parameters); } - public function getMaxContentWidth(): MaxWidth | string | null + public function getMaxContentWidth(): Width | string | null { return $this->getCurrentOrDefaultPanel()->getMaxContentWidth(); } - public function getSimplePageMaxContentWidth(): MaxWidth | string | null + public function getSimplePageMaxContentWidth(): Width | string | null { return $this->getCurrentOrDefaultPanel()->getSimplePageMaxContentWidth(); } diff --git a/packages/panels/src/Pages/BasePage.php b/packages/panels/src/Pages/BasePage.php index 41f0e90089d..7a0201a393b 100644 --- a/packages/panels/src/Pages/BasePage.php +++ b/packages/panels/src/Pages/BasePage.php @@ -11,7 +11,7 @@ use Filament\Infolists\Contracts\HasInfolists; use Filament\Schemas\Contracts\HasRenderHookScopes; use Filament\Support\Enums\Alignment; -use Filament\Support\Enums\MaxWidth; +use Filament\Support\Enums\Width; use Filament\Support\Exceptions\Halt; use Illuminate\Contracts\Support\Htmlable; use Illuminate\Contracts\View\View; @@ -36,7 +36,7 @@ abstract class BasePage extends Component implements HasActions, HasForms, HasIn public static ?Closure $reportValidationErrorUsing = null; - protected MaxWidth | string | null $maxContentWidth = null; + protected Width | string | null $maxContentWidth = null; /** * @var array @@ -87,7 +87,7 @@ public function getTitle(): string | Htmlable ->title(); } - public function getMaxContentWidth(): MaxWidth | string | null + public function getMaxContentWidth(): Width | string | null { return $this->maxContentWidth; } diff --git a/packages/panels/src/Pages/Concerns/HasMaxWidth.php b/packages/panels/src/Pages/Concerns/HasMaxWidth.php index e30e2958c53..58d0908afad 100644 --- a/packages/panels/src/Pages/Concerns/HasMaxWidth.php +++ b/packages/panels/src/Pages/Concerns/HasMaxWidth.php @@ -2,13 +2,13 @@ namespace Filament\Pages\Concerns; -use Filament\Support\Enums\MaxWidth; +use Filament\Support\Enums\Width; trait HasMaxWidth { protected ?string $maxWidth = null; - public function getMaxWidth(): MaxWidth | string | null + public function getMaxWidth(): Width | string | null { return $this->maxWidth; } diff --git a/packages/panels/src/Panel/Concerns/HasMaxContentWidth.php b/packages/panels/src/Panel/Concerns/HasMaxContentWidth.php index 44837ac5d45..97bf0ca28f3 100644 --- a/packages/panels/src/Panel/Concerns/HasMaxContentWidth.php +++ b/packages/panels/src/Panel/Concerns/HasMaxContentWidth.php @@ -2,34 +2,34 @@ namespace Filament\Panel\Concerns; -use Filament\Support\Enums\MaxWidth; +use Filament\Support\Enums\Width; trait HasMaxContentWidth { - protected MaxWidth | string | null $maxContentWidth = null; + protected Width | string | null $maxContentWidth = null; - protected MaxWidth | string | null $simplePageMaxContentWidth = null; + protected Width | string | null $simplePageMaxContentWidth = null; - public function maxContentWidth(MaxWidth | string | null $maxContentWidth): static + public function maxContentWidth(Width | string | null $maxContentWidth): static { $this->maxContentWidth = $maxContentWidth; return $this; } - public function getMaxContentWidth(): MaxWidth | string | null + public function getMaxContentWidth(): Width | string | null { return $this->maxContentWidth; } - public function simplePageMaxContentWidth(MaxWidth | string | null $width): static + public function simplePageMaxContentWidth(Width | string | null $width): static { $this->simplePageMaxContentWidth = $width; return $this; } - public function getSimplePageMaxContentWidth(): MaxWidth | string | null + public function getSimplePageMaxContentWidth(): Width | string | null { return $this->simplePageMaxContentWidth; } diff --git a/packages/schemas/resources/views/schema.blade.php b/packages/schemas/resources/views/schema.blade.php index 169f6e528e0..c06559dc633 100644 --- a/packages/schemas/resources/views/schema.blade.php +++ b/packages/schemas/resources/views/schema.blade.php @@ -3,7 +3,7 @@ use Filament\Actions\ActionGroup; use Filament\Schemas\Components\Component; use Filament\Support\Enums\Alignment; - use Filament\Support\Enums\MaxWidth; + use Filament\Support\Enums\Width; use Illuminate\Support\Js; use Illuminate\View\ComponentAttributeBag; @@ -102,17 +102,17 @@ function (Component | Action | ActionGroup $component) use (&$hasVisibleComponen ], escape: false) ->class([ match ($maxWidth = $schemaComponent->getMaxWidth()) { - MaxWidth::ExtraSmall, 'xs' => 'max-w-xs', - MaxWidth::Small, 'sm' => 'max-w-sm', - MaxWidth::Medium, 'md' => 'max-w-md', - MaxWidth::Large, 'lg' => 'max-w-lg', - MaxWidth::ExtraLarge, 'xl' => 'max-w-xl', - MaxWidth::TwoExtraLarge, '2xl' => 'max-w-2xl', - MaxWidth::ThreeExtraLarge, '3xl' => 'max-w-3xl', - MaxWidth::FourExtraLarge, '4xl' => 'max-w-4xl', - MaxWidth::FiveExtraLarge, '5xl' => 'max-w-5xl', - MaxWidth::SixExtraLarge, '6xl' => 'max-w-6xl', - MaxWidth::SevenExtraLarge, '7xl' => 'max-w-7xl', + Width::ExtraSmall, 'xs' => 'max-w-xs', + Width::Small, 'sm' => 'max-w-sm', + Width::Medium, 'md' => 'max-w-md', + Width::Large, 'lg' => 'max-w-lg', + Width::ExtraLarge, 'xl' => 'max-w-xl', + Width::TwoExtraLarge, '2xl' => 'max-w-2xl', + Width::ThreeExtraLarge, '3xl' => 'max-w-3xl', + Width::FourExtraLarge, '4xl' => 'max-w-4xl', + Width::FiveExtraLarge, '5xl' => 'max-w-5xl', + Width::SixExtraLarge, '6xl' => 'max-w-6xl', + Width::SevenExtraLarge, '7xl' => 'max-w-7xl', default => $maxWidth, }, ]) diff --git a/packages/schemas/src/Components/Concerns/HasMaxWidth.php b/packages/schemas/src/Components/Concerns/HasMaxWidth.php index 023b2f834be..9a4d1b2ae37 100644 --- a/packages/schemas/src/Components/Concerns/HasMaxWidth.php +++ b/packages/schemas/src/Components/Concerns/HasMaxWidth.php @@ -3,20 +3,20 @@ namespace Filament\Schemas\Components\Concerns; use Closure; -use Filament\Support\Enums\MaxWidth; +use Filament\Support\Enums\Width; trait HasMaxWidth { - protected MaxWidth | string | Closure | null $maxWidth = null; + protected Width | string | Closure | null $maxWidth = null; - public function maxWidth(MaxWidth | string | Closure | null $width): static + public function maxWidth(Width | string | Closure | null $width): static { $this->maxWidth = $width; return $this; } - public function getMaxWidth(): MaxWidth | string | null + public function getMaxWidth(): Width | string | null { return $this->evaluate($this->maxWidth); } diff --git a/packages/support/resources/views/components/dropdown/index.blade.php b/packages/support/resources/views/components/dropdown/index.blade.php index c6feb28eff9..2f44870810e 100644 --- a/packages/support/resources/views/components/dropdown/index.blade.php +++ b/packages/support/resources/views/components/dropdown/index.blade.php @@ -14,7 +14,7 @@ ]) @php - use Filament\Support\Enums\MaxWidth; + use Filament\Support\Enums\Width; $sizeConfig = collect([ 'availableHeight' => $availableHeight, @@ -22,8 +22,8 @@ 'padding' => $sizePadding, ])->filter()->toJson(); - if (! ($width instanceof MaxWidth)) { - $width = MaxWidth::tryFrom($width) ?? $width; + if (! ($width instanceof Width)) { + $width = Width::tryFrom($width) ?? $width; } @endphp @@ -51,7 +51,7 @@ @endif @class([ 'fi-dropdown-panel', - ($width instanceof MaxWidth) ? "fi-width-{$width->value}" : (is_string($width) ? $width : 'fi-width-default'), + ($width instanceof Width) ? "fi-width-{$width->value}" : (is_string($width) ? $width : 'fi-width-default'), 'fi-scrollable' => $maxHeight || $size, ]) @style([ diff --git a/packages/support/resources/views/components/modal/index.blade.php b/packages/support/resources/views/components/modal/index.blade.php index a9c177e621f..608e23e39d8 100644 --- a/packages/support/resources/views/components/modal/index.blade.php +++ b/packages/support/resources/views/components/modal/index.blade.php @@ -1,6 +1,6 @@ @php use Filament\Support\Enums\Alignment; - use Filament\Support\Enums\MaxWidth; + use Filament\Support\Enums\Width; use Filament\Support\Facades\FilamentView; use Filament\Support\View\Components\Modal\Icon; @endphp @@ -49,8 +49,8 @@ $footerActionsAlignment = filled($footerActionsAlignment) ? (Alignment::tryFrom($footerActionsAlignment) ?? $footerActionsAlignment) : null; } - if (! $width instanceof MaxWidth) { - $width = filled($width) ? (MaxWidth::tryFrom($width) ?? $width) : null; + if (! $width instanceof Width) { + $width = filled($width) ? (Width::tryFrom($width) ?? $width) : null; } $closeEventHandler = filled($id) ? '$dispatch(' . \Illuminate\Support\Js::from($closeEventName) . ', { id: ' . \Illuminate\Support\Js::from($id) . ' })' : 'close()'; @@ -79,7 +79,7 @@ @class([ 'fi-modal', 'fi-modal-slide-over' => $slideOver, - 'fi-width-screen' => $width === MaxWidth::Screen, + 'fi-width-screen' => $width === Width::Screen, ]) > @if ($trigger) @@ -135,7 +135,7 @@ class="fi-modal-close-overlay" x-show="isShown" x-transition:enter="fi-transition-enter" x-transition:leave="fi-transition-leave" - @if ($width !== MaxWidth::Screen) + @if ($width !== Width::Screen) x-transition:enter-start="fi-transition-enter-start" x-transition:enter-end="fi-transition-enter-end" x-transition:leave-start="fi-transition-leave-start" @@ -151,7 +151,7 @@ class="fi-modal-close-overlay" 'fi-modal-window-has-sticky-header' => $stickyHeader, 'fi-hidden' => ! $visible, ($alignment instanceof Alignment) ? "fi-align-{$alignment->value}" : null, - ($width instanceof MaxWidth) ? "fi-width-{$width->value}" : (is_string($width) ? $width : null), + ($width instanceof Width) ? "fi-width-{$width->value}" : (is_string($width) ? $width : null), ]) }} > diff --git a/packages/support/src/Enums/MaxWidth.php b/packages/support/src/Enums/Width.php similarity index 97% rename from packages/support/src/Enums/MaxWidth.php rename to packages/support/src/Enums/Width.php index e41f0adfca0..61a98c633dd 100644 --- a/packages/support/src/Enums/MaxWidth.php +++ b/packages/support/src/Enums/Width.php @@ -2,7 +2,7 @@ namespace Filament\Support\Enums; -enum MaxWidth: string +enum Width: string { case ExtraSmall = 'xs'; diff --git a/packages/tables/docs/03-filters/06-layout.md b/packages/tables/docs/03-filters/06-layout.md index 276efc7315a..cd5d54610a2 100644 --- a/packages/tables/docs/03-filters/06-layout.md +++ b/packages/tables/docs/03-filters/06-layout.md @@ -25,7 +25,7 @@ public function table(Table $table): Table To customize the dropdown width, you may use the `filtersFormWidth()` method, and specify a width - `ExtraSmall`, `Small`, `Medium`, `Large`, `ExtraLarge`, `TwoExtraLarge`, `ThreeExtraLarge`, `FourExtraLarge`, `FiveExtraLarge`, `SixExtraLarge` or `SevenExtraLarge`. By default, the width is `ExtraSmall`: ```php -use Filament\Support\Enums\MaxWidth; +use Filament\Support\Enums\Width; use Filament\Tables\Table; public function table(Table $table): Table @@ -34,7 +34,7 @@ public function table(Table $table): Table ->filters([ // ... ]) - ->filtersFormWidth(MaxWidth::FourExtraLarge); + ->filtersFormWidth(Width::FourExtraLarge); } ``` diff --git a/packages/tables/src/Table/Concerns/CanToggleColumns.php b/packages/tables/src/Table/Concerns/CanToggleColumns.php index 8a2dc5abc95..578b4757fe7 100644 --- a/packages/tables/src/Table/Concerns/CanToggleColumns.php +++ b/packages/tables/src/Table/Concerns/CanToggleColumns.php @@ -6,7 +6,7 @@ use Filament\Actions\Action; use Filament\Schemas\Schema; use Filament\Support\Enums\ActionSize; -use Filament\Support\Enums\MaxWidth; +use Filament\Support\Enums\Width; use Filament\Support\Facades\FilamentIcon; trait CanToggleColumns @@ -18,7 +18,7 @@ trait CanToggleColumns protected string | Closure | null $columnToggleFormMaxHeight = null; - protected MaxWidth | string | Closure | null $columnToggleFormWidth = null; + protected Width | string | Closure | null $columnToggleFormWidth = null; protected ?Closure $modifyToggleColumnsTriggerActionUsing = null; @@ -46,7 +46,7 @@ public function columnToggleFormMaxHeight(string | Closure | null $height): stat return $this; } - public function columnToggleFormWidth(MaxWidth | string | Closure | null $width): static + public function columnToggleFormWidth(Width | string | Closure | null $width): static { $this->columnToggleFormWidth = $width; @@ -94,12 +94,12 @@ public function getColumnToggleFormMaxHeight(): ?string return $this->evaluate($this->columnToggleFormMaxHeight); } - public function getColumnToggleFormWidth(): MaxWidth | string | null + public function getColumnToggleFormWidth(): Width | string | null { return $this->evaluate($this->columnToggleFormWidth) ?? match ($this->getColumnToggleFormColumns()) { - 2 => MaxWidth::TwoExtraLarge, - 3 => MaxWidth::FourExtraLarge, - 4 => MaxWidth::SixExtraLarge, + 2 => Width::TwoExtraLarge, + 3 => Width::FourExtraLarge, + 4 => Width::SixExtraLarge, default => null, }; } diff --git a/packages/tables/src/Table/Concerns/HasFilters.php b/packages/tables/src/Table/Concerns/HasFilters.php index c548c2b56ee..0b3b60c4437 100644 --- a/packages/tables/src/Table/Concerns/HasFilters.php +++ b/packages/tables/src/Table/Concerns/HasFilters.php @@ -7,7 +7,7 @@ use Filament\Schemas\Components\Group; use Filament\Schemas\Schema; use Filament\Support\Enums\ActionSize; -use Filament\Support\Enums\MaxWidth; +use Filament\Support\Enums\Width; use Filament\Support\Facades\FilamentIcon; use Filament\Tables\Enums\FiltersLayout; use Filament\Tables\Filters\BaseFilter; @@ -28,7 +28,7 @@ trait HasFilters protected string | Closure | null $filtersFormMaxHeight = null; - protected MaxWidth | string | Closure | null $filtersFormWidth = null; + protected Width | string | Closure | null $filtersFormWidth = null; protected FiltersLayout | Closure | null $filtersLayout = null; @@ -114,7 +114,7 @@ public function filtersFormMaxHeight(string | Closure | null $height): static return $this; } - public function filtersFormWidth(MaxWidth | string | Closure | null $width): static + public function filtersFormWidth(Width | string | Closure | null $width): static { $this->filtersFormWidth = $width; @@ -267,12 +267,12 @@ public function getFiltersFormMaxHeight(): ?string return $this->evaluate($this->filtersFormMaxHeight); } - public function getFiltersFormWidth(): MaxWidth | string | null + public function getFiltersFormWidth(): Width | string | null { return $this->evaluate($this->filtersFormWidth) ?? match ($this->getFiltersFormColumns()) { - 2 => MaxWidth::TwoExtraLarge, - 3 => MaxWidth::FourExtraLarge, - 4 => MaxWidth::SixExtraLarge, + 2 => Width::TwoExtraLarge, + 3 => Width::FourExtraLarge, + 4 => Width::SixExtraLarge, default => null, }; } diff --git a/packages/upgrade/bin/filament-v4 b/packages/upgrade/bin/filament-v4 index ab317b56ae8..ccd0d140e63 100755 --- a/packages/upgrade/bin/filament-v4 +++ b/packages/upgrade/bin/filament-v4 @@ -2,7 +2,7 @@ - Added MaxWidth type to \$maxContentWidth {$file}. + Added Width type to \$maxContentWidth {$file}.

HTML); } diff --git a/packages/upgrade/src/rector.php b/packages/upgrade/src/rector.php index 01b9aca2e41..6221b276c45 100644 --- a/packages/upgrade/src/rector.php +++ b/packages/upgrade/src/rector.php @@ -229,6 +229,7 @@ 'Filament\\Pages\\Auth\\PasswordReset\\RequestPasswordReset' => 'Filament\\Auth\\Pages\\PasswordReset\\RequestPasswordReset', 'Filament\\Pages\\Auth\\PasswordReset\\ResetPassword' => 'Filament\\Auth\\Pages\\PasswordReset\\ResetPassword', 'Filament\\Pages\\Auth\\Register' => 'Filament\\Auth\\Pages\\Register', + 'Filament\\Support\\Enums\\MaxWidth' => 'Filament\\Support\\Enums\\Width', ], );