From 871f6168d11d013118fe5c9dc39246491b696efb Mon Sep 17 00:00:00 2001
From: Takayuki Miyoshi <takayukister@gmail.com>
Date: Wed, 19 Oct 2022 16:43:47 +0900
Subject: [PATCH] Check form.wpcf7.schema directly

---
 includes/js/src/init.js     | 2 +-
 includes/js/src/validate.js | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/includes/js/src/init.js b/includes/js/src/init.js
index c0ef7b2e..51cf42a8 100644
--- a/includes/js/src/init.js
+++ b/includes/js/src/init.js
@@ -21,7 +21,7 @@ export default function init( form ) {
 		unitTag: formData.get( '_wpcf7_unit_tag' ),
 		containerPost: absInt( formData.get( '_wpcf7_container_post' ) ),
 		parent: form.closest( '.wpcf7' ),
-		schema: {},
+		schema: undefined,
 	};
 
 	form.querySelectorAll( '.has-spinner' ).forEach( element => {
diff --git a/includes/js/src/validate.js b/includes/js/src/validate.js
index 12c9b231..badbe831 100644
--- a/includes/js/src/validate.js
+++ b/includes/js/src/validate.js
@@ -4,12 +4,12 @@ import { setStatus } from './status';
 export default function validate( form, options = {} ) {
 	const scope = form;
 
-	const schema = { ...form.wpcf7?.schema };
-
-	if ( undefined === schema ) {
+	if ( undefined === form.wpcf7?.schema ) {
 		return;
 	}
 
+	const schema = { ...form.wpcf7.schema };
+
 	// Event target is not a wpcf7 form control.
 	if ( ! options.target?.closest( '.wpcf7-form-control-wrap[data-name]' ) ) {
 		return;