Refactor

Author: pascalbaljet

app/tests/Browser/Form/LibrariesTest.php

@@ -37,8 +37,8 @@ public function it_can_change_the_default_bound_values()
                 ->assertSeeIn('div[data-select-name="countries[]"] .choices__list--multiple', 'Germany')
                 ->assertSeeIn('div[data-select-name="countries[]"] .choices__list--multiple', 'Italy')
                 ->assertInputValue('date', '2022-08-22')
-                ->assertInputValue('time', '3:14')
-                ->assertInputValue('datetime', '2022-08-22 3:14')
+                ->assertInputValue('time', '03:14')
+                ->assertInputValue('datetime', '2022-08-22 03:14')
                 ->assertInputValue('daterange', '2022-08-22 to 2022-09-22');
         });
     }

src/Components/Form.php

@@ -85,9 +85,12 @@ public static function selected($name, $value): bool
 
         $instance = Arr::last(static::$instances);
 
-        $data = $instance->guardedData() ?: $instance->defaultData();
+        $data = data_get(
+            $instance->guardedData() ?: $instance->defaultData(),
+            static::dottedName($name)
+        );
 
-        return data_get($data, static::dottedName($name)) === $value;
+        return is_array($data) ? in_array($value, $data, true) : $data === $value;
     }
 
     public static function defaultUnguarded(bool $state = true)