Extend attribute support to Radio sets and Checkbox sets

popphp · Jul 3, 2023 · bdd331f · bdd331f
1 parent 358d98e
commit bdd331f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/src/Element/CheckboxSet.php b/src/Element/CheckboxSet.php
@@ -82,6 +82,13 @@ public function __construct($name, array $values, $checked = null, $indent = nul
                 'value' => $k
             ]);
 
+            if (is_array($v) && isset($v['value']) && isset($v['attributes'])) {
+                $nodeValue = $v['value'];
+                $checkbox->setAttributes($v['attributes']);
+            } else {
+                $nodeValue = $v;
+            }
+
             // Determine if the current radio element is checked.
             if (in_array($k, $this->checked)) {
                 $checkbox->check();
@@ -92,7 +99,7 @@ public function __construct($name, array $values, $checked = null, $indent = nul
                 $span->setIndent($indent);
             }
             $span->setAttribute('class', 'checkbox-span');
-            $span->setNodeValue($v);
+            $span->setNodeValue($nodeValue);
             $this->addChildren([$checkbox, $span]);
             $this->checkboxes[] = $checkbox;
             $i++;

diff --git a/src/Element/RadioSet.php b/src/Element/RadioSet.php
@@ -82,6 +82,13 @@ public function __construct($name, array $values, $checked = null, $indent = nul
                 'value' => $k
             ]);
 
+            if (is_array($v) && isset($v['value']) && isset($v['attributes'])) {
+                $nodeValue = $v['value'];
+                $radio->setAttributes($v['attributes']);
+            } else {
+                $nodeValue = $v;
+            }
+
             // Determine if the current radio element is checked.
             if ((null !== $this->checked) && ($k == $this->checked)) {
                 $radio->check();
@@ -92,7 +99,7 @@ public function __construct($name, array $values, $checked = null, $indent = nul
                 $span->setIndent($indent);
             }
             $span->setAttribute('class', 'radio-span');
-            $span->setNodeValue($v);
+            $span->setNodeValue($nodeValue);
             $this->addChildren([$radio, $span]);
             $this->radios[] = $radio;
             $i++;