Merge branch 'main' into feature/improvements

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.4
+        uses: aglipanci/laravel-pint-action@2.5
 
       - name: Commit changes
         uses: stefanzweifel/git-auto-commit-action@v5

src/Concerns/CanMapDynamicFields.php

@@ -99,16 +99,19 @@ protected function mutateFormData(array $data, callable $mutationStrategy): arra
         return $data;
     }
 
-    private function resolveFormFields(): array
+    private function resolveFormFields(?Model $record = null): array
     {
-        if (! isset($this->record) || $this->record->fields->isEmpty()) {
+
+        $record = $record ?? $this->record;
+
+        if (! isset($record->fields) || $record->fields->isEmpty()) {
             return [];
         }
 
         $customFields = $this->resolveCustomFields();
 
-        return $this->record->fields
-            ->map(fn ($field) => $this->resolveFieldInput($field, $customFields))
+        return $record->fields
+            ->map(fn($field) => $this->resolveFieldInput($field, $customFields))
             ->filter()
             ->values()
             ->all();
@@ -117,12 +120,14 @@ private function resolveFormFields(): 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): ?object
+    private function resolveFieldInput(Model $field, Collection $customFields, ?Model $record = null): ?object
     {
-        $inputName = "{$this->record->valueColumn}.{$field->ulid}";
+        $record = $record ?? $this->record;
+
+        $inputName = "{$record->valueColumn}.{$field->ulid}";
 
         // Try to resolve from standard field type map
         if ($fieldClass = self::FIELD_TYPE_MAP[$field->field_type] ?? null) {

src/Fields/Repeater.php

@@ -55,6 +55,7 @@ public static function getDefaultConfig(): array
             'collapsible' => false,
             'collapsed' => false,
             'cloneable' => false,
+            'columns' => 1,
             'form' => [],
         ];
     }
@@ -69,7 +70,8 @@ public static function make(string $name, ?Field $field = null): Input
             ->deletable($field->config['deletable'] ?? self::getDefaultConfig()['deletable'])
             ->reorderable($field->config['reorderable'] ?? self::getDefaultConfig()['reorderable'])
             ->collapsible($field->config['collapsible'] ?? self::getDefaultConfig()['collapsible'])
-            ->cloneable($field->config['cloneable'] ?? self::getDefaultConfig()['cloneable']);
+            ->cloneable($field->config['cloneable'] ?? self::getDefaultConfig()['cloneable'])
+            ->columns($field->config['columns'] ?? self::getDefaultConfig()['columns']);
 
         if ($field->config['reorderableWithButtons'] ?? self::getDefaultConfig()['reorderableWithButtons']) {
             $input = $input->reorderableWithButtons();
@@ -124,6 +126,10 @@ public function getForm(): array
                                 ->inline(false),
                             Forms\Components\TextInput::make('config.addActionLabel')
                                 ->label(__('Add action label')),
+                            Forms\Components\TextInput::make('config.columns')
+                                ->label(__('Columns'))
+                                ->default(1)
+                                ->numeric(),
                             AdjacencyList::make('config.form')
                                 ->columnSpanFull()
                                 ->label(__('Fields'))