@dxos/react-ui-form 0.7.5-labs.e27f9b9 → 0.7.5-labs.ea4b4c2

package/dist/lib/node/index.cjs

@@ -48,7 +48,8 @@ __export(node_exports, {
   parseValue: () => parseValue,
   pathNotUniqueError: () => pathNotUniqueError,
   translations: () => translations_default,
-  useForm: () => useForm
+  useForm: () => useForm,
+  useFormValues: () => useFormValues
 });
 module.exports = __toCommonJS(node_exports);
 var import_react = __toESM(require("react"));
@@ -60,38 +61,38 @@ var import_log = require("@dxos/log");
 var import_react_ui2 = require("@dxos/react-ui");
 var import_schema = require("@dxos/schema");
 var import_react3 = __toESM(require("react"));
+var import_debug = require("@dxos/debug");
+var import_echo_schema2 = require("@dxos/echo-schema");
+var import_effect = require("@dxos/effect");
+var import_react4 = require("react");
+var import_echo_schema3 = require("@dxos/echo-schema");
+var import_effect2 = require("@dxos/effect");
+var import_invariant = require("@dxos/invariant");
+var import_log2 = require("@dxos/log");
+var import_schema2 = require("@dxos/schema");
+var import_react5 = __toESM(require("react"));
 var import_react_ui3 = require("@dxos/react-ui");
 var import_util = require("@dxos/util");
-var import_react4 = __toESM(require("react"));
+var import_react6 = __toESM(require("react"));
 var import_react_ui4 = require("@dxos/react-ui");
 var import_react_ui_theme2 = require("@dxos/react-ui-theme");
-var import_react5 = __toESM(require("react"));
+var import_react7 = __toESM(require("react"));
 var import_keys = require("@dxos/keys");
 var import_react_ui5 = require("@dxos/react-ui");
 var import_react_ui_list = require("@dxos/react-ui-list");
 var import_react_ui_pickers = require("@dxos/react-ui-pickers");
 var import_react_ui_theme3 = require("@dxos/react-ui-theme");
-var import_react6 = __toESM(require("react"));
+var import_react8 = __toESM(require("react"));
 var import_react_ui6 = require("@dxos/react-ui");
 var import_react_ui_theme4 = require("@dxos/react-ui-theme");
 var import_util2 = require("@dxos/util");
-var import_react7 = __toESM(require("react"));
+var import_react9 = __toESM(require("react"));
 var import_react_ui7 = require("@dxos/react-ui");
-var import_react8 = __toESM(require("react"));
+var import_react10 = __toESM(require("react"));
 var import_react_ui_theme5 = require("@dxos/react-ui-theme");
-var import_react9 = __toESM(require("react"));
+var import_react11 = __toESM(require("react"));
 var import_react_ui8 = require("@dxos/react-ui");
 var import_react_ui_theme6 = require("@dxos/react-ui-theme");
-var import_react10 = __toESM(require("react"));
-var import_debug = require("@dxos/debug");
-var import_echo_schema2 = require("@dxos/echo-schema");
-var import_effect = require("@dxos/effect");
-var import_react11 = require("react");
-var import_echo_schema3 = require("@dxos/echo-schema");
-var import_effect2 = require("@dxos/effect");
-var import_invariant = require("@dxos/invariant");
-var import_log2 = require("@dxos/log");
-var import_schema2 = require("@dxos/schema");
 var import_effect3 = require("effect");
 var import_String = require("effect/String");
 var import_react12 = __toESM(require("react"));
@@ -211,31 +212,220 @@ var DeprecatedFormInput = ({ label, description, secondary, children }) => {
   }
   return primary;
 };
+var __dxlog_file = "/home/runner/work/dxos/dxos/packages/ui/react-ui-form/src/hooks/useForm.ts";
+var useForm = ({ schema, initialValues, onValuesChanged, onValidate, onValid, onSave }) => {
+  (0, import_invariant.invariant)(import_effect2.AST.isTypeLiteral(schema.ast), void 0, {
+    F: __dxlog_file,
+    L: 91,
+    S: void 0,
+    A: [
+      "AST.isTypeLiteral(schema.ast)",
+      ""
+    ]
+  });
+  const [values, setValues] = (0, import_react4.useState)(initialValues);
+  (0, import_react4.useEffect)(() => {
+    setValues(initialValues);
+  }, [
+    initialValues
+  ]);
+  const [touched, setTouched] = (0, import_react4.useState)(createKeySet(initialValues, false));
+  const [changed, setChanged] = (0, import_react4.useState)(createKeySet(initialValues, false));
+  const [errors, setErrors] = (0, import_react4.useState)({});
+  const [saving, setSaving] = (0, import_react4.useState)(false);
+  const validate = (0, import_react4.useCallback)((values2) => {
+    let errors2 = (0, import_schema2.validateSchema)(schema, values2) ?? [];
+    if (errors2.length === 0 && onValidate) {
+      const validatedValues = values2;
+      errors2 = onValidate(validatedValues) ?? [];
+    }
+    setErrors(flatMap(errors2));
+    const valid = errors2.length === 0;
+    return valid;
+  }, [
+    schema,
+    onValidate
+  ]);
+  const [schemaDirty, setSchemaDirty] = (0, import_react4.useState)(false);
+  (0, import_react4.useEffect)(() => setSchemaDirty(true), [
+    schema
+  ]);
+  (0, import_react4.useEffect)(() => {
+    if (schemaDirty) {
+      validate(values);
+      setSchemaDirty(false);
+    }
+  }, [
+    values,
+    schemaDirty
+  ]);
+  const canSave = (0, import_react4.useMemo)(() => !saving && // Check if any error paths that are touched have errors
+  !Object.entries(touched).some(([path, isTouched]) => isTouched && Object.keys(errors).some((errorPath) => errorPath === path || errorPath.startsWith(`${path}.`) || errorPath.startsWith(`${path}[`))), [
+    touched,
+    errors,
+    saving
+  ]);
+  const handleSave = (0, import_react4.useCallback)(async () => {
+    if (validate(values)) {
+      setSaving(true);
+      try {
+        await onSave?.(values, {
+          changed
+        });
+      } finally {
+        setSaving(false);
+      }
+    }
+  }, [
+    values,
+    validate,
+    onSave,
+    changed
+  ]);
+  const getStatus = (0, import_react4.useCallback)((path) => {
+    const jsonPath = Array.isArray(path) ? (0, import_effect2.createJsonPath)(path) : path;
+    const matchingError = Object.entries(errors).find(([errorPath]) => errorPath === jsonPath || errorPath.startsWith(`${jsonPath}.`) || errorPath.startsWith(`${jsonPath}[`));
+    return {
+      status: matchingError ? "error" : void 0,
+      error: matchingError ? matchingError[1] : void 0
+    };
+  }, [
+    errors
+  ]);
+  const getFormValue = (path) => {
+    return (0, import_echo_schema3.getValue)(values, (0, import_effect2.createJsonPath)(path));
+  };
+  const onValueChange = (path, type, value) => {
+    const jsonPath = (0, import_effect2.createJsonPath)(path);
+    let parsedValue = value;
+    try {
+      if (type === "number") {
+        parsedValue = parseFloat(value) || 0;
+      }
+    } catch (err) {
+      import_log2.log.catch(err, void 0, {
+        F: __dxlog_file,
+        L: 193,
+        S: void 0,
+        C: (f, a) => f(...a)
+      });
+      parsedValue = void 0;
+    }
+    const newValues = {
+      ...(0, import_echo_schema3.setValue)(values, jsonPath, parsedValue)
+    };
+    setValues(newValues);
+    setChanged((prev) => ({
+      ...prev,
+      [jsonPath]: true
+    }));
+    onValuesChanged?.(newValues);
+    const isValid = validate(newValues);
+    if (isValid && onValid) {
+      onValid(newValues, {
+        changed
+      });
+    }
+  };
+  const onTouched = (0, import_react4.useCallback)((path) => {
+    const jsonPath = (0, import_effect2.createJsonPath)(path);
+    setTouched((touched2) => ({
+      ...touched2,
+      [jsonPath]: true
+    }));
+    validate(values);
+  }, [
+    validate,
+    values
+  ]);
+  return {
+    // State.
+    values,
+    errors,
+    touched,
+    changed,
+    canSave,
+    handleSave,
+    // Field utils.
+    getStatus,
+    getValue: getFormValue,
+    onValueChange,
+    onTouched
+  };
+};
+var createKeySet = (obj, value) => {
+  (0, import_invariant.invariant)(obj, void 0, {
+    F: __dxlog_file,
+    L: 235,
+    S: void 0,
+    A: [
+      "obj",
+      ""
+    ]
+  });
+  return Object.keys(obj).reduce((acc, key) => ({
+    ...acc,
+    [key]: value
+  }), {});
+};
+var flatMap = (errors) => {
+  return errors.reduce((result, { path, message }) => {
+    const jsonPath = (0, import_effect2.fromEffectValidationPath)(path);
+    if (!(jsonPath in result)) {
+      result[jsonPath] = message;
+    }
+    return result;
+  }, {});
+};
+var FormContext = /* @__PURE__ */ (0, import_react3.createContext)(void 0);
+var useFormContext = () => {
+  return (0, import_react3.useContext)(FormContext) ?? (0, import_debug.raise)(new Error("Missing FormContext"));
+};
+var useFormValues = (path = []) => {
+  const { values: formValues } = useFormContext();
+  const jsonPath = (0, import_effect.createJsonPath)(path);
+  return (0, import_echo_schema2.getValue)(formValues, jsonPath);
+};
+var useInputProps = (path = []) => {
+  const { getStatus, getValue: getFormValue, onValueChange, onTouched } = useFormContext();
+  return {
+    getStatus: () => getStatus(path),
+    getValue: () => getFormValue(path),
+    onValueChange: (type, value) => onValueChange(path, type, value),
+    onBlur: () => onTouched(path)
+  };
+};
+var FormProvider = ({ children, ...formOptions }) => {
+  const formHandler = useForm(formOptions);
+  return /* @__PURE__ */ import_react3.default.createElement(FormContext.Provider, {
+    value: formHandler
+  }, children);
+};
 var InputHeader = ({ children, error }) => {
-  return /* @__PURE__ */ import_react4.default.createElement("div", {
+  return /* @__PURE__ */ import_react6.default.createElement("div", {
     role: "none",
     className: "flex justify-between items-center mb-1"
-  }, children, error && /* @__PURE__ */ import_react4.default.createElement(import_react_ui4.Tooltip.Root, null, /* @__PURE__ */ import_react4.default.createElement(import_react_ui4.Tooltip.Trigger, {
+  }, children, error && /* @__PURE__ */ import_react6.default.createElement(import_react_ui4.Tooltip.Root, null, /* @__PURE__ */ import_react6.default.createElement(import_react_ui4.Tooltip.Trigger, {
     asChild: true
-  }, /* @__PURE__ */ import_react4.default.createElement(import_react_ui4.Icon, {
+  }, /* @__PURE__ */ import_react6.default.createElement(import_react_ui4.Icon, {
     icon: "ph--warning--regular",
     size: 4,
     classNames: import_react_ui_theme2.errorText
-  })), /* @__PURE__ */ import_react4.default.createElement(import_react_ui4.Tooltip.Content, {
+  })), /* @__PURE__ */ import_react6.default.createElement(import_react_ui4.Tooltip.Content, {
     side: "bottom"
-  }, /* @__PURE__ */ import_react4.default.createElement(import_react_ui4.Tooltip.Arrow, null), error)));
+  }, /* @__PURE__ */ import_react6.default.createElement(import_react_ui4.Tooltip.Arrow, null), error)));
 };
 var GeoPointInput = ({ type, label, disabled, getStatus, getValue: getValue3, onValueChange, onBlur }) => {
   const { t } = (0, import_react_ui3.useTranslation)(translationKey);
   const { status, error } = getStatus();
   const [lng = 0, lat = 0] = getValue3() ?? [];
-  return /* @__PURE__ */ import_react3.default.createElement(import_react_ui3.Input.Root, {
+  return /* @__PURE__ */ import_react5.default.createElement(import_react_ui3.Input.Root, {
     validationValence: status
-  }, /* @__PURE__ */ import_react3.default.createElement(InputHeader, {
+  }, /* @__PURE__ */ import_react5.default.createElement(InputHeader, {
     error
-  }, /* @__PURE__ */ import_react3.default.createElement(import_react_ui3.Input.Label, null, label)), /* @__PURE__ */ import_react3.default.createElement("div", {
+  }, /* @__PURE__ */ import_react5.default.createElement(import_react_ui3.Input.Label, null, label)), /* @__PURE__ */ import_react5.default.createElement("div", {
     className: "grid grid-cols-2 gap-2"
-  }, /* @__PURE__ */ import_react3.default.createElement(import_react_ui3.Input.TextInput, {
+  }, /* @__PURE__ */ import_react5.default.createElement(import_react_ui3.Input.TextInput, {
     type: "number",
     disabled,
     placeholder: t("placeholder longitude"),
@@ -245,7 +435,7 @@ var GeoPointInput = ({ type, label, disabled, getStatus, getValue: getValue3, on
       (0, import_util.safeParseFloat)(event.target.value, 0)
     ]),
     onBlur
-  }), /* @__PURE__ */ import_react3.default.createElement(import_react_ui3.Input.TextInput, {
+  }), /* @__PURE__ */ import_react5.default.createElement(import_react_ui3.Input.TextInput, {
     type: "number",
     disabled,
     placeholder: t("placeholder latitude"),
@@ -258,13 +448,13 @@ var GeoPointInput = ({ type, label, disabled, getStatus, getValue: getValue3, on
   })));
 };
 var SelectOptionInput = ({ type, label, disabled, getStatus, getValue: getValue3, onValueChange }) => {
-  const [selected, setSelectedId] = (0, import_react5.useState)(null);
-  const [isNewOption, setIsNewOption] = (0, import_react5.useState)(false);
-  const inputRef = (0, import_react5.useRef)(null);
+  const [selected, setSelectedId] = (0, import_react7.useState)(null);
+  const [isNewOption, setIsNewOption] = (0, import_react7.useState)(false);
+  const inputRef = (0, import_react7.useRef)(null);
   const { t } = (0, import_react_ui5.useTranslation)(translationKey);
   const { status, error } = getStatus();
   const options = getValue3();
-  (0, import_react5.useEffect)(() => {
+  (0, import_react7.useEffect)(() => {
     if (options === void 0) {
       onValueChange(type, []);
     }
@@ -284,7 +474,7 @@ var SelectOptionInput = ({ type, label, disabled, getStatus, getValue: getValue3
     const availableHues = hueKeys.filter((hue) => !lastThree.has(hue));
     return availableHues[Math.floor(Math.random() * availableHues.length)] ?? hueKeys[Math.floor(Math.random() * hueKeys.length)];
   };
-  const handleAdd = (0, import_react5.useCallback)(() => {
+  const handleAdd = (0, import_react7.useCallback)(() => {
     const newId = import_keys.PublicKey.random().truncate();
     const newOption = {
       id: newId,
@@ -302,7 +492,7 @@ var SelectOptionInput = ({ type, label, disabled, getStatus, getValue: getValue3
     type,
     onValueChange
   ]);
-  const handleDelete = (0, import_react5.useCallback)((id) => {
+  const handleDelete = (0, import_react7.useCallback)((id) => {
     const newOptions = options?.filter((option) => option.id !== id) ?? [];
     onValueChange(type, newOptions);
     setSelectedId(null);
@@ -311,7 +501,7 @@ var SelectOptionInput = ({ type, label, disabled, getStatus, getValue: getValue3
     type,
     onValueChange
   ]);
-  const handleMove = (0, import_react5.useCallback)((from, to) => {
+  const handleMove = (0, import_react7.useCallback)((from, to) => {
     if (!options) {
       return;
     }
@@ -326,10 +516,10 @@ var SelectOptionInput = ({ type, label, disabled, getStatus, getValue: getValue3
     type,
     onValueChange
   ]);
-  const handleClick = (0, import_react5.useCallback)((id) => {
+  const handleClick = (0, import_react7.useCallback)((id) => {
     setSelectedId((current) => current === id ? null : id);
   }, []);
-  const handleTitleChange = (0, import_react5.useCallback)((id) => (e) => {
+  const handleTitleChange = (0, import_react7.useCallback)((id) => (e) => {
     const newOptions = options?.map((o) => o.id === id ? {
       ...o,
       title: e.target.value
@@ -340,12 +530,12 @@ var SelectOptionInput = ({ type, label, disabled, getStatus, getValue: getValue3
     type,
     onValueChange
   ]);
-  const handleKeyDown = (0, import_react5.useCallback)((e) => {
+  const handleKeyDown = (0, import_react7.useCallback)((e) => {
     if (e.key === "Enter") {
       setSelectedId(null);
     }
   }, []);
-  const handleColorChange = (0, import_react5.useCallback)((id) => (hue) => {
+  const handleColorChange = (0, import_react7.useCallback)((id) => (hue) => {
     const newOptions = options?.map((o) => o.id === id ? {
       ...o,
       color: hue
@@ -356,7 +546,7 @@ var SelectOptionInput = ({ type, label, disabled, getStatus, getValue: getValue3
     type,
     onValueChange
   ]);
-  (0, import_react5.useEffect)(() => {
+  (0, import_react7.useEffect)(() => {
     if (selected && isNewOption && inputRef.current) {
       inputRef.current.focus();
       setIsNewOption(false);
@@ -365,70 +555,70 @@ var SelectOptionInput = ({ type, label, disabled, getStatus, getValue: getValue3
     selected,
     isNewOption
   ]);
-  return /* @__PURE__ */ import_react5.default.createElement(import_react_ui5.Input.Root, {
+  return /* @__PURE__ */ import_react7.default.createElement(import_react_ui5.Input.Root, {
     validationValence: status
-  }, /* @__PURE__ */ import_react5.default.createElement(InputHeader, {
+  }, /* @__PURE__ */ import_react7.default.createElement(InputHeader, {
     error
-  }, /* @__PURE__ */ import_react5.default.createElement(import_react_ui5.Input.Label, null, label)), /* @__PURE__ */ import_react5.default.createElement("div", {
+  }, /* @__PURE__ */ import_react7.default.createElement(import_react_ui5.Input.Label, null, label)), /* @__PURE__ */ import_react7.default.createElement("div", {
     role: "none"
-  }, options && /* @__PURE__ */ import_react5.default.createElement(import_react_ui_list.List.Root, {
+  }, options && /* @__PURE__ */ import_react7.default.createElement(import_react_ui_list.List.Root, {
     items: options,
     isItem: (item) => true,
     onMove: handleMove
-  }, ({ items }) => /* @__PURE__ */ import_react5.default.createElement("div", {
+  }, ({ items }) => /* @__PURE__ */ import_react7.default.createElement("div", {
     role: "list",
     className: "w-full overflow-auto"
-  }, items?.map((item) => /* @__PURE__ */ import_react5.default.createElement("div", {
+  }, items?.map((item) => /* @__PURE__ */ import_react7.default.createElement("div", {
     key: item.id
-  }, /* @__PURE__ */ import_react5.default.createElement(import_react_ui_list.List.Item, {
+  }, /* @__PURE__ */ import_react7.default.createElement(import_react_ui_list.List.Item, {
     role: "button",
     item,
     classNames: (0, import_react_ui_theme3.mx)("p-1 plb-2", "flex flex-col", "cursor-pointer", "hover:bg-hoverOverlay"),
     "aria-expanded": selected === item.id
-  }, /* @__PURE__ */ import_react5.default.createElement("div", {
+  }, /* @__PURE__ */ import_react7.default.createElement("div", {
     className: "flex items-center"
-  }, /* @__PURE__ */ import_react5.default.createElement(import_react_ui_list.List.ItemDragHandle, null), /* @__PURE__ */ import_react5.default.createElement(import_react_ui_list.List.ItemTitle, {
+  }, /* @__PURE__ */ import_react7.default.createElement(import_react_ui_list.List.ItemDragHandle, null), /* @__PURE__ */ import_react7.default.createElement(import_react_ui_list.List.ItemTitle, {
     onClick: () => handleClick(item.id),
     classNames: "flex-1"
-  }, /* @__PURE__ */ import_react5.default.createElement(import_react_ui5.Tag, {
+  }, /* @__PURE__ */ import_react7.default.createElement(import_react_ui5.Tag, {
     palette: item.color
-  }, item.title || "\u200B")), /* @__PURE__ */ import_react5.default.createElement(import_react_ui5.Icon, {
+  }, item.title || "\u200B")), /* @__PURE__ */ import_react7.default.createElement(import_react_ui5.Icon, {
     icon: selected === item.id ? "ph--caret-down--regular" : "ph--caret-right--regular",
     onClick: () => handleClick(item.id)
-  })), selected === item.id && /* @__PURE__ */ import_react5.default.createElement("div", {
+  })), selected === item.id && /* @__PURE__ */ import_react7.default.createElement("div", {
     className: "mis-4 mbs-2 flex flex-col gap-1"
-  }, /* @__PURE__ */ import_react5.default.createElement(import_react_ui5.Input.Label, {
+  }, /* @__PURE__ */ import_react7.default.createElement(import_react_ui5.Input.Label, {
     classNames: "text-xs"
-  }, t("select option label")), /* @__PURE__ */ import_react5.default.createElement("div", {
+  }, t("select option label")), /* @__PURE__ */ import_react7.default.createElement("div", {
     className: "flex flex-row items-center gap-1"
-  }, /* @__PURE__ */ import_react5.default.createElement(import_react_ui5.Input.TextInput, {
+  }, /* @__PURE__ */ import_react7.default.createElement(import_react_ui5.Input.TextInput, {
     placeholder: t("select option label placeholder"),
     ref: selected === item.id ? inputRef : void 0,
     value: item.title,
     onChange: handleTitleChange(item.id),
     onKeyDown: handleKeyDown,
     classNames: "flex-1"
-  }), /* @__PURE__ */ import_react5.default.createElement(import_react_ui5.Toolbar.Root, {
+  }), /* @__PURE__ */ import_react7.default.createElement(import_react_ui5.Toolbar.Root, {
     classNames: "p-0 m-0 !is-auto"
-  }, /* @__PURE__ */ import_react5.default.createElement(import_react_ui_pickers.HuePickerToolbarButton, {
+  }, /* @__PURE__ */ import_react7.default.createElement(import_react_ui_pickers.HuePickerToolbarButton, {
     hue: item.color,
     onChangeHue: handleColorChange(item.id)
-  })), /* @__PURE__ */ import_react5.default.createElement(import_react_ui5.IconButton, {
+  })), /* @__PURE__ */ import_react7.default.createElement(import_react_ui5.IconButton, {
     icon: "ph--trash--fill",
     iconOnly: true,
     label: t("select option delete"),
     onClick: () => handleDelete(item.id)
-  })))))), /* @__PURE__ */ import_react5.default.createElement("div", {
+  })))))), /* @__PURE__ */ import_react7.default.createElement("div", {
     role: "listitem"
-  }, /* @__PURE__ */ import_react5.default.createElement("div", {
+  }, /* @__PURE__ */ import_react7.default.createElement("div", {
     role: "button",
     className: (0, import_react_ui_theme3.mx)("p-1 plb-2", "flex flex-col", "cursor-pointer", "hover:bg-hoverOverlay"),
     onClick: handleAdd
-  }, /* @__PURE__ */ import_react5.default.createElement("div", {
+  }, /* @__PURE__ */ import_react7.default.createElement("div", {
     className: "flex items-center gap-1"
-  }, /* @__PURE__ */ import_react5.default.createElement(import_react_ui5.Icon, {
+  }, /* @__PURE__ */ import_react7.default.createElement(import_react_ui5.Icon, {
     icon: "ph--plus--regular"
-  }), /* @__PURE__ */ import_react5.default.createElement("span", {
+  }), /* @__PURE__ */ import_react7.default.createElement("span", {
     className: "text-sm"
   }, t("select option add")))))))));
 };
@@ -441,13 +631,13 @@ var gridCols = [
 var TupleInput = ({ binding, type, label, disabled, getStatus, getValue: getValue3, onValueChange, onBlur }) => {
   const { status, error } = getStatus();
   const values = getValue3() ?? {};
-  return /* @__PURE__ */ import_react6.default.createElement(import_react_ui6.Input.Root, {
+  return /* @__PURE__ */ import_react8.default.createElement(import_react_ui6.Input.Root, {
     validationValence: status
-  }, /* @__PURE__ */ import_react6.default.createElement(InputHeader, {
+  }, /* @__PURE__ */ import_react8.default.createElement(InputHeader, {
     error
-  }, /* @__PURE__ */ import_react6.default.createElement(import_react_ui6.Input.Label, null, label)), /* @__PURE__ */ import_react6.default.createElement("div", {
+  }, /* @__PURE__ */ import_react8.default.createElement(import_react_ui6.Input.Label, null, label)), /* @__PURE__ */ import_react8.default.createElement("div", {
     className: (0, import_react_ui_theme4.mx)("grid gap-2", gridCols[binding.length - 1])
-  }, binding.map((prop) => /* @__PURE__ */ import_react6.default.createElement(import_react_ui6.Input.TextInput, {
+  }, binding.map((prop) => /* @__PURE__ */ import_react8.default.createElement(import_react_ui6.Input.TextInput, {
     key: prop,
     type: "number",
     disabled,
@@ -461,269 +651,81 @@ var TupleInput = ({ binding, type, label, disabled, getStatus, getValue: getValu
 };
 var TextInput = ({ type, label, inputOnly, disabled, placeholder, getStatus, getValue: getValue3, onValueChange, onBlur }) => {
   const { status, error } = getStatus();
-  return /* @__PURE__ */ import_react7.default.createElement(import_react_ui7.Input.Root, {
+  return /* @__PURE__ */ import_react9.default.createElement(import_react_ui7.Input.Root, {
     validationValence: status
-  }, !inputOnly && /* @__PURE__ */ import_react7.default.createElement(InputHeader, {
+  }, !inputOnly && /* @__PURE__ */ import_react9.default.createElement(InputHeader, {
     error
-  }, /* @__PURE__ */ import_react7.default.createElement(import_react_ui7.Input.Label, null, label)), /* @__PURE__ */ import_react7.default.createElement(import_react_ui7.Input.TextInput, {
+  }, /* @__PURE__ */ import_react9.default.createElement(import_react_ui7.Input.Label, null, label)), /* @__PURE__ */ import_react9.default.createElement(import_react_ui7.Input.TextInput, {
     disabled,
     placeholder,
     value: getValue3() ?? "",
     onChange: (event) => onValueChange(type, event.target.value),
     onBlur
-  }), inputOnly && /* @__PURE__ */ import_react7.default.createElement(import_react_ui7.Input.Validation, null, error));
+  }), inputOnly && /* @__PURE__ */ import_react9.default.createElement(import_react_ui7.Input.Validation, null, error));
 };
 var NumberInput = ({ type, label, inputOnly, disabled, placeholder, getStatus, getValue: getValue3, onValueChange, onBlur }) => {
   const { status, error } = getStatus();
-  return /* @__PURE__ */ import_react7.default.createElement(import_react_ui7.Input.Root, {
+  return /* @__PURE__ */ import_react9.default.createElement(import_react_ui7.Input.Root, {
     validationValence: status
-  }, !inputOnly && /* @__PURE__ */ import_react7.default.createElement(InputHeader, {
+  }, !inputOnly && /* @__PURE__ */ import_react9.default.createElement(InputHeader, {
     error
-  }, /* @__PURE__ */ import_react7.default.createElement(import_react_ui7.Input.Label, null, label)), /* @__PURE__ */ import_react7.default.createElement(import_react_ui7.Input.TextInput, {
+  }, /* @__PURE__ */ import_react9.default.createElement(import_react_ui7.Input.Label, null, label)), /* @__PURE__ */ import_react9.default.createElement(import_react_ui7.Input.TextInput, {
     type: "number",
     disabled,
     placeholder,
     value: getValue3() ?? 0,
     onChange: (event) => onValueChange(type, event.target.value),
     onBlur
-  }), inputOnly && /* @__PURE__ */ import_react7.default.createElement(import_react_ui7.Input.DescriptionAndValidation, null, error));
+  }), inputOnly && /* @__PURE__ */ import_react9.default.createElement(import_react_ui7.Input.DescriptionAndValidation, null, error));
 };
 var BooleanInput = ({ type, label, inputOnly, getStatus, getValue: getValue3, onValueChange }) => {
   const { status, error } = getStatus();
-  return /* @__PURE__ */ import_react7.default.createElement(import_react_ui7.Input.Root, {
+  const checked = Boolean(getValue3());
+  return /* @__PURE__ */ import_react9.default.createElement(import_react_ui7.Input.Root, {
     validationValence: status
-  }, !inputOnly && /* @__PURE__ */ import_react7.default.createElement(InputHeader, {
+  }, !inputOnly && /* @__PURE__ */ import_react9.default.createElement(InputHeader, {
     error
-  }, /* @__PURE__ */ import_react7.default.createElement(import_react_ui7.Input.Label, null, label)), /* @__PURE__ */ import_react7.default.createElement(import_react_ui7.Input.Switch, {
-    checked: getValue3(),
+  }, /* @__PURE__ */ import_react9.default.createElement(import_react_ui7.Input.Label, null, label)), /* @__PURE__ */ import_react9.default.createElement(import_react_ui7.Input.Switch, {
+    checked,
     onCheckedChange: (value) => onValueChange(type, value)
-  }), inputOnly && /* @__PURE__ */ import_react7.default.createElement(import_react_ui7.Input.DescriptionAndValidation, null, error));
+  }), inputOnly && /* @__PURE__ */ import_react9.default.createElement(import_react_ui7.Input.DescriptionAndValidation, null, error));
 };
 var SelectInput = ({ type, label, inputOnly, disabled, placeholder, options, getStatus, getValue: getValue3, onValueChange }) => {
   const { status, error } = getStatus();
-  return /* @__PURE__ */ import_react7.default.createElement(import_react_ui7.Input.Root, {
+  return /* @__PURE__ */ import_react9.default.createElement(import_react_ui7.Input.Root, {
     validationValence: status
-  }, !inputOnly && /* @__PURE__ */ import_react7.default.createElement(InputHeader, {
+  }, !inputOnly && /* @__PURE__ */ import_react9.default.createElement(InputHeader, {
     error
-  }, /* @__PURE__ */ import_react7.default.createElement(import_react_ui7.Input.Label, null, label)), /* @__PURE__ */ import_react7.default.createElement(import_react_ui7.Select.Root, {
+  }, /* @__PURE__ */ import_react9.default.createElement(import_react_ui7.Input.Label, null, label)), /* @__PURE__ */ import_react9.default.createElement(import_react_ui7.Select.Root, {
     value: getValue3(),
     onValueChange: (value) => onValueChange(type, value)
-  }, /* @__PURE__ */ import_react7.default.createElement(import_react_ui7.Select.TriggerButton, {
+  }, /* @__PURE__ */ import_react9.default.createElement(import_react_ui7.Select.TriggerButton, {
     classNames: "is-full",
     disabled,
     placeholder
-  }), /* @__PURE__ */ import_react7.default.createElement(import_react_ui7.Select.Portal, null, /* @__PURE__ */ import_react7.default.createElement(import_react_ui7.Select.Content, null, /* @__PURE__ */ import_react7.default.createElement(import_react_ui7.Select.Viewport, null, options?.map(({ value, label: label2 }) => (
+  }), /* @__PURE__ */ import_react9.default.createElement(import_react_ui7.Select.Portal, null, /* @__PURE__ */ import_react9.default.createElement(import_react_ui7.Select.Content, null, /* @__PURE__ */ import_react9.default.createElement(import_react_ui7.Select.Viewport, null, options?.map(({ value, label: label2 }) => (
     // NOTE: Numeric values are converted to and from strings.
-    /* @__PURE__ */ import_react7.default.createElement(import_react_ui7.Select.Option, {
+    /* @__PURE__ */ import_react9.default.createElement(import_react_ui7.Select.Option, {
       key: String(value),
       value: String(value)
     }, label2 ?? String(value))
-  )))))), inputOnly && /* @__PURE__ */ import_react7.default.createElement(import_react_ui7.Input.DescriptionAndValidation, null, error));
-};
-var __dxlog_file = "/home/runner/work/dxos/dxos/packages/ui/react-ui-form/src/hooks/useForm.ts";
-var useForm = ({ schema, initialValues, onValuesChanged, onValidate, onValid, onSave }) => {
-  (0, import_invariant.invariant)(import_effect2.AST.isTypeLiteral(schema.ast), void 0, {
-    F: __dxlog_file,
-    L: 91,
-    S: void 0,
-    A: [
-      "AST.isTypeLiteral(schema.ast)",
-      ""
-    ]
-  });
-  const [values, setValues] = (0, import_react11.useState)(initialValues);
-  (0, import_react11.useEffect)(() => {
-    setValues(initialValues);
-  }, [
-    initialValues
-  ]);
-  const [touched, setTouched] = (0, import_react11.useState)(createKeySet(initialValues, false));
-  const [changed, setChanged] = (0, import_react11.useState)(createKeySet(initialValues, false));
-  const [errors, setErrors] = (0, import_react11.useState)({});
-  const [saving, setSaving] = (0, import_react11.useState)(false);
-  const validate = (0, import_react11.useCallback)((values2) => {
-    let errors2 = (0, import_schema2.validateSchema)(schema, values2) ?? [];
-    if (errors2.length === 0 && onValidate) {
-      const validatedValues = values2;
-      errors2 = onValidate(validatedValues) ?? [];
-    }
-    setErrors(flatMap(errors2));
-    const valid = errors2.length === 0;
-    return valid;
-  }, [
-    schema,
-    onValidate
-  ]);
-  const [schemaDirty, setSchemaDirty] = (0, import_react11.useState)(false);
-  (0, import_react11.useEffect)(() => setSchemaDirty(true), [
-    schema
-  ]);
-  (0, import_react11.useEffect)(() => {
-    if (schemaDirty) {
-      validate(values);
-      setSchemaDirty(false);
-    }
-  }, [
-    values,
-    schemaDirty
-  ]);
-  const canSave = (0, import_react11.useMemo)(() => !saving && // Check if any error paths that are touched have errors
-  !Object.entries(touched).some(([path, isTouched]) => isTouched && Object.keys(errors).some((errorPath) => errorPath === path || errorPath.startsWith(`${path}.`) || errorPath.startsWith(`${path}[`))), [
-    touched,
-    errors,
-    saving
-  ]);
-  const handleSave = (0, import_react11.useCallback)(async () => {
-    if (validate(values)) {
-      setSaving(true);
-      try {
-        await onSave?.(values, {
-          changed
-        });
-      } finally {
-        setSaving(false);
-      }
-    }
-  }, [
-    values,
-    validate,
-    onSave,
-    changed
-  ]);
-  const getStatus = (0, import_react11.useCallback)((path) => {
-    const jsonPath = Array.isArray(path) ? (0, import_effect2.createJsonPath)(path) : path;
-    const matchingError = Object.entries(errors).find(([errorPath]) => errorPath === jsonPath || errorPath.startsWith(`${jsonPath}.`) || errorPath.startsWith(`${jsonPath}[`));
-    return {
-      status: matchingError ? "error" : void 0,
-      error: matchingError ? matchingError[1] : void 0
-    };
-  }, [
-    errors
-  ]);
-  const getFormValue = (path) => {
-    return (0, import_echo_schema3.getValue)(values, (0, import_effect2.createJsonPath)(path));
-  };
-  const onValueChange = (path, type, value) => {
-    const jsonPath = (0, import_effect2.createJsonPath)(path);
-    let parsedValue = value;
-    try {
-      if (type === "number") {
-        parsedValue = parseFloat(value) || 0;
-      }
-    } catch (err) {
-      import_log2.log.catch(err, void 0, {
-        F: __dxlog_file,
-        L: 193,
-        S: void 0,
-        C: (f, a) => f(...a)
-      });
-      parsedValue = void 0;
-    }
-    const newValues = {
-      ...(0, import_echo_schema3.setValue)(values, jsonPath, parsedValue)
-    };
-    setValues(newValues);
-    setChanged((prev) => ({
-      ...prev,
-      [jsonPath]: true
-    }));
-    onValuesChanged?.(newValues);
-    const isValid = validate(newValues);
-    if (isValid && onValid) {
-      onValid(newValues, {
-        changed
-      });
-    }
-  };
-  const onTouched = (0, import_react11.useCallback)((path) => {
-    const jsonPath = (0, import_effect2.createJsonPath)(path);
-    setTouched((touched2) => ({
-      ...touched2,
-      [jsonPath]: true
-    }));
-    validate(values);
-  }, [
-    validate,
-    values
-  ]);
-  return {
-    // State.
-    values,
-    errors,
-    touched,
-    changed,
-    canSave,
-    handleSave,
-    // Field utils.
-    getStatus,
-    getValue: getFormValue,
-    onValueChange,
-    onTouched
-  };
-};
-var createKeySet = (obj, value) => {
-  (0, import_invariant.invariant)(obj, void 0, {
-    F: __dxlog_file,
-    L: 235,
-    S: void 0,
-    A: [
-      "obj",
-      ""
-    ]
-  });
-  return Object.keys(obj).reduce((acc, key) => ({
-    ...acc,
-    [key]: value
-  }), {});
-};
-var flatMap = (errors) => {
-  return errors.reduce((result, { path, message }) => {
-    const jsonPath = (0, import_effect2.fromEffectValidationPath)(path);
-    if (!(jsonPath in result)) {
-      result[jsonPath] = message;
-    }
-    return result;
-  }, {});
-};
-var FormContext = /* @__PURE__ */ (0, import_react10.createContext)(void 0);
-var useFormContext = () => {
-  return (0, import_react10.useContext)(FormContext) ?? (0, import_debug.raise)(new Error("Missing FormContext"));
-};
-var useFormValues = (path = []) => {
-  const { values: formValues } = useFormContext();
-  const jsonPath = (0, import_effect.createJsonPath)(path);
-  return (0, import_echo_schema2.getValue)(formValues, jsonPath);
-};
-var useInputProps = (path = []) => {
-  const { getStatus, getValue: getFormValue, onValueChange, onTouched } = useFormContext();
-  return {
-    getStatus: () => getStatus(path),
-    getValue: () => getFormValue(path),
-    onValueChange: (type, value) => onValueChange(path, type, value),
-    onBlur: () => onTouched(path)
-  };
-};
-var FormProvider = ({ children, ...formOptions }) => {
-  const formHandler = useForm(formOptions);
-  return /* @__PURE__ */ import_react10.default.createElement(FormContext.Provider, {
-    value: formHandler
-  }, children);
+  )))))), inputOnly && /* @__PURE__ */ import_react9.default.createElement(import_react_ui7.Input.DescriptionAndValidation, null, error));
 };
 var FormActions = ({ onCancel, readonly }) => {
   const { t } = (0, import_react_ui8.useTranslation)(translationKey);
   const { canSave, handleSave } = useFormContext();
-  return /* @__PURE__ */ import_react9.default.createElement("div", {
+  return /* @__PURE__ */ import_react11.default.createElement("div", {
     role: "none",
-    className: "flex justify-center"
-  }, /* @__PURE__ */ import_react9.default.createElement("div", {
+    className: "mt-2 flex justify-center"
+  }, /* @__PURE__ */ import_react11.default.createElement("div", {
     role: "none",
     className: (0, import_react_ui_theme6.mx)(onCancel && !readonly && "grid grid-cols-2 gap-2")
-  }, onCancel && !readonly && /* @__PURE__ */ import_react9.default.createElement(import_react_ui8.IconButton, {
+  }, onCancel && !readonly && /* @__PURE__ */ import_react11.default.createElement(import_react_ui8.IconButton, {
     "data-testid": "cancel-button",
     icon: "ph--x--regular",
     label: t("button cancel"),
     onClick: onCancel
-  }), handleSave && /* @__PURE__ */ import_react9.default.createElement(import_react_ui8.IconButton, {
+  }), handleSave && /* @__PURE__ */ import_react11.default.createElement(import_react_ui8.IconButton, {
     type: "submit",
     "data-testid": "save-button",
     disabled: !canSave,
@@ -966,7 +968,7 @@ var FormFields = ({ schema, path, filter, sort, readonly, lookupComponent, Custo
   ]);
   return /* @__PURE__ */ import_react12.default.createElement("div", {
     role: "form",
-    className: (0, import_react_ui_theme7.mx)("flex flex-col w-full gap-2 py-2")
+    className: (0, import_react_ui_theme7.mx)("flex flex-col w-full gap-2")
   }, properties.map((property) => {
     return /* @__PURE__ */ import_react12.default.createElement(FormField, {
       key: property.name,
@@ -982,11 +984,11 @@ var FormFields = ({ schema, path, filter, sort, readonly, lookupComponent, Custo
   }).filter(import_util3.isNotFalsy));
 };
 var Form = ({ classNames, schema, values: initialValues, path = [], autoFocus, readonly, filter, sort, autoSave, testId, onValuesChanged, onValidate, onSave, onCancel, lookupComponent, Custom }) => {
-  const onValid = (0, import_react8.useMemo)(() => autoSave ? onSave : void 0, [
+  const onValid = (0, import_react10.useMemo)(() => autoSave ? onSave : void 0, [
     autoSave,
     onSave
   ]);
-  (0, import_react8.useEffect)(() => {
+  (0, import_react10.useEffect)(() => {
     if (autoFocus) {
       const input = document.querySelector("input");
       if (input) {
@@ -996,18 +998,18 @@ var Form = ({ classNames, schema, values: initialValues, path = [], autoFocus, r
   }, [
     autoFocus
   ]);
-  return /* @__PURE__ */ import_react8.default.createElement(FormProvider, {
+  return /* @__PURE__ */ import_react10.default.createElement(FormProvider, {
     schema,
     initialValues,
     onValuesChanged,
     onValidate,
     onValid,
     onSave
-  }, /* @__PURE__ */ import_react8.default.createElement("div", {
+  }, /* @__PURE__ */ import_react10.default.createElement("div", {
     role: "none",
     className: (0, import_react_ui_theme5.mx)("p-2", classNames),
     "data-testid": testId
-  }, /* @__PURE__ */ import_react8.default.createElement(FormFields, {
+  }, /* @__PURE__ */ import_react10.default.createElement(FormFields, {
     schema,
     path,
     readonly,
@@ -1015,7 +1017,7 @@ var Form = ({ classNames, schema, values: initialValues, path = [], autoFocus, r
     sort,
     lookupComponent,
     Custom
-  }), (onCancel || onSave) && !autoSave && /* @__PURE__ */ import_react8.default.createElement(FormActions, {
+  }), (onCancel || onSave) && !autoSave && /* @__PURE__ */ import_react10.default.createElement(FormActions, {
     onCancel,
     readonly
   })));
@@ -1526,6 +1528,7 @@ var formatForEditing = ({ type, format, value, locale = void 0 }) => {
   parseValue,
   pathNotUniqueError,
   translations,
-  useForm
+  useForm,
+  useFormValues
 });
 //# sourceMappingURL=index.cjs.map