Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,16 @@
"license" : "MIT",
"require" : {
"php": "^8.2",
"filament/filament": "^3.1",
"filament/filament": "^4.0",
"illuminate/contracts": "^10.0|^11.0|^12.0",
"livewire/livewire": "^3.2",
"spatie/laravel-package-tools": "^1.12",
"illuminate/contracts": "^10.0|^11.0|^12.0"
"spatie/laravel-package-tools": "^1.12"
},
"require-dev" : {
"filament/upgrade": "^4.0",
"larastan/larastan": "^2.0|^3.0",
"laravel/pint": "^1.0",
"nunomaduro/collision": "^7.0|^8.0",
"larastan/larastan": "^2.0|^3.0",
"orchestra/testbench": "^8.0|^9.0|^10.0",
"pestphp/pest": "^2.0|^3.0",
"pestphp/pest-plugin-laravel": "^2.0|^3.0",
Expand Down
2 changes: 1 addition & 1 deletion phpstan-baseline.neon
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
count: 2
path: src/Pages/Settings.php
-
message: "#^Static property Codedor\\\\FilamentSettings\\\\Widgets\\\\RequiredFieldsWidget\\:\\:\\$view \\(view-string\\) does not accept default value of type string\\.$#"
message: "#^Property Codedor\\\\FilamentSettings\\\\Widgets\\\\RequiredFieldsWidget\\:\\:\\$view \\(view-string\\) does not accept default value of type string\\.$#"
count: 1
path: src/Widgets/RequiredFieldsWidget.php
-
Expand Down
1 change: 1 addition & 0 deletions resources/css/plugin.css
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@source '../views/**';
14 changes: 10 additions & 4 deletions resources/views/pages/settings.blade.php
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
<x-filament::page :header-widgets-columns="4">

<form wire:submit.prevent="submit" class="space-y-6">
<form wire:submit.prevent="submit" class="fi-sc-form">
{{ $this->form }}

<x-filament::button type="submit">
{{ __('filament-settings::widget.save') }}
</x-filament::button>
<div class="fi-sc fi-sc-has-gap fi-grid">
<div class="fi-sc-actions">
<div class="fi-ac fi-align-start">
<x-filament::button type="submit">
{{ __('filament-settings::widget.save') }}
</x-filament::button>
</div>
</div>
</div>
</form>

</x-filament::page>
12 changes: 5 additions & 7 deletions src/Pages/Settings.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,12 @@
use Codedor\FilamentSettings\Drivers\DriverInterface;
use Codedor\FilamentSettings\Repositories\SettingTabRepository;
use Codedor\FilamentSettings\Widgets\RequiredFieldsWidget;
use Filament\Forms\Components\Tabs;
use Filament\Forms\Form;
use Filament\Notifications\Notification;
use Filament\Pages\Page;

class Settings extends Page
{
protected static string $view = 'filament-settings::pages.settings';
protected string $view = 'filament-settings::pages.settings';

public string $focus = '';

Expand Down Expand Up @@ -61,14 +59,14 @@ public function submit()
$this->dispatch('filament-settings::refresh-widget');
}

public function form(Form $form): Form
public function form(\Filament\Schemas\Schema $schema): \Filament\Schemas\Schema
{
/** @var SettingTabRepository $rep */
$rep = app(SettingTabRepository::class);

return $form
->schema([
Tabs::make('Settings')
return $schema
->components([
\Filament\Schemas\Components\Tabs::make('Settings')
->persistTabInQueryString()
->tabs($rep->toTabsSchema($this->focus)),
])->statePath('data');
Expand Down
3 changes: 1 addition & 2 deletions src/Repositories/SettingTabRepository.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
use Codedor\FilamentSettings\Rules\SettingMustBeFilledIn;
use Codedor\FilamentSettings\Settings\SettingsInterface;
use Filament\Forms\Components\Field;
use Filament\Forms\Components\Tabs\Tab;
use Illuminate\Support\Collection;
use Illuminate\Support\Str;

Expand Down Expand Up @@ -68,7 +67,7 @@ public function toTabsSchema(string $focusKey = ''): array
return $field->default($value);
})->toArray();

return Tab::make($tabName)->schema($schema);
return \Filament\Schemas\Components\Tabs\Tab::make($tabName)->schema($schema);
})->values()->toArray();
}

Expand Down
2 changes: 1 addition & 1 deletion src/Widgets/RequiredFieldsWidget.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

class RequiredFieldsWidget extends Widget
{
protected static string $view = 'filament-settings::widgets.required_fields_widget';
protected string $view = 'filament-settings::widgets.required_fields_widget';

protected int|string|array $columnSpan = 'full';

Expand Down
Loading