@open-mercato/ui 0.8.1-develop.7452.1.5e211edd51 → 0.8.1-develop.7455.1.8f7e53badb

package/dist/backend/CrudForm.js

@@ -553,7 +553,13 @@ function CrudForm({
   const navigationConfirmPendingRef = React.useRef(false);
   const submitNavigationBypassRef = React.useRef(false);
   const submitNavigationBypassTimeoutRef = React.useRef(null);
-  const [hasUnsavedChanges, setHasUnsavedChanges] = React.useState(false);
+  const [hasUnsavedChanges, setHasUnsavedChangesState] = React.useState(false);
+  const hasUnsavedChangesRef = React.useRef(false);
+  const setHasUnsavedChanges = React.useCallback((next) => {
+    if (hasUnsavedChangesRef.current === next) return;
+    hasUnsavedChangesRef.current = next;
+    setHasUnsavedChangesState(next);
+  }, []);
   const popStateRollbackRef = React.useRef(false);
   const shouldBypassUnsavedChangesGuardRef = React.useRef(shouldBypassUnsavedChangesGuard);
   React.useEffect(() => {
@@ -575,7 +581,7 @@ function CrudForm({
     const dirty = currentSnapshot !== snapshot;
     isDirtyRef.current = dirty;
     setHasUnsavedChanges(dirty);
-  }, [embedded, trackDirtyWhenEmbedded, values]);
+  }, [embedded, trackDirtyWhenEmbedded, values, setHasUnsavedChanges]);
   React.useEffect(() => {
     onDirtyChange?.(hasUnsavedChanges);
   }, [hasUnsavedChanges, onDirtyChange]);
@@ -619,7 +625,7 @@ function CrudForm({
     everEditedFieldIdsRef.current.clear();
     isDirtyRef.current = false;
     setHasUnsavedChanges(false);
-  }, []);
+  }, [setHasUnsavedChanges]);
   const confirmUnsavedChanges = React.useCallback(async () => {
     if (!isDirtyRef.current || typeof window === "undefined") return true;
     if (navigationPromptBypassRef.current || submitNavigationBypassRef.current) return true;
@@ -725,7 +731,7 @@ function CrudForm({
       window.history.pushState = originalPushState;
       window.history.replaceState = originalReplaceState;
     };
-  }, [allowNextNavigation, clearDirtyState, confirmUnsavedChanges, embedded, hasUnsavedChanges, router, trackDirtyWhenEmbedded]);
+  }, [allowNextNavigation, clearDirtyState, confirmUnsavedChanges, embedded, hasUnsavedChanges, router, trackDirtyWhenEmbedded, setHasUnsavedChanges]);
   const { widgets: primaryInjectionWidgets } = useInjectionWidgets(resolvedInjectionSpotId, {
     context: injectionContext,
     triggerOnLoad: true
@@ -1964,14 +1970,18 @@ function CrudForm({
       if (activeDispatch?.eventId === dispatchToken.eventId && activeDispatch.formGeneration === dispatchToken.formGeneration) {
         activeFieldChangeDispatchRef.current = null;
       }
-      if (fieldChangeDispatcherMountedRef.current && fieldChangeFormGenerationRef.current === dispatchToken.formGeneration) {
+      if (fieldChangeDispatcherMountedRef.current && fieldChangeFormGenerationRef.current === dispatchToken.formGeneration && pendingFieldChangeEventsRef.current.length > 0) {
         setFieldChangeDispatchVersion((version) => version + 1);
       }
     });
   }, [extendedInjectionEventsEnabled, fieldChangeDispatchVersion, triggerInjectionEvent, values]);
-  const onBlurRequest = React.useCallback((fieldId) => {
-    void validateFieldOnBlur(fieldId);
+  const validateFieldOnBlurRef = React.useRef(validateFieldOnBlur);
+  React.useLayoutEffect(() => {
+    validateFieldOnBlurRef.current = validateFieldOnBlur;
   }, [validateFieldOnBlur]);
+  const onBlurRequest = React.useCallback((fieldId) => {
+    void validateFieldOnBlurRef.current(fieldId);
+  }, []);
   const handleFieldsetSelectionChange = React.useCallback(
     (entityId2, nextCode) => {
       if (!nextCode) return;