[Live] Fix default select value with preferred choices

Author: 1ed

src/LiveComponent/src/ComponentWithFormTrait.php

@@ -288,7 +288,7 @@ private function extractFormValues(FormView $formView): array
                 && !$child->vars['multiple']                // is not multiple
                 && !\is_string($child->vars['placeholder'])  // has no placeholder (empty string is valid)
             ) {
-                $choices = $child->vars['choices'];
+                $choices = $child->vars['preferred_choices'] ?: $child->vars['choices'];
                 do {
                     $choice = $choices[array_key_first($choices)];
                     if (!$choice instanceof ChoiceGroupView) {

src/LiveComponent/tests/Fixtures/Form/FormWithManyDifferentFieldsType.php

@@ -74,6 +74,28 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'foo' => 1,
                 ],
             ])
+            ->add('choice_required_with_preferred_choices_array', ChoiceType::class, [
+                'choices' => [
+                    'Bar Group' => [
+                        'Bar Label' => 'ok',
+                        'Foo Label' => 'foo_value',
+                    ],
+                    'foo' => 1,
+                ],
+                'preferred_choices' => ['foo_value'],
+            ])
+            ->add('choice_required_with_preferred_choices_callback', ChoiceType::class, [
+                'choices' => [
+                    'Bar Group' => [
+                        'Bar Label' => 'ok',
+                        'Foo Label' => 'foo_value',
+                    ],
+                    'foo' => 1,
+                ],
+                'preferred_choices' => function ($choice): bool {
+                    return is_int($choice);
+                },
+            ])
             ->add('choice_expanded', ChoiceType::class, [
                 'choices' => [
                     'foo' => 1,

src/LiveComponent/tests/Functional/Form/ComponentWithFormTest.php

@@ -182,6 +182,8 @@ public function testHandleCheckboxChanges(): void
             'choice_required_with_empty_placeholder' => '',
             'choice_required_without_placeholder' => '2',
             'choice_required_without_placeholder_and_choice_group' => 'ok',
+            'choice_required_with_preferred_choices_array' => 'foo_value',
+            'choice_required_with_preferred_choices_callback' => '1',
             'choice_expanded' => '',
             'choice_multiple' => ['2'],
             'select_multiple' => ['2'],

src/LiveComponent/tests/Unit/Form/ComponentWithFormTest.php

@@ -49,6 +49,8 @@ public function testFormValues(): void
                 'choice_required_with_empty_placeholder' => '',
                 'choice_required_without_placeholder' => '2',
                 'choice_required_without_placeholder_and_choice_group' => 'ok',
+                'choice_required_with_preferred_choices_array' => 'foo_value',
+                'choice_required_with_preferred_choices_callback' => '1',
                 'choice_expanded' => '',
                 'choice_multiple' => ['2'],
                 'select_multiple' => ['2'],