update

Author: mevdschee

src/Input.php

@@ -15,7 +15,7 @@ class Input implements Control
     protected string $type = 'text';
     protected string $placeholder = '';
 
-    /** @var array<string|int,string> $options */
+    /** @var array<string> $options */
     protected array $options = [];
 
     protected bool $disabled = false;
@@ -89,7 +89,7 @@ public function placeholder(string $placeholder): self
     }
 
     /**
-     * @param array<string|int,string> $options
+     * @param array<string> $options
      */
     public function options(array $options): self
     {
@@ -170,11 +170,8 @@ public function renderDom(DOMDocument $doc): DOMElement
             $input->setAttribute('list', $this->name . '-options');
             $datalist = $doc->createElement('datalist');
             $datalist->setAttribute('id', $this->name . '-options');
-            foreach ($this->options as $value => $label) {
-                $option = $doc->createElement('option', $label);
-                if (!is_int($value)) {
-                    $option->setAttribute('value', $value);
-                }
+            foreach ($this->options as $value) {
+                $option = $doc->createElement('option', $value);
                 $datalist->appendChild($option);
             }
             $wrapper = $doc->createElement('div');

src/Select.php

@@ -10,7 +10,7 @@ class Select implements Control
     use HtmlElement;
 
     protected string $name = '';
-    /** @var array<string|int,string> $options */
+    /** @var array<string,string> $options */
     protected array $options = [];
     /** @var string[] $values */
     protected array $values = [];
@@ -81,7 +81,13 @@ public function autocomplete(string $value): self
      */
     public function options(array $options): self
     {
-        $this->options = $options;
+        $this->options = [];
+        foreach ($options as $key => $value) {
+            if (is_int($key)) {
+                $key = $value;
+            }
+            $this->options[$key] = $value ?: '...';
+        }
         if (!isset($this->options[''])) {
             $this->options = ['' => '...'] + $this->options; // Add empty option if not present
         }
@@ -158,7 +164,7 @@ public function renderDom(\DOMDocument $doc): \DOMElement
         }
         foreach ($this->options as $key => $value) {
             $option = $doc->createElement('option', $value);
-            $option->setAttribute('value', strval($key));
+            $option->setAttribute('value', $key);
             if (in_array($key, $this->values)) {
                 $option->setAttribute('selected', 'selected');
             }

src/SelectOrType.php

@@ -162,7 +162,9 @@ public function renderDom(\DOMDocument $doc): \DOMElement
             $caption = $value ?: '...';
             $isLast = $i == count($this->options) - 1;
             $option = $doc->createElement('option', $caption);
-            if (!$isLast) {
+            if ($isLast) {
+                $option->setAttribute('value', '');
+            } else {
                 $option->setAttribute('value', $value);
                 if ($value == $this->value) {
                     $option->setAttribute('selected', 'selected');