update

Author: mevdschee

src/Bulma/Input.php

@@ -29,10 +29,14 @@ public function renderDom(\DOMDocument $doc): \DOMElement
             $this->addClass('button');
             $this->addClass('is-primary');
         }
-        $wrapper = $doc->createElement('div');
-        $wrapper->setAttribute('class', 'control');
         $input = parent::renderDom($doc);
-        $wrapper->appendChild($input);
+        if ($input->tagName == 'div') {
+            $wrapper = $input;
+        } else {
+            $wrapper = $doc->createElement('div');
+            $wrapper->appendChild($input);
+        }
+        $wrapper->setAttribute('class', 'control');
         return $wrapper;
     }
 }

src/Input.php

@@ -172,14 +172,15 @@ public function renderDom(DOMDocument $doc): DOMElement
             $datalist->setAttribute('id', $this->name . '-options');
             foreach ($this->options as $value => $label) {
                 $option = $doc->createElement('option', $label);
-                if (is_int($value)) {
-                    $option->setAttribute('value', $label);
-                } else {
+                if (!is_int($value)) {
                     $option->setAttribute('value', $value);
                 }
                 $datalist->appendChild($option);
             }
-            $doc->appendChild($datalist);
+            $wrapper = $doc->createElement('div');
+            $wrapper->appendChild($input);
+            $wrapper->appendChild($datalist);
+            return $wrapper;
         }
         return $input;
     }

tests/Forms/SourceFormTest.php

@@ -0,0 +1,66 @@
+<?php
+
+namespace MintyPHP\Tests\Forms;
+
+use PHPUnit\Framework\TestCase;
+
+use MintyPHP\Form\Form;
+use MintyPHP\Form\Elements as E;
+use MintyPHP\Form\Validator\Validators as V;
+
+class SourceFormTest extends TestCase
+{
+    private function createForm(string $style): Form
+    {
+        $sources = [
+            'Ad',
+            'Blog',
+            'Magazine',
+            'Newspaper',
+        ];
+        E::$style = $style;
+        return E::form([
+            E::field(E::text('sources')->options($sources), E::label('How did you hear about us?'), [V::required('Field cannot be empty')]),
+        ]);
+    }
+
+    public function testRenderForm(): void
+    {
+        $form = $this->createForm('none');
+        $lines = [
+            '<div>',
+            '  <label for="sources">How did you hear about us?</label>',
+            '  <div>',
+            '    <input id="sources" type="text" name="sources" value="" list="sources-options"/>',
+            '    <datalist id="sources-options">',
+            '      <option>Ad</option>',
+            '      <option>Blog</option>',
+            '      <option>Magazine</option>',
+            '      <option>Newspaper</option>',
+            '    </datalist>',
+            '  </div>',
+            '</div>',
+        ];
+        $this->assertEquals(implode("\n", $lines), $form->toString(false, false));
+    }
+
+    public function testRenderBulma(): void
+    {
+        $form = $this->createForm('bulma');
+        $lines = [
+            '<div class="field">',
+            '  <label class="label" for="sources">How did you hear about us?</label>',
+            '  <div class="control">',
+            '    <input id="sources" class="input" type="text" name="sources" value="" list="sources-options"/>',
+            '    <datalist id="sources-options">',
+            '      <option>Ad</option>',
+            '      <option>Blog</option>',
+            '      <option>Magazine</option>',
+            '      <option>Newspaper</option>',
+            '    </datalist>',
+            '  </div>',
+            '</div>',
+        ];
+        $this->assertEquals(implode("\n", $lines), $form->toString(false, false));
+    }
+}