Merge branch 'main' of github.com:backstagephp/fields

Baspa · Baspa · commit 73090efbf697 · 2025-02-07T11:04:06.000+01:00
diff --git a/database/factories/FieldFactory.php b/database/factories/FieldFactory.php
@@ -2,8 +2,8 @@
 
 namespace Backstage\Fields\Database\Factories;
 
-use Illuminate\Database\Eloquent\Factories\Factory;
 use Backstage\Fields\Models\Field;
+use Illuminate\Database\Eloquent\Factories\Factory;
 
 class FieldFactory extends Factory
 {
diff --git a/src/Concerns/CanMapDynamicFields.php b/src/Concerns/CanMapDynamicFields.php
@@ -2,8 +2,6 @@
 
 namespace Backstage\Fields\Concerns;
 
-use Illuminate\Support\Collection;
-use Livewire\Attributes\On;
 use Backstage\Fields\Contracts\FieldInspector;
 use Backstage\Fields\Enums\Field;
 use Backstage\Fields\Fields;
@@ -21,6 +19,8 @@
 use Backstage\Fields\Fields\Textarea;
 use Backstage\Fields\Fields\Toggle;
 use Backstage\Fields\Models\Field as Model;
+use Illuminate\Support\Collection;
+use Livewire\Attributes\On;
 
 trait CanMapDynamicFields
 {
@@ -110,7 +110,7 @@ private function resolveFormFields(mixed $record = null): array
         $customFields = $this->resolveCustomFields();
 
         return $record->fields
-            ->map(fn($field) => $this->resolveFieldInput($field, $customFields, $record))
+            ->map(fn ($field) => $this->resolveFieldInput($field, $customFields, $record))
             ->filter()
             ->values()
             ->all();
@@ -119,7 +119,7 @@ private function resolveFormFields(mixed $record = null): array
     private function resolveCustomFields(): Collection
     {
         return collect(Fields::getFields())
-            ->map(fn($fieldClass) => new $fieldClass);
+            ->map(fn ($fieldClass) => new $fieldClass);
     }
 
     private function resolveFieldInput(Model $field, Collection $customFields, mixed $record = null): ?object
diff --git a/src/Concerns/HasConfigurableFields.php b/src/Concerns/HasConfigurableFields.php
@@ -2,8 +2,8 @@
 
 namespace Backstage\Fields\Concerns;
 
-use Illuminate\Support\Str;
 use Backstage\Fields\Facades\Fields;
+use Illuminate\Support\Str;
 
 trait HasConfigurableFields
 {
diff --git a/src/Concerns/HasEnumNames.php b/src/Concerns/HasEnumNames.php
@@ -8,6 +8,6 @@ abstract public static function cases(): array;
 
     public static function names(): array
     {
-        return array_map(fn($enum) => $enum->name, static::cases());
+        return array_map(fn ($enum) => $enum->name, static::cases());
     }
 }
diff --git a/src/Concerns/HasEnumValues.php b/src/Concerns/HasEnumValues.php
@@ -8,6 +8,6 @@ abstract public static function cases(): array;
 
     public static function values(): array
     {
-        return array_map(fn($enum) => $enum->value, static::cases());
+        return array_map(fn ($enum) => $enum->value, static::cases());
     }
 }
diff --git a/src/Concerns/HasFieldTypeResolver.php b/src/Concerns/HasFieldTypeResolver.php
@@ -2,10 +2,10 @@
 
 namespace Backstage\Fields\Concerns;
 
-use Exception;
-use Illuminate\Support\Str;
 use Backstage\Fields\Enums\Field;
 use Backstage\Fields\Facades\Fields;
+use Exception;
+use Illuminate\Support\Str;
 
 trait HasFieldTypeResolver
 {
diff --git a/src/Concerns/HasFields.php b/src/Concerns/HasFields.php
@@ -2,8 +2,8 @@
 
 namespace Backstage\Fields\Concerns;
 
-use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Backstage\Fields\Models\Field;
+use Illuminate\Database\Eloquent\Relations\MorphMany;
 
 trait HasFields
 {
diff --git a/src/Concerns/HasOptions.php b/src/Concerns/HasOptions.php
@@ -105,8 +105,8 @@ public function optionFormFields(): Fieldset
                         Forms\Components\KeyValue::make('config.options')
                             ->label(__('Options'))
                             ->columnSpanFull()
-                            ->visible(fn(Forms\Get $get): bool => $get('config.optionType') == 'array')
-                            ->required(fn(Forms\Get $get): bool => $get('config.optionType') == 'array'),
+                            ->visible(fn (Forms\Get $get): bool => $get('config.optionType') == 'array')
+                            ->required(fn (Forms\Get $get): bool => $get('config.optionType') == 'array'),
                         // Relationship options
                         Repeater::make('config.relations')
                             ->label(__('Relations'))
@@ -165,19 +165,19 @@ public function optionFormFields(): Fieldset
                                                     ->toArray();
                                             })
                                             ->noSearchResultsMessage(__('No types found'))
-                                            ->required(fn(Forms\Get $get): bool => $get('config.optionType') == 'relationship'),
+                                            ->required(fn (Forms\Get $get): bool => $get('config.optionType') == 'relationship'),
                                         Forms\Components\Hidden::make('relationKey')
                                             ->default('ulid')
                                             ->label(__('Key'))
-                                            ->required(fn(Forms\Get $get): bool => $get('config.optionType') == 'relationship'),
+                                            ->required(fn (Forms\Get $get): bool => $get('config.optionType') == 'relationship'),
                                         Forms\Components\Repeater::make('relationValue_filters')
                                             ->label(__('Filters'))
-                                            ->visible(fn(Forms\Get $get): bool => ! empty($get('resource')))
+                                            ->visible(fn (Forms\Get $get): bool => ! empty($get('resource')))
                                             ->schema([
                                                 Forms\Components\Grid::make(3)
                                                     ->schema([
                                                         Forms\Components\Select::make('column')
-                                                            ->options(fn(\Filament\Forms\Get $get) => $get('../../relationValue_options') ?? [
+                                                            ->options(fn (\Filament\Forms\Get $get) => $get('../../relationValue_options') ?? [
                                                                 'slug' => __('Slug'),
                                                                 'name' => __('Name'),
                                                             ])
@@ -232,7 +232,7 @@ public function optionFormFields(): Fieldset
                                             ->columnSpanFull(),
                                     ]),
                             ])
-                            ->visible(fn(Forms\Get $get): bool => $get('config.optionType') == 'relationship')
+                            ->visible(fn (Forms\Get $get): bool => $get('config.optionType') == 'relationship')
                             ->columnSpanFull(),
                     ]),
             ]);
diff --git a/src/Fields/Base.php b/src/Fields/Base.php
@@ -2,10 +2,10 @@
 
 namespace Backstage\Fields;
 
-use Filament\Forms;
-use Filament\Support\Colors\Color;
 use Backstage\Fields\Contracts\FieldContract;
 use Backstage\Fields\Models\Field;
+use Filament\Forms;
+use Filament\Support\Colors\Color;
 
 abstract class Base implements FieldContract
 {
diff --git a/src/Fields/Checkbox.php b/src/Fields/Checkbox.php
@@ -2,10 +2,10 @@
 
 namespace Backstage\Fields;
 
-use Filament\Forms;
-use Filament\Forms\Components\Checkbox as Input;
 use Backstage\Fields\Contracts\FieldContract;
 use Backstage\Fields\Models\Field;
+use Filament\Forms;
+use Filament\Forms\Components\Checkbox as Input;
 
 class Checkbox extends Base implements FieldContract
 {
diff --git a/src/Fields/CheckboxList.php b/src/Fields/CheckboxList.php
@@ -2,11 +2,11 @@
 
 namespace Backstage\Fields;
 
-use Filament\Forms;
-use Filament\Forms\Components\CheckboxList as Input;
 use Backstage\Fields\Concerns\HasOptions;
 use Backstage\Fields\Contracts\FieldContract;
 use Backstage\Fields\Models\Field;
+use Filament\Forms;
+use Filament\Forms\Components\CheckboxList as Input;
 
 class CheckboxList extends Base implements FieldContract
 {
@@ -94,16 +94,16 @@ public function getForm(): array
                                     //
                                     Forms\Components\TextInput::make('config.noSearchResultsMessage')
                                         ->label(__('No search results message'))
-                                        ->visible(fn(Forms\Get $get): bool => $get('config.searchable')),
+                                        ->visible(fn (Forms\Get $get): bool => $get('config.searchable')),
                                     Forms\Components\TextInput::make('config.searchPrompt')
                                         ->label(__('Search prompt'))
-                                        ->visible(fn(Forms\Get $get): bool => $get('config.searchable')),
+                                        ->visible(fn (Forms\Get $get): bool => $get('config.searchable')),
                                     Forms\Components\TextInput::make('config.searchDebounce')
                                         ->numeric()
                                         ->minValue(0)
                                         ->step(100)
                                         ->label(__('Search debounce'))
-                                        ->visible(fn(Forms\Get $get): bool => $get('config.searchable')),
+                                        ->visible(fn (Forms\Get $get): bool => $get('config.searchable')),
                                 ]),
                         ]),
                 ])->columnSpanFull(),
diff --git a/src/Fields/Color.php b/src/Fields/Color.php
@@ -2,11 +2,11 @@
 
 namespace Backstage\Fields;
 
-use Filament\Forms;
-use Filament\Forms\Components\ColorPicker as Input;
 use Backstage\Fields\Contracts\FieldContract;
 use Backstage\Fields\Enums\ColorFormat;
 use Backstage\Fields\Models\Field;
+use Filament\Forms;
+use Filament\Forms\Components\ColorPicker as Input;
 
 /**
  * For validation regex patterns, check the Filament documentation.
diff --git a/src/Fields/DateTime.php b/src/Fields/DateTime.php
@@ -2,12 +2,12 @@
 
 namespace Backstage\Fields;
 
-use Baspa\Timezones\Facades\Timezones;
-use Filament\Forms;
-use Filament\Forms\Components\DateTimePicker as Input;
 use Backstage\Fields\Concerns\HasAffixes;
 use Backstage\Fields\Contracts\FieldContract;
 use Backstage\Fields\Models\Field;
+use Baspa\Timezones\Facades\Timezones;
+use Filament\Forms;
+use Filament\Forms\Components\DateTimePicker as Input;
 
 class DateTime extends Base implements FieldContract
 {
diff --git a/src/Fields/KeyValue.php b/src/Fields/KeyValue.php
@@ -2,10 +2,10 @@
 
 namespace Backstage\Fields;
 
-use Filament\Forms;
-use Filament\Forms\Components\KeyValue as Input;
 use Backstage\Fields\Contracts\FieldContract;
 use Backstage\Fields\Models\Field;
+use Filament\Forms;
+use Filament\Forms\Components\KeyValue as Input;
 
 class KeyValue extends Base implements FieldContract
 {
diff --git a/src/Fields/Radio.php b/src/Fields/Radio.php
@@ -2,11 +2,11 @@
 
 namespace Backstage\Fields;
 
-use Filament\Forms;
-use Filament\Forms\Components\Radio as Input;
 use Backstage\Fields\Concerns\HasOptions;
 use Backstage\Fields\Contracts\FieldContract;
 use Backstage\Fields\Models\Field;
+use Filament\Forms;
+use Filament\Forms\Components\Radio as Input;
 
 class Radio extends Base implements FieldContract
 {
diff --git a/src/Fields/Repeater.php b/src/Fields/Repeater.php
@@ -2,6 +2,14 @@
 
 namespace Backstage\Fields;
 
+use Backstage\Fields\Concerns\HasConfigurableFields;
+use Backstage\Fields\Concerns\HasFieldTypeResolver;
+use Backstage\Fields\Concerns\HasOptions;
+use Backstage\Fields\Contracts\FieldContract;
+use Backstage\Fields\Enums\Field as FieldEnum;
+use Backstage\Fields\Facades\Fields;
+use Backstage\Fields\Fields\Select as FieldsSelect;
+use Backstage\Fields\Models\Field;
 use Filament\Forms;
 use Filament\Forms\Components\Hidden;
 use Filament\Forms\Components\Repeater as Input;
@@ -13,14 +21,6 @@
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
 use Saade\FilamentAdjacencyList\Forms\Components\AdjacencyList;
-use Backstage\Fields\Concerns\HasConfigurableFields;
-use Backstage\Fields\Concerns\HasFieldTypeResolver;
-use Backstage\Fields\Concerns\HasOptions;
-use Backstage\Fields\Contracts\FieldContract;
-use Backstage\Fields\Enums\Field as FieldEnum;
-use Backstage\Fields\Facades\Fields;
-use Backstage\Fields\Fields\Select as FieldsSelect;
-use Backstage\Fields\Models\Field;
 
 class Repeater extends Base implements FieldContract
 {
@@ -111,15 +111,15 @@ public function getForm(): array
                                 Forms\Components\Toggle::make('config.reorderableWithButtons')
                                     ->label(__('Reorderable with buttons'))
                                     ->dehydrated()
-                                    ->disabled(fn(Forms\Get $get): bool => $get('config.reorderable') === false)
+                                    ->disabled(fn (Forms\Get $get): bool => $get('config.reorderable') === false)
                                     ->inline(false),
                             ]),
                             Forms\Components\Toggle::make('config.collapsible')
                                 ->label(__('Collapsible'))
                                 ->inline(false),
                             Forms\Components\Toggle::make('config.collapsed')
                                 ->label(__('Collapsed'))
-                                ->visible(fn(Forms\Get $get): bool => $get('config.collapsible') === true)
+                                ->visible(fn (Forms\Get $get): bool => $get('config.collapsible') === true)
                                 ->inline(false),
                             Forms\Components\Toggle::make('config.cloneable')
                                 ->label(__('Cloneable'))
@@ -138,9 +138,9 @@ public function getForm(): array
                                 ->live(debounce: 250)
                                 ->labelKey('name')
                                 ->maxDepth(0)
-                                ->addable(fn(string $operation) => $operation !== 'create')
-                                ->disabled(fn(string $operation) => $operation === 'create')
-                                ->hint(fn(string $operation) => $operation === 'create' ? __('Fields can be added once the field is created.') : '')
+                                ->addable(fn (string $operation) => $operation !== 'create')
+                                ->disabled(fn (string $operation) => $operation === 'create')
+                                ->hint(fn (string $operation) => $operation === 'create' ? __('Fields can be added once the field is created.') : '')
                                 ->hintColor('primary')
                                 ->form([
                                     Section::make('Field')
@@ -155,7 +155,7 @@ public function getForm(): array
                                                 ->required()
                                                 ->placeholder(__('Name'))
                                                 ->live(debounce: 250)
-                                                ->afterStateUpdated(fn(Set $set, ?string $state) => $set('slug', Str::slug($state))),
+                                                ->afterStateUpdated(fn (Set $set, ?string $state) => $set('slug', Str::slug($state))),
                                             TextInput::make('slug')
                                                 ->readonly(),
                                             Select::make('field_type')
@@ -185,10 +185,10 @@ function () {
                                         ])->columnSpanFull(),
                                     Section::make('Configuration')
                                         ->columns(3)
-                                        ->schema(fn(Get $get) => $this->getFieldTypeFormSchema(
+                                        ->schema(fn (Get $get) => $this->getFieldTypeFormSchema(
                                             $get('field_type')
                                         ))
-                                        ->visible(fn(Get $get) => filled($get('field_type'))),
+                                        ->visible(fn (Get $get) => filled($get('field_type'))),
                                 ]),
                         ])->columns(2),
                 ])->columnSpanFull(),
diff --git a/src/Fields/RichEditor.php b/src/Fields/RichEditor.php
@@ -2,11 +2,11 @@
 
 namespace Backstage\Fields;
 
-use Filament\Forms;
-use Filament\Forms\Components\RichEditor as Input;
 use Backstage\Backstage\Enums\ToolbarButton;
 use Backstage\Fields\Contracts\FieldContract;
 use Backstage\Fields\Models\Field;
+use Filament\Forms;
+use Filament\Forms\Components\RichEditor as Input;
 
 class RichEditor extends Base implements FieldContract
 {
diff --git a/src/Fields/Tags.php b/src/Fields/Tags.php
@@ -2,10 +2,10 @@
 
 namespace Backstage\Fields;
 
-use Filament\Forms;
-use Filament\Forms\Components\TagsInput as Input;
 use Backstage\Fields\Contracts\FieldContract;
 use Backstage\Fields\Models\Field;
+use Filament\Forms;
+use Filament\Forms\Components\TagsInput as Input;
 
 class Tags extends Base implements FieldContract
 {
diff --git a/src/Fields/Text.php b/src/Fields/Text.php
diff --git a/src/Fields/Textarea.php b/src/Fields/Textarea.php
diff --git a/src/Fields/Toggle.php b/src/Fields/Toggle.php
diff --git a/src/FieldsServiceProvider.php b/src/FieldsServiceProvider.php
diff --git a/src/Filament/RelationManagers/FieldsRelationManager.php b/src/Filament/RelationManagers/FieldsRelationManager.php
diff --git a/src/Models/Field.php b/src/Models/Field.php
diff --git a/src/Services/FieldInspectionService.php b/src/Services/FieldInspectionService.php
diff --git a/tests/TestCase.php b/tests/TestCase.php

Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,8 @@`
`2`	`2`
`3`	`3`	`namespace Backstage\Fields\Database\Factories;`
`4`	`4`
`5`		`-use Illuminate\Database\Eloquent\Factories\Factory;`
`6`	`5`	`use Backstage\Fields\Models\Field;`
	`6`	`+use Illuminate\Database\Eloquent\Factories\Factory;`
`7`	`7`
`8`	`8`	`class FieldFactory extends Factory`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,8 @@`
`2`	`2`
`3`	`3`	`namespace Backstage\Fields\Concerns;`
`4`	`4`
`5`		`-use Illuminate\Support\Str;`
`6`	`5`	`use Backstage\Fields\Facades\Fields;`
	`6`	`+use Illuminate\Support\Str;`
`7`	`7`
`8`	`8`	`trait HasConfigurableFields`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,6 @@ abstract public static function cases(): array;`
`8`	`8`
`9`	`9`	`public static function names(): array`
`10`	`10`	`{`
`11`		`- return array_map(fn($enum) => $enum->name, static::cases());`
	`11`	`+ return array_map(fn ($enum) => $enum->name, static::cases());`
`12`	`12`	`}`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,6 @@ abstract public static function cases(): array;`
`8`	`8`
`9`	`9`	`public static function values(): array`
`10`	`10`	`{`
`11`		`- return array_map(fn($enum) => $enum->value, static::cases());`
	`11`	`+ return array_map(fn ($enum) => $enum->value, static::cases());`
`12`	`12`	`}`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,8 @@`
`2`	`2`
`3`	`3`	`namespace Backstage\Fields\Concerns;`
`4`	`4`
`5`		`-use Illuminate\Database\Eloquent\Relations\MorphMany;`
`6`	`5`	`use Backstage\Fields\Models\Field;`
	`6`	`+use Illuminate\Database\Eloquent\Relations\MorphMany;`
`7`	`7`
`8`	`8`	`trait HasFields`
`9`	`9`	`{`