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

package/dist/forms.js

@@ -36241,19 +36241,10 @@ 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 {
-      schema,
+      schema: schemaFromProps,
       values = {},
       onValuesChange,
       onSubmit,
@@ -36263,18 +36254,22 @@ const FormRenderer = memo(
       onDirty,
       onDirtyChange,
       // if the title isn't provided, hide it by default
-      hideTitle = !schema.title,
+      hideTitle = !schemaFromProps.title,
       hideDescription,
       className,
       buttonProps,
       enableReinitialize = false,
       excludeUnchangedFields = false
     } = props;
+    const [schema, setSchema] = useState(schemaFromProps);
+    useLayoutEffect(() => {
+      setSchema(schemaFromProps);
+    }, [schemaFromProps]);
     const { readonly } = schema.meta;
     const formId2 = useId$1();
     const initialValues = useMemo(() => {
-      return addExtraKey(initializeFieldValues(flattenFields(schema.fields), values));
-    }, [schema.fields, values]);
+      return initializeFieldValues(flattenFields(schemaFromProps.fields), values);
+    }, [schemaFromProps.fields, values]);
     const handleSubmit = useCallback(
       (values2) => {
         onSubmit == null ? void 0 : onSubmit(
@@ -36285,19 +36280,26 @@ const FormRenderer = memo(
     );
     const formik = useFormik({
       initialValues,
-      onSubmit: (values2) => handleSubmit(stripExtraKey(values2)),
-      validate: (values2) => validateFields(schema.fields, stripExtraKey(values2)),
+      onSubmit: handleSubmit,
+      validate: (values2) => validateFields(schema.fields, values2),
       // only validate the entire form on submit
       validateOnBlur: false,
       validateOnChange: false,
-      enableReinitialize
+      enableReinitialize: false
     });
+    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({ ...stripExtraKey(formik.values), [identifier]: value }, { [identifier]: value });
+        onValuesChange == null ? void 0 : onValuesChange({ ...formik.values, [identifier]: value }, { [identifier]: value });
       },
       [formik.values, initialValues, onValuesChange, schema.fields]
     );

package/dist/forms.umd.cjs

@@ -36243,19 +36243,10 @@ 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 {
-        schema,
+        schema: schemaFromProps,
         values = {},
         onValuesChange,
         onSubmit,
@@ -36265,18 +36256,22 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
         onDirty,
         onDirtyChange,
         // if the title isn't provided, hide it by default
-        hideTitle = !schema.title,
+        hideTitle = !schemaFromProps.title,
         hideDescription,
         className,
         buttonProps,
         enableReinitialize = false,
         excludeUnchangedFields = false
       } = props;
+      const [schema, setSchema] = React.useState(schemaFromProps);
+      React.useLayoutEffect(() => {
+        setSchema(schemaFromProps);
+      }, [schemaFromProps]);
       const { readonly } = schema.meta;
       const formId2 = React.useId();
       const initialValues = React.useMemo(() => {
-        return addExtraKey(initializeFieldValues(flattenFields(schema.fields), values));
-      }, [schema.fields, values]);
+        return initializeFieldValues(flattenFields(schemaFromProps.fields), values);
+      }, [schemaFromProps.fields, values]);
       const handleSubmit = React.useCallback(
         (values2) => {
           onSubmit == null ? void 0 : onSubmit(
@@ -36287,19 +36282,26 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
       );
       const formik$1 = formik.useFormik({
         initialValues,
-        onSubmit: (values2) => handleSubmit(stripExtraKey(values2)),
-        validate: (values2) => validateFields(schema.fields, stripExtraKey(values2)),
+        onSubmit: handleSubmit,
+        validate: (values2) => validateFields(schema.fields, values2),
         // only validate the entire form on submit
         validateOnBlur: false,
         validateOnChange: false,
-        enableReinitialize
+        enableReinitialize: false
       });
+      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({ ...stripExtraKey(formik$1.values), [identifier]: value }, { [identifier]: value });
+          onValuesChange == null ? void 0 : onValuesChange({ ...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.20",
+	"version": "1.0.32-react-flow-david-fixes.22",
 	"license": "UNLICENSED",
 	"main": "dist/forms.umd.cjs",
 	"module": "dist/forms.js",