Merge branch 'main' of github.com:backstagephp/fields into feature/conditional-fields

Author: Baspa

.github/workflows/fix-php-code-style-issues.yml

@@ -19,7 +19,7 @@ jobs:
           ref: ${{ github.head_ref }}
 
       - name: Fix PHP code style issues
-        uses: aglipanci/laravel-pint-action@2.5
+        uses: aglipanci/laravel-pint-action@2.6
 
       - name: Commit changes
         uses: stefanzweifel/git-auto-commit-action@v6

src/Concerns/CanMapDynamicFields.php

@@ -10,6 +10,7 @@
 use Backstage\Fields\Fields\Color;
 use Backstage\Fields\Fields\DateTime;
 use Backstage\Fields\Fields\KeyValue;
+use Backstage\Fields\Fields\MarkdownEditor;
 use Backstage\Fields\Fields\Radio;
 use Backstage\Fields\Fields\Repeater;
 use Backstage\Fields\Fields\RichEditor;
@@ -41,6 +42,7 @@ trait CanMapDynamicFields
         'text' => Text::class,
         'textarea' => Textarea::class,
         'rich-editor' => RichEditor::class,
+        'markdown-editor' => MarkdownEditor::class,
         'repeater' => Repeater::class,
         'select' => Select::class,
         'checkbox' => Checkbox::class,

src/Enums/Field.php

@@ -12,10 +12,10 @@ enum Field: string
     case CheckboxList = 'checkbox-list';
     case Color = 'color';
     case DateTime = 'date-time';
-    case File = 'file-upload';
-    case Hidden = 'hidden';
+    // case File = 'file-upload';
+    // case Hidden = 'hidden';
     case KeyValue = 'key-value';
-    case Link = 'link';
+    // case Link = 'link';
     case MarkdownEditor = 'markdown-editor';
     case Radio = 'radio';
     case Repeater = 'repeater';
@@ -25,5 +25,5 @@ enum Field: string
     case Text = 'text';
     case Textarea = 'textarea';
     case Toggle = 'toggle';
-    case ToggleButtons = 'toggle-buttons';
+    // case ToggleButtons = 'toggle-buttons';
 }

src/Fields/MarkdownEditor.php

@@ -0,0 +1,78 @@
+<?php
+
+namespace Backstage\Fields\Fields;
+
+use Backstage\Fields\Contracts\FieldContract;
+use Backstage\Fields\Enums\ToolbarButton;
+use Backstage\Fields\Models\Field;
+use Filament\Forms;
+use Filament\Forms\Components\RichEditor as Input;
+
+class MarkdownEditor extends Base implements FieldContract
+{
+    public static function getDefaultConfig(): array
+    {
+        return [
+            ...parent::getDefaultConfig(),
+            'toolbarButtons' => ['attachFiles', 'blockquote', 'bold', 'bulletList', 'codeBlock', 'heading', 'italic', 'link', 'orderedList', 'redo', 'strike', 'table', 'undo'],
+            'disableToolbarButtons' => [],
+            'fileAttachmentsDisk' => 'public',
+            'fileAttachmentsDirectory' => 'attachments',
+            'fileAttachmentsVisibility' => 'public',
+        ];
+    }
+
+    public static function make(string $name, ?Field $field = null): Input
+    {
+        $input = self::applyDefaultSettings(Input::make($name), $field);
+
+        $input = $input->label($field->name ?? null)
+            ->toolbarButtons($field->config['toolbarButtons'] ?? self::getDefaultConfig()['toolbarButtons'])
+            ->disableToolbarButtons($field->config['disableToolbarButtons'] ?? self::getDefaultConfig()['disableToolbarButtons'])
+            ->fileAttachmentsDisk($field->config['fileAttachmentsDisk'] ?? self::getDefaultConfig()['fileAttachmentsDisk'])
+            ->fileAttachmentsDirectory($field->config['fileAttachmentsDirectory'] ?? self::getDefaultConfig()['fileAttachmentsDirectory'])
+            ->fileAttachmentsVisibility($field->config['fileAttachmentsVisibility'] ?? self::getDefaultConfig()['fileAttachmentsVisibility']);
+
+        return $input;
+    }
+
+    public function getForm(): array
+    {
+        return [
+            Forms\Components\Tabs::make()
+                ->schema([
+                    Forms\Components\Tabs\Tab::make('General')
+                        ->label(__('General'))
+                        ->schema([
+                            ...parent::getForm(),
+                        ]),
+                    Forms\Components\Tabs\Tab::make('Field specific')
+                        ->label(__('Field specific'))
+                        ->schema([
+                            Forms\Components\Grid::make(2)
+                                ->schema([
+                                    Forms\Components\Select::make('config.toolbarButtons')
+                                        ->label(__('Toolbar buttons'))
+                                        ->default(['attachFiles', 'blockquote', 'bold', 'bulletList', 'codeBlock', 'heading', 'italic', 'link', 'orderedList', 'redo', 'strike', 'table', 'undo'])
+                                        ->default(ToolbarButton::array()) // Not working in Filament yet.
+                                        ->multiple()
+                                        ->options(ToolbarButton::array())
+                                        ->columnSpanFull(),
+                                    Forms\Components\Grid::make(3)
+                                        ->schema([
+                                            Forms\Components\TextInput::make('config.fileAttachmentsDisk')
+                                                ->label(__('File attachments disk'))
+                                                ->default('public'),
+                                            Forms\Components\TextInput::make('config.fileAttachmentsDirectory')
+                                                ->label(__('File attachments directory'))
+                                                ->default('attachments'),
+                                            Forms\Components\TextInput::make('config.fileAttachmentsVisibility')
+                                                ->label(__('File attachments visibility'))
+                                                ->default('public'),
+                                        ]),
+                                ]),
+                        ]),
+                ])->columnSpanFull(),
+        ];
+    }
+}

src/Fields/Select.php

@@ -80,7 +80,7 @@ public static function make(string $name, ?Field $field = null): Input
         return $input;
     }
 
-    public static function mutateFormDataCallback(Model $record, $field, array $data): array
+    public static function mutateFormDataCallback(Model $record, Field $field, array $data): array
     {
         if (! property_exists($record, 'valueColumn') || ! isset($record->values[$field->ulid])) {
             return $data;
@@ -92,7 +92,7 @@ public static function mutateFormDataCallback(Model $record, $field, array $data
         return $data;
     }
 
-    public static function mutateBeforeSaveCallback(Model $record, $field, array $data): array
+    public static function mutateBeforeSaveCallback(Model $record, Field $field, array $data): array
     {
         if (! property_exists($record, 'valueColumn') || ! isset($data[$record->valueColumn][$field->ulid])) {
             return $data;