From 8dd29de9f331589b5f3395b79639303dcbe84ea7 Mon Sep 17 00:00:00 2001
From: "vivi-the-going-merry[bot]"
 <308115520+vivi-the-going-merry[bot]@users.noreply.github.com>
Date: Thu, 17 Sep 2026 18:55:40 -0600
Subject: [PATCH 1/2] Fix aria_id_unique: shared toggle emits dangling
 aria-labelledby

The shared toggle component (classes/views/shared/toggle.php) always
rendered aria-labelledby="{id}_label" on its switch span, but 6 callers
pass aria-label-attr instead of rendering a companion <label id="{id}_label">
element, leaving aria-labelledby pointing at an id that doesn't exist
anywhere in the document. Only emit aria-labelledby when aria-label-attr
isn't set; the two are mutually exclusive ways of naming the same control,
and aria-labelledby wins the accessible-name computation when both are
present, so the dangling attribute was never doing anything but failing
IBM Equal Access's aria_id_unique check.

Confirmed via a live Cypress + cy.checkIbmAccessibility run against all 12
admin pages admin-a11y.cy.js covers: 4 aria_id_unique hits before (Add-Ons
page's Stripe/Square/PayPal Commerce toggles, Styles page's Custom CSS
toggle), 0 after, matching formidable-pro#6696's "flagged 4 times" count.
---
 classes/views/shared/toggle.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/classes/views/shared/toggle.php b/classes/views/shared/toggle.php
index 477e0ffb62..c14f85ea29 100644
--- a/classes/views/shared/toggle.php
+++ b/classes/views/shared/toggle.php
@@ -70,8 +70,11 @@
 		/>
 
 		<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"
+			<?php if ( ! empty( $args['aria-label-attr'] ) ) { ?>
+				aria-label="<?php echo esc_attr( $args['aria-label-attr'] ); ?>"
+			<?php } else { ?>
+				aria-labelledby="<?php echo esc_attr( $id ); ?>_label"
+			<?php } ?>
 			aria-checked="<?php echo esc_attr( $aria_checked ); ?>"
 		>
 			<span class="frm_toggle_slider"></span>

From 6c4532dca3a52f32c376d9ea8ff1fc29037b617d Mon Sep 17 00:00:00 2001
From: "vivi-the-going-merry[bot]"
 <308115520+vivi-the-going-merry[bot]@users.noreply.github.com>
Date: Fri, 18 Sep 2026 07:57:02 -0600
Subject: [PATCH 2/2] Build toggle aria attrs as an array via
 array_to_html_params()

Requested by @Crabcyborg: replace the inline if/else PHP blocks with an
array built once and rendered through FrmAppHelper::array_to_html_params(),
keeping the aria-label/aria-labelledby exclusivity in the array-building
step so array_to_html_params() never gets handed both.
---
 classes/views/shared/toggle.php | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/classes/views/shared/toggle.php b/classes/views/shared/toggle.php
index c14f85ea29..a4afa12813 100644
--- a/classes/views/shared/toggle.php
+++ b/classes/views/shared/toggle.php
@@ -25,6 +25,14 @@
 $input_html    = $args['input_html'] ?? array();
 $use_container = false;
 
+$aria_attrs = array();
+if ( ! empty( $args['aria-label-attr'] ) ) {
+	$aria_attrs['aria-label'] = $args['aria-label-attr'];
+} else {
+	$aria_attrs['aria-labelledby'] = $id . '_label';
+}
+$aria_attrs['aria-checked'] = $aria_checked;
+
 $div_params = array(
 	// This is important when the default style is !important as Pro styling may cause conflicts.
 	// It uses --toggle-on-color so just set the variable.
@@ -70,12 +78,7 @@
 		/>
 
 		<span class="frm_toggle" tabindex="0" role="switch"
-			<?php if ( ! empty( $args['aria-label-attr'] ) ) { ?>
-				aria-label="<?php echo esc_attr( $args['aria-label-attr'] ); ?>"
-			<?php } else { ?>
-				aria-labelledby="<?php echo esc_attr( $id ); ?>_label"
-			<?php } ?>
-			aria-checked="<?php echo esc_attr( $aria_checked ); ?>"
+			<?php FrmAppHelper::array_to_html_params( $aria_attrs, true ); ?>
 		>
 			<span class="frm_toggle_slider"></span>
 		</span>