Forms: Set consent block to not required when using implicit mode (#46443)

* changelog

* exclude implicit consent blocks from required watcher

* change consent block to force not required on implicit mode

* fix wrong attribute check

* add required setting for terms consent field

* add required block controls for terms consent field. Extend toolbar functionality to disable the button and provide an explanation for being disabled

Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/20956327835

Upstream-Ref: Automattic/jetpack@28959d2

Author: CGastrell

jetpack_vendor/automattic/jetpack-forms/CHANGELOG.md

@@ -17,6 +17,7 @@ This is an alpha version! The changes listed here are not final.
 - Update package dependencies.
 
 ### Fixed
+- Consent block: automatically set required to false when consent type is implicit
 - Forms: fix dashboard routing on wpcom.
 
 ## [7.3.0] - 2026-01-12

jetpack_vendor/automattic/jetpack-forms/dist/blocks/editor.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array('jetpack-connection', 'jetpack-script-data', 'lodash', 'react', 'react-jsx-runtime', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-dom-ready', 'wp-editor', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-jp-i18n-loader', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-primitives', 'wp-url'), 'version' => '2833638571620141c23e');
+<?php return array('dependencies' => array('jetpack-connection', 'jetpack-script-data', 'lodash', 'react', 'react-jsx-runtime', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-dom-ready', 'wp-editor', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-jp-i18n-loader', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-primitives', 'wp-url'), 'version' => 'a6321396bb8add9aa94d');

jetpack_vendor/automattic/jetpack-forms/dist/blocks/editor.js

@@ -110,7 +110,12 @@ const isInputWithRequiredField = ( fullName?: string ): boolean => {
 	// TS is inferring the type wrong. Fix is to update childBlocks to TS with types.
 	const hasRequired = field && field?.settings?.attributes?.required !== undefined;
 	const isHidden = field?.name === 'field-hidden';
-	return hasRequired && ! isHidden;
+	const isImplicitConsent =
+		field?.name === 'field-consent' &&
+		// @ts-expect-error: childBlocks are defined in JS without explicit types.
+		// TS is inferring the type wrong. Fix is to update childBlocks to TS with types.
+		field?.settings?.attributes?.consentType !== 'explicit';
+	return hasRequired && ! isHidden && ! isImplicitConsent;
 };
 
 type CustomThankyouType =

jetpack_vendor/automattic/jetpack-forms/src/blocks/contact-form/edit.tsx

@@ -1412,19 +1412,20 @@ private function render_consent_field( $id, $class ) {
 		$consent_message               = 'explicit' === $consent_type ? $this->get_attribute( 'explicitconsentmessage' ) : $this->get_attribute( 'implicitconsentmessage' );
 		$label_class                   = 'grunion-field-label consent consent-' . esc_attr( $consent_type );
 		$label_class                  .= $this->option_classes ? ' ' . $this->option_classes : '';
+		$label_class                  .= $this->is_error() ? ' form-error' : '';
 		$has_inner_block_option_styles = ! empty( $this->get_attribute( 'optionstyles' ) );
 
 		$field = "<label class='" . esc_attr( $label_class ) . "' style='" . esc_attr( $this->label_styles ) . ( $has_inner_block_option_styles ? esc_attr( $this->option_styles ) : '' ) . "'>";
 
 		if ( 'implicit' === $consent_type ) {
 			$field .= "\t\t<input type='hidden' name='" . esc_attr( $id ) . "' value='" . esc_attr__( 'Yes', 'jetpack-forms' ) . "' /> \n";
 		} else {
-			$field .= "\t\t<input type='checkbox' name='" . esc_attr( $id ) . "' value='" . esc_attr__( 'Yes', 'jetpack-forms' ) . "' " . $class . "/> \n";
+			$field .= "\t\t<input type='checkbox' data-wp-on--change='actions.onFieldChange' name='" . esc_attr( $id ) . "' value='" . esc_attr__( 'Yes', 'jetpack-forms' ) . "' " . $class . "/> \n";
 		}
 		$field .= "\t\t" . wp_kses_post( $consent_message );
 		$field .= "</label>\n";
 		$field .= "<div class='clear-form'></div>\n";
-		return $field;
+		return $field . $this->get_error_div( $id, 'checkbox' );
 	}
 
 	/**

jetpack_vendor/automattic/jetpack-forms/src/contact-form/class-contact-form-field.php

@@ -66,7 +66,7 @@
     ),
     'jetpack-forms' => array(
       'path' => 'jetpack_vendor/automattic/jetpack-forms',
-      'ver' => '7.4.0-alpha1768248146',
+      'ver' => '7.4.0-alpha1768306492',
     ),
     'jetpack-image-cdn' => array(
       'path' => 'jetpack_vendor/automattic/jetpack-image-cdn',