Fixes #30

reachweb · Oct 16, 2024 · 4438b5e · 4438b5e
1 parent 019fdbe
commit 4438b5e
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 9 deletions.
diff --git a/src/Http/Livewire/Traits/HandleFieldOptions.php b/src/Http/Livewire/Traits/HandleFieldOptions.php
@@ -29,6 +29,20 @@ protected function hasOptionsInConfig($field)
         return array_key_exists('options', $field->toArray());
     }
 
+    protected function transformOptionsArray($field)
+    {
+        $options = collect($field->get('options'));
+        if (! is_array($options->first()) || ! array_key_exists('key', $options->first())) {
+            return $field;
+        }
+        $field->setConfig(array_merge(
+            $field->config(),
+            ['options' => $options->flatMap(fn ($option) => [$option['key'] => $option['value']])->all()]
+        ));
+
+        return $field;
+    }
+
     protected function addCountsArrayToConfig($field)
     {
         $field->setConfig(array_merge(

diff --git a/src/Http/Livewire/Traits/IsLivewireFilter.php b/src/Http/Livewire/Traits/IsLivewireFilter.php
@@ -38,6 +38,7 @@ public function initiateField()
         if ($field->type() == 'terms') {
             $field = $this->addTermsToOptions($field);
         } elseif ($this->hasOptionsInConfig($field)) {
+            $field = $this->transformOptionsArray($field);
             $field = $this->addCountsArrayToConfig($field);
         } elseif ($this->hasCustomOptions()) {
             $field = $this->addCustomOptionsToConfig($field);

diff --git a/tests/Feature/LfCheckboxFilterTest.php b/tests/Feature/LfCheckboxFilterTest.php
@@ -42,9 +42,18 @@ public function setUp(): void
                                 'display' => 'Checkbox',
                                 'listable' => 'hidden',
                                 'options' => [
-                                    'option1' => 'Option 1',
-                                    'option2' => 'Option 2',
-                                    'option3' => 'Option 3',
+                                    [
+                                        'key' => 'option1',
+                                        'value' => 'Option 1',
+                                    ],
+                                    [
+                                        'key' => 'option2',
+                                        'value' => 'Option 2',
+                                    ],
+                                    [
+                                        'key' => 'option3',
+                                        'value' => 'Option 3',
+                                    ],
                                 ],
                             ],
                         ],

diff --git a/tests/Feature/LfRadioFilterTest.php b/tests/Feature/LfRadioFilterTest.php
@@ -42,9 +42,18 @@ public function setUp(): void
                                 'display' => 'Radio',
                                 'listable' => 'hidden',
                                 'options' => [
-                                    'option1' => 'Option 1',
-                                    'option2' => 'Option 2',
-                                    'option3' => 'Option 3',
+                                    [
+                                        'key' => 'option1',
+                                        'value' => 'Option 1',
+                                    ],
+                                    [
+                                        'key' => 'option2',
+                                        'value' => 'Option 2',
+                                    ],
+                                    [
+                                        'key' => 'option3',
+                                        'value' => 'Option 3',
+                                    ],
                                 ],
                             ],
                         ],

diff --git a/tests/Feature/LfSelectFilterTest.php b/tests/Feature/LfSelectFilterTest.php
@@ -41,9 +41,18 @@ public function setUp(): void
                                 'display' => 'Select',
                                 'listable' => 'hidden',
                                 'options' => [
-                                    'option1' => 'Option 1',
-                                    'option2' => 'Option 2',
-                                    'option3' => 'Option 3',
+                                    [
+                                        'key' => 'option1',
+                                        'value' => 'Option 1',
+                                    ],
+                                    [
+                                        'key' => 'option2',
+                                        'value' => 'Option 2',
+                                    ],
+                                    [
+                                        'key' => 'option3',
+                                        'value' => 'Option 3',
+                                    ],
                                 ],
                             ],
                         ],