← All changes
|
includes/Frontend/Form/View/Conversational/Fields/ImageSelectField.php
+68
-51
2.10.0
→
3.3.1
View file →
| @@ -18,8 +18,11 @@ | ||
| 18 | 18 | $fieldHelpers = new ConversationalFieldHelpers($formID, $field, $rowID, $form_atomic_Cls_map); |
| 19 | 19 | |
| 20 | 20 | $name = $fieldHelpers->name(); |
| 21 | 21 | $req = $fieldHelpers->required(); |
| 22 | + $ariaDescribedBy = $fieldHelpers->ariaDescribedBy(); | |
| 23 | + $ariaRequired = $fieldHelpers->ariaRequired(); | |
| 24 | + $labelId = $fieldHelpers->getLabelId(); | |
| 22 | 25 | |
| 23 | 26 | $bfFrontendFormIds = FrontendHelpers::$bfFrontendFormIds; |
| 24 | 27 | $contentCount = count($bfFrontendFormIds); |
| 25 | 28 | |
| @@ -56,88 +59,102 @@ | ||
| 56 | 59 | |
| 57 | 60 | $optLblHide = null; |
| 58 | 61 | |
| 59 | 62 | if (!$field->optLblHide) { |
| 60 | - $optLblHide = <<<OPTLBLHIDE | |
| 61 | - <div | |
| 62 | - class="{$fieldHelpers->getConversationalCls('tc')} {$fieldHelpers->getCustomClasses('tc')}" | |
| 63 | - {$fieldHelpers->getCustomAttributes('tc')} | |
| 63 | + $optLblHide = sprintf( | |
| 64 | + '<div | |
| 65 | + class="%1$s" | |
| 66 | + %2$s | |
| 64 | 67 | > |
| 65 | 68 | <span |
| 66 | - class="{$fieldHelpers->getConversationalCls('img-title')} {$fieldHelpers->getCustomClasses('img-title')}" | |
| 67 | - {$fieldHelpers->getCustomAttributes('img-title')} | |
| 69 | + class="%3$s" | |
| 70 | + %4$s | |
| 68 | 71 | > |
| 69 | - {$fieldHelpers->kses_post($lbl)} | |
| 72 | + %5$s | |
| 70 | 73 | </span> |
| 71 | - </div> | |
| 72 | -OPTLBLHIDE; | |
| 74 | + </div>', | |
| 75 | + $fieldHelpers->getConversationalCls('tc') . ' ' . $fieldHelpers->getCustomClasses('tc'), | |
| 76 | + $fieldHelpers->getCustomAttributes('tc'), | |
| 77 | + $fieldHelpers->getConversationalCls('img-title') . ' ' . $fieldHelpers->getCustomClasses('img-title'), | |
| 78 | + $fieldHelpers->getCustomAttributes('img-title'), | |
| 79 | + $fieldHelpers->kses_post($lbl) | |
| 80 | + ); | |
| 73 | 81 | } else { |
| 74 | 82 | $optLblHide = ''; |
| 75 | 83 | } |
| 76 | 84 | |
| 77 | - $imageOption .= <<<IMAGESELECT | |
| 78 | - <div | |
| 79 | - class="{$fieldHelpers->getConversationalCls('inp-opt')} {$fieldHelpers->getCustomClasses('inp-opt')}" | |
| 80 | - {$fieldHelpers->getCustomAttributes('inp-opt')} | |
| 85 | + $imageOption .= '<div | |
| 86 | + class="' . $fieldHelpers->getConversationalCls('inp-opt') . ' ' . $fieldHelpers->getCustomClasses('inp-opt') . '" | |
| 87 | + ' . $fieldHelpers->getCustomAttributes('inp-opt') . ' | |
| 81 | 88 | > |
| 82 | 89 | <input |
| 83 | - class="{$fieldHelpers->getConversationalCls('img-inp')} {$fieldHelpers->getCustomClasses('img-inp')}" | |
| 84 | - type="{$inpType}" | |
| 85 | - id="{$rowID}-{$contentCount}-img-wrp-{$key}" | |
| 86 | - {$name} | |
| 87 | - value="{$fieldHelpers->esc_attr($val)}" | |
| 88 | - {$checked} | |
| 89 | - {$req} | |
| 90 | - {$disabled} | |
| 91 | - {$fieldHelpers->getCustomAttributes('img-inp')} | |
| 90 | + class="' . $fieldHelpers->getConversationalCls('img-inp') . ' ' . $fieldHelpers->getCustomClasses('img-inp') . '" | |
| 91 | + type="' . $inpType . '" | |
| 92 | + id="' . $rowID . '-' . $contentCount . '-img-wrp-' . $key . '" | |
| 93 | + ' . $name . ' | |
| 94 | + value="' . $fieldHelpers->esc_attr($val) . '" | |
| 95 | + ' . $checked . ' | |
| 96 | + ' . $req . ' | |
| 97 | + ' . $disabled . ' | |
| 98 | + ' . $fieldHelpers->getCustomAttributes('img-inp') . ' | |
| 92 | 99 | /> |
| 93 | 100 | <label |
| 94 | - for="{$rowID}-{$contentCount}-img-wrp-{$key}" | |
| 95 | - class="{$fieldHelpers->getConversationalCls('img-wrp')} {$fieldHelpers->getCustomClasses('img-wrp')}" | |
| 96 | - {$fieldHelpers->getCustomAttributes('img-wrp')} | |
| 101 | + for="' . $rowID . '-' . $contentCount . '-img-wrp-' . $key . '" | |
| 102 | + class="' . $fieldHelpers->getConversationalCls('img-wrp') . ' ' . $fieldHelpers->getCustomClasses('img-wrp') . '" | |
| 103 | + ' . $fieldHelpers->getCustomAttributes('img-wrp') . ' | |
| 97 | 104 | > |
| 98 | 105 | <span |
| 99 | - class="{$fieldHelpers->getConversationalCls('check-box')} {$fieldHelpers->getCustomClasses('check-box')}" | |
| 100 | - {$fieldHelpers->getCustomAttributes('check-box')} | |
| 106 | + class="' . $fieldHelpers->getConversationalCls('check-box') . ' ' . $fieldHelpers->getCustomClasses('check-box') . '" | |
| 107 | + ' . $fieldHelpers->getCustomAttributes('check-box') . ' | |
| 101 | 108 | > |
| 102 | 109 | <img |
| 103 | - src="{$checkedImg}" | |
| 110 | + src="' . $checkedImg . '" | |
| 104 | 111 | alt="" |
| 105 | - class="{$fieldHelpers->getConversationalCls('check-img')} {$fieldHelpers->getCustomClasses('check-img')}" | |
| 106 | - {$fieldHelpers->getCustomAttributes('check-img')} | |
| 112 | + class="' . $fieldHelpers->getConversationalCls('check-img') . ' ' . $fieldHelpers->getCustomClasses('check-img') . '" | |
| 113 | + ' . $fieldHelpers->getCustomAttributes('check-img') . ' | |
| 107 | 114 | /> |
| 108 | 115 | </span> |
| 109 | 116 | |
| 110 | 117 | <span |
| 111 | - class="{$fieldHelpers->getConversationalCls('img-card-wrp')} {$fieldHelpers->getCustomClasses('img-card-wrp')}" | |
| 112 | - {$fieldHelpers->getCustomAttributes('img-card-wrp')} | |
| 118 | + class="' . $fieldHelpers->getConversationalCls('img-card-wrp') . ' ' . $fieldHelpers->getCustomClasses('img-card-wrp') . '" | |
| 119 | + ' . $fieldHelpers->getCustomAttributes('img-card-wrp') . ' | |
| 113 | 120 | > |
| 114 | 121 | <img |
| 115 | - src="{$img}" | |
| 116 | - alt="{$imgAlt}" | |
| 117 | - aria-label="{$imgAlt}" | |
| 118 | - class="{$fieldHelpers->getConversationalCls('select-img')} {$fieldHelpers->getCustomClasses('select-img')}" | |
| 119 | - {$fieldHelpers->getCustomAttributes('select-img')} | |
| 122 | + src="' . $img . '" | |
| 123 | + alt="' . $imgAlt . '" | |
| 124 | + aria-label="' . $imgAlt . '" | |
| 125 | + class="' . $fieldHelpers->getConversationalCls('select-img') . ' ' . $fieldHelpers->getCustomClasses('select-img') . '" | |
| 126 | + ' . $fieldHelpers->getCustomAttributes('select-img') . ' | |
| 120 | 127 | /> |
| 121 | - {$optLblHide} | |
| 128 | + ' . $optLblHide . ' | |
| 122 | 129 | </span> |
| 123 | 130 | </label> |
| 124 | 131 | </div> |
| 125 | -IMAGESELECT; | |
| 132 | +'; | |
| 126 | 133 | } |
| 127 | 134 | } |
| 128 | 135 | |
| 129 | - return <<<IMAGESELECTFIELD | |
| 130 | - <div | |
| 131 | - class="{$fieldHelpers->getConversationalCls('inp-fld-wrp')} {$fieldHelpers->getCustomClasses('inp-fld-wrp')}" | |
| 132 | - {$fieldHelpers->getCustomAttributes('inp-fld-wrp')} | |
| 133 | - > | |
| 134 | - <div | |
| 135 | - class="{$fieldHelpers->getConversationalCls('ic')} {$fieldHelpers->getCustomClasses('ic')}" | |
| 136 | - {$fieldHelpers->getCustomAttributes('ic')} | |
| 136 | + return sprintf( | |
| 137 | + '<div | |
| 138 | + class="%1$s" | |
| 139 | + %2$s | |
| 140 | + > | |
| 141 | + <div | |
| 142 | + class="%3$s" | |
| 143 | + %4$s | |
| 144 | + role="group" | |
| 145 | + aria-labelledby="%5$s" | |
| 146 | + %6$s | |
| 137 | 147 | > |
| 138 | - {$imageOption} | |
| 139 | - </div> | |
| 140 | - </div> | |
| 141 | -IMAGESELECTFIELD; | |
| 148 | + %7$s | |
| 149 | + </div> | |
| 150 | + </div>', | |
| 151 | + $fieldHelpers->getConversationalCls('inp-fld-wrp') . ' ' . $fieldHelpers->getCustomClasses('inp-fld-wrp'), | |
| 152 | + $fieldHelpers->getCustomAttributes('inp-fld-wrp'), | |
| 153 | + $fieldHelpers->getConversationalCls('ic') . ' ' . $fieldHelpers->getCustomClasses('ic'), | |
| 154 | + $fieldHelpers->getCustomAttributes('ic'), | |
| 155 | + $labelId, | |
| 156 | + $ariaDescribedBy, | |
| 157 | + $imageOption | |
| 158 | + ); | |
| 142 | 159 | } |
| 143 | 160 | } |