Changeset 3746820 for formidable/trunk/classes/views/shared/toggle.php

Timestamp:

10/14/2026 04:54:36 PM (2 weeks ago)

Author:

formidableforms

Message:

Update to version 7.0 from GitHub

File:

• formidable/trunk/classes/views/shared/toggle.php (modified) (4 diffs)

formidable/trunk/classes/views/shared/toggle.php

@@ -18 +18 @@
 $show_labels   = $args['show_labels'] ?? false;
 $off_label     = $args['off_label'] ?? '';
-$on_label      = $args['on_label'] ?? 1;
-$value         = $args['value'] ?? $on_label;
+$on_label      = $args['on_label'] ?? '';
+$value         = $args['value'] ?? $args['on_label'] ?? 1;
 $checked       = isset( $args['checked'] ) && ( true === $args['checked'] || str_contains( $args['checked'], 'checked="checked"' ) );
 $disabled      = ! empty( $args['disabled'] );
@@ -25 +25 @@
 $input_html    = $args['input_html'] ?? array();
 $use_container = false;
+
+$off_label_shown = $show_labels && '' !== $off_label;
+$on_label_shown  = $show_labels && '' !== $on_label;
+
+$aria_attrs = array();
+
+if ( isset( $args['aria-label-attr'] ) && '' !== $args['aria-label-attr'] ) {
+        $aria_attrs['aria-label'] = $args['aria-label-attr'];
+} elseif ( $off_label_shown || $on_label_shown ) {
+        // Use the visible labels for the accessible name when this view renders them.
+        $labelledby = array();
+
+        if ( $off_label_shown ) {
+                $labelledby[] = $id . '_off_label';
+        }
+
+        if ( $on_label_shown ) {
+                $labelledby[] = $id . '_on_label';
+        }
+        $aria_attrs['aria-labelledby'] = implode( ' ', $labelledby );
+} else {
+        $aria_attrs['aria-labelledby'] = $id . '_label';
+}//end if
+$aria_attrs['aria-checked'] = $aria_checked;
 
 $div_params = array(
@@ -49 +73 @@
 ?>
         <label class="frm_toggle_block" <?php FrmAppHelper::array_to_html_params( $div_params, true ); ?>>
-                <?php if ( $show_labels && $off_label ) { ?>
-                        <span class="frm_off_label frm_toggle_opt frm-leading-none"><?php echo esc_html( $off_label ); ?></span>
+                <?php if ( $off_label_shown ) { ?>
+                        <span id="<?php echo esc_attr( $id ); ?>_off_label" class="frm_off_label frm_toggle_opt frm-leading-none"><?php echo esc_html( $off_label ); ?></span>
                 <?php } ?>
 
                 <input type="checkbox" name="<?php echo esc_attr( $name ); ?>" id="<?php echo esc_attr( $id ); ?>" value="<?php echo esc_attr( $value ); ?>"
                         <?php checked( $checked, true ); ?>
-                        <?php if ( $show_labels && $off_label ) { ?>
+                        <?php if ( $off_label_shown ) { ?>
                                 data-off="<?php echo esc_attr( $off_label ); ?>"
                         <?php } ?>
@@ -71 +95 @@
 
                 <span class="frm_toggle" tabindex="0" role="switch"
-                        <?php echo ! empty( $args['aria-label-attr'] ) ? 'aria-label="' . esc_attr( $args['aria-label-attr'] ) . '"' : ''; ?>
-                        aria-labelledby="<?php echo esc_attr( $id ); ?>_label"
-                        aria-checked="<?php echo esc_attr( $aria_checked ); ?>"
+                        <?php FrmAppHelper::array_to_html_params( $aria_attrs, true ); ?>
                 >
                         <span class="frm_toggle_slider"></span>
                 </span>
 
-                <?php // phpcs:ignore Universal.Operators.StrictComparisons ?>
-                <?php if ( $show_labels && $on_label != 1 ) { ?>
-                        <span class="frm_on_label frm_toggle_opt frm-leading-none"><?php FrmAppHelper::kses_echo( $on_label, 'all' ); ?></span>
+                <?php if ( $on_label_shown ) { ?>
+                        <span id="<?php echo esc_attr( $id ); ?>_on_label" class="frm_on_label frm_toggle_opt frm-leading-none"><?php FrmAppHelper::kses_echo( $on_label, 'all' ); ?></span>
                 <?php } ?>
         </label>