Squashed 'packages/fields/' changes from 1520150..07f5929

07f5929 fix: reordering bug with drag n drop in repeater (#47)
df174de fix: selecting relationship options (#46)

git-subtree-dir: packages/fields
git-subtree-split: 07f5929d60b10abadafee0759b93c5d5f83380e6

Author: Casmo

src/Concerns/HasSelectableValues.php

@@ -288,7 +288,23 @@ protected function selectableValuesFormFields(string $type, string $label, strin
                                         Select::make('relationKey')
                                             ->label(__('Key Column'))
                                             ->helperText(__('The column to use as the unique identifier/value for each option'))
-                                            ->options(fn (Get $get) => $get('relationKey_options') ?? [])
+                                            ->options(function (Get $get) {
+                                                $resource = $get('resource');
+                                                if (! $resource) {
+                                                    return [];
+                                                }
+
+                                                $model = static::resolveResourceModel($resource);
+                                                if (! $model) {
+                                                    return [];
+                                                }
+
+                                                $columns = Schema::getColumnListing($model->getTable());
+
+                                                return collect($columns)->mapWithKeys(function ($column) {
+                                                    return [$column => Str::title($column)];
+                                                })->toArray();
+                                            })
                                             ->searchable()
                                             ->visible(fn (Get $get): bool => ! empty($get('resource')))
                                             ->required(
@@ -298,7 +314,23 @@ protected function selectableValuesFormFields(string $type, string $label, strin
                                         Select::make('relationValue')
                                             ->label(__('Display Column'))
                                             ->helperText(__('The column to use as the display text/label for each option'))
-                                            ->options(fn (Get $get) => $get('relationValue_options') ?? [])
+                                            ->options(function (Get $get) {
+                                                $resource = $get('resource');
+                                                if (! $resource) {
+                                                    return [];
+                                                }
+
+                                                $model = static::resolveResourceModel($resource);
+                                                if (! $model) {
+                                                    return [];
+                                                }
+
+                                                $columns = Schema::getColumnListing($model->getTable());
+
+                                                return collect($columns)->mapWithKeys(function ($column) {
+                                                    return [$column => Str::title($column)];
+                                                })->toArray();
+                                            })
                                             ->searchable()
                                             ->visible(fn (Get $get): bool => ! empty($get('resource')))
                                             ->required(fn (Get $get): bool => ! empty($get('resource'))),

src/Fields/Repeater.php

@@ -59,11 +59,14 @@ public static function make(string $name, ?Field $field = null): Input
     {
         $input = self::applyDefaultSettings(Input::make($name), $field);
 
+        $isReorderable = $field->config['reorderable'] ?? self::getDefaultConfig()['reorderable'];
+        $isReorderableWithButtons = $field->config['reorderableWithButtons'] ?? self::getDefaultConfig()['reorderableWithButtons'];
+
         $input = $input->label($field->name ?? self::getDefaultConfig()['label'] ?? null)
             ->addActionLabel($field->config['addActionLabel'] ?? self::getDefaultConfig()['addActionLabel'])
             ->addable($field->config['addable'] ?? self::getDefaultConfig()['addable'])
             ->deletable($field->config['deletable'] ?? self::getDefaultConfig()['deletable'])
-            ->reorderable($field->config['reorderable'] ?? self::getDefaultConfig()['reorderable'])
+            ->reorderable($isReorderable)
             ->collapsible($field->config['collapsible'] ?? self::getDefaultConfig()['collapsible'])
             ->cloneable($field->config['cloneable'] ?? self::getDefaultConfig()['cloneable'])
             ->columns($field->config['columns'] ?? self::getDefaultConfig()['columns']);
@@ -72,10 +75,34 @@ public static function make(string $name, ?Field $field = null): Input
             $input = $input->compact();
         }
 
-        if ($field->config['reorderableWithButtons'] ?? self::getDefaultConfig()['reorderableWithButtons']) {
+        if ($isReorderableWithButtons) {
             $input = $input->reorderableWithButtons();
         }
 
+        // Fix for Filament Forms v4.2.0 reorder bug
+        // The default reorder action has a bug where array_flip() creates integer values
+        // that get merged with the state array, causing type errors
+        if ($isReorderable || $isReorderableWithButtons) {
+            $input = $input->reorderAction(function ($action) {
+                return $action->action(function (array $arguments, Input $component): void {
+                    $currentState = $component->getRawState();
+                    $newOrder = $arguments['items'];
+
+                    // Reorder the items based on the new order
+                    $reorderedItems = [];
+                    foreach ($newOrder as $oldIndex) {
+                        if (isset($currentState[$oldIndex])) {
+                            $reorderedItems[] = $currentState[$oldIndex];
+                        }
+                    }
+
+                    $component->rawState($reorderedItems);
+                    $component->callAfterStateUpdated();
+                    $component->shouldPartiallyRenderAfterActionsCalled() ? $component->partiallyRender() : null;
+                });
+            });
+        }
+
         if ($field && ! $field->relationLoaded('children')) {
             $field->load('children');
         }