Customized the "id" attribute from the 2nd until the last options on …

…Radio and MultiCheckbox inputs to allow a working connection with labels via the "for" attribute.
neilime · Jul 7, 2018 · b805632 · b805632
1 parent 1b4bf4e
commit b805632
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 12 deletions.
diff --git a/src/TwbsHelper/Form/View/Helper/FormMultiCheckbox.php b/src/TwbsHelper/Form/View/Helper/FormMultiCheckbox.php
@@ -65,12 +65,9 @@ protected function renderOptions(MultiCheckbox $oElement, array $aOptions, array
         $iCount          = 0;
 
         foreach ($aOptions as $sKey => $aOptionSpec) {
+            // Count number of options
             $iCount++;
 
-            if ($iCount > 1 && array_key_exists('id', $aAttributes)) {
-                unset($aAttributes['id']);
-            }
-
             $sValue           = '';
             $sLabel           = '';
             $aInputAttributes = $aAttributes;
@@ -80,6 +77,12 @@ protected function renderOptions(MultiCheckbox $oElement, array $aOptions, array
                 && $aInputAttributes['selected']);
             $bDisabled        = (isset($aInputAttributes['disabled']) && $aInputAttributes['disabled']);
 
+            // Customize the 'id' input attribute to enable
+            // working 'for' label attribute on all options
+            if ($iCount > 1 && array_key_exists('id', $aAttributes)) {
+                $aInputAttributes['id'] .= $iCount;
+            }
+
             if (is_scalar($aOptionSpec)) {
                 $aOptionSpec = [
                     'label' => $aOptionSpec,
@@ -140,7 +143,7 @@ protected function renderOptions(MultiCheckbox $oElement, array $aOptions, array
                     : $aOptionSpec['label_attributes'];
             }
 
-            // Assign label for attribute with element id attribute when defined
+            // Assign label for attribute with defined element id attribute
             if (empty($aLabelAttributes['for']) && ! empty($aInputAttributes['id'])) {
                 $aLabelAttributes['for'] = $aInputAttributes['id'];
             }

diff --git a/src/TwbsHelper/Form/View/Helper/FormRadio.php b/src/TwbsHelper/Form/View/Helper/FormRadio.php
@@ -82,28 +82,32 @@ public function render(ElementInterface $oElement)
      */
     protected function renderOptions(MultiCheckbox $oElement, array $aOptions, array $aSelectedOptions, array $aAttributes)
     {
-        $iIterator              = 0;
+        $iCount                 = 0;
         $aGlobalLabelAttributes = $oElement->getLabelAttributes() ? : $this->labelAttributes;
         $sMarkup                = '';
         $oLabelHelper           = $this->getLabelHelper();
         $aElementOptions        = $oElement->getOptions();
 
         foreach ($aOptions as $key => $aOptionspec) {
+            // Count number of options
+            $iCount++;
+
             if (is_scalar($aOptionspec)) {
                 $aOptionspec = ['label' => $aOptionspec, 'value' => $key];
             }
 
-            $iIterator++;
-            if ($iIterator > 1 && array_key_exists('id', $aAttributes)) {
-                unset($aAttributes['id']);
-            }
-
             // Option attributes
             $aInputAttributes = $aAttributes;
             if (isset($aOptionspec['attributes'])) {
                 $aInputAttributes = \Zend\Stdlib\ArrayUtils::merge($aInputAttributes, $aOptionspec['attributes']);
             }
 
+            // Customize the 'id' input attribute to enable
+            // working 'for' label attribute on all options
+            if ($iCount > 1 && array_key_exists('id', $aAttributes)) {
+                $aInputAttributes['id'] .= $iCount;
+            }
+
             // Add BS4 form-check-input class if not set
             $aInputAttributes['class']  = ! empty($aInputAttributes['class']) ? $aInputAttributes['class'] : '';
             $aInputAttributes['class'] .= (false === strpos($aInputAttributes['class'], 'form-check-label')) ? ' form-check-input' : '';
@@ -131,12 +135,17 @@ protected function renderOptions(MultiCheckbox $oElement, array $aOptions, array
             // Render option
             $sOptionMarkup = sprintf('<input %s%s', $this->createAttributesString($aInputAttributes), $this->getInlineClosingBracket());
 
-            //Option label
+            // Option label
             $sLabel = isset($aOptionspec['label']) ? $aOptionspec['label'] : '';
 
             if ($sLabel) {
                 $aLabelAttributes = $aGlobalLabelAttributes;
 
+                // Assign label for attribute with defined element id attribute
+                if (empty($aLabelAttributes['for']) && ! empty($aInputAttributes['id'])) {
+                    $aLabelAttributes['for'] = $aInputAttributes['id'];
+                }
+
                 // Add BS4 form-check-label class if not set
                 $aLabelAttributes['class']  = ! empty($aLabelAttributes['class']) ? $aLabelAttributes['class'] : '';
                 $aLabelAttributes['class'] .= (false === strpos($aLabelAttributes['class'], 'form-check-label')) ? ' form-check-label' : '';