Forms: fix single input general error (#45796)

* changelog

* use field error for form error when single input form

Author: CGastrell

projects/packages/forms/changelog/fix-forms-single-input-general-error

@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Forms: single input forms don't show general errors, move general form error into field error when necessary

projects/packages/forms/src/contact-form/class-contact-form.php

@@ -806,6 +806,7 @@ public static function parse( $attributes, $content, $context = array() ) {
 			'submissionSuccess'       => $submission_success,
 			'submissionError'         => null,
 			'elementId'               => $element_id,
+			'isSingleInputForm'       => $is_single_input_form,
 		);
 
 		if ( $is_multistep ) {

projects/packages/forms/src/modules/form/view.js

@@ -183,6 +183,11 @@ const { state, actions } = store( NAMESPACE, {
 				return false;
 			}
 
+			// For single input forms, show submission errors in the field error div
+			if ( context.isSingleInputForm && context.submissionError ) {
+				return true;
+			}
+
 			return ( context.showErrors || field.showFieldError ) && field.error && field.error !== 'yes';
 		},
 
@@ -233,6 +238,11 @@ const { state, actions } = store( NAMESPACE, {
 			const fieldId = context.fieldId;
 			const field = context.fields[ fieldId ] || {};
 
+			// For single input forms, show submission errors in the field error div
+			if ( context.isSingleInputForm && context.submissionError ) {
+				return context.submissionError;
+			}
+
 			if ( ! ( context.showErrors || field.showFieldError ) || ! field.error ) {
 				return '';
 			}