From 5d61ca2deb0663fb63adfe5b7ca9e8186230f43b Mon Sep 17 00:00:00 2001
From: Christian Gastrell <cgastrell@gmail.com>
Date: Thu, 25 Jun 2026 11:19:34 -0300
Subject: [PATCH 01/14] Forms: disable block visibility control on fields and
 inputs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Device/viewport visibility ("Hide on…") is not honored on the field wrapper
at render time — the field render pipeline bypasses core's render_block
visibility filter — so the control did nothing. Disable the 'visibility'
block support on field and input blocks on both the JS (shared/settings,
input) and PHP (register_block_type_args filter) registrations so the
non-functional option no longer appears. Labels keep visibility support.

See FORMS-694.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---
 ...fix-forms-disable-field-visibility-control |  4 +++
 .../contact-form/class-contact-form-block.php | 34 +++++++++++++++++++
 .../packages/forms/src/blocks/input/index.js  |  3 ++
 .../forms/src/blocks/shared/settings/index.js |  5 +++
 4 files changed, 46 insertions(+)
 create mode 100644 projects/packages/forms/changelog/fix-forms-disable-field-visibility-control

diff --git a/projects/packages/forms/changelog/fix-forms-disable-field-visibility-control b/projects/packages/forms/changelog/fix-forms-disable-field-visibility-control
new file mode 100644
index 000000000000..b13642fa0cb9
--- /dev/null
+++ b/projects/packages/forms/changelog/fix-forms-disable-field-visibility-control
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Forms: Disable the block visibility ("Hide on…") control on form fields and inputs, where it had no effect on the frontend. Labels keep their visibility support.
diff --git a/projects/packages/forms/src/blocks/contact-form/class-contact-form-block.php b/projects/packages/forms/src/blocks/contact-form/class-contact-form-block.php
index a7bd4c23050d..bddcf584a3db 100644
--- a/projects/packages/forms/src/blocks/contact-form/class-contact-form-block.php
+++ b/projects/packages/forms/src/blocks/contact-form/class-contact-form-block.php
@@ -90,6 +90,35 @@ public static function register_block() {
 		// Load AI integration after Jetpack_Gutenberg registers extensions (priority 10)
 		add_action( 'enqueue_block_editor_assets', array( __CLASS__, 'maybe_load_ai_integration' ), 11 );
 	}
+
+	/**
+	 * Disable the block "visibility" support on form field and input blocks.
+	 *
+	 * Device/viewport visibility ("Hide on…") is not honored on the field
+	 * wrapper at render time — the field render pipeline bypasses core's
+	 * render_block visibility filter — so the control would do nothing. We
+	 * disable the support so it does not appear. This mirrors the JS
+	 * registration (shared/settings/index.js and input/index.js). Labels keep
+	 * visibility support (handled separately via labelhiddenbyblockvisibility),
+	 * and the internal field-option-* blocks are left untouched to match JS.
+	 *
+	 * @param array  $args       Block type registration args.
+	 * @param string $block_name Block name being registered.
+	 * @return array
+	 */
+	public static function disable_field_visibility_support( $args, $block_name ) {
+		$is_field = strpos( $block_name, 'jetpack/field-' ) === 0 && strpos( $block_name, 'jetpack/field-option-' ) !== 0;
+
+		if ( 'jetpack/input' === $block_name || $is_field ) {
+			if ( ! isset( $args['supports'] ) || ! is_array( $args['supports'] ) ) {
+				$args['supports'] = array();
+			}
+			$args['supports']['visibility'] = false;
+		}
+
+		return $args;
+	}
+
 	/**
 	 * Register the contact form block feature flag.
 	 *
@@ -171,6 +200,11 @@ public static function register_child_blocks() {
 			return;
 		}
 
+		// Keep the PHP-registered "visibility" support in sync with the JS
+		// registration (src/blocks/shared/settings/index.js and
+		// src/blocks/input/index.js), which disables it on fields and inputs.
+		add_filter( 'register_block_type_args', array( __CLASS__, 'disable_field_visibility_support' ), 10, 2 );
+
 		// Field inner block types.
 		Blocks::jetpack_register_block(
 			'jetpack/input',
diff --git a/projects/packages/forms/src/blocks/input/index.js b/projects/packages/forms/src/blocks/input/index.js
index 6cb54180811e..1e645098fa7a 100644
--- a/projects/packages/forms/src/blocks/input/index.js
+++ b/projects/packages/forms/src/blocks/input/index.js
@@ -32,6 +32,9 @@ const settings = {
 	supports: {
 		reusable: false,
 		html: false,
+		// See FORMS-694: device/viewport visibility isn't honored on the field
+		// wrapper at render, so disable the control on the input too.
+		visibility: false,
 		color: {
 			text: true,
 			background: true,
diff --git a/projects/packages/forms/src/blocks/shared/settings/index.js b/projects/packages/forms/src/blocks/shared/settings/index.js
index 3b103f123d1f..e23b9f5a50e8 100644
--- a/projects/packages/forms/src/blocks/shared/settings/index.js
+++ b/projects/packages/forms/src/blocks/shared/settings/index.js
@@ -30,6 +30,11 @@ export default {
 	supports: {
 		reusable: false,
 		html: false,
+		// Device/viewport visibility ("Hide on…") is not honored on the field
+		// wrapper at render time, so disable the control on fields to avoid an
+		// option that does nothing. Labels keep visibility support (handled
+		// separately via labelhiddenbyblockvisibility). See FORMS-694.
+		visibility: false,
 		__experimentalExposeControlsToChildren: true,
 	},
 	transforms,

From 0c21998729d7cf8c29e7b1b3a291ab3d755f5ffe Mon Sep 17 00:00:00 2001
From: Christian Gastrell <cgastrell@gmail.com>
Date: Fri, 26 Jun 2026 10:05:06 -0300
Subject: [PATCH 02/14] Forms: update child-block supports test fixture for
 removed visibility control

---
 .../forms/tests/php/contact-form/Contact_Form_Block_Test.php     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/projects/packages/forms/tests/php/contact-form/Contact_Form_Block_Test.php b/projects/packages/forms/tests/php/contact-form/Contact_Form_Block_Test.php
index 5f6d00add923..e311e89cfde5 100644
--- a/projects/packages/forms/tests/php/contact-form/Contact_Form_Block_Test.php
+++ b/projects/packages/forms/tests/php/contact-form/Contact_Form_Block_Test.php
@@ -87,6 +87,7 @@ public static function data_provider_test_register_child_blocks() {
 						'__experimentalTextDecoration' => true,
 						'__experimentalLetterSpacing'  => true,
 					),
+					'visibility'           => false,
 				),
 			),
 			'jetpack/label'   => array(

From 91d659737e37c9113edbdb16b7bbcf7c07f31848 Mon Sep 17 00:00:00 2001
From: Christian Gastrell <cgastrell@gmail.com>
Date: Fri, 26 Jun 2026 10:15:33 -0300
Subject: [PATCH 03/14] Forms: add TODO to refactor visibility-disable filter
 into shared supports array

---
 .../forms/src/blocks/contact-form/class-contact-form-block.php   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/projects/packages/forms/src/blocks/contact-form/class-contact-form-block.php b/projects/packages/forms/src/blocks/contact-form/class-contact-form-block.php
index bddcf584a3db..0fb7e834e73d 100644
--- a/projects/packages/forms/src/blocks/contact-form/class-contact-form-block.php
+++ b/projects/packages/forms/src/blocks/contact-form/class-contact-form-block.php
@@ -107,6 +107,7 @@ public static function register_block() {
 	 * @return array
 	 */
 	public static function disable_field_visibility_support( $args, $block_name ) {
+		// TODO: refactor into an array_merge'd shared supports array mirroring the JS defaultSettings, instead of this filter.
 		$is_field = strpos( $block_name, 'jetpack/field-' ) === 0 && strpos( $block_name, 'jetpack/field-option-' ) !== 0;
 
 		if ( 'jetpack/input' === $block_name || $is_field ) {

From 9fb35579a2f0ef4d90a2a2e93f501985429ec3d2 Mon Sep 17 00:00:00 2001
From: Christian Gastrell <cgastrell@gmail.com>
Date: Mon, 29 Jun 2026 00:26:58 -0300
Subject: [PATCH 04/14] Forms: reframe visibility-disable rationale to match
 verified findings
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The per-viewport "Hide on…" option is the part that isn't honored (and on a
required field can't be made safe); "hide everywhere" does work for fields,
but the GB control bundles both under one supports boolean, so we disable it
wholesale on fields/inputs as an interim. Comment/changelog wording only — no
functional change. Labels untouched.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .../fix-forms-disable-field-visibility-control  |  2 +-
 .../contact-form/class-contact-form-block.php   | 17 ++++++++++-------
 .../packages/forms/src/blocks/input/index.js    |  5 +++--
 .../forms/src/blocks/shared/settings/index.js   | 11 +++++++----
 4 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/projects/packages/forms/changelog/fix-forms-disable-field-visibility-control b/projects/packages/forms/changelog/fix-forms-disable-field-visibility-control
index b13642fa0cb9..b4260ca61842 100644
--- a/projects/packages/forms/changelog/fix-forms-disable-field-visibility-control
+++ b/projects/packages/forms/changelog/fix-forms-disable-field-visibility-control
@@ -1,4 +1,4 @@
 Significance: patch
 Type: fixed
 
-Forms: Disable the block visibility ("Hide on…") control on form fields and inputs, where it had no effect on the frontend. Labels keep their visibility support.
+Forms: Disable the block visibility control on form fields and inputs, where the per-viewport "Hide on…" option was not honored on the frontend. Labels keep their visibility support.
diff --git a/projects/packages/forms/src/blocks/contact-form/class-contact-form-block.php b/projects/packages/forms/src/blocks/contact-form/class-contact-form-block.php
index 0fb7e834e73d..6f0eae07c95e 100644
--- a/projects/packages/forms/src/blocks/contact-form/class-contact-form-block.php
+++ b/projects/packages/forms/src/blocks/contact-form/class-contact-form-block.php
@@ -94,13 +94,16 @@ public static function register_block() {
 	/**
 	 * Disable the block "visibility" support on form field and input blocks.
 	 *
-	 * Device/viewport visibility ("Hide on…") is not honored on the field
-	 * wrapper at render time — the field render pipeline bypasses core's
-	 * render_block visibility filter — so the control would do nothing. We
-	 * disable the support so it does not appear. This mirrors the JS
-	 * registration (shared/settings/index.js and input/index.js). Labels keep
-	 * visibility support (handled separately via labelhiddenbyblockvisibility),
-	 * and the internal field-option-* blocks are left untouched to match JS.
+	 * FORMS-694 (interim). The per-viewport "Hide on…" option is not honored in
+	 * the forms render pipeline — fields flatten to a shortcode and bypass core's
+	 * render_block class injection — and on a required field it cannot be made
+	 * safe (server- and client-side validation are both viewport-blind). "Hide
+	 * everywhere" does work for fields, but the control bundles both modes under
+	 * one boolean, so we disable it wholesale on fields and inputs as an interim.
+	 * This mirrors the JS registration (shared/settings/index.js and
+	 * input/index.js). Labels keep visibility support (full-hide wired via
+	 * labelhiddenbyblockvisibility), and the internal field-option-* blocks are
+	 * left untouched to match JS. Full field visibility is a separate decision.
 	 *
 	 * @param array  $args       Block type registration args.
 	 * @param string $block_name Block name being registered.
diff --git a/projects/packages/forms/src/blocks/input/index.js b/projects/packages/forms/src/blocks/input/index.js
index 1e645098fa7a..1a05d7eb3d7c 100644
--- a/projects/packages/forms/src/blocks/input/index.js
+++ b/projects/packages/forms/src/blocks/input/index.js
@@ -32,8 +32,9 @@ const settings = {
 	supports: {
 		reusable: false,
 		html: false,
-		// See FORMS-694: device/viewport visibility isn't honored on the field
-		// wrapper at render, so disable the control on the input too.
+		// FORMS-694 (interim): disabled on the input for the same reason as the
+		// field — see shared/settings/index.js. The input is inert in every
+		// visibility mode (its rendered output is discarded by the field renderer).
 		visibility: false,
 		color: {
 			text: true,
diff --git a/projects/packages/forms/src/blocks/shared/settings/index.js b/projects/packages/forms/src/blocks/shared/settings/index.js
index e23b9f5a50e8..e597ce2add04 100644
--- a/projects/packages/forms/src/blocks/shared/settings/index.js
+++ b/projects/packages/forms/src/blocks/shared/settings/index.js
@@ -30,10 +30,13 @@ export default {
 	supports: {
 		reusable: false,
 		html: false,
-		// Device/viewport visibility ("Hide on…") is not honored on the field
-		// wrapper at render time, so disable the control on fields to avoid an
-		// option that does nothing. Labels keep visibility support (handled
-		// separately via labelhiddenbyblockvisibility). See FORMS-694.
+		// FORMS-694 (interim): the per-viewport "Hide on…" option isn't honored
+		// in the forms render pipeline — fields flatten to a shortcode and bypass
+		// core's render_block class injection — and on a required field it can't
+		// be made safe (server/client validation are viewport-blind). "Hide
+		// everywhere" does work, but the control bundles both under one boolean,
+		// so we disable it wholesale here. Labels keep it (full-hide wired via
+		// labelhiddenbyblockvisibility). Full field visibility is a separate call.
 		visibility: false,
 		__experimentalExposeControlsToChildren: true,
 	},

From e6396098b0efabbc5863b19e6ca1e05677d77f82 Mon Sep 17 00:00:00 2001
From: Christian Gastrell <cgastrell@gmail.com>
Date: Mon, 29 Jun 2026 09:54:00 -0300
Subject: [PATCH 05/14] Forms: honor per-viewport label visibility (Hide on
 mobile/tablet/desktop)

Labels kept blockVisibility support but only full-hide was wired; the
per-viewport selection was ignored because the field renderer discards the
label's own rendered output (where Gutenberg would have added the
wp-block-hidden-* classes). Read blockVisibility.viewport in the block->shortcode
bridge and add the same wp-block-hidden-{mobile,tablet,desktop} classes to the
label the field renderer emits; the matching media-query CSS is already
registered by core's render_block visibility filter (label keeps support).
Also apply label classes to the 'below' style-variation label for parity.

Verified on the frontend: hidden-on-mobile label gets the class and the
@media (width <= 480px){.wp-block-hidden-mobile{display:none}} rule is emitted.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .../fix-forms-disable-field-visibility-control |  2 +-
 .../contact-form/class-contact-form-field.php  |  2 +-
 .../contact-form/class-contact-form-plugin.php | 18 ++++++++++++++++--
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/projects/packages/forms/changelog/fix-forms-disable-field-visibility-control b/projects/packages/forms/changelog/fix-forms-disable-field-visibility-control
index b4260ca61842..6088000811d1 100644
--- a/projects/packages/forms/changelog/fix-forms-disable-field-visibility-control
+++ b/projects/packages/forms/changelog/fix-forms-disable-field-visibility-control
@@ -1,4 +1,4 @@
 Significance: patch
 Type: fixed
 
-Forms: Disable the block visibility control on form fields and inputs, where the per-viewport "Hide on…" option was not honored on the frontend. Labels keep their visibility support.
+Forms: Disable the block visibility control on form fields and inputs, where the per-viewport "Hide on…" option was not honored on the frontend. Labels keep their visibility support and now honor the per-viewport "Hide on…" option too.
diff --git a/projects/packages/forms/src/contact-form/class-contact-form-field.php b/projects/packages/forms/src/contact-form/class-contact-form-field.php
index 8d70edbc2876..773f57ea196e 100644
--- a/projects/packages/forms/src/contact-form/class-contact-form-field.php
+++ b/projects/packages/forms/src/contact-form/class-contact-form-field.php
@@ -2554,7 +2554,7 @@ public function render_below_label( $id, $label, $required, $required_field_text
 		return '
 			<label
 				for="' . esc_attr( $id ) . '"
-				class="below-label__label ' . ( $this->is_error() ? ' form-error' : '' ) . '"
+				class="below-label__label ' . ( $this->is_error() ? ' form-error' : '' ) . ( $this->label_classes ? ' ' . esc_attr( $this->label_classes ) : '' ) . '"
 			>'
 			. esc_html( $label )
 			. ( $required && $required_indicator ? '<span>' . $required_field_text . '</span>' : '' ) .
diff --git a/projects/packages/forms/src/contact-form/class-contact-form-plugin.php b/projects/packages/forms/src/contact-form/class-contact-form-plugin.php
index 80951c1299a5..6c4294d6014a 100644
--- a/projects/packages/forms/src/contact-form/class-contact-form-plugin.php
+++ b/projects/packages/forms/src/contact-form/class-contact-form-plugin.php
@@ -584,8 +584,22 @@ public static function block_attributes_to_shortcode_attributes( $atts, $type, $
 					$atts['labelstyles']                      = $label_attrs['style'] ?? null;
 					$add_block_style_classes_to_field_wrapper = true;
 
-					// check if the block has been hidden by blockVisibility support
-					$atts['labelhiddenbyblockvisibility'] = isset( $inner_block['attrs']['metadata']['blockVisibility'] ) && false === $inner_block['attrs']['metadata']['blockVisibility'];
+					// Honor blockVisibility support on the label. Full-hide
+					// (blockVisibility === false) skips the label render; per-viewport
+					// hide gets the same wp-block-hidden-{mobile,tablet,desktop} classes
+					// Gutenberg would add — the matching media-query CSS is already
+					// registered by core's render_block visibility filter (the label
+					// keeps visibility support). See FORMS-694.
+					$block_visibility                     = $inner_block['attrs']['metadata']['blockVisibility'] ?? null;
+					$atts['labelhiddenbyblockvisibility'] = false === $block_visibility;
+
+					if ( is_array( $block_visibility ) && isset( $block_visibility['viewport'] ) && is_array( $block_visibility['viewport'] ) ) {
+						foreach ( array( 'mobile', 'tablet', 'desktop' ) as $viewport_size ) {
+							if ( isset( $block_visibility['viewport'][ $viewport_size ] ) && false === $block_visibility['viewport'][ $viewport_size ] ) {
+								$atts['labelclasses'] .= ' wp-block-hidden-' . $viewport_size;
+							}
+						}
+					}
 
 					continue;
 				}

From 992aa1bb708ea57ccbcfb4e7f75a757a8b4856b8 Mon Sep 17 00:00:00 2001
From: Christian Gastrell <cgastrell@gmail.com>
Date: Mon, 29 Jun 2026 11:40:12 -0300
Subject: [PATCH 06/14] Forms: disable visibility on the remaining input blocks
 too

The standard jetpack/input was disabled, but the field-specific input blocks
(input-range/slider, input-rating, input-image-option, phone-input, dropzone/file)
define their own supports and don't share defaultSettings, so the control still
showed on them. Add visibility:false to each (JS) and broaden the PHP filter to
match all jetpack/input* plus phone-input and dropzone. Verified in-editor: every
field-* and input block now hides the control; only label keeps it.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .../src/blocks/contact-form/class-contact-form-block.php     | 5 ++++-
 projects/packages/forms/src/blocks/dropzone/index.js         | 3 +++
 .../packages/forms/src/blocks/input-image-option/index.tsx   | 3 +++
 projects/packages/forms/src/blocks/input-phone/index.js      | 3 +++
 projects/packages/forms/src/blocks/input-range/index.js      | 3 +++
 projects/packages/forms/src/blocks/input-rating/index.js     | 3 +++
 6 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/projects/packages/forms/src/blocks/contact-form/class-contact-form-block.php b/projects/packages/forms/src/blocks/contact-form/class-contact-form-block.php
index 6f0eae07c95e..7a42e4e57d15 100644
--- a/projects/packages/forms/src/blocks/contact-form/class-contact-form-block.php
+++ b/projects/packages/forms/src/blocks/contact-form/class-contact-form-block.php
@@ -112,8 +112,11 @@ public static function register_block() {
 	public static function disable_field_visibility_support( $args, $block_name ) {
 		// TODO: refactor into an array_merge'd shared supports array mirroring the JS defaultSettings, instead of this filter.
 		$is_field = strpos( $block_name, 'jetpack/field-' ) === 0 && strpos( $block_name, 'jetpack/field-option-' ) !== 0;
+		// All input variants: jetpack/input, input-range, input-rating,
+		// input-image-option, plus the differently-named phone-input and dropzone.
+		$is_input = strpos( $block_name, 'jetpack/input' ) === 0 || in_array( $block_name, array( 'jetpack/phone-input', 'jetpack/dropzone' ), true );
 
-		if ( 'jetpack/input' === $block_name || $is_field ) {
+		if ( $is_input || $is_field ) {
 			if ( ! isset( $args['supports'] ) || ! is_array( $args['supports'] ) ) {
 				$args['supports'] = array();
 			}
diff --git a/projects/packages/forms/src/blocks/dropzone/index.js b/projects/packages/forms/src/blocks/dropzone/index.js
index 25e8fe950e40..3dbcb424fc29 100644
--- a/projects/packages/forms/src/blocks/dropzone/index.js
+++ b/projects/packages/forms/src/blocks/dropzone/index.js
@@ -42,6 +42,9 @@ const settings = {
 	supports: {
 		reusable: false,
 		html: false,
+		// FORMS-694: the dropzone is the file field's input — inert for visibility
+		// (output discarded by the field renderer); disable the control.
+		visibility: false,
 		// Mimic the layout settings of the core Group block.
 		layout: {
 			type: 'flex',
diff --git a/projects/packages/forms/src/blocks/input-image-option/index.tsx b/projects/packages/forms/src/blocks/input-image-option/index.tsx
index 0ad144a61bb5..a99014cc1e60 100644
--- a/projects/packages/forms/src/blocks/input-image-option/index.tsx
+++ b/projects/packages/forms/src/blocks/input-image-option/index.tsx
@@ -29,6 +29,9 @@ const settings = {
 		fixedHeight: 'fixedHeight',
 	},
 	supports: {
+		// FORMS-694: inputs are inert for visibility (output discarded by the
+		// field renderer); disable the control like the standard input block.
+		visibility: false,
 		color: {
 			background: true,
 			text: true,
diff --git a/projects/packages/forms/src/blocks/input-phone/index.js b/projects/packages/forms/src/blocks/input-phone/index.js
index fdccd779e1a3..ee818fa8e9a1 100644
--- a/projects/packages/forms/src/blocks/input-phone/index.js
+++ b/projects/packages/forms/src/blocks/input-phone/index.js
@@ -28,6 +28,9 @@ const settings = {
 	supports: {
 		reusable: false,
 		html: false,
+		// FORMS-694: inputs are inert for visibility (output discarded by the
+		// field renderer); disable the control like the standard input block.
+		visibility: false,
 		color: {
 			text: true,
 			background: true,
diff --git a/projects/packages/forms/src/blocks/input-range/index.js b/projects/packages/forms/src/blocks/input-range/index.js
index 6b2081b3a7c8..0427af958365 100644
--- a/projects/packages/forms/src/blocks/input-range/index.js
+++ b/projects/packages/forms/src/blocks/input-range/index.js
@@ -29,6 +29,9 @@ const settings = {
 	supports: {
 		reusable: false,
 		html: false,
+		// FORMS-694: inputs are inert for visibility (output discarded by the
+		// field renderer); disable the control like the standard input block.
+		visibility: false,
 		color: {
 			text: true,
 			background: false,
diff --git a/projects/packages/forms/src/blocks/input-rating/index.js b/projects/packages/forms/src/blocks/input-rating/index.js
index 52a753d09aa2..298f3c5e693e 100644
--- a/projects/packages/forms/src/blocks/input-rating/index.js
+++ b/projects/packages/forms/src/blocks/input-rating/index.js
@@ -36,6 +36,9 @@ const settings = {
 	supports: {
 		reusable: false,
 		html: false,
+		// FORMS-694: inputs are inert for visibility (output discarded by the
+		// field renderer); disable the control like the standard input block.
+		visibility: false,
 		color: {
 			text: true,
 			background: false,

From 410613dc22cfb4a71a2a43fb20e36c9abf421e3e Mon Sep 17 00:00:00 2001
From: Christian Gastrell <cgastrell@gmail.com>
Date: Mon, 29 Jun 2026 13:22:59 -0300
Subject: [PATCH 07/14] Forms: disable visibility on choice/option blocks too
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Per team decision, the choice/option blocks (option, options, fieldset-image-options,
and the deprecated field-option-radio/checkbox) are inputs in effect — they flatten
through the same field-shortcode path, so visibility is inert on them. Add
visibility:false (JS) and extend the PHP filter (drop the field-option-* exclusion;
add the option containers). Label is now the only forms block keeping the control.

Verified in-editor: every field/input/option block hides the control; only label shows it.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .../contact-form/class-contact-form-block.php  | 18 +++++++++++-------
 .../deprecated/field-option-checkbox/index.js  |  3 +++
 .../deprecated/field-option-radio/index.js     |  3 +++
 .../blocks/fieldset-image-options/index.tsx    |  5 +++++
 .../packages/forms/src/blocks/option/index.js  |  3 +++
 .../packages/forms/src/blocks/options/index.js |  3 +++
 .../contact-form/Contact_Form_Block_Test.php   |  2 ++
 7 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/projects/packages/forms/src/blocks/contact-form/class-contact-form-block.php b/projects/packages/forms/src/blocks/contact-form/class-contact-form-block.php
index 7a42e4e57d15..f0c206a673fa 100644
--- a/projects/packages/forms/src/blocks/contact-form/class-contact-form-block.php
+++ b/projects/packages/forms/src/blocks/contact-form/class-contact-form-block.php
@@ -99,11 +99,12 @@ public static function register_block() {
 	 * render_block class injection — and on a required field it cannot be made
 	 * safe (server- and client-side validation are both viewport-blind). "Hide
 	 * everywhere" does work for fields, but the control bundles both modes under
-	 * one boolean, so we disable it wholesale on fields and inputs as an interim.
-	 * This mirrors the JS registration (shared/settings/index.js and
-	 * input/index.js). Labels keep visibility support (full-hide wired via
-	 * labelhiddenbyblockvisibility), and the internal field-option-* blocks are
-	 * left untouched to match JS. Full field visibility is a separate decision.
+	 * one boolean, so we disable it wholesale on fields, inputs, and choice/option
+	 * blocks as an interim. This mirrors the JS registration. The label is the
+	 * only block that keeps visibility support — it honors hiding (full-hide via
+	 * labelhiddenbyblockvisibility, per-viewport via wp-block-hidden-* classes)
+	 * and never affects validation or submission. Full field visibility is a
+	 * separate decision.
 	 *
 	 * @param array  $args       Block type registration args.
 	 * @param string $block_name Block name being registered.
@@ -111,12 +112,15 @@ public static function register_block() {
 	 */
 	public static function disable_field_visibility_support( $args, $block_name ) {
 		// TODO: refactor into an array_merge'd shared supports array mirroring the JS defaultSettings, instead of this filter.
-		$is_field = strpos( $block_name, 'jetpack/field-' ) === 0 && strpos( $block_name, 'jetpack/field-option-' ) !== 0;
+		// Fields, incl. the deprecated field-option-* choice blocks.
+		$is_field = strpos( $block_name, 'jetpack/field-' ) === 0;
 		// All input variants: jetpack/input, input-range, input-rating,
 		// input-image-option, plus the differently-named phone-input and dropzone.
 		$is_input = strpos( $block_name, 'jetpack/input' ) === 0 || in_array( $block_name, array( 'jetpack/phone-input', 'jetpack/dropzone' ), true );
+		// Choice/option containers.
+		$is_option = in_array( $block_name, array( 'jetpack/option', 'jetpack/options', 'jetpack/fieldset-image-options' ), true );
 
-		if ( $is_input || $is_field ) {
+		if ( $is_input || $is_field || $is_option ) {
 			if ( ! isset( $args['supports'] ) || ! is_array( $args['supports'] ) ) {
 				$args['supports'] = array();
 			}
diff --git a/projects/packages/forms/src/blocks/deprecated/field-option-checkbox/index.js b/projects/packages/forms/src/blocks/deprecated/field-option-checkbox/index.js
index 28e6a864db59..5a7e1ebce3d4 100644
--- a/projects/packages/forms/src/blocks/deprecated/field-option-checkbox/index.js
+++ b/projects/packages/forms/src/blocks/deprecated/field-option-checkbox/index.js
@@ -15,6 +15,9 @@ const settings = {
 		},
 	},
 	supports: {
+		// FORMS-694: choice/option blocks flatten through the field shortcode
+		// like inputs — visibility is inert; disable the control.
+		visibility: false,
 		html: false,
 		inserter: false,
 		reusable: false,
diff --git a/projects/packages/forms/src/blocks/deprecated/field-option-radio/index.js b/projects/packages/forms/src/blocks/deprecated/field-option-radio/index.js
index f82c51a2acec..d5da95dec013 100644
--- a/projects/packages/forms/src/blocks/deprecated/field-option-radio/index.js
+++ b/projects/packages/forms/src/blocks/deprecated/field-option-radio/index.js
@@ -15,6 +15,9 @@ const settings = {
 		},
 	},
 	supports: {
+		// FORMS-694: choice/option blocks flatten through the field shortcode
+		// like inputs — visibility is inert; disable the control.
+		visibility: false,
 		html: false,
 		inserter: false,
 		reusable: false,
diff --git a/projects/packages/forms/src/blocks/fieldset-image-options/index.tsx b/projects/packages/forms/src/blocks/fieldset-image-options/index.tsx
index baa6bf38193a..86583c813396 100644
--- a/projects/packages/forms/src/blocks/fieldset-image-options/index.tsx
+++ b/projects/packages/forms/src/blocks/fieldset-image-options/index.tsx
@@ -18,6 +18,11 @@ const settings = {
 	icon,
 	parent: [ 'jetpack/field-image-select' ],
 	allowedBlocks: [ 'jetpack/input-image-option' ],
+	supports: {
+		// FORMS-694: choice/option blocks flatten through the field shortcode
+		// like inputs — visibility is inert; disable the control.
+		visibility: false,
+	},
 	edit,
 	save,
 };
diff --git a/projects/packages/forms/src/blocks/option/index.js b/projects/packages/forms/src/blocks/option/index.js
index bcc7006eaed4..164e3dca500a 100644
--- a/projects/packages/forms/src/blocks/option/index.js
+++ b/projects/packages/forms/src/blocks/option/index.js
@@ -20,6 +20,9 @@ const settings = {
 	supports: {
 		reusable: false,
 		html: false,
+		// FORMS-694: choice/option blocks flatten through the field shortcode
+		// like inputs — visibility is inert; disable the control.
+		visibility: false,
 		splitting: true,
 		color: {
 			text: true,
diff --git a/projects/packages/forms/src/blocks/options/index.js b/projects/packages/forms/src/blocks/options/index.js
index aa73db09dd65..ece85012dc7f 100644
--- a/projects/packages/forms/src/blocks/options/index.js
+++ b/projects/packages/forms/src/blocks/options/index.js
@@ -29,6 +29,9 @@ const settings = {
 	},
 	usesContext: [ 'jetpack/field-share-attributes' ],
 	supports: {
+		// FORMS-694: choice/option blocks flatten through the field shortcode
+		// like inputs — visibility is inert; disable the control.
+		visibility: false,
 		spacing: {
 			blockGap: false,
 		},
diff --git a/projects/packages/forms/tests/php/contact-form/Contact_Form_Block_Test.php b/projects/packages/forms/tests/php/contact-form/Contact_Form_Block_Test.php
index e311e89cfde5..8fa4c39327e2 100644
--- a/projects/packages/forms/tests/php/contact-form/Contact_Form_Block_Test.php
+++ b/projects/packages/forms/tests/php/contact-form/Contact_Form_Block_Test.php
@@ -127,6 +127,7 @@ public static function data_provider_test_register_child_blocks() {
 					'spacing'              => array(
 						'blockGap' => false,
 					),
+					'visibility'           => false,
 				),
 			),
 			'jetpack/option'  => array(
@@ -147,6 +148,7 @@ public static function data_provider_test_register_child_blocks() {
 						'__experimentalTextDecoration' => true,
 						'__experimentalLetterSpacing'  => true,
 					),
+					'visibility' => false,
 				),
 			),
 		);

From 9a0cc838d8efc73828c857efa0cf878cf5f81835 Mon Sep 17 00:00:00 2001
From: Christian Gastrell <cgastrell@gmail.com>
Date: Mon, 29 Jun 2026 13:24:07 -0300
Subject: [PATCH 08/14] Forms: update changelog for choice/option visibility
 disable

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .../forms/changelog/fix-forms-disable-field-visibility-control  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/projects/packages/forms/changelog/fix-forms-disable-field-visibility-control b/projects/packages/forms/changelog/fix-forms-disable-field-visibility-control
index 6088000811d1..8991f4e04100 100644
--- a/projects/packages/forms/changelog/fix-forms-disable-field-visibility-control
+++ b/projects/packages/forms/changelog/fix-forms-disable-field-visibility-control
@@ -1,4 +1,4 @@
 Significance: patch
 Type: fixed
 
-Forms: Disable the block visibility control on form fields and inputs, where the per-viewport "Hide on…" option was not honored on the frontend. Labels keep their visibility support and now honor the per-viewport "Hide on…" option too.
+Forms: Disable the block visibility control on form field, input, and choice/option blocks, where the per-viewport "Hide on…" option was not honored on the frontend. Labels keep their visibility support and now honor the per-viewport "Hide on…" option too.

From 4e8a2dfe1812bce2daf58d6470e6789a3b9ccf3c Mon Sep 17 00:00:00 2001
From: Christian Gastrell <cgastrell@gmail.com>
Date: Mon, 29 Jun 2026 16:20:26 -0300
Subject: [PATCH 09/14] Forms: honor full-hide on grouped-field legend labels +
 add visibility tests

- render_legend_as_label() now respects labelhiddenbyblockvisibility, so a
  fully-hidden label is dropped on radio/checkbox-multiple/image-select/rating
  fields too (it already honored per-viewport hide via label_classes). Mirrors
  render_label(); addresses Liam's review.
- Add a dataProvider matrix test for disable_field_visibility_support() (field,
  field-option, all input variants, option containers, label, non-forms block).
- Add label blockVisibility tests for block_attributes_to_shortcode_attributes:
  full-hide sets the flag, per-viewport adds wp-block-hidden-* classes.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .../contact-form/class-contact-form-field.php |  7 ++
 .../contact-form/Contact_Form_Block_Test.php  | 46 ++++++++++++
 .../contact-form/Contact_Form_Plugin_Test.php | 75 +++++++++++++++++++
 3 files changed, 128 insertions(+)

diff --git a/projects/packages/forms/src/contact-form/class-contact-form-field.php b/projects/packages/forms/src/contact-form/class-contact-form-field.php
index 773f57ea196e..22d5e5f571e5 100644
--- a/projects/packages/forms/src/contact-form/class-contact-form-field.php
+++ b/projects/packages/forms/src/contact-form/class-contact-form-field.php
@@ -874,6 +874,13 @@ public function render_label( $type, $id, $label, $required, $required_field_tex
 	 * @return string HTML
 	 */
 	public function render_legend_as_label( $type, $id, $legend, $required, $required_field_text, $extra_attrs = array(), $required_indicator = true ) {
+		// Full-hide via blockVisibility, mirroring render_label(). Grouped fields
+		// (radio, checkbox-multiple, image-select, rating) render their label as a
+		// legend, so they need the same guard. Per-viewport hiding still works via
+		// the label_classes applied below.
+		if ( $this->attributes['labelhiddenbyblockvisibility'] ) {
+			return '';
+		}
 		if ( ! empty( $this->label_styles ) ) {
 			$extra_attrs['style'] = $this->label_styles;
 		}
diff --git a/projects/packages/forms/tests/php/contact-form/Contact_Form_Block_Test.php b/projects/packages/forms/tests/php/contact-form/Contact_Form_Block_Test.php
index 8fa4c39327e2..2f4577d02fbb 100644
--- a/projects/packages/forms/tests/php/contact-form/Contact_Form_Block_Test.php
+++ b/projects/packages/forms/tests/php/contact-form/Contact_Form_Block_Test.php
@@ -547,4 +547,50 @@ public function test_render_email_with_empty_attrs() {
 		// Cleanup
 		wp_delete_post( $post_id, true );
 	}
+
+	/**
+	 * Test that ::disable_field_visibility_support turns off the visibility
+	 * support on every field, input, and choice/option block, and leaves the
+	 * label and non-forms blocks untouched. See FORMS-694.
+	 *
+	 * @dataProvider data_disable_field_visibility_support
+	 *
+	 * @param string $block_name     The block name being registered.
+	 * @param bool   $should_disable Whether visibility should be disabled for it.
+	 */
+	#[DataProvider( 'data_disable_field_visibility_support' )]
+	public function test_disable_field_visibility_support( $block_name, $should_disable ) {
+		$result = Contact_Form_Block::disable_field_visibility_support( array(), $block_name );
+
+		if ( $should_disable ) {
+			$this->assertArrayHasKey( 'supports', $result );
+			$this->assertFalse( $result['supports']['visibility'] );
+		} else {
+			$this->assertArrayNotHasKey( 'supports', $result );
+		}
+	}
+
+	/**
+	 * Data provider for test_disable_field_visibility_support.
+	 *
+	 * @return array
+	 */
+	public static function data_disable_field_visibility_support() {
+		return array(
+			'field'                  => array( 'jetpack/field-name', true ),
+			'field (file)'           => array( 'jetpack/field-file', true ),
+			'deprecated option'      => array( 'jetpack/field-option-radio', true ),
+			'standard input'         => array( 'jetpack/input', true ),
+			'range input'            => array( 'jetpack/input-range', true ),
+			'rating input'           => array( 'jetpack/input-rating', true ),
+			'image-option input'     => array( 'jetpack/input-image-option', true ),
+			'phone input'            => array( 'jetpack/phone-input', true ),
+			'dropzone'               => array( 'jetpack/dropzone', true ),
+			'option'                 => array( 'jetpack/option', true ),
+			'options'                => array( 'jetpack/options', true ),
+			'fieldset-image-options' => array( 'jetpack/fieldset-image-options', true ),
+			'label (kept)'           => array( 'jetpack/label', false ),
+			'non-forms block'        => array( 'core/paragraph', false ),
+		);
+	}
 }
diff --git a/projects/packages/forms/tests/php/contact-form/Contact_Form_Plugin_Test.php b/projects/packages/forms/tests/php/contact-form/Contact_Form_Plugin_Test.php
index 12c0e805120c..c57d43219dc6 100644
--- a/projects/packages/forms/tests/php/contact-form/Contact_Form_Plugin_Test.php
+++ b/projects/packages/forms/tests/php/contact-form/Contact_Form_Plugin_Test.php
@@ -2109,4 +2109,79 @@ function ( $results, $query ) use ( &$found_source_sql ) {
 			wp_set_current_user( 0 );
 		}
 	}
+
+	/**
+	 * Test that ::block_attributes_to_shortcode_attributes honors the label's
+	 * blockVisibility support: full-hide (blockVisibility === false) sets
+	 * labelhiddenbyblockvisibility, and per-viewport hide adds the matching
+	 * wp-block-hidden-{mobile,tablet,desktop} classes to the label. See FORMS-694.
+	 *
+	 * @dataProvider data_provider_label_block_visibility
+	 *
+	 * @param mixed $block_visibility   The label's metadata.blockVisibility value (null to omit).
+	 * @param bool  $expected_full_hide Whether labelhiddenbyblockvisibility should be truthy.
+	 * @param array $expected_hidden    The viewports expected to add a wp-block-hidden-* class.
+	 */
+	#[DataProvider( 'data_provider_label_block_visibility' )]
+	public function test_block_attributes_to_shortcode_attributes_label_block_visibility( $block_visibility, $expected_full_hide, $expected_hidden ) {
+		$label_attrs = array( 'label' => 'Name' );
+		if ( null !== $block_visibility ) {
+			$label_attrs['metadata'] = array( 'blockVisibility' => $block_visibility );
+		}
+		$block = array(
+			'blockName'   => 'jetpack/field-name',
+			'attrs'       => array( 'required' => false ),
+			'innerBlocks' => array(
+				array(
+					'blockName' => 'jetpack/label',
+					'attrs'     => $label_attrs,
+				),
+			),
+		);
+		$atts  = Contact_Form_Plugin::block_attributes_to_shortcode_attributes( array(), 'text', new WP_Block( $block ) );
+
+		$this->assertSame( $expected_full_hide, (bool) $atts['labelhiddenbyblockvisibility'] );
+
+		foreach ( array( 'mobile', 'tablet', 'desktop' ) as $viewport ) {
+			$class = 'wp-block-hidden-' . $viewport;
+			if ( in_array( $viewport, $expected_hidden, true ) ) {
+				$this->assertStringContainsString( $class, $atts['labelclasses'] );
+			} else {
+				$this->assertStringNotContainsString( $class, $atts['labelclasses'] );
+			}
+		}
+	}
+
+	/**
+	 * Data provider for test_block_attributes_to_shortcode_attributes_label_block_visibility.
+	 *
+	 * @return array
+	 */
+	public static function data_provider_label_block_visibility() {
+		return array(
+			'no visibility set'       => array( null, false, array() ),
+			'full hide (false)'       => array( false, true, array() ),
+			'hide on mobile'          => array( array( 'viewport' => array( 'mobile' => false ) ), false, array( 'mobile' ) ),
+			'hide on mobile + tablet' => array(
+				array(
+					'viewport' => array(
+						'mobile' => false,
+						'tablet' => false,
+					),
+				),
+				false,
+				array( 'mobile', 'tablet' ),
+			),
+			'viewport all visible'    => array(
+				array(
+					'viewport' => array(
+						'mobile' => true,
+						'tablet' => true,
+					),
+				),
+				false,
+				array(),
+			),
+		);
+	}
 }

From 7d0a66f26a610e18b717d4d354a772ba2c542a1a Mon Sep 17 00:00:00 2001
From: Christian Gastrell <cgastrell@gmail.com>
Date: Wed, 1 Jul 2026 13:15:55 -0300
Subject: [PATCH 10/14] Forms: honor hide-everywhere on fields independent of
 WP version + legend a11y

Addresses review on #49973 (FORMS-694).

- Fields: add a render_block filter (drop_field_hidden_everywhere) that drops a
  field whose metadata.blockVisibility === false before Contact_Form::parse()
  sees it. Disabling the visibility *support* stopped core's release-WP filter
  from honoring saved full-hide (the reorder fix, gutenberg#78780, is
  unreleased), so previously-hidden fields would reappear. Doing the drop
  ourselves is version-independent and required-safe: the field is fully removed
  from the form, so its required check never runs.
- Grouped fields: when the legend label is fully hidden, move the label onto the
  <fieldset> as an aria-label so radio/checkbox-multiple/image-select/rating keep
  an accessible name, mirroring the single-input fallback.
- Fix the label's support key (blockVisibility -> visibility; the old key was a
  no-op) and update the registration test.
- Tests: unit + do_blocks integration coverage for the field drop; render-level
  coverage for the legend aria-label across both fieldset code paths.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 ...fix-forms-disable-field-visibility-control |  2 +-
 .../contact-form/class-contact-form-block.php | 46 +++++++++-
 .../contact-form/class-contact-form-field.php | 32 +++++--
 .../contact-form/Contact_Form_Block_Test.php  | 83 ++++++++++++++++++-
 .../contact-form/Contact_Form_Field_Test.php  | 80 ++++++++++++++++++
 5 files changed, 231 insertions(+), 12 deletions(-)

diff --git a/projects/packages/forms/changelog/fix-forms-disable-field-visibility-control b/projects/packages/forms/changelog/fix-forms-disable-field-visibility-control
index 8991f4e04100..6a28348cb1c0 100644
--- a/projects/packages/forms/changelog/fix-forms-disable-field-visibility-control
+++ b/projects/packages/forms/changelog/fix-forms-disable-field-visibility-control
@@ -1,4 +1,4 @@
 Significance: patch
 Type: fixed
 
-Forms: Disable the block visibility control on form field, input, and choice/option blocks, where the per-viewport "Hide on…" option was not honored on the frontend. Labels keep their visibility support and now honor the per-viewport "Hide on…" option too.
+Forms: Disable the block visibility control on form field, input, and choice/option blocks, where the per-viewport "Hide on…" option was not honored on the frontend. Fields still honor a saved "Hide everywhere" (removing the field entirely, which keeps required fields safe) regardless of WordPress version. Labels keep their visibility support and now honor the per-viewport "Hide on…" option too, and grouped fields whose legend label is hidden keep an accessible name.
diff --git a/projects/packages/forms/src/blocks/contact-form/class-contact-form-block.php b/projects/packages/forms/src/blocks/contact-form/class-contact-form-block.php
index f0c206a673fa..5ee206191235 100644
--- a/projects/packages/forms/src/blocks/contact-form/class-contact-form-block.php
+++ b/projects/packages/forms/src/blocks/contact-form/class-contact-form-block.php
@@ -130,6 +130,39 @@ public static function disable_field_visibility_support( $args, $block_name ) {
 		return $args;
 	}
 
+	/**
+	 * Drop a field that has been hidden everywhere via block visibility.
+	 *
+	 * FORMS-694. "Hide everywhere" (metadata.blockVisibility === false) must keep
+	 * working on fields even though we disable the visibility *support* on them
+	 * (see disable_field_visibility_support). We can't rely on core's render_block
+	 * visibility filter for this: on released WP it gates the full-hide branch
+	 * behind the support check, so once support is false the field would reappear
+	 * (the fix that reorders those — WordPress/gutenberg#78780 — is unreleased).
+	 *
+	 * Dropping the field's rendered output ('') before Contact_Form::parse() sees
+	 * it removes the [contact-field] shortcode entirely, so the field is never
+	 * parsed, rendered, or validated — which is what makes this required-safe (a
+	 * required hidden-everywhere field simply isn't in the form). This is a full
+	 * removal, not a CSS hide; the per-viewport "Hide on…" mode (which leaves the
+	 * field in place and only display:none's it) is intentionally not honored on
+	 * fields for exactly that reason.
+	 *
+	 * @param string $block_content Rendered block content.
+	 * @param array  $block         Parsed block.
+	 * @return string
+	 */
+	public static function drop_field_hidden_everywhere( $block_content, $block ) {
+		$block_name       = $block['blockName'] ?? '';
+		$block_visibility = $block['attrs']['metadata']['blockVisibility'] ?? null;
+
+		if ( false === $block_visibility && strpos( $block_name, 'jetpack/field-' ) === 0 ) {
+			return '';
+		}
+
+		return $block_content;
+	}
+
 	/**
 	 * Register the contact form block feature flag.
 	 *
@@ -216,6 +249,10 @@ public static function register_child_blocks() {
 		// src/blocks/input/index.js), which disables it on fields and inputs.
 		add_filter( 'register_block_type_args', array( __CLASS__, 'disable_field_visibility_support' ), 10, 2 );
 
+		// Honor "hide everywhere" on fields ourselves, independent of core's
+		// version-dependent visibility filter. See drop_field_hidden_everywhere().
+		add_filter( 'render_block', array( __CLASS__, 'drop_field_hidden_everywhere' ), 10, 2 );
+
 		// Field inner block types.
 		Blocks::jetpack_register_block(
 			'jetpack/input',
@@ -254,12 +291,12 @@ public static function register_child_blocks() {
 			'jetpack/label',
 			array(
 				'supports'     => array(
-					'color'           => array(
+					'color'      => array(
 						'text'       => true,
 						'background' => false,
 						'gradients'  => false,
 					),
-					'typography'      => array(
+					'typography' => array(
 						'fontSize'                     => true,
 						'lineHeight'                   => true,
 						'__experimentalFontFamily'     => true,
@@ -269,7 +306,10 @@ public static function register_child_blocks() {
 						'__experimentalTextDecoration' => true,
 						'__experimentalLetterSpacing'  => true,
 					),
-					'blockVisibility' => true,
+					// The real support key is `visibility`, not `blockVisibility`
+					// (that's the per-instance saved attribute). The label is the
+					// only forms block that keeps the control — see FORMS-694.
+					'visibility' => true,
 				),
 				'uses_context' => array(
 					'jetpack/field-required',
diff --git a/projects/packages/forms/src/contact-form/class-contact-form-field.php b/projects/packages/forms/src/contact-form/class-contact-form-field.php
index 22d5e5f571e5..46a42ff27f66 100644
--- a/projects/packages/forms/src/contact-form/class-contact-form-field.php
+++ b/projects/packages/forms/src/contact-form/class-contact-form-field.php
@@ -860,6 +860,27 @@ public function render_label( $type, $id, $label, $required, $required_field_tex
 			"</label>\n";
 	}
 
+	/**
+	 * Return an aria-label attribute string for a grouped field's <fieldset>
+	 * when its legend label is fully hidden by block visibility.
+	 *
+	 * The render_legend_as_label() method returns '' on full-hide, which strips
+	 * the group's accessible name (a display:none/removed <legend> is dropped from
+	 * the a11y tree). This mirrors the single-input aria-label fallback in render_field()
+	 * so radio / checkbox-multiple / image-select / rating groups keep a name.
+	 * Returns '' (no attribute) when the legend is visible. See FORMS-694.
+	 *
+	 * @param string $label The field label.
+	 * @return string An ` aria-label='…' ` attribute, or '' when not hidden.
+	 */
+	private function get_hidden_legend_aria_label_attr( $label ) {
+		if ( ! $this->get_attribute( 'labelhiddenbyblockvisibility' ) ) {
+			return '';
+		}
+
+		return " aria-label='" . esc_attr( Contact_Form_Plugin::strip_tags( $label ) ) . "'";
+	}
+
 	/**
 	 * Return the HTML for a legend that shares the same style as a label.
 	 *
@@ -1295,7 +1316,7 @@ public function render_radio_field( $id, $label, $value, $class, $required, $req
 		$options_styles    = $this->get_attribute( 'optionsstyles' );
 		$form_style        = $this->get_form_style();
 		$is_outlined_style = 'outlined' === $form_style;
-		$fieldset_id       = "id='" . esc_attr( "$id-label" ) . "'";
+		$fieldset_id       = "id='" . esc_attr( "$id-label" ) . "'" . $this->get_hidden_legend_aria_label_attr( $label );
 
 		if ( $is_outlined_style ) {
 			$style_variation_attributes = $this->get_attribute( 'stylevariationattributes' );
@@ -1784,7 +1805,7 @@ public function render_checkbox_multiple_field( $id, $label, $value, $class, $re
 		 * any of the radio buttons in the group is selected, adding a required attribute directly to
 		 * a checkbox means that this specific checkbox must be checked.
 		 */
-		$fieldset_id = "id='" . esc_attr( "$id-label" ) . "'";
+		$fieldset_id = "id='" . esc_attr( "$id-label" ) . "'" . $this->get_hidden_legend_aria_label_attr( $label );
 
 		if ( $is_outlined_style ) {
 			$style_variation_attributes = $this->get_attribute( 'stylevariationattributes' );
@@ -2119,7 +2140,7 @@ public function render_image_select_field( $id, $label, $value, $class, $require
 
 		$field = "<div class='jetpack-field jetpack-field-image-select'>";
 
-		$fieldset_id = "id='" . esc_attr( "$id-label" ) . "'";
+		$fieldset_id = "id='" . esc_attr( "$id-label" ) . "'" . $this->get_hidden_legend_aria_label_attr( $label );
 
 		$field .= "<fieldset {$fieldset_id} data-wp-bind--aria-invalid='state.fieldAriaInvalid' >";
 
@@ -2966,7 +2987,7 @@ function ( $key, $value ) {
 		$style_attr .= ' ' . implode( ';', $remaining_styles ) . '"';
 
 		return sprintf(
-			'<fieldset id="%4$s-label" class="jetpack-field-multiple__fieldset jetpack-field-rating" %1$s>
+			'<fieldset id="%4$s-label" class="jetpack-field-multiple__fieldset jetpack-field-rating" %1$s%6$s>
 				%5$s
 				<div class="jetpack-field-rating__options %3$s">%2$s</div>
 			</fieldset>',
@@ -2974,7 +2995,8 @@ function ( $key, $value ) {
 			$options,
 			esc_attr( $this->field_classes ),
 			esc_attr( $id ),
-			$label_html
+			$label_html,
+			$this->get_hidden_legend_aria_label_attr( $label )
 		) . $this->get_error_div( $id, 'rating' );
 	}
 
diff --git a/projects/packages/forms/tests/php/contact-form/Contact_Form_Block_Test.php b/projects/packages/forms/tests/php/contact-form/Contact_Form_Block_Test.php
index 2f4577d02fbb..52a6cdcafbac 100644
--- a/projects/packages/forms/tests/php/contact-form/Contact_Form_Block_Test.php
+++ b/projects/packages/forms/tests/php/contact-form/Contact_Form_Block_Test.php
@@ -93,12 +93,12 @@ public static function data_provider_test_register_child_blocks() {
 			'jetpack/label'   => array(
 				'jetpack/label',
 				array(
-					'color'           => array(
+					'color'      => array(
 						'text'       => true,
 						'background' => false,
 						'gradients'  => false,
 					),
-					'typography'      => array(
+					'typography' => array(
 						'fontSize'                     => true,
 						'lineHeight'                   => true,
 						'__experimentalFontFamily'     => true,
@@ -108,7 +108,7 @@ public static function data_provider_test_register_child_blocks() {
 						'__experimentalTextDecoration' => true,
 						'__experimentalLetterSpacing'  => true,
 					),
-					'blockVisibility' => true,
+					'visibility' => true,
 				),
 			),
 			'jetpack/options' => array(
@@ -593,4 +593,81 @@ public static function data_disable_field_visibility_support() {
 			'non-forms block'        => array( 'core/paragraph', false ),
 		);
 	}
+
+	/**
+	 * Test that ::drop_field_hidden_everywhere removes a field's rendered output
+	 * when it has been hidden everywhere (metadata.blockVisibility === false), and
+	 * leaves it untouched for the per-viewport hide, no visibility, non-field
+	 * blocks, and non-boolean values. See FORMS-694.
+	 *
+	 * @dataProvider data_drop_field_hidden_everywhere
+	 *
+	 * @param array $block        The parsed block passed to the render_block filter.
+	 * @param bool  $should_drop  Whether the field output should be dropped.
+	 */
+	#[DataProvider( 'data_drop_field_hidden_everywhere' )]
+	public function test_drop_field_hidden_everywhere( $block, $should_drop ) {
+		$content = '[contact-field type="text" label="Name"/]';
+		$result  = Contact_Form_Block::drop_field_hidden_everywhere( $content, $block );
+
+		$this->assertSame( $should_drop ? '' : $content, $result );
+	}
+
+	/**
+	 * Data provider for test_drop_field_hidden_everywhere.
+	 *
+	 * @return array
+	 */
+	public static function data_drop_field_hidden_everywhere() {
+		$field = static function ( $block_visibility ) {
+			$attrs = array();
+			if ( null !== $block_visibility ) {
+				$attrs['metadata'] = array( 'blockVisibility' => $block_visibility );
+			}
+			return array(
+				'blockName' => 'jetpack/field-name',
+				'attrs'     => $attrs,
+			);
+		};
+
+		return array(
+			'field hidden everywhere'     => array( $field( false ), true ),
+			'field per-viewport hide'     => array( $field( array( 'viewport' => array( 'mobile' => false ) ) ), false ),
+			'field no visibility set'     => array( $field( null ), false ),
+			'field visibility true'       => array( $field( true ), false ),
+			'non-field hidden everywhere' => array(
+				array(
+					'blockName' => 'core/paragraph',
+					'attrs'     => array( 'metadata' => array( 'blockVisibility' => false ) ),
+				),
+				false,
+			),
+			'block without a name'        => array( array( 'attrs' => array() ), false ),
+		);
+	}
+
+	/**
+	 * Integration: confirm the render_block filter is actually wired by
+	 * register_child_blocks() and drops a hidden-everywhere field in the real
+	 * do_blocks() pipeline (independent of core's visibility filter), while a
+	 * normal field still renders its [contact-field] shortcode. Dropping the
+	 * shortcode before it reaches Contact_Form::parse() is what keeps a required
+	 * hidden field from ever being validated. See FORMS-694.
+	 */
+	public function test_hidden_everywhere_field_is_dropped_in_do_blocks() {
+		Contact_Form_Block::register_block();
+		Contact_Form_Block::register_child_blocks();
+
+		$hidden = '<!-- wp:jetpack/field-text {"label":"Hide me","required":true,"metadata":{"blockVisibility":false}} /-->';
+		$shown  = '<!-- wp:jetpack/field-text {"label":"Keep me","required":true} /-->';
+
+		// The hidden-everywhere required field produces no output — so it never
+		// becomes a [contact-field] shortcode, is never parsed, and is never
+		// validated (a required field that isn't in the form can't block submit).
+		$this->assertSame( '', trim( do_blocks( $hidden ) ) );
+
+		// A normal field still flattens to its shortcode.
+		$this->assertStringContainsString( 'contact-field', do_blocks( $shown ) );
+		$this->assertStringContainsString( 'Keep me', do_blocks( $shown ) );
+	}
 }
diff --git a/projects/packages/forms/tests/php/contact-form/Contact_Form_Field_Test.php b/projects/packages/forms/tests/php/contact-form/Contact_Form_Field_Test.php
index d137c66d2a3c..dd29385c8de5 100644
--- a/projects/packages/forms/tests/php/contact-form/Contact_Form_Field_Test.php
+++ b/projects/packages/forms/tests/php/contact-form/Contact_Form_Field_Test.php
@@ -8,6 +8,7 @@
 namespace Automattic\Jetpack\Forms\ContactForm;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
 use WorDBless\BaseTestCase;
 
 /**
@@ -243,4 +244,83 @@ public function test_render_consent_field_default_implicit() {
 		$this->assertStringContainsString( 'type=\'hidden\'', $html );
 		$this->assertStringContainsString( 'consent-implicit', $html );
 	}
+
+	/**
+	 * A grouped field whose legend label is fully hidden via block visibility
+	 * must render no <legend>, but must move the label onto the <fieldset> as an
+	 * aria-label so the group keeps an accessible name. Covers both fieldset code
+	 * paths — radio/checkbox-multiple/image-select (via $fieldset_id) and rating
+	 * (via sprintf). See FORMS-694.
+	 *
+	 * @dataProvider data_grouped_field_types
+	 *
+	 * @param string $type       The grouped field type.
+	 * @param array  $extra_atts Extra attributes needed to make the field renderable.
+	 */
+	#[DataProvider( 'data_grouped_field_types' )]
+	public function test_render_grouped_field_hidden_legend_keeps_accessible_name( $type, $extra_atts ) {
+		$field = $this->get_new_field_instance(
+			array_merge(
+				array(
+					'type'                         => $type,
+					'id'                           => 'test_group',
+					'label'                        => 'Pick one',
+					'labelhiddenbyblockvisibility' => true,
+				),
+				$extra_atts
+			)
+		);
+
+		$html = $field->render();
+
+		// The legend is dropped (no visible group label)...
+		$this->assertStringNotContainsString( '<legend', $html );
+		// ...but the accessible name is preserved on the fieldset.
+		$this->assertStringContainsString( "aria-label='Pick one'", $html );
+	}
+
+	/**
+	 * When the legend label is NOT hidden, the grouped field renders a normal
+	 * <legend> and does not add the aria-label fallback to the fieldset. Guards
+	 * the render-level behavior above against regressions. See FORMS-694.
+	 *
+	 * @dataProvider data_grouped_field_types
+	 *
+	 * @param string $type       The grouped field type.
+	 * @param array  $extra_atts Extra attributes needed to make the field renderable.
+	 */
+	#[DataProvider( 'data_grouped_field_types' )]
+	public function test_render_grouped_field_visible_legend_has_no_aria_label( $type, $extra_atts ) {
+		$field = $this->get_new_field_instance(
+			array_merge(
+				array(
+					'type'  => $type,
+					'id'    => 'test_group',
+					'label' => 'Pick one',
+				),
+				$extra_atts
+			)
+		);
+
+		$html = $field->render();
+
+		$this->assertStringContainsString( '<legend', $html );
+		$this->assertStringContainsString( 'Pick one', $html );
+		$this->assertStringNotContainsString( "aria-label='Pick one'", $html );
+	}
+
+	/**
+	 * Grouped field types keyed by the two distinct <fieldset> code paths.
+	 *
+	 * @return array
+	 */
+	public static function data_grouped_field_types() {
+		return array(
+			// $fieldset_id path (shared by radio, checkbox-multiple, image-select).
+			'radio'             => array( 'radio', array( 'options' => array( 'A', 'B' ) ) ),
+			'checkbox-multiple' => array( 'checkbox-multiple', array( 'options' => array( 'A', 'B' ) ) ),
+			// sprintf path.
+			'rating'            => array( 'rating', array() ),
+		);
+	}
 } // end class

From 1687ffb4bfa7f0f6162f186e146968db5b9652af Mon Sep 17 00:00:00 2001
From: Christian Gastrell <cgastrell@gmail.com>
Date: Wed, 1 Jul 2026 13:43:52 -0300
Subject: [PATCH 11/14] Forms: extend the label-hidden aria-label fallback to
 per-viewport hiding
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Optional follow-up to the legend a11y fix (FORMS-694). The visibility control
now survives only on the label block, so per-viewport hiding hides the
<label>/<legend> (display:none on that viewport) while the input stays visible —
leaving the field with no accessible name on that viewport.

Route every aria-label fallback site (input, phone, textarea, select, grouped
legend) through a single predicate that treats the label as hidden on either
full-hide (labelhiddenbyblockvisibility) or per-viewport (a wp-block-hidden-*
class on the label), and prefer the label text as the fallback name so it
matches the visible label where the per-viewport label still shows (falling back
to the placeholder only when there is no label). The render_label /
render_legend_as_label early-returns stay full-hide-only, so per-viewport keeps
the label rendered rather than removing it.

This is intentionally a standalone commit: if we'd rather keep the PR minimal and
treat per-viewport label hiding as visual-only for now, it can be dropped without
touching the rest of the fix.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .../contact-form/class-contact-form-field.php | 79 +++++++++++++------
 .../contact-form/Contact_Form_Field_Test.php  | 50 ++++++++++++
 2 files changed, 107 insertions(+), 22 deletions(-)

diff --git a/projects/packages/forms/src/contact-form/class-contact-form-field.php b/projects/packages/forms/src/contact-form/class-contact-form-field.php
index 46a42ff27f66..f78fe0eff2f3 100644
--- a/projects/packages/forms/src/contact-form/class-contact-form-field.php
+++ b/projects/packages/forms/src/contact-form/class-contact-form-field.php
@@ -860,25 +860,61 @@ public function render_label( $type, $id, $label, $required, $required_field_tex
 			"</label>\n";
 	}
 
+	/**
+	 * Whether the field's label is hidden by block visibility in any mode.
+	 *
+	 * Two modes hide a label: "hide everywhere" (labelhiddenbyblockvisibility,
+	 * the label is not rendered at all) and per-viewport (the label is rendered
+	 * but carries a wp-block-hidden-{viewport} class that display:none's it on
+	 * that viewport). Either way the label is absent from the accessibility tree
+	 * where hidden, so the field needs an aria-label fallback to keep a name.
+	 *
+	 * The visibility control now only survives on the label block (see
+	 * FORMS-694), so this is the single place that decides "is the label hidden?"
+	 *
+	 * @return bool
+	 */
+	private function is_label_hidden_by_block_visibility() {
+		if ( $this->get_attribute( 'labelhiddenbyblockvisibility' ) ) {
+			return true;
+		}
+
+		return strpos( (string) $this->get_attribute( 'labelclasses' ), 'wp-block-hidden-' ) !== false;
+	}
+
+	/**
+	 * The accessible name to fall back to when the label is hidden by block
+	 * visibility. Prefers the label text (it matches what sighted users see on
+	 * viewports where the label is visible, for the per-viewport case) and only
+	 * falls back to the placeholder when there is no label. See FORMS-694.
+	 *
+	 * @param string $placeholder Optional placeholder to use when there is no label.
+	 * @return string
+	 */
+	private function get_block_visibility_aria_label( $placeholder = '' ) {
+		$label = Contact_Form_Plugin::strip_tags( (string) $this->get_attribute( 'label' ) );
+
+		return '' !== $label ? $label : (string) $placeholder;
+	}
+
 	/**
 	 * Return an aria-label attribute string for a grouped field's <fieldset>
-	 * when its legend label is fully hidden by block visibility.
+	 * when its legend label is hidden by block visibility (full or per-viewport).
 	 *
-	 * The render_legend_as_label() method returns '' on full-hide, which strips
-	 * the group's accessible name (a display:none/removed <legend> is dropped from
-	 * the a11y tree). This mirrors the single-input aria-label fallback in render_field()
-	 * so radio / checkbox-multiple / image-select / rating groups keep a name.
-	 * Returns '' (no attribute) when the legend is visible. See FORMS-694.
+	 * The render_legend_as_label() method drops the legend from the a11y tree
+	 * where hidden (returns '' on full-hide; display:none on the hidden viewport
+	 * otherwise), so the group would lose its name. This mirrors the single-input
+	 * aria-label fallback in render_field() for radio / checkbox-multiple /
+	 * image-select / rating. Returns '' (no attribute) when the legend is shown.
 	 *
-	 * @param string $label The field label.
 	 * @return string An ` aria-label='…' ` attribute, or '' when not hidden.
 	 */
-	private function get_hidden_legend_aria_label_attr( $label ) {
-		if ( ! $this->get_attribute( 'labelhiddenbyblockvisibility' ) ) {
+	private function get_hidden_legend_aria_label_attr() {
+		if ( ! $this->is_label_hidden_by_block_visibility() ) {
 			return '';
 		}
 
-		return " aria-label='" . esc_attr( Contact_Form_Plugin::strip_tags( $label ) ) . "'";
+		return " aria-label='" . esc_attr( $this->get_block_visibility_aria_label() ) . "'";
 	}
 
 	/**
@@ -963,9 +999,8 @@ public function render_input_field( $type, $id, $value, $class, $placeholder, $r
 			$extra_attrs_string .= " data-wp-on--keypress='actions.handleNumberKeyPress' ";
 		}
 
-		if ( $this->get_attribute( 'labelhiddenbyblockvisibility' ) ) {
-			$aria_label          = ! empty( $placeholder ) ? $placeholder : Contact_Form_Plugin::strip_tags( $this->get_attribute( 'label' ) );
-			$extra_attrs_string .= " aria-label='" . esc_attr( $aria_label ) . "' ";
+		if ( $this->is_label_hidden_by_block_visibility() ) {
+			$extra_attrs_string .= " aria-label='" . esc_attr( $this->get_block_visibility_aria_label( $placeholder ) ) . "' ";
 		}
 
 		return "<input
@@ -1215,8 +1250,8 @@ class="jetpack-field__input-element"
 					data-wp-class--has-value='context.phoneNumber'
 					data-wp-init="callbacks.registerPhoneInput"
 					data-wp-init--phone-field-custom-combobox="callbacks.initializePhoneFieldCustomComboBox"
-					<?php if ( $this->get_attribute( 'labelhiddenbyblockvisibility' ) ) { ?>
-						aria-label="<?php echo esc_attr( $this->get_attribute( 'label' ) ); ?>"
+					<?php if ( $this->is_label_hidden_by_block_visibility() ) { ?>
+						aria-label="<?php echo esc_attr( $this->get_block_visibility_aria_label() ); ?>"
 					<?php } ?>
 					/>
 				<input type="hidden"
@@ -1273,7 +1308,7 @@ public function render_textarea_field( $id, $label, $value, $class, $required, $
 		}
 
 		$field      = $this->render_label( 'textarea', 'contact-form-comment-' . $id, $label, $required, $required_field_text, array(), false, $required_indicator );
-		$aria_label = ! empty( $placeholder ) ? $placeholder : Contact_Form_Plugin::strip_tags( $this->get_attribute( 'label' ) );
+		$aria_label = $this->get_block_visibility_aria_label( $placeholder );
 		$field     .= "<textarea
 		                style='" . $this->field_styles . "'
 		                name='" . esc_attr( $id ) . "'
@@ -1286,7 +1321,7 @@ public function render_textarea_field( $id, $label, $value, $class, $required, $
 						aria-describedby='" . esc_attr( $id ) . "-textarea-error-message'
 						data-wp-bind--aria-invalid='state.fieldAriaInvalid'
 						"
-						. ( $this->get_attribute( 'labelhiddenbyblockvisibility' )
+						. ( $this->is_label_hidden_by_block_visibility()
 							? "aria-label='" . esc_attr( $aria_label ) . "'"
 							: '' )
 						. $class
@@ -1316,7 +1351,7 @@ public function render_radio_field( $id, $label, $value, $class, $required, $req
 		$options_styles    = $this->get_attribute( 'optionsstyles' );
 		$form_style        = $this->get_form_style();
 		$is_outlined_style = 'outlined' === $form_style;
-		$fieldset_id       = "id='" . esc_attr( "$id-label" ) . "'" . $this->get_hidden_legend_aria_label_attr( $label );
+		$fieldset_id       = "id='" . esc_attr( "$id-label" ) . "'" . $this->get_hidden_legend_aria_label_attr();
 
 		if ( $is_outlined_style ) {
 			$style_variation_attributes = $this->get_attribute( 'stylevariationattributes' );
@@ -1805,7 +1840,7 @@ public function render_checkbox_multiple_field( $id, $label, $value, $class, $re
 		 * any of the radio buttons in the group is selected, adding a required attribute directly to
 		 * a checkbox means that this specific checkbox must be checked.
 		 */
-		$fieldset_id = "id='" . esc_attr( "$id-label" ) . "'" . $this->get_hidden_legend_aria_label_attr( $label );
+		$fieldset_id = "id='" . esc_attr( "$id-label" ) . "'" . $this->get_hidden_legend_aria_label_attr();
 
 		if ( $is_outlined_style ) {
 			$style_variation_attributes = $this->get_attribute( 'stylevariationattributes' );
@@ -1945,7 +1980,7 @@ public function render_select_field( $id, $label, $value, $class, $required, $re
 		$aria_label = ! empty( $this->get_attribute( 'togglelabel' ) )
 			? Contact_Form_Plugin::strip_tags( $this->get_attribute( 'togglelabel' ) )
 			: __( 'Select an option', 'jetpack-forms' ); // selects don't have a default label
-		$field     .= "\t<span class='contact-form__select-element-wrapper'><select name='" . esc_attr( $id ) . "' id='" . esc_attr( $id ) . "' " . ( $required ? "required aria-required='true'" : '' ) . " data-wp-on--change='actions.onFieldChange' data-wp-bind--aria-invalid='state.fieldAriaInvalid' " . ( $this->get_attribute( 'labelhiddenbyblockvisibility' ) ? "aria-label='" . esc_attr( $aria_label ) . "'" : '' ) . ">\n";
+		$field     .= "\t<span class='contact-form__select-element-wrapper'><select name='" . esc_attr( $id ) . "' id='" . esc_attr( $id ) . "' " . ( $required ? "required aria-required='true'" : '' ) . " data-wp-on--change='actions.onFieldChange' data-wp-bind--aria-invalid='state.fieldAriaInvalid' " . ( $this->is_label_hidden_by_block_visibility() ? "aria-label='" . esc_attr( $this->get_block_visibility_aria_label( $aria_label ) ) . "'" : '' ) . ">\n";
 
 		if ( $this->get_attribute( 'togglelabel' ) ) {
 			$field .= "\t\t<option value=''>" . $this->get_attribute( 'togglelabel' ) . "</option>\n";
@@ -2140,7 +2175,7 @@ public function render_image_select_field( $id, $label, $value, $class, $require
 
 		$field = "<div class='jetpack-field jetpack-field-image-select'>";
 
-		$fieldset_id = "id='" . esc_attr( "$id-label" ) . "'" . $this->get_hidden_legend_aria_label_attr( $label );
+		$fieldset_id = "id='" . esc_attr( "$id-label" ) . "'" . $this->get_hidden_legend_aria_label_attr();
 
 		$field .= "<fieldset {$fieldset_id} data-wp-bind--aria-invalid='state.fieldAriaInvalid' >";
 
@@ -2996,7 +3031,7 @@ function ( $key, $value ) {
 			esc_attr( $this->field_classes ),
 			esc_attr( $id ),
 			$label_html,
-			$this->get_hidden_legend_aria_label_attr( $label )
+			$this->get_hidden_legend_aria_label_attr()
 		) . $this->get_error_div( $id, 'rating' );
 	}
 
diff --git a/projects/packages/forms/tests/php/contact-form/Contact_Form_Field_Test.php b/projects/packages/forms/tests/php/contact-form/Contact_Form_Field_Test.php
index dd29385c8de5..199181cad62f 100644
--- a/projects/packages/forms/tests/php/contact-form/Contact_Form_Field_Test.php
+++ b/projects/packages/forms/tests/php/contact-form/Contact_Form_Field_Test.php
@@ -323,4 +323,54 @@ public static function data_grouped_field_types() {
 			'rating'            => array( 'rating', array() ),
 		);
 	}
+
+	/**
+	 * Per-viewport hide: a grouped field whose legend label carries a
+	 * wp-block-hidden-{viewport} class is still rendered (display:none only on
+	 * that viewport), but the <fieldset> also gets an aria-label so the group
+	 * keeps an accessible name where the legend is hidden. See FORMS-694.
+	 */
+	public function test_render_grouped_field_per_viewport_hidden_legend_keeps_accessible_name() {
+		$field = $this->get_new_field_instance(
+			array(
+				'type'         => 'radio',
+				'id'           => 'test_group',
+				'label'        => 'Pick one',
+				'options'      => array( 'A', 'B' ),
+				'labelclasses' => 'wp-block-hidden-mobile',
+			)
+		);
+
+		$html = $field->render();
+
+		// The legend is still rendered (per-viewport is display:none, not removed)...
+		$this->assertStringContainsString( '<legend', $html );
+		$this->assertStringContainsString( 'wp-block-hidden-mobile', $html );
+		// ...and the accessible name is also on the fieldset for the hidden viewport.
+		$this->assertStringContainsString( "aria-label='Pick one'", $html );
+	}
+
+	/**
+	 * Per-viewport hide: a single input whose label carries a
+	 * wp-block-hidden-{viewport} class gets an aria-label (the label text, not the
+	 * placeholder) so it keeps an accessible name where the label is hidden. See
+	 * FORMS-694.
+	 */
+	public function test_render_input_per_viewport_hidden_label_keeps_accessible_name() {
+		$field = $this->get_new_field_instance(
+			array(
+				'type'         => 'text',
+				'id'           => 'test_text',
+				'label'        => 'Your name',
+				'placeholder'  => 'e.g. Jane',
+				'labelclasses' => 'wp-block-hidden-tablet',
+			)
+		);
+
+		$html = $field->render();
+
+		// The accessible name falls back to the label, matching the visible label.
+		$this->assertStringContainsString( "aria-label='Your name'", $html );
+		$this->assertStringNotContainsString( "aria-label='e.g. Jane'", $html );
+	}
 } // end class

From 6250c4f98a8b349c7c912fbf156a4ed2537a187f Mon Sep 17 00:00:00 2001
From: Christian Gastrell <cgastrell@gmail.com>
Date: Thu, 2 Jul 2026 10:17:11 -0300
Subject: [PATCH 12/14] =?UTF-8?q?Forms:=20address=20review=20nits=20?=
 =?UTF-8?q?=E2=80=94=20slider=20a11y,=20raw=20placeholder=20fallback,=20JS?=
 =?UTF-8?q?=20key,=20changelog?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Follow-up to the review on #49973 (FORMS-694):

- Slider: the bare <input type="range"> was the one single input missing the
  hidden-label aria-label fallback; add it.
- Lift the input aria-label logic into a shared get_hidden_label_aria_label_attr()
  helper used by every path (input, phone, textarea, select, slider, legend) so
  none get skipped again. The fallback now takes the raw placeholder (not the
  pre-built placeholder='…' fragment), so an empty-label field no longer renders
  aria-label="placeholder='…'", and the attribute is omitted entirely when there
  is no label and no placeholder (no empty aria-label).
- label/index.js: match the PHP fix — blockVisibility -> visibility support key.
- Changelog: drop the redundant "Forms:" prefix.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 ...fix-forms-disable-field-visibility-control |  2 +-
 .../packages/forms/src/blocks/label/index.js  |  4 +-
 .../contact-form/class-contact-form-field.php | 72 +++++++++++--------
 .../contact-form/Contact_Form_Field_Test.php  | 41 +++++++++++
 4 files changed, 86 insertions(+), 33 deletions(-)

diff --git a/projects/packages/forms/changelog/fix-forms-disable-field-visibility-control b/projects/packages/forms/changelog/fix-forms-disable-field-visibility-control
index 6a28348cb1c0..a082a48e4aa7 100644
--- a/projects/packages/forms/changelog/fix-forms-disable-field-visibility-control
+++ b/projects/packages/forms/changelog/fix-forms-disable-field-visibility-control
@@ -1,4 +1,4 @@
 Significance: patch
 Type: fixed
 
-Forms: Disable the block visibility control on form field, input, and choice/option blocks, where the per-viewport "Hide on…" option was not honored on the frontend. Fields still honor a saved "Hide everywhere" (removing the field entirely, which keeps required fields safe) regardless of WordPress version. Labels keep their visibility support and now honor the per-viewport "Hide on…" option too, and grouped fields whose legend label is hidden keep an accessible name.
+Disable the block visibility control on form field, input, and choice/option blocks, where the per-viewport "Hide on…" option was not honored on the frontend. Fields still honor a saved "Hide everywhere" (removing the field entirely, which keeps required fields safe) regardless of WordPress version. Labels keep their visibility support and now honor the per-viewport "Hide on…" option too, and fields whose label is hidden keep an accessible name.
diff --git a/projects/packages/forms/src/blocks/label/index.js b/projects/packages/forms/src/blocks/label/index.js
index f51b078aad6b..1f8709f704be 100644
--- a/projects/packages/forms/src/blocks/label/index.js
+++ b/projects/packages/forms/src/blocks/label/index.js
@@ -53,7 +53,9 @@ const settings = {
 				fontSize: true,
 			},
 		},
-		blockVisibility: true,
+		// The real support key is `visibility`, not `blockVisibility` (that's the
+		// per-instance saved attribute); mirrors the PHP registration. FORMS-694.
+		visibility: true,
 	},
 	attributes: {
 		label: {
diff --git a/projects/packages/forms/src/contact-form/class-contact-form-field.php b/projects/packages/forms/src/contact-form/class-contact-form-field.php
index f78fe0eff2f3..59672b939333 100644
--- a/projects/packages/forms/src/contact-form/class-contact-form-field.php
+++ b/projects/packages/forms/src/contact-form/class-contact-form-field.php
@@ -886,35 +886,51 @@ private function is_label_hidden_by_block_visibility() {
 	 * The accessible name to fall back to when the label is hidden by block
 	 * visibility. Prefers the label text (it matches what sighted users see on
 	 * viewports where the label is visible, for the per-viewport case) and only
-	 * falls back to the placeholder when there is no label. See FORMS-694.
+	 * falls back to a secondary name when there is no label. See FORMS-694.
 	 *
-	 * @param string $placeholder Optional placeholder to use when there is no label.
+	 * @param string|null $fallback Secondary name to use when there is no label.
+	 *                              Must be a raw string, not a built attribute
+	 *                              fragment. Defaults to the raw placeholder.
 	 * @return string
 	 */
-	private function get_block_visibility_aria_label( $placeholder = '' ) {
+	private function get_block_visibility_aria_label( $fallback = null ) {
 		$label = Contact_Form_Plugin::strip_tags( (string) $this->get_attribute( 'label' ) );
+		if ( '' !== $label ) {
+			return $label;
+		}
+
+		if ( null === $fallback ) {
+			$fallback = $this->get_attribute( 'placeholder' );
+		}
 
-		return '' !== $label ? $label : (string) $placeholder;
+		return Contact_Form_Plugin::strip_tags( (string) $fallback );
 	}
 
 	/**
-	 * Return an aria-label attribute string for a grouped field's <fieldset>
-	 * when its legend label is hidden by block visibility (full or per-viewport).
+	 * Return an ` aria-label='…'` attribute string when the field's label is
+	 * hidden by block visibility (full or per-viewport), or '' otherwise.
 	 *
-	 * The render_legend_as_label() method drops the legend from the a11y tree
-	 * where hidden (returns '' on full-hide; display:none on the hidden viewport
-	 * otherwise), so the group would lose its name. This mirrors the single-input
-	 * aria-label fallback in render_field() for radio / checkbox-multiple /
-	 * image-select / rating. Returns '' (no attribute) when the legend is shown.
+	 * A hidden label (removed on full-hide, display:none per-viewport) is absent
+	 * from the a11y tree, so every field that renders its own label — single
+	 * inputs and the grouped <fieldset> legend alike — needs this fallback to
+	 * keep an accessible name. Shared by all paths so none get missed. The
+	 * attribute is skipped when there is no name to give. See FORMS-694.
 	 *
-	 * @return string An ` aria-label='…' ` attribute, or '' when not hidden.
+	 * @param string|null $fallback Secondary name when there is no label (raw
+	 *                              string, not a built attribute fragment).
+	 * @return string
 	 */
-	private function get_hidden_legend_aria_label_attr() {
+	private function get_hidden_label_aria_label_attr( $fallback = null ) {
 		if ( ! $this->is_label_hidden_by_block_visibility() ) {
 			return '';
 		}
 
-		return " aria-label='" . esc_attr( $this->get_block_visibility_aria_label() ) . "'";
+		$name = $this->get_block_visibility_aria_label( $fallback );
+		if ( '' === $name ) {
+			return '';
+		}
+
+		return " aria-label='" . esc_attr( $name ) . "'";
 	}
 
 	/**
@@ -999,9 +1015,7 @@ public function render_input_field( $type, $id, $value, $class, $placeholder, $r
 			$extra_attrs_string .= " data-wp-on--keypress='actions.handleNumberKeyPress' ";
 		}
 
-		if ( $this->is_label_hidden_by_block_visibility() ) {
-			$extra_attrs_string .= " aria-label='" . esc_attr( $this->get_block_visibility_aria_label( $placeholder ) ) . "' ";
-		}
+		$extra_attrs_string .= $this->get_hidden_label_aria_label_attr();
 
 		return "<input
 					type='" . esc_attr( $type ) . "'
@@ -1250,9 +1264,7 @@ class="jetpack-field__input-element"
 					data-wp-class--has-value='context.phoneNumber'
 					data-wp-init="callbacks.registerPhoneInput"
 					data-wp-init--phone-field-custom-combobox="callbacks.initializePhoneFieldCustomComboBox"
-					<?php if ( $this->is_label_hidden_by_block_visibility() ) { ?>
-						aria-label="<?php echo esc_attr( $this->get_block_visibility_aria_label() ); ?>"
-					<?php } ?>
+					<?php echo $this->get_hidden_label_aria_label_attr(); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- attribute value is escaped in the helper. ?>
 					/>
 				<input type="hidden"
 					id="<?php echo esc_attr( $id ); ?>"
@@ -1307,9 +1319,8 @@ public function render_textarea_field( $id, $label, $value, $class, $required, $
 			$value = '';
 		}
 
-		$field      = $this->render_label( 'textarea', 'contact-form-comment-' . $id, $label, $required, $required_field_text, array(), false, $required_indicator );
-		$aria_label = $this->get_block_visibility_aria_label( $placeholder );
-		$field     .= "<textarea
+		$field  = $this->render_label( 'textarea', 'contact-form-comment-' . $id, $label, $required, $required_field_text, array(), false, $required_indicator );
+		$field .= "<textarea
 		                style='" . $this->field_styles . "'
 		                name='" . esc_attr( $id ) . "'
 		                id='contact-form-comment-" . esc_attr( $id ) . "'
@@ -1321,9 +1332,7 @@ public function render_textarea_field( $id, $label, $value, $class, $required, $
 						aria-describedby='" . esc_attr( $id ) . "-textarea-error-message'
 						data-wp-bind--aria-invalid='state.fieldAriaInvalid'
 						"
-						. ( $this->is_label_hidden_by_block_visibility()
-							? "aria-label='" . esc_attr( $aria_label ) . "'"
-							: '' )
+						. $this->get_hidden_label_aria_label_attr()
 						. $class
 						. $placeholder
 						. ' ' . ( $required ? "required aria-required='true'" : '' ) .
@@ -1351,7 +1360,7 @@ public function render_radio_field( $id, $label, $value, $class, $required, $req
 		$options_styles    = $this->get_attribute( 'optionsstyles' );
 		$form_style        = $this->get_form_style();
 		$is_outlined_style = 'outlined' === $form_style;
-		$fieldset_id       = "id='" . esc_attr( "$id-label" ) . "'" . $this->get_hidden_legend_aria_label_attr();
+		$fieldset_id       = "id='" . esc_attr( "$id-label" ) . "'" . $this->get_hidden_label_aria_label_attr();
 
 		if ( $is_outlined_style ) {
 			$style_variation_attributes = $this->get_attribute( 'stylevariationattributes' );
@@ -1840,7 +1849,7 @@ public function render_checkbox_multiple_field( $id, $label, $value, $class, $re
 		 * any of the radio buttons in the group is selected, adding a required attribute directly to
 		 * a checkbox means that this specific checkbox must be checked.
 		 */
-		$fieldset_id = "id='" . esc_attr( "$id-label" ) . "'" . $this->get_hidden_legend_aria_label_attr();
+		$fieldset_id = "id='" . esc_attr( "$id-label" ) . "'" . $this->get_hidden_label_aria_label_attr();
 
 		if ( $is_outlined_style ) {
 			$style_variation_attributes = $this->get_attribute( 'stylevariationattributes' );
@@ -1980,7 +1989,7 @@ public function render_select_field( $id, $label, $value, $class, $required, $re
 		$aria_label = ! empty( $this->get_attribute( 'togglelabel' ) )
 			? Contact_Form_Plugin::strip_tags( $this->get_attribute( 'togglelabel' ) )
 			: __( 'Select an option', 'jetpack-forms' ); // selects don't have a default label
-		$field     .= "\t<span class='contact-form__select-element-wrapper'><select name='" . esc_attr( $id ) . "' id='" . esc_attr( $id ) . "' " . ( $required ? "required aria-required='true'" : '' ) . " data-wp-on--change='actions.onFieldChange' data-wp-bind--aria-invalid='state.fieldAriaInvalid' " . ( $this->is_label_hidden_by_block_visibility() ? "aria-label='" . esc_attr( $this->get_block_visibility_aria_label( $aria_label ) ) . "'" : '' ) . ">\n";
+		$field     .= "\t<span class='contact-form__select-element-wrapper'><select name='" . esc_attr( $id ) . "' id='" . esc_attr( $id ) . "' " . ( $required ? "required aria-required='true'" : '' ) . " data-wp-on--change='actions.onFieldChange' data-wp-bind--aria-invalid='state.fieldAriaInvalid' " . $this->get_hidden_label_aria_label_attr( $aria_label ) . ">\n";
 
 		if ( $this->get_attribute( 'togglelabel' ) ) {
 			$field .= "\t\t<option value=''>" . $this->get_attribute( 'togglelabel' ) . "</option>\n";
@@ -2175,7 +2184,7 @@ public function render_image_select_field( $id, $label, $value, $class, $require
 
 		$field = "<div class='jetpack-field jetpack-field-image-select'>";
 
-		$fieldset_id = "id='" . esc_attr( "$id-label" ) . "'" . $this->get_hidden_legend_aria_label_attr();
+		$fieldset_id = "id='" . esc_attr( "$id-label" ) . "'" . $this->get_hidden_label_aria_label_attr();
 
 		$field .= "<fieldset {$fieldset_id} data-wp-bind--aria-invalid='state.fieldAriaInvalid' >";
 
@@ -3031,7 +3040,7 @@ function ( $key, $value ) {
 			esc_attr( $this->field_classes ),
 			esc_attr( $id ),
 			$label_html,
-			$this->get_hidden_legend_aria_label_attr()
+			$this->get_hidden_label_aria_label_attr()
 		) . $this->get_error_div( $id, 'rating' );
 	}
 
@@ -3110,6 +3119,7 @@ class="<?php echo esc_attr( trim( $class . ' jetpack-field-slider__range' ) ); ?
 					data-wp-bind--value="state.getSliderValue"
 					data-wp-on--input="actions.onSliderChange"
 					data-wp-bind--aria-invalid="state.fieldAriaInvalid"
+					<?php echo $this->get_hidden_label_aria_label_attr(); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- attribute value is escaped in the helper. ?>
 				/>
 				<div
 					class="jetpack-field-slider__value-indicator"
diff --git a/projects/packages/forms/tests/php/contact-form/Contact_Form_Field_Test.php b/projects/packages/forms/tests/php/contact-form/Contact_Form_Field_Test.php
index 199181cad62f..9507c4100b26 100644
--- a/projects/packages/forms/tests/php/contact-form/Contact_Form_Field_Test.php
+++ b/projects/packages/forms/tests/php/contact-form/Contact_Form_Field_Test.php
@@ -373,4 +373,45 @@ public function test_render_input_per_viewport_hidden_label_keeps_accessible_nam
 		$this->assertStringContainsString( "aria-label='Your name'", $html );
 		$this->assertStringNotContainsString( "aria-label='e.g. Jane'", $html );
 	}
+
+	/**
+	 * The slider's <input type="range"> gets the hidden-label aria-label fallback
+	 * too — it renders a bare range input with no other accessible name. See
+	 * FORMS-694.
+	 */
+	public function test_render_slider_hidden_label_keeps_accessible_name() {
+		$field = $this->get_new_field_instance(
+			array(
+				'type'                         => 'slider',
+				'id'                           => 'test_slider',
+				'label'                        => 'Rate us',
+				'labelhiddenbyblockvisibility' => true,
+			)
+		);
+
+		$html = $field->render();
+
+		$this->assertStringContainsString( 'type="range"', $html );
+		$this->assertStringContainsString( "aria-label='Rate us'", $html );
+	}
+
+	/**
+	 * When the label is hidden but empty and there is no placeholder, no
+	 * aria-label attribute is emitted (rather than an empty or fragment value).
+	 * See FORMS-694.
+	 */
+	public function test_render_input_hidden_empty_label_emits_no_aria_label() {
+		$field = $this->get_new_field_instance(
+			array(
+				'type'                         => 'text',
+				'id'                           => 'test_text',
+				'label'                        => '',
+				'labelhiddenbyblockvisibility' => true,
+			)
+		);
+
+		$html = $field->render();
+
+		$this->assertStringNotContainsString( 'aria-label', $html );
+	}
 } // end class

From 3dff8d4bd6e4022254455b716037874052a1beeb Mon Sep 17 00:00:00 2001
From: Christian Gastrell <cgastrell@gmail.com>
Date: Thu, 2 Jul 2026 12:15:37 -0300
Subject: [PATCH 13/14] Forms: give the file upload dropzone a distinct
 accessible name when its label is hidden
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Follow-up to the review on #49973 (FORMS-694). The file field's dropzone
<div role="button"> is the interactive control, but its accessible name is
otherwise the generic "Select a file to upload.", so two upload fields whose
labels are hidden are announced identically.

Prefix the field name onto the dropzone's aria-label when the label is hidden
(full or per-viewport), reusing the shared block-visibility name resolver — the
same fallback the other single inputs got. Extracted into
get_file_dropzone_aria_label() so it's unit-testable (the full file render
short-circuits without an active Jetpack).

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .../contact-form/class-contact-form-field.php | 36 ++++++++++++-
 .../contact-form/Contact_Form_Field_Test.php  | 53 +++++++++++++++++++
 2 files changed, 88 insertions(+), 1 deletion(-)

diff --git a/projects/packages/forms/src/contact-form/class-contact-form-field.php b/projects/packages/forms/src/contact-form/class-contact-form-field.php
index 59672b939333..8302e7cf22ca 100644
--- a/projects/packages/forms/src/contact-form/class-contact-form-field.php
+++ b/projects/packages/forms/src/contact-form/class-contact-form-field.php
@@ -933,6 +933,38 @@ private function get_hidden_label_aria_label_attr( $fallback = null ) {
 		return " aria-label='" . esc_attr( $name ) . "'";
 	}
 
+	/**
+	 * Accessible name for the file field's dropzone <div role="button">.
+	 *
+	 * The dropzone is the field's interactive control, but its name is otherwise
+	 * the generic "Select a file to upload.", so two hidden-label upload fields
+	 * would be announced identically. When the label is hidden (full or
+	 * per-viewport), prefix the field name — the same fallback the other single
+	 * inputs use. Falls back to the plain instruction when the label is visible
+	 * or there is no name to give. See FORMS-694.
+	 *
+	 * @return string
+	 */
+	private function get_file_dropzone_aria_label() {
+		$select_file_text = __( 'Select a file to upload.', 'jetpack-forms' );
+
+		if ( ! $this->is_label_hidden_by_block_visibility() ) {
+			return $select_file_text;
+		}
+
+		$hidden_name = $this->get_block_visibility_aria_label();
+		if ( '' === $hidden_name ) {
+			return $select_file_text;
+		}
+
+		return sprintf(
+			/* translators: 1: the form field's label, 2: the "Select a file to upload." instruction. */
+			_x( '%1$s: %2$s', 'file upload field accessible name', 'jetpack-forms' ),
+			$hidden_name,
+			$select_file_text
+		);
+	}
+
 	/**
 	 * Return the HTML for a legend that shares the same style as a label.
 	 *
@@ -1704,6 +1736,8 @@ private function render_file_field( $id, $label, $class, $required, $required_fi
 
 		$field = $this->render_label( 'file', $id, $label, $required, $required_field_text, array(), true, $required_indicator );
 
+		$dropzone_aria_label = $this->get_file_dropzone_aria_label();
+
 		ob_start();
 		?>
 		<div
@@ -1721,7 +1755,7 @@ class="jetpack-form-file-field__container"
 			data-is-required="<?php echo esc_attr( $required ); ?>"
 		>
 			<div class="jetpack-form-file-field__dropzone" data-wp-class--is-dropping="context.isDropping" data-wp-class--is-hidden="state.hasMaxFiles">
-				<div class="jetpack-form-file-field__dropzone-inner" data-wp-on--click="actions.openFilePicker" data-wp-on--keydown="actions.handleKeyDown" tabindex="0" role="button" aria-label="<?php esc_attr_e( 'Select a file to upload.', 'jetpack-forms' ); ?>"></div>
+				<div class="jetpack-form-file-field__dropzone-inner" data-wp-on--click="actions.openFilePicker" data-wp-on--keydown="actions.handleKeyDown" tabindex="0" role="button" aria-label="<?php echo esc_attr( $dropzone_aria_label ); ?>"></div>
 				<?php // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Content is intentionally unescaped as it contains block content that was previously escaped ?>
 				<?php echo html_entity_decode( $this->content, ENT_COMPAT, 'UTF-8' ); ?>
 				<input
diff --git a/projects/packages/forms/tests/php/contact-form/Contact_Form_Field_Test.php b/projects/packages/forms/tests/php/contact-form/Contact_Form_Field_Test.php
index 9507c4100b26..61cfe2f7f414 100644
--- a/projects/packages/forms/tests/php/contact-form/Contact_Form_Field_Test.php
+++ b/projects/packages/forms/tests/php/contact-form/Contact_Form_Field_Test.php
@@ -414,4 +414,57 @@ public function test_render_input_hidden_empty_label_emits_no_aria_label() {
 
 		$this->assertStringNotContainsString( 'aria-label', $html );
 	}
+
+	/**
+	 * The file field's dropzone button gets a distinct accessible name when its
+	 * label is hidden (field label prefixed to the instruction) so two
+	 * hidden-label upload fields aren't announced identically, and falls back to
+	 * the plain instruction otherwise. Tested directly because the full file
+	 * render short-circuits without an active Jetpack. See FORMS-694.
+	 *
+	 * @dataProvider data_file_dropzone_aria_label
+	 *
+	 * @param array  $atts     Field attributes.
+	 * @param string $expected Expected dropzone accessible name.
+	 */
+	#[DataProvider( 'data_file_dropzone_aria_label' )]
+	public function test_file_dropzone_aria_label( $atts, $expected ) {
+		$field  = $this->get_new_field_instance( array_merge( array( 'type' => 'file' ), $atts ) );
+		$method = new \ReflectionMethod( $field, 'get_file_dropzone_aria_label' );
+		$method->setAccessible( true );
+
+		$this->assertSame( $expected, $method->invoke( $field ) );
+	}
+
+	/**
+	 * Data provider for test_file_dropzone_aria_label.
+	 *
+	 * @return array
+	 */
+	public static function data_file_dropzone_aria_label() {
+		return array(
+			'visible label'          => array( array( 'label' => 'Resume' ), 'Select a file to upload.' ),
+			'full-hidden label'      => array(
+				array(
+					'label'                        => 'Resume',
+					'labelhiddenbyblockvisibility' => true,
+				),
+				'Resume: Select a file to upload.',
+			),
+			'per-viewport hidden'    => array(
+				array(
+					'label'        => 'Resume',
+					'labelclasses' => 'wp-block-hidden-mobile',
+				),
+				'Resume: Select a file to upload.',
+			),
+			'hidden but empty label' => array(
+				array(
+					'label'                        => '',
+					'labelhiddenbyblockvisibility' => true,
+				),
+				'Select a file to upload.',
+			),
+		);
+	}
 } // end class

From 8e2ad73c08539612620bc3fb44823f02193ca4eb Mon Sep 17 00:00:00 2001
From: Christian Gastrell <cgastrell@gmail.com>
Date: Thu, 2 Jul 2026 13:08:29 -0300
Subject: [PATCH 14/14] Forms: fix PHP 8.5 test failure and cover the other
 aria-label render paths

- ReflectionMethod::setAccessible() is deprecated on PHP 8.5 (a no-op since
  8.1), and the forms suite fails the build on deprecations, so the file
  dropzone test broke CI on 8.5. Guard the call with PHP_VERSION_ID < 80100,
  matching the existing pattern in Contact_Form_Block_Test.
- Add render tests exercising the hidden-label aria-label fallback through the
  textarea, select and country-selector phone paths (the remaining changed
  lines that weren't covered), which also verifies the fix across those types.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .../contact-form/Contact_Form_Field_Test.php  | 48 ++++++++++++++++++-
 1 file changed, 47 insertions(+), 1 deletion(-)

diff --git a/projects/packages/forms/tests/php/contact-form/Contact_Form_Field_Test.php b/projects/packages/forms/tests/php/contact-form/Contact_Form_Field_Test.php
index 61cfe2f7f414..a4c0bcd33072 100644
--- a/projects/packages/forms/tests/php/contact-form/Contact_Form_Field_Test.php
+++ b/projects/packages/forms/tests/php/contact-form/Contact_Form_Field_Test.php
@@ -431,7 +431,9 @@ public function test_render_input_hidden_empty_label_emits_no_aria_label() {
 	public function test_file_dropzone_aria_label( $atts, $expected ) {
 		$field  = $this->get_new_field_instance( array_merge( array( 'type' => 'file' ), $atts ) );
 		$method = new \ReflectionMethod( $field, 'get_file_dropzone_aria_label' );
-		$method->setAccessible( true );
+		if ( PHP_VERSION_ID < 80100 ) {
+			$method->setAccessible( true );
+		}
 
 		$this->assertSame( $expected, $method->invoke( $field ) );
 	}
@@ -467,4 +469,48 @@ public static function data_file_dropzone_aria_label() {
 			),
 		);
 	}
+
+	/**
+	 * The hidden-label aria-label fallback reaches the other single-input render
+	 * paths too — textarea, select and the country-selector phone input each move
+	 * the label onto the control when it's hidden. See FORMS-694.
+	 *
+	 * @dataProvider data_single_input_render_paths
+	 *
+	 * @param array $atts Field attributes (type plus anything needed to render).
+	 */
+	#[DataProvider( 'data_single_input_render_paths' )]
+	public function test_render_single_input_hidden_label_keeps_accessible_name( $atts ) {
+		$hidden = $this->get_new_field_instance(
+			array_merge( array( 'label' => 'Your name' ), $atts, array( 'labelhiddenbyblockvisibility' => true ) )
+		);
+		$this->assertStringContainsString( "aria-label='Your name'", $hidden->render() );
+
+		// And no stray aria-label when the label is visible.
+		$shown = $this->get_new_field_instance( array_merge( array( 'label' => 'Your name' ), $atts ) );
+		$this->assertStringNotContainsString( "aria-label='Your name'", $shown->render() );
+	}
+
+	/**
+	 * Data provider for test_render_single_input_hidden_label_keeps_accessible_name.
+	 *
+	 * @return array
+	 */
+	public static function data_single_input_render_paths() {
+		return array(
+			'textarea'          => array( array( 'type' => 'textarea' ) ),
+			'select'            => array(
+				array(
+					'type'    => 'select',
+					'options' => array( 'A', 'B' ),
+				),
+			),
+			'phone w/ selector' => array(
+				array(
+					'type'                => 'phone',
+					'showcountryselector' => true,
+				),
+			),
+		);
+	}
 } // end class