@open-mercato/ui 0.6.5-develop.4703.1.59a086a9ee → 0.6.5-develop.4718.1.56d834bb34

package/dist/backend/CrudForm.js

@@ -261,6 +261,9 @@ function normalizeDirtySnapshotValue(value) {
 function createDirtySnapshot(source) {
   return JSON.stringify(normalizeDirtySnapshotValue(source) ?? {});
 }
+function createDirtyValueSnapshot(value) {
+  return JSON.stringify(normalizeDirtySnapshotValue(value) ?? null);
+}
 const FIELDSET_ICON_COMPONENTS = {
   layers: Layers,
   tag: Tag,
@@ -555,6 +558,8 @@ function CrudForm({
   const clearDirtyState = React.useCallback((snapshotSource) => {
     const source = snapshotSource ?? valuesRef.current;
     dirtyBaselineSnapshotRef.current = createDirtySnapshot(source);
+    dirtyBaselineValuesRef.current = { ...source };
+    userEditedFieldIdsRef.current.clear();
     isDirtyRef.current = false;
     setHasUnsavedChanges(false);
   }, []);
@@ -1651,16 +1656,30 @@ function CrudForm({
       lastErrorFieldRef.current = fieldId;
     }
   }, [errors, formId]);
+  const updateEditedFieldMarker = React.useCallback((id, nextValue, baselineSource = dirtyBaselineValuesRef.current) => {
+    if (baselineSource && createDirtyValueSnapshot(baselineSource[id]) === createDirtyValueSnapshot(nextValue)) {
+      userEditedFieldIdsRef.current.delete(id);
+      return;
+    }
+    userEditedFieldIdsRef.current.add(id);
+  }, []);
   const setValue = React.useCallback((id, nextValue) => {
     let nextData = null;
     let nextDirty = null;
+    const currentValue = valuesRef.current[id];
+    if (!Object.is(currentValue, nextValue)) {
+      updateEditedFieldMarker(id, nextValue);
+    }
     setValues((prev) => {
       if (Object.is(prev[id], nextValue)) return prev;
+      const baselineSource = dirtyBaselineValuesRef.current ?? prev;
+      updateEditedFieldMarker(id, nextValue, baselineSource);
       nextData = { ...prev, [id]: nextValue };
       valuesRef.current = nextData;
       if (!(embedded && !trackDirtyWhenEmbedded)) {
         const baseline = dirtyBaselineSnapshotRef.current ?? createDirtySnapshot(prev);
         dirtyBaselineSnapshotRef.current = baseline;
+        dirtyBaselineValuesRef.current = baselineSource;
         nextDirty = createDirtySnapshot(nextData) !== baseline;
       }
       return nextData;
@@ -1728,7 +1747,7 @@ function CrudForm({
     }).catch((err) => {
       console.error("[CrudForm] Error in onFieldChange:", err);
     });
-  }, [embedded, extendedInjectionEventsEnabled, flash, t, trackDirtyWhenEmbedded, translateValidationMessage, triggerInjectionEvent]);
+  }, [embedded, extendedInjectionEventsEnabled, flash, t, trackDirtyWhenEmbedded, translateValidationMessage, triggerInjectionEvent, updateEditedFieldMarker]);
   const onBlurRequest = React.useCallback((fieldId) => {
     void validateFieldOnBlur(fieldId);
   }, [validateFieldOnBlur]);
@@ -1752,6 +1771,8 @@ function CrudForm({
   );
   const appliedInitialValuesSnapshotRef = React.useRef(void 0);
   const dirtyBaselineSnapshotRef = React.useRef(void 0);
+  const dirtyBaselineValuesRef = React.useRef(void 0);
+  const userEditedFieldIdsRef = React.useRef(/* @__PURE__ */ new Set());
   React.useLayoutEffect(() => {
     if (!initialValues) return;
     const snapshot = JSON.stringify({
@@ -1767,8 +1788,14 @@ function CrudForm({
     let hadUnsavedEdits = false;
     setValues((prev) => {
       const priorBaseline = dirtyBaselineSnapshotRef.current;
-      hadUnsavedEdits = priorBaseline !== void 0 && createDirtySnapshot(prev) !== priorBaseline;
-      const merged = { ...prev, ...initialValues };
+      const editedFieldIds = userEditedFieldIdsRef.current;
+      hadUnsavedEdits = editedFieldIds.size > 0 || priorBaseline !== void 0 && createDirtySnapshot(prev) !== priorBaseline;
+      const merged = { ...prev };
+      const mergedRecord = merged;
+      for (const [key, value] of Object.entries(initialValues)) {
+        if (editedFieldIds.has(key)) continue;
+        mergedRecord[key] = value;
+      }
       for (const definition of injectedFieldDefinitions) {
         if (merged[definition.id] !== void 0) continue;
         const extracted = readByDotPath(initialRecord, definition.id);
@@ -1799,6 +1826,7 @@ function CrudForm({
     });
     if (mergedValues && !hadUnsavedEdits) {
       dirtyBaselineSnapshotRef.current = createDirtySnapshot(mergedValues);
+      dirtyBaselineValuesRef.current = { ...mergedValues };
     }
     if (!extendedInjectionEventsEnabled || !mergedValues) return;
     let cancelled = false;
@@ -1813,6 +1841,7 @@ function CrudForm({
         if (cancelled || !transformed) return;
         if (isDirtyRef.current) return;
         dirtyBaselineSnapshotRef.current = createDirtySnapshot(transformed);
+        dirtyBaselineValuesRef.current = { ...transformed };
         setValues(transformed);
       } catch (err) {
         console.error("[CrudForm] Error in transformDisplayData:", err);
@@ -1866,6 +1895,7 @@ function CrudForm({
     });
     if (mergedValues) {
       dirtyBaselineSnapshotRef.current = createDirtySnapshot(mergedValues);
+      dirtyBaselineValuesRef.current = { ...mergedValues };
     }
   }, [isLoading, initialValuesHasId, cfDefinitions, customEntity]);
   const markFormAsClean = React.useCallback((snapshotSource) => {