@overmap-ai/forms 1.0.32-react-flow-david-fixes.18 → 1.0.32-react-flow-david-fixes.20

package/dist/forms.js

@@ -34621,7 +34621,6 @@ const deserializeConditions = (serializedConditions, fields) => {
   );
 };
 const applyConditions = (conditions, values) => {
-  console.debug("apply conditions", values);
   return conditions.length > 0 ? conditions.every((condition) => {
     return condition.apply(values[condition.field.identifier]);
   }) : true;
@@ -34741,6 +34740,7 @@ const FieldSectionLayout = memo((props) => {
   }, [fieldSections, section.identifier]);
   const conditionMet = useMemo(() => {
     if (conditionalSections.length === 0) return true;
+    console.debug("apply conditions section layout", values);
     return conditionalSections.some(
       (conditionalSection) => applyConditions(conditionalSection.getConditions(section.identifier), values)
     );
@@ -36139,6 +36139,7 @@ const validateFields = (fields, values) => {
   for (const field of fields) {
     if (field instanceof FieldSection) {
       const conditionalSections = sectionElements.filter((section) => field.identifier in section.conditions);
+      console.debug("apply conditions validate fields", values);
       const conditionMet = conditionalSections.length > 0 ? conditionalSections.some(
         (conditionalSection) => applyConditions(conditionalSection.getConditions(field.identifier), values)
       ) : true;
@@ -36240,6 +36241,15 @@ async function awaitPromisesFromFieldValues(values) {
   }
   return valuesWithoutFiles;
 }
+const EXTRA_KEY = "__EXTRA_KEY__";
+const addExtraKey = (values) => {
+  return { ...values, [EXTRA_KEY]: v4() };
+};
+const stripExtraKey = (values) => {
+  const valuesCopy = { ...values };
+  delete valuesCopy[EXTRA_KEY];
+  return valuesCopy;
+};
 const FormRenderer = memo(
   forwardRef((props, ref) => {
     const {
@@ -36263,9 +36273,8 @@ const FormRenderer = memo(
     const { readonly } = schema.meta;
     const formId2 = useId$1();
     const initialValues = useMemo(() => {
-      return initializeFieldValues(flattenFields(schema.fields), values);
+      return addExtraKey(initializeFieldValues(flattenFields(schema.fields), values));
     }, [schema.fields, values]);
-    console.debug("initialValues", initialValues);
     const handleSubmit = useCallback(
       (values2) => {
         onSubmit == null ? void 0 : onSubmit(
@@ -36276,26 +36285,19 @@ const FormRenderer = memo(
     );
     const formik = useFormik({
       initialValues,
-      onSubmit: handleSubmit,
-      validate: (form) => validateFields(schema.fields, form),
+      onSubmit: (values2) => handleSubmit(stripExtraKey(values2)),
+      validate: (values2) => validateFields(schema.fields, stripExtraKey(values2)),
       // only validate the entire form on submit
       validateOnBlur: false,
       validateOnChange: false,
-      enableReinitialize: false
+      enableReinitialize
     });
-    useLayoutEffect(() => {
-      if (enableReinitialize) {
-        formik.resetForm({
-          values: initialValues
-        });
-      }
-    }, [enableReinitialize, initialValues]);
     const { dirty } = formik;
     const handleValuesChange = useCallback(
       (identifier, value) => {
         const field = getFieldsMapping(schema.fields)[identifier];
         if (field.areValuesEqual(initialValues[identifier], value)) return;
-        onValuesChange == null ? void 0 : onValuesChange({ ...formik.values, [identifier]: value }, { [identifier]: value });
+        onValuesChange == null ? void 0 : onValuesChange({ ...stripExtraKey(formik.values), [identifier]: value }, { [identifier]: value });
       },
       [formik.values, initialValues, onValuesChange, schema.fields]
     );

package/dist/forms.umd.cjs

@@ -34623,7 +34623,6 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
     );
   };
   const applyConditions = (conditions, values) => {
-    console.debug("apply conditions", values);
     return conditions.length > 0 ? conditions.every((condition) => {
       return condition.apply(values[condition.field.identifier]);
     }) : true;
@@ -34743,6 +34742,7 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
     }, [fieldSections, section.identifier]);
     const conditionMet = React.useMemo(() => {
       if (conditionalSections.length === 0) return true;
+      console.debug("apply conditions section layout", values);
       return conditionalSections.some(
         (conditionalSection) => applyConditions(conditionalSection.getConditions(section.identifier), values)
       );
@@ -36141,6 +36141,7 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
     for (const field of fields) {
       if (field instanceof FieldSection) {
         const conditionalSections = sectionElements.filter((section) => field.identifier in section.conditions);
+        console.debug("apply conditions validate fields", values);
         const conditionMet = conditionalSections.length > 0 ? conditionalSections.some(
           (conditionalSection) => applyConditions(conditionalSection.getConditions(field.identifier), values)
         ) : true;
@@ -36242,6 +36243,15 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
     }
     return valuesWithoutFiles;
   }
+  const EXTRA_KEY = "__EXTRA_KEY__";
+  const addExtraKey = (values) => {
+    return { ...values, [EXTRA_KEY]: uuid.v4() };
+  };
+  const stripExtraKey = (values) => {
+    const valuesCopy = { ...values };
+    delete valuesCopy[EXTRA_KEY];
+    return valuesCopy;
+  };
   const FormRenderer = React.memo(
     React.forwardRef((props, ref) => {
       const {
@@ -36265,9 +36275,8 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
       const { readonly } = schema.meta;
       const formId2 = React.useId();
       const initialValues = React.useMemo(() => {
-        return initializeFieldValues(flattenFields(schema.fields), values);
+        return addExtraKey(initializeFieldValues(flattenFields(schema.fields), values));
       }, [schema.fields, values]);
-      console.debug("initialValues", initialValues);
       const handleSubmit = React.useCallback(
         (values2) => {
           onSubmit == null ? void 0 : onSubmit(
@@ -36278,26 +36287,19 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
       );
       const formik$1 = formik.useFormik({
         initialValues,
-        onSubmit: handleSubmit,
-        validate: (form) => validateFields(schema.fields, form),
+        onSubmit: (values2) => handleSubmit(stripExtraKey(values2)),
+        validate: (values2) => validateFields(schema.fields, stripExtraKey(values2)),
         // only validate the entire form on submit
         validateOnBlur: false,
         validateOnChange: false,
-        enableReinitialize: false
+        enableReinitialize
       });
-      React.useLayoutEffect(() => {
-        if (enableReinitialize) {
-          formik$1.resetForm({
-            values: initialValues
-          });
-        }
-      }, [enableReinitialize, initialValues]);
       const { dirty } = formik$1;
       const handleValuesChange = React.useCallback(
         (identifier, value) => {
           const field = getFieldsMapping(schema.fields)[identifier];
           if (field.areValuesEqual(initialValues[identifier], value)) return;
-          onValuesChange == null ? void 0 : onValuesChange({ ...formik$1.values, [identifier]: value }, { [identifier]: value });
+          onValuesChange == null ? void 0 : onValuesChange({ ...stripExtraKey(formik$1.values), [identifier]: value }, { [identifier]: value });
         },
         [formik$1.values, initialValues, onValuesChange, schema.fields]
       );

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@overmap-ai/forms",
-	"version": "1.0.32-react-flow-david-fixes.18",
+	"version": "1.0.32-react-flow-david-fixes.20",
 	"license": "UNLICENSED",
 	"main": "dist/forms.umd.cjs",
 	"module": "dist/forms.js",