@dxos/react-ui-form 0.7.5-labs.f5080a1 → 0.7.5-labs.ff2ff30

package/dist/lib/browser/index.mjs

@@ -105,28 +105,233 @@ import { log as log2 } from "@dxos/log";
 import { useTranslation as useTranslation5 } from "@dxos/react-ui";
 import { getFormatSchema, getSchemaProperties as getSchemaProperties3, sortProperties } from "@dxos/schema";
 
+// packages/ui/react-ui-form/src/components/Form/FormContext.tsx
+import React2, { createContext, useContext } from "react";
+import { raise } from "@dxos/debug";
+import { getValue as getValue2 } from "@dxos/echo-schema";
+import { createJsonPath as createJsonPath2 } from "@dxos/effect";
+
+// packages/ui/react-ui-form/src/hooks/useForm.ts
+import { useCallback, useEffect, useMemo, useState } from "react";
+import { getValue, setValue } from "@dxos/echo-schema";
+import { AST, createJsonPath, fromEffectValidationPath } from "@dxos/effect";
+import { invariant } from "@dxos/invariant";
+import { log } from "@dxos/log";
+import { validateSchema } from "@dxos/schema";
+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 }) => {
+  invariant(AST.isTypeLiteral(schema.ast), void 0, {
+    F: __dxlog_file,
+    L: 91,
+    S: void 0,
+    A: [
+      "AST.isTypeLiteral(schema.ast)",
+      ""
+    ]
+  });
+  const [values, setValues] = useState(initialValues);
+  useEffect(() => {
+    setValues(initialValues);
+  }, [
+    initialValues
+  ]);
+  const [touched, setTouched] = useState(createKeySet(initialValues, false));
+  const [changed, setChanged] = useState(createKeySet(initialValues, false));
+  const [errors, setErrors] = useState({});
+  const [saving, setSaving] = useState(false);
+  const validate = useCallback((values2) => {
+    let errors2 = 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] = useState(false);
+  useEffect(() => setSchemaDirty(true), [
+    schema
+  ]);
+  useEffect(() => {
+    if (schemaDirty) {
+      validate(values);
+      setSchemaDirty(false);
+    }
+  }, [
+    values,
+    schemaDirty
+  ]);
+  const canSave = 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 = useCallback(async () => {
+    if (validate(values)) {
+      setSaving(true);
+      try {
+        await onSave?.(values, {
+          changed
+        });
+      } finally {
+        setSaving(false);
+      }
+    }
+  }, [
+    values,
+    validate,
+    onSave,
+    changed
+  ]);
+  const getStatus = useCallback((path) => {
+    const jsonPath = Array.isArray(path) ? 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 getValue(values, createJsonPath(path));
+  };
+  const onValueChange = (path, type, value) => {
+    const jsonPath = createJsonPath(path);
+    let parsedValue = value;
+    try {
+      if (type === "number") {
+        parsedValue = parseFloat(value) || 0;
+      }
+    } catch (err) {
+      log.catch(err, void 0, {
+        F: __dxlog_file,
+        L: 193,
+        S: void 0,
+        C: (f, a) => f(...a)
+      });
+      parsedValue = void 0;
+    }
+    const newValues = {
+      ...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 = useCallback((path) => {
+    const jsonPath = 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) => {
+  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 = fromEffectValidationPath(path);
+    if (!(jsonPath in result)) {
+      result[jsonPath] = message;
+    }
+    return result;
+  }, {});
+};
+
+// packages/ui/react-ui-form/src/components/Form/FormContext.tsx
+var FormContext = /* @__PURE__ */ createContext(void 0);
+var useFormContext = () => {
+  return useContext(FormContext) ?? raise(new Error("Missing FormContext"));
+};
+var useFormValues = (path = []) => {
+  const { values: formValues } = useFormContext();
+  const jsonPath = createJsonPath2(path);
+  return getValue2(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__ */ React2.createElement(FormContext.Provider, {
+    value: formHandler
+  }, children);
+};
+
 // packages/ui/react-ui-form/src/components/Form/custom/GeoPointInput.tsx
-import React3 from "react";
+import React4 from "react";
 import { Input as Input2, useTranslation } from "@dxos/react-ui";
 import { safeParseFloat } from "@dxos/util";
 
 // packages/ui/react-ui-form/src/components/Form/Input.tsx
-import React2 from "react";
+import React3 from "react";
 import { Icon, Tooltip } from "@dxos/react-ui";
 import { errorText } from "@dxos/react-ui-theme";
 var InputHeader = ({ children, error }) => {
-  return /* @__PURE__ */ React2.createElement("div", {
+  return /* @__PURE__ */ React3.createElement("div", {
     role: "none",
     className: "flex justify-between items-center mb-1"
-  }, children, error && /* @__PURE__ */ React2.createElement(Tooltip.Root, null, /* @__PURE__ */ React2.createElement(Tooltip.Trigger, {
+  }, children, error && /* @__PURE__ */ React3.createElement(Tooltip.Root, null, /* @__PURE__ */ React3.createElement(Tooltip.Trigger, {
     asChild: true
-  }, /* @__PURE__ */ React2.createElement(Icon, {
+  }, /* @__PURE__ */ React3.createElement(Icon, {
     icon: "ph--warning--regular",
     size: 4,
     classNames: errorText
-  })), /* @__PURE__ */ React2.createElement(Tooltip.Content, {
+  })), /* @__PURE__ */ React3.createElement(Tooltip.Content, {
     side: "bottom"
-  }, /* @__PURE__ */ React2.createElement(Tooltip.Arrow, null), error)));
+  }, /* @__PURE__ */ React3.createElement(Tooltip.Arrow, null), error)));
 };
 
 // packages/ui/react-ui-form/src/components/Form/custom/GeoPointInput.tsx
@@ -134,13 +339,13 @@ var GeoPointInput = ({ type, label, disabled, getStatus, getValue: getValue3, on
   const { t } = useTranslation(translationKey);
   const { status, error } = getStatus();
   const [lng = 0, lat = 0] = getValue3() ?? [];
-  return /* @__PURE__ */ React3.createElement(Input2.Root, {
+  return /* @__PURE__ */ React4.createElement(Input2.Root, {
     validationValence: status
-  }, /* @__PURE__ */ React3.createElement(InputHeader, {
+  }, /* @__PURE__ */ React4.createElement(InputHeader, {
     error
-  }, /* @__PURE__ */ React3.createElement(Input2.Label, null, label)), /* @__PURE__ */ React3.createElement("div", {
+  }, /* @__PURE__ */ React4.createElement(Input2.Label, null, label)), /* @__PURE__ */ React4.createElement("div", {
     className: "grid grid-cols-2 gap-2"
-  }, /* @__PURE__ */ React3.createElement(Input2.TextInput, {
+  }, /* @__PURE__ */ React4.createElement(Input2.TextInput, {
     type: "number",
     disabled,
     placeholder: t("placeholder longitude"),
@@ -150,7 +355,7 @@ var GeoPointInput = ({ type, label, disabled, getStatus, getValue: getValue3, on
       safeParseFloat(event.target.value, 0)
     ]),
     onBlur
-  }), /* @__PURE__ */ React3.createElement(Input2.TextInput, {
+  }), /* @__PURE__ */ React4.createElement(Input2.TextInput, {
     type: "number",
     disabled,
     placeholder: t("placeholder latitude"),
@@ -164,20 +369,20 @@ var GeoPointInput = ({ type, label, disabled, getStatus, getValue: getValue3, on
 };
 
 // packages/ui/react-ui-form/src/components/Form/custom/SelectOptionsInput.tsx
-import React4, { useCallback, useEffect, useState, useRef } from "react";
+import React5, { useCallback as useCallback2, useEffect as useEffect2, useState as useState2, useRef } from "react";
 import { PublicKey } from "@dxos/keys";
 import { Icon as Icon2, IconButton, Input as Input3, Tag, Toolbar, useTranslation as useTranslation2 } from "@dxos/react-ui";
 import { List } from "@dxos/react-ui-list";
 import { HuePickerToolbarButton } from "@dxos/react-ui-pickers";
 import { hueTokenThemes, mx as mx2 } from "@dxos/react-ui-theme";
 var SelectOptionInput = ({ type, label, disabled, getStatus, getValue: getValue3, onValueChange }) => {
-  const [selected, setSelectedId] = useState(null);
-  const [isNewOption, setIsNewOption] = useState(false);
+  const [selected, setSelectedId] = useState2(null);
+  const [isNewOption, setIsNewOption] = useState2(false);
   const inputRef = useRef(null);
   const { t } = useTranslation2(translationKey);
   const { status, error } = getStatus();
   const options = getValue3();
-  useEffect(() => {
+  useEffect2(() => {
     if (options === void 0) {
       onValueChange(type, []);
     }
@@ -197,7 +402,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 = useCallback(() => {
+  const handleAdd = useCallback2(() => {
     const newId = PublicKey.random().truncate();
     const newOption = {
       id: newId,
@@ -215,7 +420,7 @@ var SelectOptionInput = ({ type, label, disabled, getStatus, getValue: getValue3
     type,
     onValueChange
   ]);
-  const handleDelete = useCallback((id) => {
+  const handleDelete = useCallback2((id) => {
     const newOptions = options?.filter((option) => option.id !== id) ?? [];
     onValueChange(type, newOptions);
     setSelectedId(null);
@@ -224,7 +429,7 @@ var SelectOptionInput = ({ type, label, disabled, getStatus, getValue: getValue3
     type,
     onValueChange
   ]);
-  const handleMove = useCallback((from, to) => {
+  const handleMove = useCallback2((from, to) => {
     if (!options) {
       return;
     }
@@ -239,10 +444,10 @@ var SelectOptionInput = ({ type, label, disabled, getStatus, getValue: getValue3
     type,
     onValueChange
   ]);
-  const handleClick = useCallback((id) => {
+  const handleClick = useCallback2((id) => {
     setSelectedId((current) => current === id ? null : id);
   }, []);
-  const handleTitleChange = useCallback((id) => (e) => {
+  const handleTitleChange = useCallback2((id) => (e) => {
     const newOptions = options?.map((o) => o.id === id ? {
       ...o,
       title: e.target.value
@@ -253,12 +458,12 @@ var SelectOptionInput = ({ type, label, disabled, getStatus, getValue: getValue3
     type,
     onValueChange
   ]);
-  const handleKeyDown = useCallback((e) => {
+  const handleKeyDown = useCallback2((e) => {
     if (e.key === "Enter") {
       setSelectedId(null);
     }
   }, []);
-  const handleColorChange = useCallback((id) => (hue) => {
+  const handleColorChange = useCallback2((id) => (hue) => {
     const newOptions = options?.map((o) => o.id === id ? {
       ...o,
       color: hue
@@ -269,7 +474,7 @@ var SelectOptionInput = ({ type, label, disabled, getStatus, getValue: getValue3
     type,
     onValueChange
   ]);
-  useEffect(() => {
+  useEffect2(() => {
     if (selected && isNewOption && inputRef.current) {
       inputRef.current.focus();
       setIsNewOption(false);
@@ -278,76 +483,76 @@ var SelectOptionInput = ({ type, label, disabled, getStatus, getValue: getValue3
     selected,
     isNewOption
   ]);
-  return /* @__PURE__ */ React4.createElement(Input3.Root, {
+  return /* @__PURE__ */ React5.createElement(Input3.Root, {
     validationValence: status
-  }, /* @__PURE__ */ React4.createElement(InputHeader, {
+  }, /* @__PURE__ */ React5.createElement(InputHeader, {
     error
-  }, /* @__PURE__ */ React4.createElement(Input3.Label, null, label)), /* @__PURE__ */ React4.createElement("div", {
+  }, /* @__PURE__ */ React5.createElement(Input3.Label, null, label)), /* @__PURE__ */ React5.createElement("div", {
     role: "none"
-  }, options && /* @__PURE__ */ React4.createElement(List.Root, {
+  }, options && /* @__PURE__ */ React5.createElement(List.Root, {
     items: options,
     isItem: (item) => true,
     onMove: handleMove
-  }, ({ items }) => /* @__PURE__ */ React4.createElement("div", {
+  }, ({ items }) => /* @__PURE__ */ React5.createElement("div", {
     role: "list",
     className: "w-full overflow-auto"
-  }, items?.map((item) => /* @__PURE__ */ React4.createElement("div", {
+  }, items?.map((item) => /* @__PURE__ */ React5.createElement("div", {
     key: item.id
-  }, /* @__PURE__ */ React4.createElement(List.Item, {
+  }, /* @__PURE__ */ React5.createElement(List.Item, {
     role: "button",
     item,
     classNames: mx2("p-1 plb-2", "flex flex-col", "cursor-pointer", "hover:bg-hoverOverlay"),
     "aria-expanded": selected === item.id
-  }, /* @__PURE__ */ React4.createElement("div", {
+  }, /* @__PURE__ */ React5.createElement("div", {
     className: "flex items-center"
-  }, /* @__PURE__ */ React4.createElement(List.ItemDragHandle, null), /* @__PURE__ */ React4.createElement(List.ItemTitle, {
+  }, /* @__PURE__ */ React5.createElement(List.ItemDragHandle, null), /* @__PURE__ */ React5.createElement(List.ItemTitle, {
     onClick: () => handleClick(item.id),
     classNames: "flex-1"
-  }, /* @__PURE__ */ React4.createElement(Tag, {
+  }, /* @__PURE__ */ React5.createElement(Tag, {
     palette: item.color
-  }, item.title || "\u200B")), /* @__PURE__ */ React4.createElement(Icon2, {
+  }, item.title || "\u200B")), /* @__PURE__ */ React5.createElement(Icon2, {
     icon: selected === item.id ? "ph--caret-down--regular" : "ph--caret-right--regular",
     onClick: () => handleClick(item.id)
-  })), selected === item.id && /* @__PURE__ */ React4.createElement("div", {
+  })), selected === item.id && /* @__PURE__ */ React5.createElement("div", {
     className: "mis-4 mbs-2 flex flex-col gap-1"
-  }, /* @__PURE__ */ React4.createElement(Input3.Label, {
+  }, /* @__PURE__ */ React5.createElement(Input3.Label, {
     classNames: "text-xs"
-  }, t("select option label")), /* @__PURE__ */ React4.createElement("div", {
+  }, t("select option label")), /* @__PURE__ */ React5.createElement("div", {
     className: "flex flex-row items-center gap-1"
-  }, /* @__PURE__ */ React4.createElement(Input3.TextInput, {
+  }, /* @__PURE__ */ React5.createElement(Input3.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__ */ React4.createElement(Toolbar.Root, {
+  }), /* @__PURE__ */ React5.createElement(Toolbar.Root, {
     classNames: "p-0 m-0 !is-auto"
-  }, /* @__PURE__ */ React4.createElement(HuePickerToolbarButton, {
+  }, /* @__PURE__ */ React5.createElement(HuePickerToolbarButton, {
     hue: item.color,
     onChangeHue: handleColorChange(item.id)
-  })), /* @__PURE__ */ React4.createElement(IconButton, {
+  })), /* @__PURE__ */ React5.createElement(IconButton, {
     icon: "ph--trash--fill",
     iconOnly: true,
     label: t("select option delete"),
     onClick: () => handleDelete(item.id)
-  })))))), /* @__PURE__ */ React4.createElement("div", {
+  })))))), /* @__PURE__ */ React5.createElement("div", {
     role: "listitem"
-  }, /* @__PURE__ */ React4.createElement("div", {
+  }, /* @__PURE__ */ React5.createElement("div", {
     role: "button",
     className: mx2("p-1 plb-2", "flex flex-col", "cursor-pointer", "hover:bg-hoverOverlay"),
     onClick: handleAdd
-  }, /* @__PURE__ */ React4.createElement("div", {
+  }, /* @__PURE__ */ React5.createElement("div", {
     className: "flex items-center gap-1"
-  }, /* @__PURE__ */ React4.createElement(Icon2, {
+  }, /* @__PURE__ */ React5.createElement(Icon2, {
     icon: "ph--plus--regular"
-  }), /* @__PURE__ */ React4.createElement("span", {
+  }), /* @__PURE__ */ React5.createElement("span", {
     className: "text-sm"
   }, t("select option add")))))))));
 };
 
 // packages/ui/react-ui-form/src/components/Form/custom/TupleInput.tsx
-import React5 from "react";
+import React6 from "react";
 import { Input as Input4 } from "@dxos/react-ui";
 import { mx as mx3 } from "@dxos/react-ui-theme";
 import { safeParseFloat as safeParseFloat2 } from "@dxos/util";
@@ -360,13 +565,13 @@ var gridCols = [
 var TupleInput = ({ binding, type, label, disabled, getStatus, getValue: getValue3, onValueChange, onBlur }) => {
   const { status, error } = getStatus();
   const values = getValue3() ?? {};
-  return /* @__PURE__ */ React5.createElement(Input4.Root, {
+  return /* @__PURE__ */ React6.createElement(Input4.Root, {
     validationValence: status
-  }, /* @__PURE__ */ React5.createElement(InputHeader, {
+  }, /* @__PURE__ */ React6.createElement(InputHeader, {
     error
-  }, /* @__PURE__ */ React5.createElement(Input4.Label, null, label)), /* @__PURE__ */ React5.createElement("div", {
+  }, /* @__PURE__ */ React6.createElement(Input4.Label, null, label)), /* @__PURE__ */ React6.createElement("div", {
     className: mx3("grid gap-2", gridCols[binding.length - 1])
-  }, binding.map((prop) => /* @__PURE__ */ React5.createElement(Input4.TextInput, {
+  }, binding.map((prop) => /* @__PURE__ */ React6.createElement(Input4.TextInput, {
     key: prop,
     type: "number",
     disabled,
@@ -380,68 +585,69 @@ var TupleInput = ({ binding, type, label, disabled, getStatus, getValue: getValu
 };
 
 // packages/ui/react-ui-form/src/components/Form/Defaults.tsx
-import React6 from "react";
+import React7 from "react";
 import { Input as Input5, Select } from "@dxos/react-ui";
 var TextInput = ({ type, label, inputOnly, disabled, placeholder, getStatus, getValue: getValue3, onValueChange, onBlur }) => {
   const { status, error } = getStatus();
-  return /* @__PURE__ */ React6.createElement(Input5.Root, {
+  return /* @__PURE__ */ React7.createElement(Input5.Root, {
     validationValence: status
-  }, !inputOnly && /* @__PURE__ */ React6.createElement(InputHeader, {
+  }, !inputOnly && /* @__PURE__ */ React7.createElement(InputHeader, {
     error
-  }, /* @__PURE__ */ React6.createElement(Input5.Label, null, label)), /* @__PURE__ */ React6.createElement(Input5.TextInput, {
+  }, /* @__PURE__ */ React7.createElement(Input5.Label, null, label)), /* @__PURE__ */ React7.createElement(Input5.TextInput, {
     disabled,
     placeholder,
     value: getValue3() ?? "",
     onChange: (event) => onValueChange(type, event.target.value),
     onBlur
-  }), inputOnly && /* @__PURE__ */ React6.createElement(Input5.Validation, null, error));
+  }), inputOnly && /* @__PURE__ */ React7.createElement(Input5.Validation, null, error));
 };
 var NumberInput = ({ type, label, inputOnly, disabled, placeholder, getStatus, getValue: getValue3, onValueChange, onBlur }) => {
   const { status, error } = getStatus();
-  return /* @__PURE__ */ React6.createElement(Input5.Root, {
+  return /* @__PURE__ */ React7.createElement(Input5.Root, {
     validationValence: status
-  }, !inputOnly && /* @__PURE__ */ React6.createElement(InputHeader, {
+  }, !inputOnly && /* @__PURE__ */ React7.createElement(InputHeader, {
     error
-  }, /* @__PURE__ */ React6.createElement(Input5.Label, null, label)), /* @__PURE__ */ React6.createElement(Input5.TextInput, {
+  }, /* @__PURE__ */ React7.createElement(Input5.Label, null, label)), /* @__PURE__ */ React7.createElement(Input5.TextInput, {
     type: "number",
     disabled,
     placeholder,
     value: getValue3() ?? 0,
     onChange: (event) => onValueChange(type, event.target.value),
     onBlur
-  }), inputOnly && /* @__PURE__ */ React6.createElement(Input5.DescriptionAndValidation, null, error));
+  }), inputOnly && /* @__PURE__ */ React7.createElement(Input5.DescriptionAndValidation, null, error));
 };
 var BooleanInput = ({ type, label, inputOnly, getStatus, getValue: getValue3, onValueChange }) => {
   const { status, error } = getStatus();
-  return /* @__PURE__ */ React6.createElement(Input5.Root, {
+  const checked = Boolean(getValue3());
+  return /* @__PURE__ */ React7.createElement(Input5.Root, {
     validationValence: status
-  }, !inputOnly && /* @__PURE__ */ React6.createElement(InputHeader, {
+  }, !inputOnly && /* @__PURE__ */ React7.createElement(InputHeader, {
     error
-  }, /* @__PURE__ */ React6.createElement(Input5.Label, null, label)), /* @__PURE__ */ React6.createElement(Input5.Switch, {
-    checked: getValue3(),
+  }, /* @__PURE__ */ React7.createElement(Input5.Label, null, label)), /* @__PURE__ */ React7.createElement(Input5.Switch, {
+    checked,
     onCheckedChange: (value) => onValueChange(type, value)
-  }), inputOnly && /* @__PURE__ */ React6.createElement(Input5.DescriptionAndValidation, null, error));
+  }), inputOnly && /* @__PURE__ */ React7.createElement(Input5.DescriptionAndValidation, null, error));
 };
 var SelectInput = ({ type, label, inputOnly, disabled, placeholder, options, getStatus, getValue: getValue3, onValueChange }) => {
   const { status, error } = getStatus();
-  return /* @__PURE__ */ React6.createElement(Input5.Root, {
+  return /* @__PURE__ */ React7.createElement(Input5.Root, {
     validationValence: status
-  }, !inputOnly && /* @__PURE__ */ React6.createElement(InputHeader, {
+  }, !inputOnly && /* @__PURE__ */ React7.createElement(InputHeader, {
     error
-  }, /* @__PURE__ */ React6.createElement(Input5.Label, null, label)), /* @__PURE__ */ React6.createElement(Select.Root, {
+  }, /* @__PURE__ */ React7.createElement(Input5.Label, null, label)), /* @__PURE__ */ React7.createElement(Select.Root, {
     value: getValue3(),
     onValueChange: (value) => onValueChange(type, value)
-  }, /* @__PURE__ */ React6.createElement(Select.TriggerButton, {
+  }, /* @__PURE__ */ React7.createElement(Select.TriggerButton, {
     classNames: "is-full",
     disabled,
     placeholder
-  }), /* @__PURE__ */ React6.createElement(Select.Portal, null, /* @__PURE__ */ React6.createElement(Select.Content, null, /* @__PURE__ */ React6.createElement(Select.Viewport, null, options?.map(({ value, label: label2 }) => (
+  }), /* @__PURE__ */ React7.createElement(Select.Portal, null, /* @__PURE__ */ React7.createElement(Select.Content, null, /* @__PURE__ */ React7.createElement(Select.Viewport, null, options?.map(({ value, label: label2 }) => (
     // NOTE: Numeric values are converted to and from strings.
-    /* @__PURE__ */ React6.createElement(Select.Option, {
+    /* @__PURE__ */ React7.createElement(Select.Option, {
       key: String(value),
       value: String(value)
     }, label2 ?? String(value))
-  )))))), inputOnly && /* @__PURE__ */ React6.createElement(Input5.DescriptionAndValidation, null, error));
+  )))))), inputOnly && /* @__PURE__ */ React7.createElement(Input5.DescriptionAndValidation, null, error));
 };
 
 // packages/ui/react-ui-form/src/components/Form/Form.tsx
@@ -452,219 +658,12 @@ import { mx as mx7 } from "@dxos/react-ui-theme";
 import React8 from "react";
 import { IconButton as IconButton2, useTranslation as useTranslation3 } from "@dxos/react-ui";
 import { mx as mx4 } from "@dxos/react-ui-theme";
-
-// packages/ui/react-ui-form/src/components/Form/FormContext.tsx
-import React7, { createContext, useContext } from "react";
-import { raise } from "@dxos/debug";
-import { getValue as getValue2 } from "@dxos/echo-schema";
-import { createJsonPath as createJsonPath2 } from "@dxos/effect";
-
-// packages/ui/react-ui-form/src/hooks/useForm.ts
-import { useCallback as useCallback2, useEffect as useEffect2, useMemo, useState as useState2 } from "react";
-import { getValue, setValue } from "@dxos/echo-schema";
-import { AST, createJsonPath, fromEffectValidationPath } from "@dxos/effect";
-import { invariant } from "@dxos/invariant";
-import { log } from "@dxos/log";
-import { validateSchema } from "@dxos/schema";
-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 }) => {
-  invariant(AST.isTypeLiteral(schema.ast), void 0, {
-    F: __dxlog_file,
-    L: 91,
-    S: void 0,
-    A: [
-      "AST.isTypeLiteral(schema.ast)",
-      ""
-    ]
-  });
-  const [values, setValues] = useState2(initialValues);
-  useEffect2(() => {
-    setValues(initialValues);
-  }, [
-    initialValues
-  ]);
-  const [touched, setTouched] = useState2(createKeySet(initialValues, false));
-  const [changed, setChanged] = useState2(createKeySet(initialValues, false));
-  const [errors, setErrors] = useState2({});
-  const [saving, setSaving] = useState2(false);
-  const validate = useCallback2((values2) => {
-    let errors2 = 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] = useState2(false);
-  useEffect2(() => setSchemaDirty(true), [
-    schema
-  ]);
-  useEffect2(() => {
-    if (schemaDirty) {
-      validate(values);
-      setSchemaDirty(false);
-    }
-  }, [
-    values,
-    schemaDirty
-  ]);
-  const canSave = 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 = useCallback2(async () => {
-    if (validate(values)) {
-      setSaving(true);
-      try {
-        await onSave?.(values, {
-          changed
-        });
-      } finally {
-        setSaving(false);
-      }
-    }
-  }, [
-    values,
-    validate,
-    onSave,
-    changed
-  ]);
-  const getStatus = useCallback2((path) => {
-    const jsonPath = Array.isArray(path) ? 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 getValue(values, createJsonPath(path));
-  };
-  const onValueChange = (path, type, value) => {
-    const jsonPath = createJsonPath(path);
-    let parsedValue = value;
-    try {
-      if (type === "number") {
-        parsedValue = parseFloat(value) || 0;
-      }
-    } catch (err) {
-      log.catch(err, void 0, {
-        F: __dxlog_file,
-        L: 193,
-        S: void 0,
-        C: (f, a) => f(...a)
-      });
-      parsedValue = void 0;
-    }
-    const newValues = {
-      ...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 = useCallback2((path) => {
-    const jsonPath = 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) => {
-  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 = fromEffectValidationPath(path);
-    if (!(jsonPath in result)) {
-      result[jsonPath] = message;
-    }
-    return result;
-  }, {});
-};
-
-// packages/ui/react-ui-form/src/components/Form/FormContext.tsx
-var FormContext = /* @__PURE__ */ createContext(void 0);
-var useFormContext = () => {
-  return useContext(FormContext) ?? raise(new Error("Missing FormContext"));
-};
-var useFormValues = (path = []) => {
-  const { values: formValues } = useFormContext();
-  const jsonPath = createJsonPath2(path);
-  return getValue2(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__ */ React7.createElement(FormContext.Provider, {
-    value: formHandler
-  }, children);
-};
-
-// packages/ui/react-ui-form/src/components/Form/FormActions.tsx
 var FormActions = ({ onCancel, readonly }) => {
   const { t } = useTranslation3(translationKey);
   const { canSave, handleSave } = useFormContext();
   return /* @__PURE__ */ React8.createElement("div", {
     role: "none",
-    className: "flex justify-center"
+    className: "mt-2 flex justify-center"
   }, /* @__PURE__ */ React8.createElement("div", {
     role: "none",
     className: mx4(onCancel && !readonly && "grid grid-cols-2 gap-2")
@@ -942,7 +941,7 @@ var FormFields = ({ schema, path, filter, sort, readonly, lookupComponent, Custo
   ]);
   return /* @__PURE__ */ React10.createElement("div", {
     role: "form",
-    className: mx6("flex flex-col w-full gap-2 py-2")
+    className: mx6("flex flex-col w-full gap-2")
   }, properties.map((property) => {
     return /* @__PURE__ */ React10.createElement(FormField, {
       key: property.name,
@@ -1519,6 +1518,7 @@ export {
   parseValue,
   pathNotUniqueError,
   translations_default as translations,
-  useForm
+  useForm,
+  useFormValues
 };
 //# sourceMappingURL=index.mjs.map