Add better support for datalist values

popphp · Apr 5, 2016 · 8534fee · 8534fee
1 parent 9a47a09
commit 8534fee
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/Element/Input/Datalist.php b/src/Element/Input/Datalist.php
@@ -54,8 +54,12 @@ public function __construct($name, array $values, $value = null, $indent = null)
         if (null !== $values) {
             $this->datalist = new Child('datalist', null, null, $this->indent);
             $this->datalist->setAttribute('id', $name . '_datalist');
-            foreach ($values as $val) {
-                $this->datalist->addChild((new Child('option'))->setAttribute('value', $val));
+            foreach ($values as $key => $val) {
+                if (is_numeric($key)) {
+                    $this->datalist->addChild((new Child('option'))->setAttribute('value', $val));
+                } else {
+                    $this->datalist->addChild((new Child('option', $val))->setAttribute('value', $key));
+                }
             }
         }
     }