Add aria-describedby attribute where missing for fields with error

classes/controllers/FrmFieldsController.php

@@ -546,13 +546,20 @@ public static function input_html( $field, $echo = true ) {
 		self::add_pattern_attribute( $field, $add_html );
 
 		$add_html = apply_filters( 'frm_field_extra_html', $add_html, $field );
-		$add_html = ' ' . implode( ' ', $add_html ) . '  ';
+		$html     = ' ' . implode( ' ', $add_html ) . '  ';
+
+		unset( $add_html );
+
+		if ( isset( $field['args'] ) ) {
+			$field_object = FrmFieldFactory::get_field_type( FrmField::get_field_type( $field ), $field );
+			$field_object->add_aria_description( $field['args'], $html );
+		}
 
 		if ( $echo ) {
-			echo $add_html; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+			echo $html; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 		}
 
-		return $add_html;
+		return $html;
 	}
 
 	/**

classes/models/FrmFieldFormHtml.php

@@ -286,16 +286,27 @@ private function replace_error_shortcode() {
 		$this->maybe_add_error_id();
 		$error = $this->pass_args['errors'][ 'field' . $this->field_id ] ?? false;
 
-		if ( ! empty( $error ) && ! str_contains( $this->html, 'role="alert"' ) && FrmAppHelper::should_include_alert_role_on_field_errors() ) {
+		if ( empty( $error ) ) {
+			FrmShortcodeHelper::remove_inline_conditions( false, 'error', $error, $this->html );
+
+			return;
+		}
+
+		$include_alert_role_on_field_errors = FrmAppHelper::should_include_alert_role_on_field_errors();
+		$has_alert_role                     = str_contains( $this->html, 'role="alert"' );
+
+		if ( ! $has_alert_role && $include_alert_role_on_field_errors ) {
 			$error_body = self::get_error_body( $this->html );
 
 			if ( is_string( $error_body ) && ! str_contains( $error_body, 'role=' ) ) {
 				$new_error_body = preg_replace( '/class="frm_error/', 'role="alert" class="frm_error', $error_body, 1 );
 				$this->html     = str_replace( '[if error]' . $error_body . '[/if error]', '[if error]' . $new_error_body . '[/if error]', $this->html );
 			}
+		} elseif ( ! $include_alert_role_on_field_errors && $has_alert_role ) {
+			$this->html = str_replace( 'role="alert"', '', $this->html );
 		}
 
-		FrmShortcodeHelper::remove_inline_conditions( ! empty( $error ), 'error', $error, $this->html );
+		FrmShortcodeHelper::remove_inline_conditions( true, 'error', $error, $this->html );
 	}
 
 	/**

classes/models/fields/FrmFieldType.php

@@ -1537,16 +1537,17 @@ protected function get_field_input_html_hook( $field ) {
 	}
 
 	/**
-	 * Link input to field description for screen readers
+	 * Link input to field description for screen readers.
 	 *
 	 * @since 3.0
+	 * @since x.x Function privacy changed from `protected` to `public`.
 	 *
 	 * @param array  $args
 	 * @param string $input_html
 	 *
 	 * @return void
 	 */
-	protected function add_aria_description( $args, &$input_html ) {
+	public function add_aria_description( $args, &$input_html ) {
 		$aria_describedby_exists = preg_match_all( '/aria-describedby=\"([^\"]*)\"/', $input_html, $matches ) === 1;
 
 		$describedby = $aria_describedby_exists ? preg_split( '/\s+/', esc_attr( trim( $matches[1][0] ) ) ) : array();

classes/views/frm-fields/front-end/checkbox-field.php

@@ -8,6 +8,12 @@
  * Extra line breaks show as space on the front-end when
  * the form is double filtered and not minimized.
  *
+ * @var array      $field
+ * @var string     $field_name
+ * @var bool       $read_only
+ * @var string     $html_id
+ * @var array|null $args
+ *
  * @phpcs:disable Generic.WhiteSpace.ScopeIndent
  */
 
@@ -68,6 +74,9 @@
 		?><input type="checkbox" name="<?php echo esc_attr( $field_name ); ?>[<?php echo esc_attr( $other_opt ? $opt_key : '' ); ?>]" id="<?php echo esc_attr( $html_id ); ?>-<?php echo esc_attr( $opt_key ); ?>" value="<?php echo esc_attr( $field_val ); ?>"<?php
 		echo $checked . ' '; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 
+		if ( isset( $args ) ) {
+			$field['args'] = $args;
+		}
 		do_action( 'frm_field_input_html', $field );
 
 		if ( 0 === $option_index && FrmField::is_required( $field ) ) {

classes/views/frm-fields/front-end/dropdown-field.php

@@ -22,7 +22,12 @@
 	if ( $read_only ) {
 		?>
 		<select <?php do_action( 'frm_field_input_html', $field ); ?>>
-	<?php } else { ?>
+		<?php
+	} else {
+		if ( isset( $args ) ) {
+			$field['args'] = $args;
+		}
+		?>
 		<select name="<?php echo esc_attr( $field_name ); ?>" id="<?php echo esc_attr( $html_id ); ?>" <?php do_action( 'frm_field_input_html', $field ); ?>>
 		<?php
 	}

classes/views/frm-fields/front-end/radio-field.php

@@ -8,6 +8,12 @@
  * Extra line breaks show as space on the front-end when
  * the form is double filtered and not minimized.
  *
+ * @var array      $field
+ * @var string     $field_name
+ * @var bool       $read_only
+ * @var string     $html_id
+ * @var array|null $args
+ *
  * @phpcs:disable Generic.WhiteSpace.ScopeIndent
  */
 
@@ -56,6 +62,10 @@
 		<input type="radio" name="<?php echo esc_attr( $field_name ); ?>" id="<?php echo esc_attr( $html_id . '-' . $opt_key ); ?>" value="<?php echo esc_attr( $field_val ); ?>"
 		<?php
 		echo $checked . ' '; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+
+		if ( isset( $args ) ) {
+			$field['args'] = $args;
+		}
 		do_action( 'frm_field_input_html', $field );
 		?>/><?php