@overmap-ai/forms 1.0.32 → 1.0.33-condition-optimizations.0

package/dist/forms.js

@@ -2,7 +2,7 @@ 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);
 import { jsxs, jsx, Fragment as Fragment$1 } from "react/jsx-runtime";
-import { Card, LuIcon, Text, Spinner, Overlay, ButtonGroup, Tooltip, IconButton, Separator, Input, Badge, Checkbox, CheckboxGroup, Popover, Button, DayPicker, Menu, OneTimePasswordField, RadioGroup, TextArea, Rating, stopPropagation, Heading, useToast, ToggleGroup } from "@overmap-ai/blocks";
+import { Card, LuIcon, Text, Spinner, Overlay, ButtonGroup, Tooltip, IconButton, Separator, Input, Badge, Checkbox, CheckboxGroup, Popover, Button, DayPicker, Menu, OneTimePasswordField, RadioGroup, TextArea, Rating, stopPropagation, Heading, toast, ToggleGroup } from "@overmap-ai/blocks";
 import { cx } from "class-variance-authority";
 import { forwardRef, createElement, memo, createContext, useContext, useRef, useCallback, useState, useEffect, useMemo, Fragment, use, useLayoutEffect, useId } from "react";
 import "@xyflow/react/dist/style.css";
@@ -825,7 +825,7 @@ const ImageViewerProvider = memo((props) => {
   ] });
 });
 ImageViewerProvider.displayName = "FileViewerProvider";
-const InputWithLabel = (props) => {
+const InputWithLabel = memo((props) => {
   const { className, label, children, severity, inputId, labelId, image } = props;
   const [resolvedImage, setResolvedImage] = useState(void 0);
   const openImageViewer = useImageViewer();
@@ -857,7 +857,7 @@ const InputWithLabel = (props) => {
     !!label && /* @__PURE__ */ jsx("label", { className: cx(className, "w-max max-w-full"), htmlFor: inputId, children: /* @__PURE__ */ jsx(Text, { accentColor: color, size: "sm", id: labelId, className: "text-wrap", children: label }) }),
     children
   ] });
-};
+});
 const InputWithLabelAndHelpText = (props) => {
   const { children, ...restProps } = props;
   return /* @__PURE__ */ jsx(InputWithHelpText, { ...restProps, children });
@@ -884,14 +884,14 @@ const useFormikInput = (props) => {
   const label = field.required ? `${field.label} *` : field.label;
   const fieldPropsWithValidation = useMemo(() => {
     const handleChange = (value) => {
-      helpers.setValue(value, false).then();
+      void helpers.setValue(value, false);
       onValuesChange == null ? void 0 : onValuesChange(field.identifier, value);
       if (touched || !field.onlyValidateAfterTouched) {
         helpers.setError(field.getError(value));
       }
     };
     const handleBlur = (value) => {
-      void helpers.setTouched(true, false).then();
+      void helpers.setTouched(true, false);
       helpers.setError(field.getError(value));
     };
     return {
@@ -1165,7 +1165,9 @@ const _MultiStringField = class _MultiStringField extends BaseField {
     return [];
   }
   areValuesEqual(value1, value2) {
-    return value1.every((v) => value2.includes(v)) && value2.every((v) => value1.includes(v));
+    const value1Set = new Set(value1);
+    const value2Set = new Set(value2);
+    return value1Set.size === value2Set.size && value1Set.isSubsetOf(value2Set);
   }
 };
 __publicField(_MultiStringField, "fieldTypeName", "Multi-string");
@@ -1699,7 +1701,9 @@ const _CheckboxListField = class _CheckboxListField extends BaseOptionsField {
     return [];
   }
   areValuesEqual(value1, value2) {
-    return value1.every((v) => value2.includes(v)) && value2.every((v) => value1.includes(v));
+    const value1Set = new Set(value1);
+    const value2Set = new Set(value2);
+    return value1Set.size === value2Set.size && value1Set.isSubsetOf(value2Set);
   }
 };
 __publicField(_CheckboxListField, "fieldTypeName", "Checkbox list");
@@ -1939,7 +1943,9 @@ const _MultiSelectField = class _MultiSelectField extends BaseOptionsField {
     return [];
   }
   areValuesEqual(value1, value2) {
-    return value1.every((v) => value2.includes(v)) && value2.every((v) => value1.includes(v));
+    const value1Set = new Set(value1);
+    const value2Set = new Set(value2);
+    return value1Set.size === value2Set.size && value1Set.isSubsetOf(value2Set);
   }
 };
 __publicField(_MultiSelectField, "fieldTypeName", "Multi-select");
@@ -2175,7 +2181,7 @@ const _OTPField = class _OTPField extends BaseField {
     const validators = super.getFieldValidators();
     const length = this.length;
     validators.push((value) => {
-      if (!this.isValueBlank(value) && (value.length < length || value.length > length)) {
+      if (!this.isValueBlank(value) && value.length != length) {
         return `Must be ${length} characters.`;
       }
     });
@@ -2280,6 +2286,7 @@ class UUIDPromise extends Promise {
       Promise.resolve(promise).then(resolve).catch(reject);
     }, uuid);
   }
+  // oxlint-disable-next-line no-thenable
   then(onFulfilled, onRejected) {
     const promise = super.then(onFulfilled, onRejected);
     promise.uuid = this.uuid;
@@ -2301,9 +2308,9 @@ function isFileAndPromiseArray(value) {
   return value.every((item) => item instanceof UUIDPromise || item instanceof UUIDFile);
 }
 function areFileAndPromiseArraysEqual(value1, value2) {
-  if (!value1.every((promise1) => value2.some((promise2) => promise1.uuid === promise2.uuid))) return false;
-  if (!value2.every((promise2) => value1.some((promise1) => promise1.uuid === promise2.uuid))) return false;
-  return true;
+  const value1Set = new Set(value1.map(({ uuid }) => uuid));
+  const value2Set = new Set(value2.map(({ uuid }) => uuid));
+  return value1Set.size === value2Set.size && value1Set.isSubsetOf(value2Set);
 }
 const ImageCard = memo(
   forwardRef((props, forwardedRef) => {
@@ -2497,7 +2504,7 @@ const PassFailInput = memo((props) => {
   const handleRemoveFile = useCallback(
     (index) => {
       const files = [...value.files];
-      files.splice(index, 1);
+      void files.splice(index, 1);
       onChange({
         ...value,
         files
@@ -25371,7 +25378,6 @@ var PDF417CodewordDecoder = (
     return PDF417CodewordDecoder2;
   }()
 );
-const global$1 = typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {};
 var PDF417ResultMetadata = (
   /** @class */
   function() {
@@ -25666,8 +25672,8 @@ function getBigIntConstructor() {
   if (typeof window !== "undefined") {
     return window["BigInt"] || null;
   }
-  if (typeof global$1 !== "undefined") {
-    return global$1["BigInt"] || null;
+  if (typeof global !== "undefined") {
+    return global["BigInt"] || null;
   }
   if (typeof self !== "undefined") {
     return self["BigInt"] || null;
@@ -31161,7 +31167,15 @@ const SCANNER_HINTS = /* @__PURE__ */ new Map([
   ]
 ]);
 const Scanner = memo((props) => {
-  const { children, open, onOpenChange, defaultOpen, modal, ...rest } = props;
+  const {
+    children,
+    open,
+    onOpenChange,
+    // oxlint-disable-line unbound-method
+    defaultOpen,
+    modal,
+    ...rest
+  } = props;
   return /* @__PURE__ */ jsxs(Overlay.Root, { open, onOpenChange, defaultOpen, modal, children: [
     !!children && /* @__PURE__ */ jsx(Overlay.Trigger, { asChild: true, children }),
     /* @__PURE__ */ jsxs(Overlay.Content, { children: [
@@ -31569,7 +31583,7 @@ const UploadInput = memo((props) => {
   const handleRemove = useCallback(
     (index) => {
       const files = [...value];
-      files.splice(index, 1);
+      void files.splice(index, 1);
       onChange(files);
     },
     [value, onChange]
@@ -31842,12 +31856,12 @@ class ConditionModifier {
   constructor(config) {
     __publicField(this, "id");
     __publicField(this, "label");
-    __publicField(this, "modifierFn");
+    __publicField(this, "getApplyFn");
     __publicField(this, "serialize");
     __publicField(this, "deserialize");
-    const { id, modifierFn, label, serialize, deserialize: deserialize2 } = config;
+    const { id, getApplyFn, label, serialize, deserialize: deserialize2 } = config;
     this.id = id;
-    this.modifierFn = modifierFn;
+    this.getApplyFn = getApplyFn;
     this.label = label;
     this.serialize = serialize;
     this.deserialize = deserialize2;
@@ -31859,40 +31873,34 @@ class ConditionModifier {
 const BooleanEqualsConditionModifier = ConditionModifier.create({
   id: "nullable-boolean-equals",
   label: "is",
-  modifierFn: (value, filterValue) => value === filterValue,
+  getApplyFn: (filterValue) => (value) => value === filterValue,
   serialize: (filterValue) => filterValue,
   deserialize: (filterValue) => filterValue
 });
 const BooleanNotEqualsConditionModifier = ConditionModifier.create({
   id: "nullable-boolean-not-equals",
   label: "is not",
-  modifierFn: (value, filterValue) => value !== filterValue,
+  getApplyFn: (filterValue) => (value) => value !== filterValue,
   serialize: (filterValue) => filterValue,
   deserialize: (filterValue) => filterValue
 });
 const DateEqualsConditionModifier = ConditionModifier.create({
   id: "date-equals",
-  modifierFn: (value, filterValue) => {
-    return value.getTime() === filterValue.getTime();
-  },
+  getApplyFn: (filterValue) => (value) => value.getTime() === filterValue.getTime(),
   label: "is",
   serialize: (filterValue) => filterValue.toISOString(),
   deserialize: (filterValue) => new Date(filterValue)
 });
 const DateNotEqualsConditionModifier = ConditionModifier.create({
   id: "date-not-equals",
-  modifierFn: (value, filterValue) => {
-    return value.getTime() !== filterValue.getTime();
-  },
+  getApplyFn: (filterValue) => (value) => value.getTime() !== filterValue.getTime(),
   label: "is not",
   serialize: (filterValue) => filterValue.toISOString(),
   deserialize: (filterValue) => new Date(filterValue)
 });
 const DateBeforeConditionModifier = ConditionModifier.create({
   id: "date-before",
-  modifierFn: (value, filterValue) => {
-    return value.getTime() < filterValue.getTime();
-  },
+  getApplyFn: (filterValue) => (value) => value.getTime() < filterValue.getTime(),
   label: "before",
   serialize: (filterValue) => filterValue.toISOString(),
   deserialize: (filterValue) => new Date(filterValue)
@@ -31900,16 +31908,14 @@ const DateBeforeConditionModifier = ConditionModifier.create({
 const DateAfterConditionModifier = ConditionModifier.create({
   id: "date-after",
   label: "after",
-  modifierFn: (value, filterValue) => {
-    return value.getTime() > filterValue.getTime();
-  },
+  getApplyFn: (filterValue) => (value) => value.getTime() > filterValue.getTime(),
   serialize: (filterValue) => filterValue.toISOString(),
   deserialize: (filterValue) => new Date(filterValue)
 });
 const DateRangeInConditionModifier = ConditionModifier.create({
   id: "date-range-in",
   label: "in between",
-  modifierFn: (value, filterValue) => {
+  getApplyFn: (filterValue) => (value) => {
     if ((filterValue == null ? void 0 : filterValue.from) && filterValue.from.getTime() > value.getTime()) return false;
     if ((filterValue == null ? void 0 : filterValue.to) && filterValue.to.getTime() < value.getTime()) return false;
     return true;
@@ -31931,7 +31937,7 @@ const DateRangeInConditionModifier = ConditionModifier.create({
 const DateRangeNotInConditionModifier = ConditionModifier.create({
   id: "date-range-not-in",
   label: "not in between",
-  modifierFn: (value, filterValue) => {
+  getApplyFn: (filterValue) => (value) => {
     if ((filterValue == null ? void 0 : filterValue.from) && filterValue.from.getTime() > value.getTime()) return true;
     if ((filterValue == null ? void 0 : filterValue.to) && filterValue.to.getTime() < value.getTime()) return true;
     return false;
@@ -31953,74 +31959,62 @@ const DateRangeNotInConditionModifier = ConditionModifier.create({
 const HasFilesConditionModifier = ConditionModifier.create({
   id: "has-files",
   label: "is",
-  modifierFn: (value, _filterValue) => value.length > 0,
+  getApplyFn: (_filterValue) => (value) => value.length > 0,
   serialize: (filterValue) => filterValue,
   deserialize: (filterValue) => filterValue
 });
 const DoesNotHaveFilesConditionModifier = ConditionModifier.create({
   id: "does-not-have-files",
   label: "is not",
-  modifierFn: (value, _filterValue) => value.length === 0,
+  getApplyFn: (_filterValue) => (value) => value.length === 0,
   serialize: (filterValue) => filterValue,
   deserialize: (filterValue) => filterValue
 });
 const NumberEqualsConditionModifier = ConditionModifier.create({
   id: "number-equals",
-  modifierFn: (value, filterValue) => {
-    return value === filterValue;
-  },
+  getApplyFn: (filterValue) => (value) => value === filterValue,
   label: "is",
   serialize: (filterValue) => filterValue,
   deserialize: (filterValue) => filterValue
 });
 const NumberNotEqualsConditionModifier = ConditionModifier.create({
   id: "number-not-equals",
-  modifierFn: (value, filterValue) => {
-    return value !== filterValue;
-  },
+  getApplyFn: (filterValue) => (value) => value !== filterValue,
   label: "is not",
   serialize: (filterValue) => filterValue,
   deserialize: (filterValue) => filterValue
 });
 const NumberLessThanConditionModifier = ConditionModifier.create({
   id: "number-less-than",
-  modifierFn: (value, filterValue) => {
-    return value < filterValue;
-  },
+  getApplyFn: (filterValue) => (value) => value < filterValue,
   label: "is less than",
   serialize: (filterValue) => filterValue,
   deserialize: (filterValue) => filterValue
 });
 const NumberLessThanOrEqualsConditionModifier = ConditionModifier.create({
   id: "number-less-than-or-equals",
-  modifierFn: (value, filterValue) => {
-    return value <= filterValue;
-  },
+  getApplyFn: (filterValue) => (value) => value <= filterValue,
   label: "is less than or equal to",
   serialize: (filterValue) => filterValue,
   deserialize: (filterValue) => filterValue
 });
 const NumberGreaterThanConditionModifier = ConditionModifier.create({
   id: "number-greater-than",
-  modifierFn: (value, filterValue) => {
-    return value > filterValue;
-  },
+  getApplyFn: (filterValue) => (value) => value > filterValue,
   label: "is greater than",
   serialize: (filterValue) => filterValue,
   deserialize: (filterValue) => filterValue
 });
 const NumberGreaterThanOrEqualsConditionModifier = ConditionModifier.create({
   id: "number-greater-than-or-equals",
-  modifierFn: (value, filterValue) => {
-    return value >= filterValue;
-  },
+  getApplyFn: (filterValue) => (value) => value >= filterValue,
   label: "is greater than or equal to",
   serialize: (filterValue) => filterValue,
   deserialize: (filterValue) => filterValue
 });
 const NumberRangeInConditionModifier = ConditionModifier.create({
   id: "number-range-in",
-  modifierFn: (value, filterValue) => {
+  getApplyFn: (filterValue) => (value) => {
     if (filterValue.to && value > filterValue.to) return false;
     if (filterValue.from && value < filterValue.from) return false;
     return true;
@@ -32031,7 +32025,7 @@ const NumberRangeInConditionModifier = ConditionModifier.create({
 });
 const NumberRangeNotInConditionModifier = ConditionModifier.create({
   id: "number-range-not-in",
-  modifierFn: (value, filterValue) => {
+  getApplyFn: (filterValue) => (value) => {
     if (filterValue.to && value > filterValue.to) return true;
     if (filterValue.from && value < filterValue.from) return true;
     return false;
@@ -32042,26 +32036,23 @@ const NumberRangeNotInConditionModifier = ConditionModifier.create({
 });
 const PassFailEqualsConditionModifier = ConditionModifier.create({
   id: "pass-fail-equals",
-  modifierFn: (value, filterValue) => {
-    return value === filterValue;
-  },
+  getApplyFn: (filterValue) => (value) => value === filterValue,
   label: "is",
   serialize: (filterValue) => filterValue,
   deserialize: (filterValue) => filterValue
 });
 const PassFailNotEqualsConditionModifier = ConditionModifier.create({
   id: "pass-fail-not-equals",
-  modifierFn: (value, filterValue) => {
-    return value !== filterValue;
-  },
+  getApplyFn: (filterValue) => (value) => value !== filterValue,
   label: "is not",
   serialize: (filterValue) => filterValue,
   deserialize: (filterValue) => filterValue
 });
 const PassFailArrayIncludesConditionModifier = ConditionModifier.create({
   id: "pass-fail-array-includes",
-  modifierFn: (value, filterValue) => {
-    return filterValue.includes(value);
+  getApplyFn: (filterValue) => {
+    const filterValueSet = new Set(filterValue);
+    return (value) => filterValueSet.has(value);
   },
   label: "is any of",
   serialize: (filterValue) => filterValue,
@@ -32069,8 +32060,9 @@ const PassFailArrayIncludesConditionModifier = ConditionModifier.create({
 });
 const PassFailArrayExcludesConditionModifier = ConditionModifier.create({
   id: "pass-fail-array-excludes",
-  modifierFn: (value, filterValue) => {
-    return !filterValue.includes(value);
+  getApplyFn: (filterValue) => {
+    const filterValueSet = new Set(filterValue);
+    return (value) => !filterValueSet.has(value);
   },
   label: "is none of",
   serialize: (filterValue) => filterValue,
@@ -32078,44 +32070,37 @@ const PassFailArrayExcludesConditionModifier = ConditionModifier.create({
 });
 const StringEqualsConditionModifier = ConditionModifier.create({
   id: "nullable-string-equals",
-  modifierFn: (value, filterValue) => {
-    return value === filterValue;
-  },
+  getApplyFn: (filterValue) => (value) => value === filterValue,
   label: "is",
   serialize: (filterValue) => filterValue,
   deserialize: (filterValue) => filterValue
 });
 const StringNotEqualsConditionModifier = ConditionModifier.create({
   id: "nullable-string-not-equals",
-  modifierFn: (value, filterValue) => {
-    return value !== filterValue;
-  },
+  getApplyFn: (filterValue) => (value) => value !== filterValue,
   label: "is not",
   serialize: (filterValue) => filterValue,
   deserialize: (filterValue) => filterValue
 });
 const StringIncludesConditionModifier = ConditionModifier.create({
   id: "string-includes",
-  modifierFn: (value, filterValue) => {
-    return value.includes(filterValue);
-  },
+  getApplyFn: (filterValue) => (value) => value.includes(filterValue),
   label: "includes",
   serialize: (filterValue) => filterValue,
   deserialize: (filterValue) => filterValue
 });
 const StringExcludesConditionModifier = ConditionModifier.create({
   id: "string-excludes",
-  modifierFn: (value, filterValue) => {
-    return !value.includes(filterValue);
-  },
+  getApplyFn: (filterValue) => (value) => !value.includes(filterValue),
   label: "does not include",
   serialize: (filterValue) => filterValue,
   deserialize: (filterValue) => filterValue
 });
 const StringArrayIncludesConditionModifier = ConditionModifier.create({
   id: "string-array-includes",
-  modifierFn: (value, filterValue) => {
-    return filterValue.includes(value);
+  getApplyFn: (filterValue) => {
+    const filterValueSet = new Set(filterValue);
+    return (value) => filterValueSet.has(value);
   },
   label: "is any of",
   serialize: (filterValue) => filterValue,
@@ -32123,8 +32108,9 @@ const StringArrayIncludesConditionModifier = ConditionModifier.create({
 });
 const StringArrayExcludesConditionModifier = ConditionModifier.create({
   id: "string-array-excludes",
-  modifierFn: (value, filterValue) => {
-    return !filterValue.includes(value);
+  getApplyFn: (filterValue) => {
+    const filterValueSet = new Set(filterValue);
+    return (value) => !filterValueSet.has(value);
   },
   label: "is none of",
   serialize: (filterValue) => filterValue,
@@ -32132,8 +32118,12 @@ const StringArrayExcludesConditionModifier = ConditionModifier.create({
 });
 const StringArrayEveryConditionModifier = ConditionModifier.create({
   id: "string-array-every",
-  modifierFn: (value, filterValue) => {
-    return filterValue.every((filterValue2) => value.includes(filterValue2));
+  getApplyFn: (filterValue) => {
+    const filterValueSet = new Set(filterValue);
+    return (value) => {
+      const valueSet = new Set(value);
+      return filterValueSet.isSubsetOf(valueSet);
+    };
   },
   label: "has all of",
   serialize: (filterValue) => filterValue,
@@ -32141,8 +32131,12 @@ const StringArrayEveryConditionModifier = ConditionModifier.create({
 });
 const StringArraySomeConditionModifier = ConditionModifier.create({
   id: "string-array-some",
-  modifierFn: (value, filterValue) => {
-    return filterValue.some((filterValue2) => value.includes(filterValue2));
+  getApplyFn: (filterValue) => {
+    const filterValueSet = new Set(filterValue);
+    return (value) => {
+      const valueSet = new Set(value);
+      return !filterValueSet.isDisjointFrom(valueSet);
+    };
   },
   label: "has any of",
   serialize: (filterValue) => filterValue,
@@ -32150,8 +32144,12 @@ const StringArraySomeConditionModifier = ConditionModifier.create({
 });
 const StringArrayNoneConditionModifier = ConditionModifier.create({
   id: "string-array-none",
-  modifierFn: (value, filterValue) => {
-    return filterValue.every((filterValue2) => !value.includes(filterValue2));
+  getApplyFn: (filterValue) => {
+    const filterValueSet = new Set(filterValue);
+    return (value) => {
+      const valueSet = new Set(value);
+      return filterValueSet.isDisjointFrom(valueSet);
+    };
   },
   label: "has none of",
   serialize: (filterValue) => filterValue,
@@ -32159,10 +32157,12 @@ const StringArrayNoneConditionModifier = ConditionModifier.create({
 });
 const StringArrayEqualsConditionModifier = ConditionModifier.create({
   id: "string-array-equals",
-  modifierFn: (value, filterValue) => {
-    if (filterValue === null && value === null) return true;
-    if (filterValue === null || value === null) return false;
-    return value.every((value2) => filterValue.includes(value2)) && filterValue.every((filterValue2) => value.includes(filterValue2));
+  getApplyFn: (filterValue) => {
+    const filterValueSet = new Set(filterValue);
+    return (value) => {
+      const valueSet = new Set(value);
+      return filterValueSet.size === valueSet.size && valueSet.isSubsetOf(filterValueSet);
+    };
   },
   label: "is",
   serialize: (filterValue) => filterValue,
@@ -32170,10 +32170,12 @@ const StringArrayEqualsConditionModifier = ConditionModifier.create({
 });
 const StringArrayNotEqualsConditionModifier = ConditionModifier.create({
   id: "string-array-not-equals",
-  modifierFn: (value, filterValue) => {
-    if (filterValue === null && value === null) return false;
-    if (filterValue === null || value === null) return true;
-    return !(value.every((value2) => filterValue.includes(value2)) && filterValue.every((filterValue2) => value.includes(filterValue2)));
+  getApplyFn: (filterValue) => {
+    const filterValueSet = new Set(filterValue);
+    return (value) => {
+      const valueSet = new Set(value);
+      return filterValueSet.size !== valueSet.size || !valueSet.isSubsetOf(filterValueSet);
+    };
   },
   label: "is not",
   serialize: (filterValue) => filterValue,
@@ -32212,14 +32214,20 @@ class BaseCondition extends Observable {
     __publicField(this, "getConditionModifiers", () => {
       return Object.entries(this.modifiers);
     });
-    __publicField(this, "apply", (value) => {
+    __publicField(this, "accessorFn", (values) => {
+      return values[this.field.identifier];
+    });
+    __publicField(this, "getApplyFn", () => {
       const modifier = this.modifiers[this.conditionModifier];
       const conditionValue = this.getConditionValue();
-      if (conditionValue == void 0) return true;
-      if (!modifier.isConditionValueValid(conditionValue)) return true;
-      const transformedValue = this.transformValue(value);
-      if (!modifier.isValueValid(transformedValue)) return false;
-      return modifier.modifier.modifierFn(transformedValue, conditionValue);
+      const conditionValueInvalid = conditionValue === void 0 || !modifier.isConditionValueValid(conditionValue);
+      const applyFn = modifier.modifier.getApplyFn(conditionValue);
+      return (value) => {
+        if (conditionValueInvalid) return true;
+        const transformedValue = this.transformValue(value);
+        if (!modifier.isValueValid(transformedValue)) return false;
+        return applyFn(transformedValue);
+      };
     });
     this.id = id;
     this.field = field;
@@ -32711,6 +32719,55 @@ class CheckboxListFieldCondition extends BaseCondition {
     return /* @__PURE__ */ jsx(CheckboxListFieldConditionCell, { condition: this, ...props }, this.id);
   }
 }
+class ConditionManager extends Observable {
+  constructor(conditions) {
+    super();
+    __publicField(this, "conditions");
+    __publicField(this, "conditionObserver", () => {
+      this.conditions = [...this.conditions];
+      this.notify(this);
+    });
+    __publicField(this, "initConditions", (conditions) => {
+      for (const c of conditions) c.observe(this.conditionObserver);
+      return conditions;
+    });
+    this.conditions = this.initConditions(conditions);
+  }
+  getConditions() {
+    return this.conditions;
+  }
+  addCondition(condition) {
+    this.conditions = this.initConditions([...this.conditions, condition]);
+    this.notify(this);
+  }
+  addConditions(conditions) {
+    this.conditions = this.initConditions([...this.conditions, ...conditions]);
+    this.notify(this);
+  }
+  removeCondition(condition) {
+    this.conditions = this.initConditions(this.conditions.filter((c) => c.id !== condition.id));
+    this.notify(this);
+  }
+  removeConditions(conditions) {
+    const conditionIds = new Set(conditions.map((c) => c.id));
+    this.conditions = this.initConditions(this.conditions.filter((c) => !conditionIds.has(c.id)));
+    this.notify(this);
+  }
+  applyConditions(values) {
+    if (this.conditions.length === 0) return true;
+    const applyAndAccessorFns = this.conditions.map((condition) => [condition.getApplyFn(), condition.accessorFn]);
+    return applyAndAccessorFns.every(([applyFn, accessorFn]) => {
+      return applyFn(accessorFn(values));
+    });
+  }
+}
+const useConditionManager = (conditions, onConditionsChange) => {
+  return useMemo(() => {
+    const ret = new ConditionManager(conditions);
+    ret.observe((conditionManager) => onConditionsChange(conditionManager.getConditions()));
+    return ret;
+  }, [conditions, onConditionsChange]);
+};
 const DateFieldConditionCell = (props) => {
   const { condition, onRemove } = props;
   const conditionValue = condition.getConditionValue();
@@ -34028,56 +34085,6 @@ const deserializeConditions = (fields, serializedConditions) => {
     (serializedCondition) => deserializeCondition(fieldsMapping[serializedCondition.fieldId], serializedCondition)
   );
 };
-const applyConditions = (conditions, values) => {
-  return conditions.length > 0 ? conditions.every((condition) => {
-    return condition.apply(values[condition.field.identifier]);
-  }) : true;
-};
-class ConditionManager extends Observable {
-  constructor(conditions) {
-    super();
-    __publicField(this, "conditions");
-    __publicField(this, "conditionObserver", () => {
-      this.conditions = [...this.conditions];
-      this.notify(this);
-    });
-    __publicField(this, "initConditions", (conditions) => {
-      for (const c of conditions) c.observe(this.conditionObserver);
-      return conditions;
-    });
-    this.conditions = this.initConditions(conditions);
-  }
-  getConditions() {
-    return this.conditions;
-  }
-  addCondition(condition) {
-    this.conditions = this.initConditions([...this.conditions, condition]);
-    this.notify(this);
-  }
-  addConditions(conditions) {
-    this.conditions = this.initConditions([...this.conditions, ...conditions]);
-    this.notify(this);
-  }
-  removeCondition(condition) {
-    this.conditions = this.initConditions(this.conditions.filter((c) => c.id !== condition.id));
-    this.notify(this);
-  }
-  removeConditions(conditions) {
-    const conditionIds = new Set(conditions.map((c) => c.id));
-    this.conditions = this.initConditions(this.conditions.filter((c) => !conditionIds.has(c.id)));
-    this.notify(this);
-  }
-  applyConditions(values) {
-    return applyConditions(this.conditions, values);
-  }
-}
-const useConditionManager = (conditions, onConditionsChange) => {
-  return useMemo(() => {
-    const ret = new ConditionManager(conditions);
-    ret.observe((conditionManager) => onConditionsChange(conditionManager.getConditions()));
-    return ret;
-  }, [conditions, onConditionsChange]);
-};
 const deserializeField = (serializedField) => {
   return FieldTypeToClsMapping[serializedField.type].deserialize(serializedField);
 };
@@ -34247,9 +34254,11 @@ const FieldSectionLayout = memo((props) => {
   }, [fieldSections, section.identifier]);
   const conditionMet = useMemo(() => {
     if (conditionalSections.length === 0) return true;
-    return conditionalSections.some(
-      (conditionalSection) => applyConditions(conditionalSection.getConditions(section.identifier), values)
-    );
+    return conditionalSections.some((conditionalSection) => {
+      const conditions = conditionalSection.getConditions(section.identifier);
+      const conditionManager = new ConditionManager(conditions);
+      return conditionManager.applyConditions(values);
+    });
   }, [conditionalSections, section, values]);
   const inputs = useFieldInputs(section.fields, rest);
   if (!conditionMet) return null;
@@ -34309,14 +34318,6 @@ const _FieldSection = class _FieldSection extends BaseFormElement {
       fields: this.fields.map((field) => field.serialize())
     };
   }
-  static deserialize(data) {
-    const fields = data.fields.map(deserializeField);
-    const conditions = {};
-    for (const [sectionId, serializedConditions] of Object.entries(data.conditions)) {
-      conditions[sectionId] = deserializeConditions(fields, serializedConditions);
-    }
-    return new _FieldSection({ ...data, fields, conditions });
-  }
   getOptions() {
     return {
       ...super.getOptions(),
@@ -34412,7 +34413,10 @@ const _FieldSection = class _FieldSection extends BaseFormElement {
     return new Set(Object.keys(this.conditions));
   }
   addConditional(identifier) {
-    this.conditions = this.initConditions({ ...this.conditions, [identifier]: [] });
+    this.conditions = this.initConditions({
+      ...this.conditions,
+      [identifier]: []
+    });
     this.notify(this);
   }
   removeConditional(identifier) {
@@ -34428,6 +34432,14 @@ const _FieldSection = class _FieldSection extends BaseFormElement {
 };
 __publicField(_FieldSection, "fieldTypeName", "Section");
 __publicField(_FieldSection, "fieldTypeDescription", "Sections can be useful for grouping fields together. They can also be conditionally shown or hidden.");
+__publicField(_FieldSection, "deserialize", (data) => {
+  const fields = data.fields.map(deserializeField);
+  const conditions = {};
+  for (const [sectionId, serializedConditions] of Object.entries(data.conditions)) {
+    conditions[sectionId] = deserializeConditions(fields, serializedConditions);
+  }
+  return new _FieldSection({ ...data, fields, conditions });
+});
 let FieldSection = _FieldSection;
 class FieldSchema extends Observable {
   constructor(fields) {
@@ -34894,7 +34906,6 @@ const FieldBuilder = memo((props) => {
 FieldBuilder.displayName = "FieldBuilder";
 const FieldBuilderWithActions = memo((props) => {
   const { field, fieldSection, fieldIndex, sectionIndex } = props;
-  const { showError } = useToast();
   const fileInputRef = useRef(null);
   const parentPath = `fields.${sectionIndex}.fields`;
   const handleAddField = useCallback(
@@ -34920,7 +34931,7 @@ const FieldBuilderWithActions = memo((props) => {
       const file = files.item(0);
       if (!file) return;
       if (file.size > maxFileSizeB) {
-        showError({
+        toast.error({
           title: "File upload error",
           description: `The file ${file.name} exceeded the maximum file size`
         });
@@ -34930,7 +34941,7 @@ const FieldBuilderWithActions = memo((props) => {
         image: file
       });
     },
-    [field, showError]
+    [field]
   );
   const handleMoveUp = useCallback(() => {
     moveField("up");
@@ -35665,9 +35676,12 @@ const validateFields = (fields, values) => {
   for (const field of fields) {
     if (field instanceof FieldSection) {
       const conditionalSections = sectionElements.filter((section) => field.identifier in section.conditions);
-      const conditionMet = conditionalSections.length > 0 ? conditionalSections.some(
-        (conditionalSection) => applyConditions(conditionalSection.getConditions(field.identifier), values)
-      ) : true;
+      if (conditionalSections.length === 0) continue;
+      const conditionMet = conditionalSections.some((conditionalSection) => {
+        const conditions = conditionalSection.getConditions(field.identifier);
+        const conditionManager = new ConditionManager(conditions);
+        return conditionManager.applyConditions(values);
+      });
       if (!conditionMet) continue;
       Object.assign(errors, field.getErrors(values));
     } else {
@@ -35681,34 +35695,10 @@ const validateFields = (fields, values) => {
   }
   if (Object.keys(errors).length > 0) return errors;
 };
-const cleanFields = (fields, values) => {
-  const errors = {};
-  const sectionElements = fields.filter((f) => f instanceof FieldSection);
-  for (const field of fields) {
-    if (field instanceof FieldSection) {
-      const conditionalSections = sectionElements.filter((section) => field.identifier in section.conditions);
-      const conditionMet = conditionalSections.length > 0 ? conditionalSections.some(
-        (conditionalSection) => applyConditions(conditionalSection.getConditions(field.identifier), values)
-      ) : true;
-      if (conditionMet) continue;
-    } else {
-      if (!(field instanceof BaseField)) {
-        throw new Error("Invalid field type");
-      }
-      const id = field.identifier;
-      const error = field.getError(get(values, id));
-      if (error) set(errors, id, error);
-    }
-  }
-  if (Object.keys(errors).length > 0) return errors;
-};
 const separateImagesFromFields = 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) {
@@ -35764,9 +35754,9 @@ const FormRenderer = memo(
     }, [schema.fields, values]);
     const handleSubmit = useCallback(
       (values2) => {
-        onSubmit == null ? void 0 : onSubmit(
+        void (onSubmit == null ? void 0 : onSubmit(
           excludeUnchangedFields ? changedFieldValues(flattenFields(schema.fields), initialValues, values2) : values2
-        );
+        ));
       },
       [excludeUnchangedFields, initialValues, onSubmit, schema.fields]
     );
@@ -35876,43 +35866,39 @@ const FormBuilderRoot = memo((props) => {
     enableReinitialize = false,
     disableRequiredFields = false
   } = props;
-  const { showError } = useToast();
-  const validate = useCallback(
-    (form) => {
-      var _a2;
-      const errors = {};
-      if (!form.title) {
-        errors.title = "Title is required.";
-      }
-      if (!form.fields || form.fields.length === 0) {
-        errors.fields = "At least one field is required.";
-      }
-      const fieldsToValidate = [];
-      for (const [sectionIndex, section] of form.fields.entries())
-        for (const [fieldIndex, field] of section.fields.entries()) {
-          const fieldSettings = ((_a2 = getFieldCreationSchema(field.type, `fields.${sectionIndex}.fields.${fieldIndex}`)) == null ? void 0 : _a2.map(
-            ({ field: field2 }) => field2
-          )) ?? [];
-          fieldsToValidate.push(...fieldSettings);
-        }
-      const values = {};
-      for (const field of fieldsToValidate) {
-        values[field.identifier] = get(form, field.identifier);
-      }
-      const fieldErrors = validateFields(fieldsToValidate, values);
-      if (fieldErrors) {
-        errors.fields = fieldErrors.fields;
-      }
-      if (Object.keys(errors).length > 0) {
-        showError({
-          title: "Some form settings are invalid",
-          description: "Please check settings highlighted in red."
-        });
-        return errors;
-      }
-    },
-    [showError]
-  );
+  const validate = useCallback((form) => {
+    var _a2;
+    const errors = {};
+    if (!form.title) {
+      errors.title = "Title is required.";
+    }
+    if (!form.fields || form.fields.length === 0) {
+      errors.fields = "At least one field is required.";
+    }
+    const fieldsToValidate = [];
+    for (const [sectionIndex, section] of form.fields.entries())
+      for (const [fieldIndex, field] of section.fields.entries()) {
+        const fieldSettings = ((_a2 = getFieldCreationSchema(field.type, `fields.${sectionIndex}.fields.${fieldIndex}`)) == null ? void 0 : _a2.map(
+          ({ field: field2 }) => field2
+        )) ?? [];
+        fieldsToValidate.push(...fieldSettings);
+      }
+    const values = {};
+    for (const field of fieldsToValidate) {
+      values[field.identifier] = get(form, field.identifier);
+    }
+    const fieldErrors = validateFields(fieldsToValidate, values);
+    if (fieldErrors) {
+      errors.fields = fieldErrors.fields;
+    }
+    if (Object.keys(errors).length > 0) {
+      toast.error({
+        title: "Some form settings are invalid",
+        description: "Please check settings highlighted in red."
+      });
+      return errors;
+    }
+  }, []);
   const initialValues = useMemo(
     () => ({
       title: initialTitle ?? "",
@@ -35931,7 +35917,7 @@ const FormBuilderRoot = memo((props) => {
   });
   const observer = useCallback(
     (fieldSchema) => {
-      formik.setFieldValue("fields", fieldSchema.serialize());
+      void formik.setFieldValue("fields", fieldSchema.serialize());
     },
     [formik]
   );
@@ -36078,13 +36064,11 @@ export {
   UploadFieldCondition,
   UploadFieldConditionCell,
   UploadInput,
-  applyConditions,
   areFileAndPromiseArraysEqual,
   arePassFieldValuesEqual,
   awaitFilesAndPromises,
   changedFieldValues,
   cleanFieldValues,
-  cleanFields,
   cleanSerializedFieldValues,
   createCondition,
   createConditionModifierConfig,
@@ -36125,3 +36109,4 @@ export {
   useScanner,
   validateFields
 };
+//# sourceMappingURL=forms.js.map