refactor: update Forms namespace to use Components across all files

Author: kwhorne

README.md

@@ -158,7 +158,7 @@ class User extends Authenticatable implements FilamentUser, HasAvatar
 
 
 ```php
-use Filament\Forms\Components\FileUpload;
+use Filament\Schemas\Components\FileUpload;
 
 WirementBreezeCore::make()
     ->avatarUploadComponent(fn($fileUpload) => $fileUpload->disableLabel())
@@ -256,8 +256,8 @@ php artisan make:livewire MyCustomComponent
 
 ```php
 use Kwhorne\WirementBreeze\Livewire\MyProfileComponent;
-use Filament\Forms\Components\TextInput;
-use Filament\Forms\Form;
+use Filament\Schemas\Components\TextInput;
+use Filament\Schemas\Schema;
 
 class MyCustomComponent extends MyProfileComponent
 {
@@ -350,7 +350,7 @@ If you want to customize only the fields and notification in the personal info c
 ```php
 namespace App\Livewire;
 
-use Filament\Forms;
+use Filament\Forms\Components;
 use Filament\Notifications\Notification;
 use Kwhorne\WirementBreeze\Livewire\PersonalInfo;
 
@@ -368,15 +368,15 @@ class CustomPersonalInfo extends PersonalInfo
         ];
     }
 
-    protected function getNameComponent(): Forms\Components\TextInput
+    protected function getNameComponent(): Components\TextInput
     {
-        return Forms\Components\TextInput::make('custom_name_field')
+        return Components\TextInput::make('custom_name_field')
             ->required();
     }
 
-    protected function getEmailComponent(): Forms\Components\TextInput
+    protected function getEmailComponent(): Components\TextInput
     {
-        return Forms\Components\TextInput::make('custom_email_field')
+        return Components\TextInput::make('custom_email_field')
             ->required();
     }
 

src/Actions/PasswordButtonAction.php

@@ -3,7 +3,7 @@
 namespace Kwhorne\WirementBreeze\Actions;
 
 use Filament\Actions\Action;
-use Filament\Forms;
+use Filament\Forms\Components;
 
 class PasswordButtonAction extends Action
 {
@@ -24,7 +24,7 @@ protected function setUp(): void
                     __('wirement-breeze::default.password_confirm.description')
                 )
                 ->form([
-                    Forms\Components\TextInput::make('current_password')
+                    Components\TextInput::make('password')
                         ->label(__('wirement-breeze::default.password_confirm.current_password'))
                         ->required()
                         ->password()

src/Livewire/BrowserSessions.php

@@ -3,9 +3,9 @@
 namespace Kwhorne\WirementBreeze\Livewire;
 
 use Carbon\Carbon;
-use Filament\Forms;
-use Filament\Forms\Components\Actions;
+use Filament\Forms\Components;
 use Filament\Forms\Form;
+use Filament\Forms\Components\Actions;
 use Filament\Notifications\Notification;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
@@ -31,7 +31,7 @@ public function form(Form $form): Form
     {
         return $form
             ->schema([
-                Forms\Components\ViewField::make('browserSessions')
+                Components\ViewField::make('browserSessions')
                     ->label(__('wirement-breeze::default.profile.browser_sessions.label'))
                     ->hiddenLabel()
                     ->view($this->listView)
@@ -45,7 +45,7 @@ public function form(Form $form): Form
                         ->modalDescription(__('wirement-breeze::default.profile.browser_sessions.logout_description'))
                         ->modalSubmitActionLabel(__('wirement-breeze::default.profile.browser_sessions.logout_action'))
                         ->form([
-                            Forms\Components\TextInput::make('password')
+                            Components\TextInput::make('password')
                                 ->password()
                                 ->revealable()
                                 ->label(__('wirement-breeze::default.fields.password'))

src/Livewire/PersonalInfo.php

@@ -3,8 +3,8 @@
 namespace Kwhorne\WirementBreeze\Livewire;
 
 use Filament\Facades\Filament;
-use Filament\Schemas\Components;
-use Filament\Schemas\Schema;
+use Filament\Forms\Components;
+use Filament\Forms\Form;
 use Filament\Notifications\Notification;
 
 class PersonalInfo extends MyProfileComponent
@@ -70,10 +70,9 @@ protected function getEmailComponent(): Components\TextInput
             ->label(__('wirement-breeze::default.fields.email'));
     }
 
-    public function form(Schema $schema): Schema
+    public function form(Form $form): Form
     {
-        return $schema
-            ->schema($this->getProfileFormSchema())->columns(3)
+        return $form->schema($this->getProfileFormSchema())->columns(3)
             ->statePath('data');
     }
 

src/Livewire/SanctumTokens.php

@@ -4,7 +4,8 @@
 
 use Carbon\Carbon;
 use Filament\Facades\Filament;
-use Filament\Forms;
+use Filament\Forms\Components;
+use Filament\Forms\Form;
 use Filament\Notifications\Notification;
 use Filament\Tables;
 use Illuminate\Database\Eloquent\Builder;
@@ -31,6 +32,11 @@ public function mount()
         $this->user = Filament::getCurrentPanel()->auth()->user();
     }
 
+    public function form(Form $form): Form
+    {
+        return $form;
+    }
+
     protected function getTableQuery(): Builder
     {
         $auth = Filament::getCurrentPanel()->auth();
@@ -67,16 +73,16 @@ protected function getTableColumns(): array
     protected function getSanctumFormSchema(bool $edit = false): array
     {
         return [
-            Forms\Components\TextInput::make('token_name')
+            Components\TextInput::make('token_name')
                 ->label(__('wirement-breeze::default.fields.token_name'))
                 ->required()
                 ->hidden($edit),
-            Forms\Components\CheckboxList::make('abilities')
+            Components\CheckboxList::make('abilities')
                 ->label(__('wirement-breeze::default.fields.abilities'))
                 ->options(filament('wirement-breeze')->getSanctumPermissions())
                 ->columns($this->abilityColumns)
                 ->required(),
-            Forms\Components\DatePicker::make('expires_at')
+            Components\DatePicker::make('expires_at')
                 ->label(__('wirement-breeze::default.fields.token_expiry')),
 
         ];

src/Livewire/TwoFactorAuthentication.php

@@ -4,7 +4,7 @@
 
 use Filament\Actions\Action;
 use Filament\Facades\Filament;
-use Filament\Forms;
+use Filament\Forms\Components;
 use Filament\Notifications\Notification;
 use Illuminate\Support\Collection;
 use Kwhorne\WirementBreeze\Actions\PasswordButtonAction;
@@ -63,7 +63,7 @@ public function confirmAction(): Action
             ->label(__('wirement-breeze::default.profile.2fa.actions.confirm_finish'))
             ->modalWidth('sm')
             ->form([
-                Forms\Components\TextInput::make('code')
+                Components\TextInput::make('code')
                     ->label(__('wirement-breeze::default.fields.2fa_code'))
                     ->placeholder('###-###')
                     ->required(),

src/Livewire/UpdatePassword.php

@@ -3,7 +3,7 @@
 namespace Kwhorne\WirementBreeze\Livewire;
 
 use Filament\Facades\Filament;
-use Filament\Forms;
+use Filament\Forms\Components;
 use Filament\Forms\Form;
 use Filament\Notifications\Notification;
 use Illuminate\Support\Facades\Hash;
@@ -27,18 +27,18 @@ public function form(Form $form): Form
     {
         return $form
             ->schema([
-                Forms\Components\TextInput::make('current_password')
+                Components\TextInput::make('current_password')
                     ->label(__('wirement-breeze::default.password_confirm.current_password'))
                     ->required()
                     ->password()
                     ->rule('current_password')
                     ->visible(filament('wirement-breeze')->getPasswordUpdateRequiresCurrent()),
-                Forms\Components\TextInput::make('new_password')
+                Components\TextInput::make('new_password')
                     ->label(__('wirement-breeze::default.fields.new_password'))
                     ->password()
                     ->rules(filament('wirement-breeze')->getPasswordUpdateRules())
                     ->required(),
-                Forms\Components\TextInput::make('new_password_confirmation')
+                Components\TextInput::make('new_password_confirmation')
                     ->label(__('wirement-breeze::default.fields.new_password_confirmation'))
                     ->password()
                     ->same('new_password')

src/Pages/TwoFactorPage.php

@@ -6,7 +6,7 @@
 use DanHarrin\LivewireRateLimiting\WithRateLimiting;
 use Filament\Actions\Action;
 use Filament\Facades\Filament;
-use Filament\Forms;
+use Filament\Schemas\Components;
 use Filament\Http\Controllers\Auth\LogoutController;
 use Filament\Pages\Concerns\InteractsWithFormActions;
 use Filament\Pages\SimplePage;
@@ -52,7 +52,7 @@ public function mount()
     protected function getFormSchema(): array
     {
         return [
-            Forms\Components\TextInput::make('code')
+            Components\TextInput::make('code')
                 ->label($this->usingRecoveryCode ? __('wirement-breeze::default.fields.2fa_recovery_code') : __('wirement-breeze::default.fields.2fa_code'))
                 ->placeholder($this->usingRecoveryCode ? __('wirement-breeze::default.two_factor.recovery_code_placeholder') : __('wirement-breeze::default.two_factor.code_placeholder'))
                 ->hint(new HtmlString(Blade::render('
@@ -62,7 +62,7 @@ protected function getFormSchema(): array
                 ->extraInputAttributes(['class' => 'text-center', 'autocomplete' => $this->usingRecoveryCode ? 'off' : 'one-time-code'])
                 ->autofocus()
                 ->suffixAction(
-                    Forms\Components\Actions\Action::make('cancel')
+                    Components\Actions\Action::make('cancel')
                         ->ToolTip(__('wirement-breeze::default.cancel'))
                         ->icon('heroicon-o-x-circle')
                         ->action(function () {

src/WirementBreezeCore.php

@@ -11,7 +11,7 @@
 use Closure;
 use Filament\Contracts\Plugin;
 use Filament\Facades\Filament;
-use Filament\Forms;
+use Filament\Forms\Components;
 use Filament\Navigation\MenuItem;
 use Filament\Panel;
 use Filament\Support\Concerns\EvaluatesClosures;
@@ -194,7 +194,7 @@ public function avatarUploadComponent(Closure $component)
 
     public function getAvatarUploadComponent()
     {
-        $fileUpload = Forms\Components\FileUpload::make('avatar_url')
+        $fileUpload = Components\FileUpload::make('avatar_url')
             ->label(__('wirement-breeze::default.fields.avatar'))->avatar();
 
         return is_null($this->avatarUploadComponent) ? $fileUpload : $this->evaluate($this->avatarUploadComponent, namedInjections: [