Commit f362c22067a for woocommerce
commit f362c22067a994e9eaba7b2fdb67409b93c1f39d
Author: Daniel Mallory <daniel.mallory@automattic.com>
Date: Thu Jun 25 11:21:50 2026 +0100
Keep Settings UI navigation guard until form exists (#65577)
Keep settings UI navigation guard until form exists
diff --git a/packages/js/settings-ui/changelog/fix-form-submit-navigation-guard b/packages/js/settings-ui/changelog/fix-form-submit-navigation-guard
new file mode 100644
index 00000000000..8cd902e2651
--- /dev/null
+++ b/packages/js/settings-ui/changelog/fix-form-submit-navigation-guard
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Keep Settings UI unsaved-changes protection enabled when the legacy settings form is missing.
diff --git a/packages/js/settings-ui/src/settings-ui-page.tsx b/packages/js/settings-ui/src/settings-ui-page.tsx
index b0d2bab8d9e..09d2066520c 100644
--- a/packages/js/settings-ui/src/settings-ui-page.tsx
+++ b/packages/js/settings-ui/src/settings-ui-page.tsx
@@ -563,14 +563,14 @@ export const SettingsUIPage = ( {
}, [] );
const submitSettingsForm = useCallback( () => {
- allowNavigation();
-
const form = document.getElementById( 'mainform' );
if ( ! ( form instanceof HTMLFormElement ) ) {
return;
}
+ allowNavigation();
+
const saveButton = document.querySelector( '.woocommerce-save-button' );
if (