npm - @overmap-ai/forms - Versions diffs - 1.0.32-react-flow-david-fixes.0 → 1.0.32-react-flow-david-fixes.2 - Mend

@overmap-ai/forms 1.0.32-react-flow-david-fixes.0 → 1.0.32-react-flow-david-fixes.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (11) hide show

package/dist/form/builder/Root.d.ts +1 -2
package/dist/form/builder/flow/FlowBuilder.d.ts +1 -4
package/dist/form/builder/index.d.ts +9 -0
package/dist/form/builder/list/ListBuilder.d.ts +1 -6
package/dist/form/builder/preview/Preview.d.ts +1 -2
package/dist/form/builder/utils.d.ts +1 -4
package/dist/form/index.d.ts +1 -1
package/dist/form/utils.d.ts +9 -1
package/dist/forms.js +221 -128
package/dist/forms.umd.cjs +220 -127
package/package.json +1 -1

package/dist/form/builder/Root.d.ts CHANGED Viewed

@@ -1,7 +1,7 @@
 import { PropsWithChildren } from 'react';
 import { SerializedFieldSection } from '../fields';
 import { FormBuilderSaveHandler } from './typings';
-interface FormBuilderRootProps extends PropsWithChildren {
+export interface FormBuilderRootProps extends PropsWithChildren {
     initialTitle?: string;
     initialDescription?: string;
     initialFields?: SerializedFieldSection[];
@@ -11,4 +11,3 @@ interface FormBuilderRootProps extends PropsWithChildren {
     disableRequiredFields?: boolean;
 }
 export declare const FormBuilderRoot: import('react').NamedExoticComponent<FormBuilderRootProps>;
-export {};

package/dist/form/builder/flow/FlowBuilder.d.ts CHANGED Viewed

@@ -1,4 +1 @@
-interface FormBuilderFlowBuilderProps {
-}
-export declare const FormBuilderFlowBuilder: import('react').NamedExoticComponent<FormBuilderFlowBuilderProps>;
-export {};
+export declare const FormBuilderFlowBuilder: import('react').MemoExoticComponent<() => import("react/jsx-runtime").JSX.Element>;

package/dist/form/builder/index.d.ts ADDED Viewed

@@ -0,0 +1,9 @@
+export type * from './typings';
+export declare const FormBuilder: {
+    Root: import('react').NamedExoticComponent<import('./Root').FormBuilderRootProps>;
+    FlowBuilder: import('react').MemoExoticComponent<() => import("react/jsx-runtime").JSX.Element>;
+    ListBuilder: import('react').MemoExoticComponent<() => import("react/jsx-runtime").JSX.Element>;
+    Preview: import('react').NamedExoticComponent<import('./preview').FormBuilderPreviewProps>;
+};
+export { createCondition } from './utils';
+export { createField } from './utils';

package/dist/form/builder/list/ListBuilder.d.ts CHANGED Viewed

@@ -1,6 +1 @@
-interface FormBuilderListBuilderProps {
-    showFormTitle?: boolean;
-    showExplainerText?: boolean;
-}
-export declare const FormBuilderListBuilder: import('react').NamedExoticComponent<FormBuilderListBuilderProps>;
-export {};
+export declare const FormBuilderListBuilder: import('react').MemoExoticComponent<() => import("react/jsx-runtime").JSX.Element>;

package/dist/form/builder/preview/Preview.d.ts CHANGED Viewed

@@ -1,5 +1,4 @@
-interface FormBuilderPreviewProps {
+export interface FormBuilderPreviewProps {
     showFormTitle?: boolean;
 }
 export declare const FormBuilderPreview: import('react').NamedExoticComponent<FormBuilderPreviewProps>;
-export {};

package/dist/form/builder/utils.d.ts CHANGED Viewed

@@ -1,7 +1,4 @@
 import { BooleanFieldCondition, CheckboxListFieldCondition, DateFieldCondition, MultiSelectFieldCondition, MultiStringFieldCondition, NumberFieldCondition, RadioFieldCondition, ScanFieldCondition, SelectFieldCondition, StringFieldCondition, TextFieldCondition, UploadFieldCondition } from '../conditions';
-import { Field, FieldType, SerializedField, SerializedOnlyField } from '../fields';
-import { SerializedFieldSection } from '../fields/FieldSection/typings';
-export declare const emptySection: (id?: string, fields?: SerializedOnlyField[]) => SerializedFieldSection;
-export declare const wrapRootFieldsWithFieldSection: (fields: SerializedField[]) => SerializedFieldSection[];
+import { Field, FieldType } from '../fields';
 export declare const createField: (type: Exclude<FieldType, "section">) => Field;
 export declare const createCondition: (field: Field) => BooleanFieldCondition | CheckboxListFieldCondition | DateFieldCondition | MultiSelectFieldCondition | MultiStringFieldCondition | NumberFieldCondition | RadioFieldCondition | ScanFieldCondition | SelectFieldCondition | StringFieldCondition | TextFieldCondition | UploadFieldCondition;

package/dist/form/index.d.ts CHANGED Viewed

@@ -3,4 +3,4 @@ export * from './constants';
 export * from './fields';
 export * from './renderer';
 export type * from './typings';
-export { initializeFieldValues, validateFields } from './utils';
+export { initializeFieldValues, separateFilesFromFields, separateFilesFromFieldValues, validateFields } from './utils';

package/dist/form/utils.d.ts CHANGED Viewed

@@ -1,8 +1,16 @@
 import { FormikErrors } from 'formik';
 import { FormBuilderValues } from './builder';
-import { AnyFormElement } from './fields';
+import { AnyFormElement, SerializedField } from './fields';
 import { FieldValues } from './typings';
 export declare const hasKeys: (errors: object) => boolean;
 export declare const validateFields: (fields: AnyFormElement[], values: FieldValues | FormBuilderValues) => FormikErrors<FieldValues | FormBuilderValues> | undefined;
 export declare const initializeFieldValues: (fields: AnyFormElement[], values: FieldValues) => FieldValues;
 export declare const changedFieldValues: (fields: AnyFormElement[], values1: FieldValues, values2: FieldValues) => FieldValues;
+export declare const separateFilesFromFieldValues: (values: FieldValues) => {
+    values: FieldValues;
+    files: Record<string, File[]>;
+};
+export declare const separateFilesFromFields: (fields: SerializedField[]) => Promise<{
+    fields: SerializedField[];
+    images: Record<string, File>;
+}>;

package/dist/forms.js CHANGED Viewed

@@ -8,12 +8,12 @@ import * as React from "react";
 import { memo, forwardRef, useMemo, createContext, useContext, useState, useRef, useCallback, useEffect, Fragment as Fragment$1, use, useLayoutEffect, useId as useId$1 } from "react";
 import "@xyflow/react/dist/style.css";
 import { getBezierPath, BaseEdge, EdgeLabelRenderer, NodeToolbar, Position, Handle, MarkerType, useNodesState, useEdgesState, ReactFlow, Panel } from "@xyflow/react";
+import { useField, useFormikContext, useFormik, FormikProvider } from "formik";
 import { DirectedGraph } from "graphology";
 import { willCreateCycle } from "graphology-dag";
 import { v4 } from "uuid";
-import { useField, useFormikContext, useFormik, FormikProvider } from "formik";
 import { DragDropContext, Droppable, Draggable } from "@hello-pangea/dnd";
-import { Copy, Download, X, Plus, Check, ChevronDown, Minus, Circle, Maximize, FileWarning, File, Upload, Trash2, Settings } from "lucide-react";
+import { Copy, Download, X, Plus, Check, ChevronDown, Minus, Circle, Maximize, FileWarning, File as File$1, Upload, Trash2, Settings } from "lucide-react";
 import * as ReactDOM from "react-dom";
 import ReactDOM__default from "react-dom";
 import { saveAs } from "file-saver";
@@ -32,6 +32,12 @@ const FileCard = memo(
   })
 );
 FileCard.displayName = "FileCard";
+const SEVERITY_COLOR_MAPPING = {
+  danger: "danger",
+  warning: "warning",
+  info: "base",
+  success: "success"
+};
 class Observable {
   constructor() {
     __publicField(this, "observers", /* @__PURE__ */ new Set());
@@ -189,12 +195,6 @@ const useFormikInput = (props) => {
   ];
 };
 const EMPTY_ARRAY = [];
-const SEVERITY_COLOR_MAPPING = {
-  danger: "danger",
-  warning: "warning",
-  info: "base",
-  success: "success"
-};
 const InputWithHelpText = (props) => {
   const { helpText, children, severity } = props;
   const color = severity ? SEVERITY_COLOR_MAPPING[severity] : "base";
@@ -31947,7 +31947,7 @@ const ImageCard = memo(
                 "bg-transparent": !file
               }),
               children: [
-                error ? /* @__PURE__ */ jsx(FileWarning, { className: "h-4 w-4" }) : file && /* @__PURE__ */ jsx(File, { className: "h-4 w-4", style: { color: "var(--base-a11)" } }),
+                error ? /* @__PURE__ */ jsx(FileWarning, { className: "h-4 w-4" }) : file && /* @__PURE__ */ jsx(File$1, { className: "h-4 w-4", style: { color: "var(--base-a11)" } }),
                 /* @__PURE__ */ jsx(Text, { className: "truncate", size: "sm", children: error ?? (file == null ? void 0 : file.name) }),
                 rightSlot
               ]
@@ -34529,6 +34529,52 @@ const changedFieldValues = (fields, values1, values2) => {
     return acc;
   }, {});
 };
+const isArrayOfFiles = (value) => {
+  return Array.isArray(value) && value[0] instanceof File;
+};
+const separateFilesFromFieldValues = (values) => {
+  const files = {};
+  const newValues = {};
+  for (const key in values) {
+    const value = values[key];
+    if (value instanceof File) {
+      files[key] = [value];
+    } else if (isArrayOfFiles(value)) {
+      files[key] = value;
+    } else if (value !== void 0) {
+      newValues[key] = value;
+    }
+  }
+  return { values: newValues, files };
+};
+const separateFilesFromFields = async (fields) => {
+  const images = {};
+  const newFields = [];
+  for (const section of fields) {
+    if (section.type !== "section") {
+      throw new Error(`Expected ISerializedField type to be a section. Got ${section.type} instead.`);
+    }
+    const { fields: sectionFields } = section;
+    const newSectionFields = [];
+    for (const field of sectionFields) {
+      if (field.image) {
+        if (field.image instanceof Promise) {
+          try {
+            images[field.identifier] = await field.image;
+          } catch (e) {
+            console.error("Failed to get image from promise", e);
+          }
+        } else {
+          images[field.identifier] = field.image;
+        }
+        delete field.image;
+      }
+      newSectionFields.push(field);
+    }
+    newFields.push({ ...section, fields: newSectionFields });
+  }
+  return { fields: newFields, images };
+};
 const FieldSettingsPopover = memo((props) => {
   const { popoverInputs, hasError, ...rest } = props;
   return /* @__PURE__ */ jsxs(Popover.Root, { children: [
@@ -35406,7 +35452,8 @@ const getLayoutedElements = (nodes, edges, direction) => {
     edges
   ];
 };
-const FormBuilderFlowBuilder = memo((_props) => {
+const FormBuilderFlowBuilder = memo(() => {
+  const { handleSubmit, errors } = useFormikContext();
   const { onCancel } = use(FormBuilderContext);
   const fieldSchema = use(FieldSchemaContext);
   const ref = useRef(null);
@@ -35495,61 +35542,98 @@ const FormBuilderFlowBuilder = memo((_props) => {
     },
     [fieldSchema.fields]
   );
-  return /* @__PURE__ */ jsxs(Card, { className: "size-full relative", variant: "outline", children: [
+  const [titleFieldProps, titleMeta, titleHelpers] = useField("title");
+  const [descriptionFieldProps, _descriptionMeta, descriptionHelpers] = useField("description");
+  return /* @__PURE__ */ jsxs("form", { className: "size-full flex flex-col gap-4", id: formId, onSubmit: handleSubmit, children: [
+    /* @__PURE__ */ jsx(InputWithHelpText, { severity: "danger", helpText: titleMeta.error ?? null, children: /* @__PURE__ */ jsx(
+      Input.Root,
+      {
+        variant: "outline",
+        size: "md",
+        accentColor: titleMeta.error ? SEVERITY_COLOR_MAPPING.danger : "primary",
+        children: /* @__PURE__ */ jsx(
+          Input.Field,
+          {
+            placeholder: "Enter a title",
+            value: titleFieldProps.value ?? "",
+            onChange: (event) => {
+              void titleHelpers.setValue(event.target.value);
+            },
+            maxLength: 100
+          }
+        )
+      }
+    ) }),
     /* @__PURE__ */ jsx(
-      ReactFlow,
+      TextArea,
       {
-        ref,
-        onInit: setReactFlow,
-        nodes: layoutedNodes,
-        onNodesChange: handleNodesChange,
-        edges: layoutedEdges,
-        onEdgesChange: handleEdgesChange,
-        nodeTypes,
-        edgeTypes,
-        onConnect: handleConnect,
-        attributionPosition: "bottom-left",
-        fitView: true,
-        minZoom: 0,
-        isValidConnection: handleValidConnection
+        className: "field-sizing-content",
+        placeholder: "Explain a description",
+        value: descriptionFieldProps.value ?? "",
+        onChange: (event) => {
+          void descriptionHelpers.setValue(event.target.value);
+        },
+        resize: "vertical",
+        maxLength: 1e3,
+        size: "md"
       }
     ),
-    /* @__PURE__ */ jsx(Panel, { position: "top-left", children: /* @__PURE__ */ jsx(ButtonGroup, { className: "flex items-center justify-end gap-2", size: "sm", children: /* @__PURE__ */ jsxs(Button, { type: "submit", variant: "surface", onClick: handleAddSection, children: [
-      /* @__PURE__ */ jsx(LuIcon, { icon: "plus" }),
-      " Add section"
-    ] }) }) }),
-    /* @__PURE__ */ jsxs(Panel, { position: "top-right", className: "flex flex-col items-center gap-2", children: [
-      /* @__PURE__ */ jsxs(
-        ToggleGroup.Root,
+    /* @__PURE__ */ jsxs(Card, { className: "size-full relative", variant: "outline", children: [
+      /* @__PURE__ */ jsx(
+        ReactFlow,
         {
-          className: "flex flex-col",
-          type: "single",
-          accentColor: "base",
-          size: "sm",
-          value: layoutDirection,
-          onValueChange: setLayoutDirection,
-          children: [
-            /* @__PURE__ */ jsx(ToggleGroup.IconItem, { className: "rounded-b-none", value: "LR", children: /* @__PURE__ */ jsx(LuIcon, { icon: "arrow-right-left" }) }),
-            /* @__PURE__ */ jsx(ToggleGroup.IconItem, { className: "rounded-t-none", value: "TB", children: /* @__PURE__ */ jsx(LuIcon, { icon: "arrow-down-up" }) })
-          ]
+          ref,
+          onInit: setReactFlow,
+          nodes: layoutedNodes,
+          onNodesChange: handleNodesChange,
+          edges: layoutedEdges,
+          onEdgesChange: handleEdgesChange,
+          nodeTypes,
+          edgeTypes,
+          onConnect: handleConnect,
+          attributionPosition: "bottom-left",
+          fitView: true,
+          minZoom: 0,
+          isValidConnection: handleValidConnection
         }
       ),
-      /* @__PURE__ */ jsx(Separator, { size: "sm" }),
-      /* @__PURE__ */ jsxs(ButtonGroup, { className: "flex flex-col ", size: "sm", accentColor: "base", variant: "soft", children: [
-        /* @__PURE__ */ jsx(IconButton, { className: "rounded-b-none", onClick: () => reactFlow == null ? void 0 : reactFlow.zoomIn(), children: /* @__PURE__ */ jsx(LuIcon, { icon: "plus" }) }),
-        /* @__PURE__ */ jsx(IconButton, { onClick: () => reactFlow == null ? void 0 : reactFlow.zoomOut(), radius: "none", children: /* @__PURE__ */ jsx(LuIcon, { icon: "minus" }) }),
-        /* @__PURE__ */ jsx(IconButton, { className: "rounded-t-none", onClick: () => reactFlow == null ? void 0 : reactFlow.fitView(), children: /* @__PURE__ */ jsx(LuIcon, { icon: "square-dashed" }) })
-      ] })
+      /* @__PURE__ */ jsx(Panel, { position: "top-left", children: /* @__PURE__ */ jsx(ButtonGroup, { className: "flex items-center justify-end gap-2", size: "sm", children: /* @__PURE__ */ jsxs(Button, { type: "button", variant: "surface", onClick: handleAddSection, children: [
+        /* @__PURE__ */ jsx(LuIcon, { icon: "plus" }),
+        " Add section"
+      ] }) }) }),
+      /* @__PURE__ */ jsxs(Panel, { position: "top-right", className: "flex flex-col items-center gap-2", children: [
+        /* @__PURE__ */ jsxs(
+          ToggleGroup.Root,
+          {
+            className: "flex flex-col",
+            type: "single",
+            accentColor: "base",
+            size: "sm",
+            value: layoutDirection,
+            onValueChange: setLayoutDirection,
+            children: [
+              /* @__PURE__ */ jsx(ToggleGroup.IconItem, { className: "rounded-b-none", value: "LR", type: "button", children: /* @__PURE__ */ jsx(LuIcon, { icon: "arrow-right-left" }) }),
+              /* @__PURE__ */ jsx(ToggleGroup.IconItem, { className: "rounded-t-none", value: "TB", type: "button", children: /* @__PURE__ */ jsx(LuIcon, { icon: "arrow-down-up" }) })
+            ]
+          }
+        ),
+        /* @__PURE__ */ jsx(Separator, { size: "sm" }),
+        /* @__PURE__ */ jsxs(ButtonGroup, { className: "flex flex-col ", size: "sm", accentColor: "base", variant: "soft", children: [
+          /* @__PURE__ */ jsx(IconButton, { className: "rounded-b-none", onClick: () => reactFlow == null ? void 0 : reactFlow.zoomIn(), type: "button", children: /* @__PURE__ */ jsx(LuIcon, { icon: "plus" }) }),
+          /* @__PURE__ */ jsx(IconButton, { onClick: () => reactFlow == null ? void 0 : reactFlow.zoomOut(), radius: "none", type: "button", children: /* @__PURE__ */ jsx(LuIcon, { icon: "minus" }) }),
+          /* @__PURE__ */ jsx(IconButton, { className: "rounded-t-none", onClick: () => reactFlow == null ? void 0 : reactFlow.fitView(), type: "button", children: /* @__PURE__ */ jsx(LuIcon, { icon: "square-dashed" }) })
+        ] })
+      ] }),
+      /* @__PURE__ */ jsx(Panel, { position: "bottom-right", children: /* @__PURE__ */ jsxs(ButtonGroup, { className: "flex items-center justify-end gap-2", size: "sm", children: [
+        onCancel && /* @__PURE__ */ jsx(Button, { type: "button", variant: "soft", accentColor: "base", onClick: onCancel, children: "Cancel" }),
+        /* @__PURE__ */ jsx(Button, { type: "submit", variant: "surface", children: "Save" })
+      ] }) })
     ] }),
-    /* @__PURE__ */ jsx(Panel, { position: "bottom-right", children: /* @__PURE__ */ jsxs(ButtonGroup, { className: "flex items-center justify-end gap-2", size: "sm", children: [
-      onCancel && /* @__PURE__ */ jsx(Button, { type: "button", variant: "soft", accentColor: "base", onClick: onCancel, children: "Cancel" }),
-      /* @__PURE__ */ jsx(Button, { type: "submit", variant: "surface", children: "Save" })
-    ] }) })
+    !!errors.fields && /* @__PURE__ */ jsx(Text, { size: "xs", accentColor: "danger", children: typeof errors.fields === "string" && errors.fields })
   ] });
 });
 FormBuilderFlowBuilder.displayName = "FormBuilderFlowBuilder";
-const FormBuilderListBuilder = memo((props) => {
-  const { showFormTitle = true, showExplainerText = true } = props;
+const FormBuilderListBuilder = memo(() => {
   const { handleSubmit, errors } = useFormikContext();
   const { onCancel } = use(FormBuilderContext);
   const fieldSchema = use(FieldSchemaContext);
@@ -35559,43 +35643,41 @@ const FormBuilderListBuilder = memo((props) => {
   const [titleFieldProps, titleMeta, titleHelpers] = useField("title");
   const [descriptionFieldProps, _descriptionMeta, descriptionHelpers] = useField("description");
   return /* @__PURE__ */ jsxs("div", { className: "flex flex-col gap-4", children: [
-    showExplainerText && /* @__PURE__ */ jsx(Text, { accentColor: "base", size: "sm", children: "Create your form using various field types. Sections can be conditionally rendered based on answers to fields in preceding sections." }),
+    /* @__PURE__ */ jsx(Text, { accentColor: "base", size: "sm", children: "Create your form using various field types. Sections can be conditionally rendered based on answers to fields in preceding sections." }),
     /* @__PURE__ */ jsxs("form", { className: "flex flex-col gap-4", id: formId, onSubmit: handleSubmit, children: [
-      showFormTitle && /* @__PURE__ */ jsxs(Fragment, { children: [
-        /* @__PURE__ */ jsx(InputWithHelpText, { severity: "danger", helpText: titleMeta.error ?? null, children: /* @__PURE__ */ jsx(
-          Input.Root,
-          {
-            variant: "outline",
-            size: "md",
-            accentColor: titleMeta.error ? SEVERITY_COLOR_MAPPING.danger : "primary",
-            children: /* @__PURE__ */ jsx(
-              Input.Field,
-              {
-                placeholder: "Enter a title",
-                value: titleFieldProps.value ?? "",
-                onChange: (event) => {
-                  void titleHelpers.setValue(event.target.value);
-                },
-                maxLength: 100
-              }
-            )
-          }
-        ) }),
-        /* @__PURE__ */ jsx(
-          TextArea,
-          {
-            className: "field-sizing-content",
-            placeholder: "Explain a description",
-            value: descriptionFieldProps.value ?? "",
-            onChange: (event) => {
-              void descriptionHelpers.setValue(event.target.value);
-            },
-            resize: "vertical",
-            maxLength: 1e3,
-            size: "md"
-          }
-        )
-      ] }),
+      /* @__PURE__ */ jsx(InputWithHelpText, { severity: "danger", helpText: titleMeta.error ?? null, children: /* @__PURE__ */ jsx(
+        Input.Root,
+        {
+          variant: "outline",
+          size: "md",
+          accentColor: titleMeta.error ? SEVERITY_COLOR_MAPPING.danger : "primary",
+          children: /* @__PURE__ */ jsx(
+            Input.Field,
+            {
+              placeholder: "Enter a title",
+              value: titleFieldProps.value ?? "",
+              onChange: (event) => {
+                void titleHelpers.setValue(event.target.value);
+              },
+              maxLength: 100
+            }
+          )
+        }
+      ) }),
+      /* @__PURE__ */ jsx(
+        TextArea,
+        {
+          className: "field-sizing-content",
+          placeholder: "Explain a description",
+          value: descriptionFieldProps.value ?? "",
+          onChange: (event) => {
+            void descriptionHelpers.setValue(event.target.value);
+          },
+          resize: "vertical",
+          maxLength: 1e3,
+          size: "md"
+        }
+      ),
       /* @__PURE__ */ jsxs("div", { className: "flex flex-col gap-4", children: [
         fieldSchema.fields.map((fieldSection, index) => /* @__PURE__ */ jsx(
           FieldSectionWithActions,
@@ -35786,45 +35868,53 @@ const FormBuilderRoot = memo((props) => {
         errors.fields = "At least one field is required.";
       }
       let fieldsToValidate = [];
-      for (const [sectionIndex, section] of form.fields.entries()) {
+      for (const [sectionIndex, section] of form.fields.entries())
         for (const [fieldIndex, field] of section.fields.entries()) {
           let fieldSettings = [];
-          if (field instanceof CheckboxListField) {
-            fieldSettings = CheckboxListField.getFieldCreationSchema(
-              `fields.${sectionIndex}.fields.${fieldIndex}`
-            ).map((field2) => field2.field);
-          } else if (field instanceof MultiSelectField) {
-            fieldSettings = MultiSelectField.getFieldCreationSchema(
-              `fields.${sectionIndex}.fields.${fieldIndex}`
-            ).map((field2) => field2.field);
-          } else if (field instanceof NumberField) {
-            fieldSettings = NumberField.getFieldCreationSchema(
-              `fields.${sectionIndex}.fields.${fieldIndex}`
-            ).map((field2) => field2.field);
-          } else if (field instanceof RadioField) {
-            fieldSettings = RadioField.getFieldCreationSchema(
-              `fields.${sectionIndex}.fields.${fieldIndex}`
-            ).map((field2) => field2.field);
-          } else if (field instanceof SelectField) {
-            fieldSettings = SelectField.getFieldCreationSchema(
-              `fields.${sectionIndex}.fields.${fieldIndex}`
-            ).map((field2) => field2.field);
-          } else if (field instanceof StringField) {
-            fieldSettings = StringField.getFieldCreationSchema(
-              `fields.${sectionIndex}.fields.${fieldIndex}`
-            ).map((field2) => field2.field);
-          } else if (field instanceof TextField) {
-            fieldSettings = TextField.getFieldCreationSchema(
-              `fields.${sectionIndex}.fields.${fieldIndex}`
-            ).map((field2) => field2.field);
-          } else if (field instanceof UploadField) {
-            fieldSettings = UploadField.getFieldCreationSchema(
-              `fields.${sectionIndex}.fields.${fieldIndex}`
-            ).map((field2) => field2.field);
+          switch (field.type) {
+            case "text":
+              fieldSettings = TextField.getFieldCreationSchema(
+                `fields.${sectionIndex}.fields.${fieldIndex}`
+              ).map((field2) => field2.field);
+              break;
+            case "number":
+              fieldSettings = NumberField.getFieldCreationSchema(
+                `fields.${sectionIndex}.fields.${fieldIndex}`
+              ).map((field2) => field2.field);
+              break;
+            case "string":
+              fieldSettings = StringField.getFieldCreationSchema(
+                `fields.${sectionIndex}.fields.${fieldIndex}`
+              ).map((field2) => field2.field);
+              break;
+            case "select":
+              fieldSettings = SelectField.getFieldCreationSchema(
+                `fields.${sectionIndex}.fields.${fieldIndex}`
+              ).map((field2) => field2.field);
+              break;
+            case "multi-select":
+              fieldSettings = MultiSelectField.getFieldCreationSchema(
+                `fields.${sectionIndex}.fields.${fieldIndex}`
+              ).map((field2) => field2.field);
+              break;
+            case "upload":
+              fieldSettings = UploadField.getFieldCreationSchema(
+                `fields.${sectionIndex}.fields.${fieldIndex}`
+              ).map((field2) => field2.field);
+              break;
+            case "radio":
+              fieldSettings = RadioField.getFieldCreationSchema(
+                `fields.${sectionIndex}.fields.${fieldIndex}`
+              ).map((field2) => field2.field);
+              break;
+            case "checkbox-list":
+              fieldSettings = fieldSettings = CheckboxListField.getFieldCreationSchema(
+                `fields.${sectionIndex}.fields.${fieldIndex}`
+              ).map((field2) => field2.field);
+              break;
           }
           fieldsToValidate = [...fieldsToValidate, ...fieldSettings];
         }
-      }
       const fieldErrors = validateFields(fieldsToValidate, form);
       if (fieldErrors) {
         errors.fields = fieldErrors.fields;
@@ -35855,16 +35945,17 @@ const FormBuilderRoot = memo((props) => {
     validateOnBlur: false,
     enableReinitialize
   });
-  const schema = useMemo(() => FieldSchema.deserialize(formik.values.fields), [formik.values.fields]);
   const observer = useCallback(
     (fieldSchema) => {
       formik.setFieldValue("fields", fieldSchema.serialize());
     },
     [formik]
   );
-  useLayoutEffect(() => {
-    return schema.observe(observer);
-  }, [observer, schema]);
+  const schema = useMemo(() => {
+    const schema2 = FieldSchema.deserialize(formik.values.fields);
+    schema2.observe(observer);
+    return schema2;
+  }, [formik.values.fields, observer]);
   const contextValue = useMemo(() => {
     return {
       disableRequiredFields,
@@ -35939,6 +36030,8 @@ export {
   maxFileSizeB,
   maxFileSizeKB,
   maxFileSizeMB,
+  separateFilesFromFieldValues,
+  separateFilesFromFields,
   serializeFieldValues,
   useFieldInput,
   useFieldInputs,

package/dist/forms.umd.cjs CHANGED Viewed

@@ -1,6 +1,6 @@
 (function(global2, factory) {
-  typeof exports === "object" && typeof module !== "undefined" ? factory(exports, require("react/jsx-runtime"), require("@overmap-ai/blocks"), require("class-variance-authority"), require("react"), require("@xyflow/react/dist/style.css"), require("@xyflow/react"), require("graphology"), require("graphology-dag"), require("uuid"), require("formik"), require("@hello-pangea/dnd"), require("lucide-react"), require("react-dom"), require("file-saver"), require("react-zxing"), require("lodash.get"), require("lodash.set"), require("@dagrejs/dagre")) : typeof define === "function" && define.amd ? define(["exports", "react/jsx-runtime", "@overmap-ai/blocks", "class-variance-authority", "react", "@xyflow/react/dist/style.css", "@xyflow/react", "graphology", "graphology-dag", "uuid", "formik", "@hello-pangea/dnd", "lucide-react", "react-dom", "file-saver", "react-zxing", "lodash.get", "lodash.set", "@dagrejs/dagre"], factory) : (global2 = typeof globalThis !== "undefined" ? globalThis : global2 || self, factory(global2.forms = {}, global2.jsxRuntime, global2.blocks, global2.classVarianceAuthority, global2.React, null, global2.react, global2.graphology, global2.graphologyDag, global2.uuid, global2.formik, global2.dnd, global2.lucideReact, global2.ReactDOM, global2.fileSaver, global2.reactZxing, global2.get, global2.set, global2.Dagre));
-})(this, function(exports2, jsxRuntime, blocks, classVarianceAuthority, React, style_css, react, graphology, graphologyDag, uuid, formik, dnd, lucideReact, ReactDOM, fileSaver, reactZxing, get, set, Dagre) {
+  typeof exports === "object" && typeof module !== "undefined" ? factory(exports, require("react/jsx-runtime"), require("@overmap-ai/blocks"), require("class-variance-authority"), require("react"), require("@xyflow/react/dist/style.css"), require("@xyflow/react"), require("formik"), require("graphology"), require("graphology-dag"), require("uuid"), require("@hello-pangea/dnd"), require("lucide-react"), require("react-dom"), require("file-saver"), require("react-zxing"), require("lodash.get"), require("lodash.set"), require("@dagrejs/dagre")) : typeof define === "function" && define.amd ? define(["exports", "react/jsx-runtime", "@overmap-ai/blocks", "class-variance-authority", "react", "@xyflow/react/dist/style.css", "@xyflow/react", "formik", "graphology", "graphology-dag", "uuid", "@hello-pangea/dnd", "lucide-react", "react-dom", "file-saver", "react-zxing", "lodash.get", "lodash.set", "@dagrejs/dagre"], factory) : (global2 = typeof globalThis !== "undefined" ? globalThis : global2 || self, factory(global2.forms = {}, global2.jsxRuntime, global2.blocks, global2.classVarianceAuthority, global2.React, null, global2.react, global2.formik, global2.graphology, global2.graphologyDag, global2.uuid, global2.dnd, global2.lucideReact, global2.ReactDOM, global2.fileSaver, global2.reactZxing, global2.get, global2.set, global2.Dagre));
+})(this, function(exports2, jsxRuntime, blocks, classVarianceAuthority, React, style_css, react, formik, graphology, graphologyDag, uuid, dnd, lucideReact, ReactDOM, fileSaver, reactZxing, get, set, Dagre) {
   "use strict";var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
@@ -34,6 +34,12 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     })
   );
   FileCard.displayName = "FileCard";
+  const SEVERITY_COLOR_MAPPING = {
+    danger: "danger",
+    warning: "warning",
+    info: "base",
+    success: "success"
+  };
   class Observable {
     constructor() {
       __publicField(this, "observers", /* @__PURE__ */ new Set());
@@ -191,12 +197,6 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     ];
   };
   const EMPTY_ARRAY = [];
-  const SEVERITY_COLOR_MAPPING = {
-    danger: "danger",
-    warning: "warning",
-    info: "base",
-    success: "success"
-  };
   const InputWithHelpText = (props) => {
     const { helpText, children, severity } = props;
     const color = severity ? SEVERITY_COLOR_MAPPING[severity] : "base";
@@ -34531,6 +34531,52 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
       return acc;
     }, {});
   };
+  const isArrayOfFiles = (value) => {
+    return Array.isArray(value) && value[0] instanceof File;
+  };
+  const separateFilesFromFieldValues = (values) => {
+    const files = {};
+    const newValues = {};
+    for (const key in values) {
+      const value = values[key];
+      if (value instanceof File) {
+        files[key] = [value];
+      } else if (isArrayOfFiles(value)) {
+        files[key] = value;
+      } else if (value !== void 0) {
+        newValues[key] = value;
+      }
+    }
+    return { values: newValues, files };
+  };
+  const separateFilesFromFields = async (fields) => {
+    const images = {};
+    const newFields = [];
+    for (const section of fields) {
+      if (section.type !== "section") {
+        throw new Error(`Expected ISerializedField type to be a section. Got ${section.type} instead.`);
+      }
+      const { fields: sectionFields } = section;
+      const newSectionFields = [];
+      for (const field of sectionFields) {
+        if (field.image) {
+          if (field.image instanceof Promise) {
+            try {
+              images[field.identifier] = await field.image;
+            } catch (e) {
+              console.error("Failed to get image from promise", e);
+            }
+          } else {
+            images[field.identifier] = field.image;
+          }
+          delete field.image;
+        }
+        newSectionFields.push(field);
+      }
+      newFields.push({ ...section, fields: newSectionFields });
+    }
+    return { fields: newFields, images };
+  };
   const FieldSettingsPopover = React.memo((props) => {
     const { popoverInputs, hasError, ...rest } = props;
     return /* @__PURE__ */ jsxRuntime.jsxs(blocks.Popover.Root, { children: [
@@ -35408,7 +35454,8 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
       edges
     ];
   };
-  const FormBuilderFlowBuilder = React.memo((_props) => {
+  const FormBuilderFlowBuilder = React.memo(() => {
+    const { handleSubmit, errors } = formik.useFormikContext();
     const { onCancel } = React.use(FormBuilderContext);
     const fieldSchema = React.use(FieldSchemaContext);
     const ref = React.useRef(null);
@@ -35497,61 +35544,98 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
       },
       [fieldSchema.fields]
     );
-    return /* @__PURE__ */ jsxRuntime.jsxs(blocks.Card, { className: "size-full relative", variant: "outline", children: [
+    const [titleFieldProps, titleMeta, titleHelpers] = formik.useField("title");
+    const [descriptionFieldProps, _descriptionMeta, descriptionHelpers] = formik.useField("description");
+    return /* @__PURE__ */ jsxRuntime.jsxs("form", { className: "size-full flex flex-col gap-4", id: formId, onSubmit: handleSubmit, children: [
+      /* @__PURE__ */ jsxRuntime.jsx(InputWithHelpText, { severity: "danger", helpText: titleMeta.error ?? null, children: /* @__PURE__ */ jsxRuntime.jsx(
+        blocks.Input.Root,
+        {
+          variant: "outline",
+          size: "md",
+          accentColor: titleMeta.error ? SEVERITY_COLOR_MAPPING.danger : "primary",
+          children: /* @__PURE__ */ jsxRuntime.jsx(
+            blocks.Input.Field,
+            {
+              placeholder: "Enter a title",
+              value: titleFieldProps.value ?? "",
+              onChange: (event) => {
+                void titleHelpers.setValue(event.target.value);
+              },
+              maxLength: 100
+            }
+          )
+        }
+      ) }),
       /* @__PURE__ */ jsxRuntime.jsx(
-        react.ReactFlow,
+        blocks.TextArea,
         {
-          ref,
-          onInit: setReactFlow,
-          nodes: layoutedNodes,
-          onNodesChange: handleNodesChange,
-          edges: layoutedEdges,
-          onEdgesChange: handleEdgesChange,
-          nodeTypes,
-          edgeTypes,
-          onConnect: handleConnect,
-          attributionPosition: "bottom-left",
-          fitView: true,
-          minZoom: 0,
-          isValidConnection: handleValidConnection
+          className: "field-sizing-content",
+          placeholder: "Explain a description",
+          value: descriptionFieldProps.value ?? "",
+          onChange: (event) => {
+            void descriptionHelpers.setValue(event.target.value);
+          },
+          resize: "vertical",
+          maxLength: 1e3,
+          size: "md"
         }
       ),
-      /* @__PURE__ */ jsxRuntime.jsx(react.Panel, { position: "top-left", children: /* @__PURE__ */ jsxRuntime.jsx(blocks.ButtonGroup, { className: "flex items-center justify-end gap-2", size: "sm", children: /* @__PURE__ */ jsxRuntime.jsxs(blocks.Button, { type: "submit", variant: "surface", onClick: handleAddSection, children: [
-        /* @__PURE__ */ jsxRuntime.jsx(blocks.LuIcon, { icon: "plus" }),
-        " Add section"
-      ] }) }) }),
-      /* @__PURE__ */ jsxRuntime.jsxs(react.Panel, { position: "top-right", className: "flex flex-col items-center gap-2", children: [
-        /* @__PURE__ */ jsxRuntime.jsxs(
-          blocks.ToggleGroup.Root,
+      /* @__PURE__ */ jsxRuntime.jsxs(blocks.Card, { className: "size-full relative", variant: "outline", children: [
+        /* @__PURE__ */ jsxRuntime.jsx(
+          react.ReactFlow,
           {
-            className: "flex flex-col",
-            type: "single",
-            accentColor: "base",
-            size: "sm",
-            value: layoutDirection,
-            onValueChange: setLayoutDirection,
-            children: [
-              /* @__PURE__ */ jsxRuntime.jsx(blocks.ToggleGroup.IconItem, { className: "rounded-b-none", value: "LR", children: /* @__PURE__ */ jsxRuntime.jsx(blocks.LuIcon, { icon: "arrow-right-left" }) }),
-              /* @__PURE__ */ jsxRuntime.jsx(blocks.ToggleGroup.IconItem, { className: "rounded-t-none", value: "TB", children: /* @__PURE__ */ jsxRuntime.jsx(blocks.LuIcon, { icon: "arrow-down-up" }) })
-            ]
+            ref,
+            onInit: setReactFlow,
+            nodes: layoutedNodes,
+            onNodesChange: handleNodesChange,
+            edges: layoutedEdges,
+            onEdgesChange: handleEdgesChange,
+            nodeTypes,
+            edgeTypes,
+            onConnect: handleConnect,
+            attributionPosition: "bottom-left",
+            fitView: true,
+            minZoom: 0,
+            isValidConnection: handleValidConnection
           }
         ),
-        /* @__PURE__ */ jsxRuntime.jsx(blocks.Separator, { size: "sm" }),
-        /* @__PURE__ */ jsxRuntime.jsxs(blocks.ButtonGroup, { className: "flex flex-col ", size: "sm", accentColor: "base", variant: "soft", children: [
-          /* @__PURE__ */ jsxRuntime.jsx(blocks.IconButton, { className: "rounded-b-none", onClick: () => reactFlow == null ? void 0 : reactFlow.zoomIn(), children: /* @__PURE__ */ jsxRuntime.jsx(blocks.LuIcon, { icon: "plus" }) }),
-          /* @__PURE__ */ jsxRuntime.jsx(blocks.IconButton, { onClick: () => reactFlow == null ? void 0 : reactFlow.zoomOut(), radius: "none", children: /* @__PURE__ */ jsxRuntime.jsx(blocks.LuIcon, { icon: "minus" }) }),
-          /* @__PURE__ */ jsxRuntime.jsx(blocks.IconButton, { className: "rounded-t-none", onClick: () => reactFlow == null ? void 0 : reactFlow.fitView(), children: /* @__PURE__ */ jsxRuntime.jsx(blocks.LuIcon, { icon: "square-dashed" }) })
-        ] })
+        /* @__PURE__ */ jsxRuntime.jsx(react.Panel, { position: "top-left", children: /* @__PURE__ */ jsxRuntime.jsx(blocks.ButtonGroup, { className: "flex items-center justify-end gap-2", size: "sm", children: /* @__PURE__ */ jsxRuntime.jsxs(blocks.Button, { type: "button", variant: "surface", onClick: handleAddSection, children: [
+          /* @__PURE__ */ jsxRuntime.jsx(blocks.LuIcon, { icon: "plus" }),
+          " Add section"
+        ] }) }) }),
+        /* @__PURE__ */ jsxRuntime.jsxs(react.Panel, { position: "top-right", className: "flex flex-col items-center gap-2", children: [
+          /* @__PURE__ */ jsxRuntime.jsxs(
+            blocks.ToggleGroup.Root,
+            {
+              className: "flex flex-col",
+              type: "single",
+              accentColor: "base",
+              size: "sm",
+              value: layoutDirection,
+              onValueChange: setLayoutDirection,
+              children: [
+                /* @__PURE__ */ jsxRuntime.jsx(blocks.ToggleGroup.IconItem, { className: "rounded-b-none", value: "LR", type: "button", children: /* @__PURE__ */ jsxRuntime.jsx(blocks.LuIcon, { icon: "arrow-right-left" }) }),
+                /* @__PURE__ */ jsxRuntime.jsx(blocks.ToggleGroup.IconItem, { className: "rounded-t-none", value: "TB", type: "button", children: /* @__PURE__ */ jsxRuntime.jsx(blocks.LuIcon, { icon: "arrow-down-up" }) })
+              ]
+            }
+          ),
+          /* @__PURE__ */ jsxRuntime.jsx(blocks.Separator, { size: "sm" }),
+          /* @__PURE__ */ jsxRuntime.jsxs(blocks.ButtonGroup, { className: "flex flex-col ", size: "sm", accentColor: "base", variant: "soft", children: [
+            /* @__PURE__ */ jsxRuntime.jsx(blocks.IconButton, { className: "rounded-b-none", onClick: () => reactFlow == null ? void 0 : reactFlow.zoomIn(), type: "button", children: /* @__PURE__ */ jsxRuntime.jsx(blocks.LuIcon, { icon: "plus" }) }),
+            /* @__PURE__ */ jsxRuntime.jsx(blocks.IconButton, { onClick: () => reactFlow == null ? void 0 : reactFlow.zoomOut(), radius: "none", type: "button", children: /* @__PURE__ */ jsxRuntime.jsx(blocks.LuIcon, { icon: "minus" }) }),
+            /* @__PURE__ */ jsxRuntime.jsx(blocks.IconButton, { className: "rounded-t-none", onClick: () => reactFlow == null ? void 0 : reactFlow.fitView(), type: "button", children: /* @__PURE__ */ jsxRuntime.jsx(blocks.LuIcon, { icon: "square-dashed" }) })
+          ] })
+        ] }),
+        /* @__PURE__ */ jsxRuntime.jsx(react.Panel, { position: "bottom-right", children: /* @__PURE__ */ jsxRuntime.jsxs(blocks.ButtonGroup, { className: "flex items-center justify-end gap-2", size: "sm", children: [
+          onCancel && /* @__PURE__ */ jsxRuntime.jsx(blocks.Button, { type: "button", variant: "soft", accentColor: "base", onClick: onCancel, children: "Cancel" }),
+          /* @__PURE__ */ jsxRuntime.jsx(blocks.Button, { type: "submit", variant: "surface", children: "Save" })
+        ] }) })
       ] }),
-      /* @__PURE__ */ jsxRuntime.jsx(react.Panel, { position: "bottom-right", children: /* @__PURE__ */ jsxRuntime.jsxs(blocks.ButtonGroup, { className: "flex items-center justify-end gap-2", size: "sm", children: [
-        onCancel && /* @__PURE__ */ jsxRuntime.jsx(blocks.Button, { type: "button", variant: "soft", accentColor: "base", onClick: onCancel, children: "Cancel" }),
-        /* @__PURE__ */ jsxRuntime.jsx(blocks.Button, { type: "submit", variant: "surface", children: "Save" })
-      ] }) })
+      !!errors.fields && /* @__PURE__ */ jsxRuntime.jsx(blocks.Text, { size: "xs", accentColor: "danger", children: typeof errors.fields === "string" && errors.fields })
     ] });
   });
   FormBuilderFlowBuilder.displayName = "FormBuilderFlowBuilder";
-  const FormBuilderListBuilder = React.memo((props) => {
-    const { showFormTitle = true, showExplainerText = true } = props;
+  const FormBuilderListBuilder = React.memo(() => {
     const { handleSubmit, errors } = formik.useFormikContext();
     const { onCancel } = React.use(FormBuilderContext);
     const fieldSchema = React.use(FieldSchemaContext);
@@ -35561,43 +35645,41 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
     const [titleFieldProps, titleMeta, titleHelpers] = formik.useField("title");
     const [descriptionFieldProps, _descriptionMeta, descriptionHelpers] = formik.useField("description");
     return /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col gap-4", children: [
-      showExplainerText && /* @__PURE__ */ jsxRuntime.jsx(blocks.Text, { accentColor: "base", size: "sm", children: "Create your form using various field types. Sections can be conditionally rendered based on answers to fields in preceding sections." }),
+      /* @__PURE__ */ jsxRuntime.jsx(blocks.Text, { accentColor: "base", size: "sm", children: "Create your form using various field types. Sections can be conditionally rendered based on answers to fields in preceding sections." }),
       /* @__PURE__ */ jsxRuntime.jsxs("form", { className: "flex flex-col gap-4", id: formId, onSubmit: handleSubmit, children: [
-        showFormTitle && /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
-          /* @__PURE__ */ jsxRuntime.jsx(InputWithHelpText, { severity: "danger", helpText: titleMeta.error ?? null, children: /* @__PURE__ */ jsxRuntime.jsx(
-            blocks.Input.Root,
-            {
-              variant: "outline",
-              size: "md",
-              accentColor: titleMeta.error ? SEVERITY_COLOR_MAPPING.danger : "primary",
-              children: /* @__PURE__ */ jsxRuntime.jsx(
-                blocks.Input.Field,
-                {
-                  placeholder: "Enter a title",
-                  value: titleFieldProps.value ?? "",
-                  onChange: (event) => {
-                    void titleHelpers.setValue(event.target.value);
-                  },
-                  maxLength: 100
-                }
-              )
-            }
-          ) }),
-          /* @__PURE__ */ jsxRuntime.jsx(
-            blocks.TextArea,
-            {
-              className: "field-sizing-content",
-              placeholder: "Explain a description",
-              value: descriptionFieldProps.value ?? "",
-              onChange: (event) => {
-                void descriptionHelpers.setValue(event.target.value);
-              },
-              resize: "vertical",
-              maxLength: 1e3,
-              size: "md"
-            }
-          )
-        ] }),
+        /* @__PURE__ */ jsxRuntime.jsx(InputWithHelpText, { severity: "danger", helpText: titleMeta.error ?? null, children: /* @__PURE__ */ jsxRuntime.jsx(
+          blocks.Input.Root,
+          {
+            variant: "outline",
+            size: "md",
+            accentColor: titleMeta.error ? SEVERITY_COLOR_MAPPING.danger : "primary",
+            children: /* @__PURE__ */ jsxRuntime.jsx(
+              blocks.Input.Field,
+              {
+                placeholder: "Enter a title",
+                value: titleFieldProps.value ?? "",
+                onChange: (event) => {
+                  void titleHelpers.setValue(event.target.value);
+                },
+                maxLength: 100
+              }
+            )
+          }
+        ) }),
+        /* @__PURE__ */ jsxRuntime.jsx(
+          blocks.TextArea,
+          {
+            className: "field-sizing-content",
+            placeholder: "Explain a description",
+            value: descriptionFieldProps.value ?? "",
+            onChange: (event) => {
+              void descriptionHelpers.setValue(event.target.value);
+            },
+            resize: "vertical",
+            maxLength: 1e3,
+            size: "md"
+          }
+        ),
         /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col gap-4", children: [
           fieldSchema.fields.map((fieldSection, index) => /* @__PURE__ */ jsxRuntime.jsx(
             FieldSectionWithActions,
@@ -35788,45 +35870,53 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
           errors.fields = "At least one field is required.";
         }
         let fieldsToValidate = [];
-        for (const [sectionIndex, section] of form.fields.entries()) {
+        for (const [sectionIndex, section] of form.fields.entries())
           for (const [fieldIndex, field] of section.fields.entries()) {
             let fieldSettings = [];
-            if (field instanceof CheckboxListField) {
-              fieldSettings = CheckboxListField.getFieldCreationSchema(
-                `fields.${sectionIndex}.fields.${fieldIndex}`
-              ).map((field2) => field2.field);
-            } else if (field instanceof MultiSelectField) {
-              fieldSettings = MultiSelectField.getFieldCreationSchema(
-                `fields.${sectionIndex}.fields.${fieldIndex}`
-              ).map((field2) => field2.field);
-            } else if (field instanceof NumberField) {
-              fieldSettings = NumberField.getFieldCreationSchema(
-                `fields.${sectionIndex}.fields.${fieldIndex}`
-              ).map((field2) => field2.field);
-            } else if (field instanceof RadioField) {
-              fieldSettings = RadioField.getFieldCreationSchema(
-                `fields.${sectionIndex}.fields.${fieldIndex}`
-              ).map((field2) => field2.field);
-            } else if (field instanceof SelectField) {
-              fieldSettings = SelectField.getFieldCreationSchema(
-                `fields.${sectionIndex}.fields.${fieldIndex}`
-              ).map((field2) => field2.field);
-            } else if (field instanceof StringField) {
-              fieldSettings = StringField.getFieldCreationSchema(
-                `fields.${sectionIndex}.fields.${fieldIndex}`
-              ).map((field2) => field2.field);
-            } else if (field instanceof TextField) {
-              fieldSettings = TextField.getFieldCreationSchema(
-                `fields.${sectionIndex}.fields.${fieldIndex}`
-              ).map((field2) => field2.field);
-            } else if (field instanceof UploadField) {
-              fieldSettings = UploadField.getFieldCreationSchema(
-                `fields.${sectionIndex}.fields.${fieldIndex}`
-              ).map((field2) => field2.field);
+            switch (field.type) {
+              case "text":
+                fieldSettings = TextField.getFieldCreationSchema(
+                  `fields.${sectionIndex}.fields.${fieldIndex}`
+                ).map((field2) => field2.field);
+                break;
+              case "number":
+                fieldSettings = NumberField.getFieldCreationSchema(
+                  `fields.${sectionIndex}.fields.${fieldIndex}`
+                ).map((field2) => field2.field);
+                break;
+              case "string":
+                fieldSettings = StringField.getFieldCreationSchema(
+                  `fields.${sectionIndex}.fields.${fieldIndex}`
+                ).map((field2) => field2.field);
+                break;
+              case "select":
+                fieldSettings = SelectField.getFieldCreationSchema(
+                  `fields.${sectionIndex}.fields.${fieldIndex}`
+                ).map((field2) => field2.field);
+                break;
+              case "multi-select":
+                fieldSettings = MultiSelectField.getFieldCreationSchema(
+                  `fields.${sectionIndex}.fields.${fieldIndex}`
+                ).map((field2) => field2.field);
+                break;
+              case "upload":
+                fieldSettings = UploadField.getFieldCreationSchema(
+                  `fields.${sectionIndex}.fields.${fieldIndex}`
+                ).map((field2) => field2.field);
+                break;
+              case "radio":
+                fieldSettings = RadioField.getFieldCreationSchema(
+                  `fields.${sectionIndex}.fields.${fieldIndex}`
+                ).map((field2) => field2.field);
+                break;
+              case "checkbox-list":
+                fieldSettings = fieldSettings = CheckboxListField.getFieldCreationSchema(
+                  `fields.${sectionIndex}.fields.${fieldIndex}`
+                ).map((field2) => field2.field);
+                break;
             }
             fieldsToValidate = [...fieldsToValidate, ...fieldSettings];
           }
-        }
         const fieldErrors = validateFields(fieldsToValidate, form);
         if (fieldErrors) {
           errors.fields = fieldErrors.fields;
@@ -35857,16 +35947,17 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
       validateOnBlur: false,
       enableReinitialize
     });
-    const schema = React.useMemo(() => FieldSchema.deserialize(formik$1.values.fields), [formik$1.values.fields]);
     const observer = React.useCallback(
       (fieldSchema) => {
         formik$1.setFieldValue("fields", fieldSchema.serialize());
       },
       [formik$1]
     );
-    React.useLayoutEffect(() => {
-      return schema.observe(observer);
-    }, [observer, schema]);
+    const schema = React.useMemo(() => {
+      const schema2 = FieldSchema.deserialize(formik$1.values.fields);
+      schema2.observe(observer);
+      return schema2;
+    }, [formik$1.values.fields, observer]);
     const contextValue = React.useMemo(() => {
       return {
         disableRequiredFields,
@@ -35940,6 +36031,8 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
   exports2.maxFileSizeB = maxFileSizeB;
   exports2.maxFileSizeKB = maxFileSizeKB;
   exports2.maxFileSizeMB = maxFileSizeMB;
+  exports2.separateFilesFromFieldValues = separateFilesFromFieldValues;
+  exports2.separateFilesFromFields = separateFilesFromFields;
   exports2.serializeFieldValues = serializeFieldValues;
   exports2.useFieldInput = useFieldInput;
   exports2.useFieldInputs = useFieldInputs;

package/package.json CHANGED Viewed

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