@dxos/react-ui-form 0.7.5-main.9d26e3a → 0.7.5-main.e9bb01b

package/dist/lib/node-esm/index.mjs

@@ -37,6 +37,7 @@ var translations_default = [
         "format ref": "Reference",
         "format regex": "RegExp",
         "format string": "String",
+        "format single-select": "Select",
         "format text": "Long text",
         "format time": "Time",
         "format timestamp": "Timestamp",
@@ -46,7 +47,13 @@ var translations_default = [
         "format uuid": "UUID",
         // Placeholders
         "placeholder latitude": "Latitude",
-        "placeholder longitude": "Longitude"
+        "placeholder longitude": "Longitude",
+        // SelectOptionsInput
+        "select option label": "Label",
+        "select option label placeholder": "Option label",
+        "select option color": "Color",
+        "select option delete": "Delete",
+        "select option add": "Add option"
       }
     }
   }
@@ -55,6 +62,16 @@ var translations_default = [
 // packages/ui/react-ui-form/src/components/deprecated/FormInput.tsx
 import React from "react";
 import { Input } from "@dxos/react-ui";
+import { mx, textBlockWidth } from "@dxos/react-ui-theme";
+var DeprecatedFormContainer = ({ children, classNames }) => {
+  return /* @__PURE__ */ React.createElement("div", {
+    role: "none",
+    className: "w-full p-4 justify-center overflow-x-hidden overflow-y-auto"
+  }, /* @__PURE__ */ React.createElement("div", {
+    role: "form",
+    className: mx("flex flex-col", textBlockWidth, classNames)
+  }, children));
+};
 var DeprecatedFormInput = ({ label, description, secondary, children }) => {
   const primary = /* @__PURE__ */ React.createElement("div", {
     role: "none",
@@ -63,14 +80,17 @@ var DeprecatedFormInput = ({ label, description, secondary, children }) => {
     role: "none",
     className: "flex flex-col w-full"
   }, /* @__PURE__ */ React.createElement(Input.Label, {
-    classNames: "flex min-h-[40px] items-center"
+    classNames: "flex min-bs-[--rail-action] items-center",
+    style: {
+      fontSize: "unset"
+    }
   }, label), description && /* @__PURE__ */ React.createElement(Input.DescriptionAndValidation, {
     classNames: "mbs-0.5"
   }, /* @__PURE__ */ React.createElement(Input.Description, null, description))), /* @__PURE__ */ React.createElement("div", {
     role: "none"
   }, /* @__PURE__ */ React.createElement("div", {
     role: "none",
-    className: "flex min-h-[40px] items-center"
+    className: "flex min-bs-[--rail-action] items-center"
   }, children))));
   if (secondary) {
     return /* @__PURE__ */ React.createElement("div", {
@@ -82,11 +102,11 @@ var DeprecatedFormInput = ({ label, description, secondary, children }) => {
 };
 
 // packages/ui/react-ui-form/src/components/FieldEditor/FieldEditor.tsx
-import React7, { useCallback as useCallback2, useEffect as useEffect3, useState as useState2 } from "react";
+import React12, { useCallback as useCallback4, useEffect as useEffect3, useMemo as useMemo5, useState as useState3 } from "react";
 import { FormatEnum as FormatEnum2, FormatEnums, formatToType } from "@dxos/echo-schema";
-import { log as log3 } from "@dxos/log";
-import { useTranslation as useTranslation3 } from "@dxos/react-ui";
-import { getFormatSchema, getSchemaProperties as getSchemaProperties2, sortProperties } from "@dxos/schema";
+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/custom/GeoPointInput.tsx
 import React3 from "react";
@@ -113,10 +133,10 @@ var InputHeader = ({ children, error }) => {
 };
 
 // packages/ui/react-ui-form/src/components/Form/custom/GeoPointInput.tsx
-var GeoPointInput = ({ property, type, label, disabled, getStatus, getValue: getValue2, onValueChange, onBlur }) => {
+var GeoPointInput = ({ type, label, disabled, getStatus, getValue: getValue3, onValueChange, onBlur }) => {
   const { t } = useTranslation(translationKey);
-  const { status, error } = getStatus?.(property);
-  const [lng = 0, lat = 0] = getValue2(property) ?? [];
+  const { status, error } = getStatus();
+  const [lng = 0, lat = 0] = getValue3() ?? [];
   return /* @__PURE__ */ React3.createElement(Input2.Root, {
     validationValence: status
   }, /* @__PURE__ */ React3.createElement(InputHeader, {
@@ -128,7 +148,7 @@ var GeoPointInput = ({ property, type, label, disabled, getStatus, getValue: get
     disabled,
     placeholder: t("placeholder longitude"),
     value: lng,
-    onChange: (event) => onValueChange(property, type, [
+    onChange: (event) => onValueChange(type, [
       lat,
       safeParseFloat(event.target.value, 0)
     ]),
@@ -138,7 +158,7 @@ var GeoPointInput = ({ property, type, label, disabled, getStatus, getValue: get
     disabled,
     placeholder: t("placeholder latitude"),
     value: lat,
-    onChange: (event) => onValueChange(property, type, [
+    onChange: (event) => onValueChange(type, [
       safeParseFloat(event.target.value, 0),
       lng
     ]),
@@ -146,10 +166,193 @@ var GeoPointInput = ({ property, type, label, disabled, getStatus, getValue: get
   })));
 };
 
+// packages/ui/react-ui-form/src/components/Form/custom/SelectOptionsInput.tsx
+import React4, { useCallback, useEffect, useState, 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 inputRef = useRef(null);
+  const { t } = useTranslation2(translationKey);
+  const { status, error } = getStatus();
+  const options = getValue3();
+  useEffect(() => {
+    if (options === void 0) {
+      onValueChange(type, []);
+    }
+  }, [
+    options,
+    onValueChange,
+    type
+  ]);
+  const randomHue = () => {
+    const usedHues = new Set(options?.map((option) => option.color) ?? []);
+    const hueKeys = Object.keys(hueTokenThemes);
+    const unusedHues = hueKeys.filter((hue) => !usedHues.has(hue));
+    if (unusedHues.length > 0) {
+      return unusedHues[Math.floor(Math.random() * unusedHues.length)];
+    }
+    const lastThree = new Set(options?.slice(-3).map((option) => option.color) ?? []);
+    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 newId = PublicKey.random().truncate();
+    const newOption = {
+      id: newId,
+      title: "",
+      color: randomHue()
+    };
+    onValueChange(type, [
+      ...options ?? [],
+      newOption
+    ]);
+    setSelectedId(newId);
+    setIsNewOption(true);
+  }, [
+    options,
+    type,
+    onValueChange
+  ]);
+  const handleDelete = useCallback((id) => {
+    const newOptions = options?.filter((option) => option.id !== id) ?? [];
+    onValueChange(type, newOptions);
+    setSelectedId(null);
+  }, [
+    options,
+    type,
+    onValueChange
+  ]);
+  const handleMove = useCallback((from, to) => {
+    if (!options) {
+      return;
+    }
+    const newOptions = [
+      ...options
+    ];
+    const [removed] = newOptions.splice(from, 1);
+    newOptions.splice(to, 0, removed);
+    onValueChange(type, newOptions);
+  }, [
+    options,
+    type,
+    onValueChange
+  ]);
+  const handleClick = useCallback((id) => {
+    setSelectedId((current) => current === id ? null : id);
+  }, []);
+  const handleTitleChange = useCallback((id) => (e) => {
+    const newOptions = options?.map((o) => o.id === id ? {
+      ...o,
+      title: e.target.value
+    } : o);
+    onValueChange(type, newOptions ?? []);
+  }, [
+    options,
+    type,
+    onValueChange
+  ]);
+  const handleKeyDown = useCallback((e) => {
+    if (e.key === "Enter") {
+      setSelectedId(null);
+    }
+  }, []);
+  const handleColorChange = useCallback((id) => (hue) => {
+    const newOptions = options?.map((o) => o.id === id ? {
+      ...o,
+      color: hue
+    } : o);
+    onValueChange(type, newOptions ?? []);
+  }, [
+    options,
+    type,
+    onValueChange
+  ]);
+  useEffect(() => {
+    if (selected && isNewOption && inputRef.current) {
+      inputRef.current.focus();
+      setIsNewOption(false);
+    }
+  }, [
+    selected,
+    isNewOption
+  ]);
+  return /* @__PURE__ */ React4.createElement(Input3.Root, {
+    validationValence: status
+  }, /* @__PURE__ */ React4.createElement(InputHeader, {
+    error
+  }, /* @__PURE__ */ React4.createElement(Input3.Label, null, label)), /* @__PURE__ */ React4.createElement("div", {
+    role: "none"
+  }, options && /* @__PURE__ */ React4.createElement(List.Root, {
+    items: options,
+    isItem: (item) => true,
+    onMove: handleMove
+  }, ({ items }) => /* @__PURE__ */ React4.createElement("div", {
+    role: "list",
+    className: "w-full overflow-auto"
+  }, items?.map((item) => /* @__PURE__ */ React4.createElement("div", {
+    key: item.id
+  }, /* @__PURE__ */ React4.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", {
+    className: "flex items-center"
+  }, /* @__PURE__ */ React4.createElement(List.ItemDragHandle, null), /* @__PURE__ */ React4.createElement(List.ItemTitle, {
+    onClick: () => handleClick(item.id),
+    classNames: "flex-1"
+  }, /* @__PURE__ */ React4.createElement(Tag, {
+    palette: item.color
+  }, item.title || "\u200B")), /* @__PURE__ */ React4.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", {
+    className: "mis-4 mbs-2 flex flex-col gap-1"
+  }, /* @__PURE__ */ React4.createElement(Input3.Label, {
+    classNames: "text-xs"
+  }, t("select option label")), /* @__PURE__ */ React4.createElement("div", {
+    className: "flex flex-row items-center gap-1"
+  }, /* @__PURE__ */ React4.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, {
+    classNames: "p-0 m-0 !is-auto"
+  }, /* @__PURE__ */ React4.createElement(HuePickerToolbarButton, {
+    hue: item.color,
+    onChangeHue: handleColorChange(item.id)
+  })), /* @__PURE__ */ React4.createElement(IconButton, {
+    icon: "ph--trash--fill",
+    iconOnly: true,
+    label: t("select option delete"),
+    onClick: () => handleDelete(item.id)
+  })))))), /* @__PURE__ */ React4.createElement("div", {
+    role: "listitem"
+  }, /* @__PURE__ */ React4.createElement("div", {
+    role: "button",
+    className: mx2("p-1 plb-2", "flex flex-col", "cursor-pointer", "hover:bg-hoverOverlay"),
+    onClick: handleAdd
+  }, /* @__PURE__ */ React4.createElement("div", {
+    className: "flex items-center gap-1"
+  }, /* @__PURE__ */ React4.createElement(Icon2, {
+    icon: "ph--plus--regular"
+  }), /* @__PURE__ */ React4.createElement("span", {
+    className: "text-sm"
+  }, t("select option add")))))))));
+};
+
 // packages/ui/react-ui-form/src/components/Form/custom/TupleInput.tsx
-import React4 from "react";
-import { Input as Input3 } from "@dxos/react-ui";
-import { mx } from "@dxos/react-ui-theme";
+import React5 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";
 var gridCols = [
   "grid-cols-1",
@@ -157,21 +360,21 @@ var gridCols = [
   "grid-cols-3",
   "grid-cols-4"
 ];
-var TupleInput = ({ binding, property, type, label, disabled, getStatus, getValue: getValue2, onValueChange, onBlur }) => {
-  const { status, error } = getStatus?.(property);
-  const values = getValue2(property) ?? {};
-  return /* @__PURE__ */ React4.createElement(Input3.Root, {
+var TupleInput = ({ binding, type, label, disabled, getStatus, getValue: getValue3, onValueChange, onBlur }) => {
+  const { status, error } = getStatus();
+  const values = getValue3() ?? {};
+  return /* @__PURE__ */ React5.createElement(Input4.Root, {
     validationValence: status
-  }, /* @__PURE__ */ React4.createElement(InputHeader, {
+  }, /* @__PURE__ */ React5.createElement(InputHeader, {
     error
-  }, /* @__PURE__ */ React4.createElement(Input3.Label, null, label)), /* @__PURE__ */ React4.createElement("div", {
-    className: mx("grid gap-2", gridCols[binding.length - 1])
-  }, binding.map((prop) => /* @__PURE__ */ React4.createElement(Input3.TextInput, {
+  }, /* @__PURE__ */ React5.createElement(Input4.Label, null, label)), /* @__PURE__ */ React5.createElement("div", {
+    className: mx3("grid gap-2", gridCols[binding.length - 1])
+  }, binding.map((prop) => /* @__PURE__ */ React5.createElement(Input4.TextInput, {
     key: prop,
     type: "number",
     disabled,
     value: values[prop],
-    onChange: (event) => onValueChange(property, type, {
+    onChange: (event) => onValueChange(type, {
       ...values,
       [prop]: safeParseFloat2(event.target.value, 0)
     }),
@@ -180,118 +383,105 @@ var TupleInput = ({ binding, property, type, label, disabled, getStatus, getValu
 };
 
 // packages/ui/react-ui-form/src/components/Form/Defaults.tsx
-import React5 from "react";
-import { Input as Input4, Select } from "@dxos/react-ui";
-var TextInput = ({ property, type, label, inputOnly, disabled, placeholder, getStatus, getValue: getValue2, onValueChange, onBlur }) => {
-  const { status, error } = getStatus?.(property);
-  return /* @__PURE__ */ React5.createElement(Input4.Root, {
+import React6 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, {
     validationValence: status
-  }, !inputOnly && /* @__PURE__ */ React5.createElement(InputHeader, {
+  }, !inputOnly && /* @__PURE__ */ React6.createElement(InputHeader, {
     error
-  }, /* @__PURE__ */ React5.createElement(Input4.Label, null, label)), /* @__PURE__ */ React5.createElement(Input4.TextInput, {
+  }, /* @__PURE__ */ React6.createElement(Input5.Label, null, label)), /* @__PURE__ */ React6.createElement(Input5.TextInput, {
     disabled,
     placeholder,
-    value: getValue2(property) ?? "",
-    onChange: (event) => onValueChange(property, type, event.target.value),
+    value: getValue3() ?? "",
+    onChange: (event) => onValueChange(type, event.target.value),
     onBlur
-  }), inputOnly && /* @__PURE__ */ React5.createElement(Input4.Validation, null, error));
+  }), inputOnly && /* @__PURE__ */ React6.createElement(Input5.Validation, null, error));
 };
-var NumberInput = ({ property, type, label, inputOnly, disabled, placeholder, getStatus, getValue: getValue2, onValueChange, onBlur }) => {
-  const { status, error } = getStatus?.(property);
-  return /* @__PURE__ */ React5.createElement(Input4.Root, {
+var NumberInput = ({ type, label, inputOnly, disabled, placeholder, getStatus, getValue: getValue3, onValueChange, onBlur }) => {
+  const { status, error } = getStatus();
+  return /* @__PURE__ */ React6.createElement(Input5.Root, {
     validationValence: status
-  }, !inputOnly && /* @__PURE__ */ React5.createElement(InputHeader, {
+  }, !inputOnly && /* @__PURE__ */ React6.createElement(InputHeader, {
     error
-  }, /* @__PURE__ */ React5.createElement(Input4.Label, null, label)), /* @__PURE__ */ React5.createElement(Input4.TextInput, {
+  }, /* @__PURE__ */ React6.createElement(Input5.Label, null, label)), /* @__PURE__ */ React6.createElement(Input5.TextInput, {
     type: "number",
     disabled,
     placeholder,
-    value: getValue2(property) ?? 0,
-    onChange: (event) => onValueChange(property, type, event.target.value),
+    value: getValue3() ?? 0,
+    onChange: (event) => onValueChange(type, event.target.value),
     onBlur
-  }), inputOnly && /* @__PURE__ */ React5.createElement(Input4.DescriptionAndValidation, null, error));
+  }), inputOnly && /* @__PURE__ */ React6.createElement(Input5.DescriptionAndValidation, null, error));
 };
-var BooleanInput = ({ property, type, label, inputOnly, getStatus, getValue: getValue2, onValueChange }) => {
-  const { status, error } = getStatus?.(property);
-  return /* @__PURE__ */ React5.createElement(Input4.Root, {
+var BooleanInput = ({ type, label, inputOnly, getStatus, getValue: getValue3, onValueChange }) => {
+  const { status, error } = getStatus();
+  return /* @__PURE__ */ React6.createElement(Input5.Root, {
     validationValence: status
-  }, !inputOnly && /* @__PURE__ */ React5.createElement(InputHeader, {
+  }, !inputOnly && /* @__PURE__ */ React6.createElement(InputHeader, {
     error
-  }, /* @__PURE__ */ React5.createElement(Input4.Label, null, label)), /* @__PURE__ */ React5.createElement(Input4.Switch, {
-    checked: getValue2(property),
-    onCheckedChange: (value) => onValueChange(property, type, value)
-  }), inputOnly && /* @__PURE__ */ React5.createElement(Input4.DescriptionAndValidation, null, error));
+  }, /* @__PURE__ */ React6.createElement(Input5.Label, null, label)), /* @__PURE__ */ React6.createElement(Input5.Switch, {
+    checked: getValue3(),
+    onCheckedChange: (value) => onValueChange(type, value)
+  }), inputOnly && /* @__PURE__ */ React6.createElement(Input5.DescriptionAndValidation, null, error));
 };
-var SelectInput = ({ property, type, label, inputOnly, disabled, placeholder, options, getStatus, getValue: getValue2, onValueChange }) => {
-  const { status, error } = getStatus?.(property);
-  return /* @__PURE__ */ React5.createElement(Input4.Root, {
+var SelectInput = ({ type, label, inputOnly, disabled, placeholder, options, getStatus, getValue: getValue3, onValueChange }) => {
+  const { status, error } = getStatus();
+  return /* @__PURE__ */ React6.createElement(Input5.Root, {
     validationValence: status
-  }, !inputOnly && /* @__PURE__ */ React5.createElement(InputHeader, {
+  }, !inputOnly && /* @__PURE__ */ React6.createElement(InputHeader, {
     error
-  }, /* @__PURE__ */ React5.createElement(Input4.Label, null, label)), /* @__PURE__ */ React5.createElement(Select.Root, {
-    value: getValue2(property),
-    onValueChange: (value) => onValueChange(property, type, value)
-  }, /* @__PURE__ */ React5.createElement(Select.TriggerButton, {
+  }, /* @__PURE__ */ React6.createElement(Input5.Label, null, label)), /* @__PURE__ */ React6.createElement(Select.Root, {
+    value: getValue3(),
+    onValueChange: (value) => onValueChange(type, value)
+  }, /* @__PURE__ */ React6.createElement(Select.TriggerButton, {
     classNames: "is-full",
     disabled,
     placeholder
-  }), /* @__PURE__ */ React5.createElement(Select.Portal, null, /* @__PURE__ */ React5.createElement(Select.Content, null, /* @__PURE__ */ React5.createElement(Select.Viewport, null, options?.map(({ value, label: label2 }) => (
+  }), /* @__PURE__ */ React6.createElement(Select.Portal, null, /* @__PURE__ */ React6.createElement(Select.Content, null, /* @__PURE__ */ React6.createElement(Select.Viewport, null, options?.map(({ value, label: label2 }) => (
     // NOTE: Numeric values are converted to and from strings.
-    /* @__PURE__ */ React5.createElement(Select.Option, {
+    /* @__PURE__ */ React6.createElement(Select.Option, {
       key: String(value),
       value: String(value)
     }, label2 ?? String(value))
-  )))))), inputOnly && /* @__PURE__ */ React5.createElement(Input4.DescriptionAndValidation, null, error));
+  )))))), inputOnly && /* @__PURE__ */ React6.createElement(Input5.DescriptionAndValidation, null, error));
 };
 
 // packages/ui/react-ui-form/src/components/Form/Form.tsx
-import { pipe } from "effect";
-import { capitalize } from "effect/String";
-import React6, { useEffect as useEffect2, useMemo as useMemo2 } from "react";
-import { AST, S } from "@dxos/echo-schema";
-import { findNode, getDiscriminatedType, isDiscriminatedUnion, SimpleType } from "@dxos/effect";
-import { log as log2 } from "@dxos/log";
-import { IconButton, useTranslation as useTranslation2 } from "@dxos/react-ui";
-import { mx as mx2 } from "@dxos/react-ui-theme";
-import { getSchemaProperties } from "@dxos/schema";
-import { isNotFalsy } from "@dxos/util";
+import React11, { useMemo as useMemo4 } from "react";
+import { mx as mx7 } from "@dxos/react-ui-theme";
 
-// packages/ui/react-ui-form/src/components/Form/factory.tsx
-import { FormatEnum } from "@dxos/echo-schema";
-var getInputComponent = (type, format) => {
-  switch (format) {
-    case FormatEnum.LatLng:
-      return GeoPointInput;
-  }
-  switch (type) {
-    case "string":
-      return TextInput;
-    case "number":
-      return NumberInput;
-    case "boolean":
-      return BooleanInput;
-  }
-};
+// packages/ui/react-ui-form/src/components/Form/FormActions.tsx
+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, useEffect, useMemo, useState } from "react";
+import { useCallback as useCallback2, useEffect as useEffect2, useMemo, useState as useState2 } from "react";
 import { getValue, setValue } from "@dxos/echo-schema";
+import { 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 }) => {
-  const [values, setValues] = useState(initialValues);
-  useEffect(() => {
+  const [values, setValues] = useState2(initialValues);
+  useEffect2(() => {
     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) => {
+  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;
@@ -304,11 +494,11 @@ var useForm = ({ schema, initialValues, onValuesChanged, onValidate, onValid, on
     schema,
     onValidate
   ]);
-  const [schemaDirty, setSchemaDirty] = useState(false);
-  useEffect(() => setSchemaDirty(true), [
+  const [schemaDirty, setSchemaDirty] = useState2(false);
+  useEffect2(() => setSchemaDirty(true), [
     schema
   ]);
-  useEffect(() => {
+  useEffect2(() => {
     if (schemaDirty) {
       validate(values);
       setSchemaDirty(false);
@@ -317,13 +507,13 @@ var useForm = ({ schema, initialValues, onValuesChanged, onValidate, onValid, on
     values,
     schemaDirty
   ]);
-  const canSave = useMemo(() => !saving && Object.keys(values).every((property) => touched[property] === false || !errors[property]), [
-    values,
+  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 () => {
+  const handleSave = useCallback2(async () => {
     if (validate(values)) {
       setSaving(true);
       try {
@@ -340,17 +530,21 @@ var useForm = ({ schema, initialValues, onValuesChanged, onValidate, onValid, on
     onSave,
     changed
   ]);
-  const getStatus = useCallback((property) => ({
-    status: errors[property] ? "error" : void 0,
-    error: errors[property] ? errors[property] : void 0
-  }), [
-    touched,
+  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 = (property) => {
-    return getValue(values, property);
+  const getFormValue = (path) => {
+    return getValue(values, createJsonPath(path));
   };
-  const onValueChange = (property, type, value) => {
+  const onValueChange = (path, type, value) => {
+    const jsonPath = createJsonPath(path);
     let parsedValue = value;
     try {
       if (type === "number") {
@@ -359,19 +553,19 @@ var useForm = ({ schema, initialValues, onValuesChanged, onValidate, onValid, on
     } catch (err) {
       log.catch(err, void 0, {
         F: __dxlog_file,
-        L: 178,
+        L: 192,
         S: void 0,
         C: (f, a) => f(...a)
       });
       parsedValue = void 0;
     }
     const newValues = {
-      ...setValue(values, property, parsedValue)
+      ...setValue(values, jsonPath, parsedValue)
     };
     setValues(newValues);
     setChanged((prev) => ({
       ...prev,
-      [property]: true
+      [jsonPath]: true
     }));
     onValuesChanged?.(newValues);
     const isValid = validate(newValues);
@@ -381,15 +575,12 @@ var useForm = ({ schema, initialValues, onValuesChanged, onValidate, onValid, on
       });
     }
   };
-  const onBlur = useCallback((event) => {
-    const { name } = event.target;
+  const onTouched = useCallback2((path) => {
+    const jsonPath = createJsonPath(path);
     setTouched((touched2) => ({
       ...touched2,
-      [name]: true
+      [jsonPath]: true
     }));
-    if (event.relatedTarget?.getAttribute("type") === "submit") {
-      setTouched(createKeySet(values, true));
-    }
     validate(values);
   }, [
     validate,
@@ -407,13 +598,13 @@ var useForm = ({ schema, initialValues, onValuesChanged, onValidate, onValid, on
     getStatus,
     getValue: getFormValue,
     onValueChange,
-    onBlur
+    onTouched
   };
 };
 var createKeySet = (obj, value) => {
   invariant(obj, void 0, {
     F: __dxlog_file,
-    L: 229,
+    L: 234,
     S: void 0,
     A: [
       "obj",
@@ -427,317 +618,381 @@ var createKeySet = (obj, value) => {
 };
 var flatMap = (errors) => {
   return errors.reduce((result, { path, message }) => {
-    if (!(path in result)) {
-      result[path] = message;
+    const jsonPath = fromEffectValidationPath(path);
+    if (!(jsonPath in result)) {
+      result[jsonPath] = message;
     }
     return result;
   }, {});
 };
 
-// packages/ui/react-ui-form/src/components/Form/Form.tsx
-var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-form/src/components/Form/Form.tsx";
+// 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"
+  }, /* @__PURE__ */ React8.createElement("div", {
+    role: "none",
+    className: mx4(onCancel && !readonly && "grid grid-cols-2 gap-2")
+  }, onCancel && !readonly && /* @__PURE__ */ React8.createElement(IconButton2, {
+    "data-testid": "cancel-button",
+    icon: "ph--x--regular",
+    label: t("button cancel"),
+    onClick: onCancel
+  }), handleSave && /* @__PURE__ */ React8.createElement(IconButton2, {
+    type: "submit",
+    "data-testid": "save-button",
+    disabled: !canSave,
+    icon: "ph--check--regular",
+    label: t("button save"),
+    onClick: handleSave
+  })));
+};
+
+// packages/ui/react-ui-form/src/components/Form/FormContent.tsx
+import { pipe as pipe2 } from "effect";
+import { capitalize as capitalize2 } from "effect/String";
+import React10, { useMemo as useMemo3 } from "react";
+import { AST as AST2, S } from "@dxos/echo-schema";
+import { createJsonPath as createJsonPath3, findNode as findNode2, getDiscriminatedType as getDiscriminatedType2, isDiscriminatedUnion as isDiscriminatedUnion2 } from "@dxos/effect";
+import { mx as mx6 } from "@dxos/react-ui-theme";
+import { getSchemaProperties as getSchemaProperties2 } from "@dxos/schema";
+import { isNotFalsy } from "@dxos/util";
+
+// packages/ui/react-ui-form/src/components/Form/ArrayField.tsx
+import { pipe } from "effect";
+import { capitalize } from "effect/String";
+import React9, { useCallback as useCallback3, useMemo as useMemo2 } from "react";
+import { AST } from "@dxos/echo-schema";
+import { findNode, getDiscriminatedType, isDiscriminatedUnion, SimpleType } from "@dxos/effect";
+import { invariant as invariant2 } from "@dxos/invariant";
+import { IconButton as IconButton3, useTranslation as useTranslation4 } from "@dxos/react-ui";
+import { mx as mx5 } from "@dxos/react-ui-theme";
+import { getSchemaProperties } from "@dxos/schema";
+var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-form/src/components/Form/ArrayField.tsx";
 var padding = "px-2";
-var Form = ({ classNames, schema, values: initialValues, path = [], readonly, filter, sort, autoSave, testId, onValuesChanged, onValidate, onSave, onCancel, Custom }) => {
-  const onValid = useMemo2(() => autoSave ? onSave : void 0, [
-    autoSave,
-    onSave
-  ]);
-  const { canSave, values, errors, handleSave, ...inputProps } = useForm({
-    schema,
-    initialValues,
-    onValuesChanged,
-    onValidate,
-    onValid,
-    onSave
+var ArrayField = ({ property, readonly, path, inputProps, Custom, lookupComponent }) => {
+  const { t } = useTranslation4(translationKey);
+  const { ast, name, type, title } = property;
+  const values = useFormValues(path ?? []);
+  invariant2(Array.isArray(values), `Values at path ${path?.join(".")} must be an array.`, {
+    F: __dxlog_file2,
+    L: 37,
+    S: void 0,
+    A: [
+      "Array.isArray(values)",
+      "`Values at path ${path?.join('.')} must be an array.`"
+    ]
   });
-  const properties = useMemo2(() => {
-    const props = getSchemaProperties(schema.ast, values);
-    const filtered = filter ? filter(props) : props;
-    const findIndex = (props2, prop) => {
-      const idx = props2.findIndex((p) => p === prop);
-      return idx === -1 ? Infinity : idx;
-    };
-    return sort ? filtered.sort(({ name: a }, { name: b }) => findIndex(sort, a) - findIndex(sort, b)) : filtered;
+  const label = title ?? pipe(name, capitalize);
+  const tupleType = findNode(ast, AST.isTupleType);
+  const elementType = tupleType?.rest[0]?.type;
+  const getDefaultObjectValue = (typeNode) => {
+    const baseNode = findNode(typeNode, isDiscriminatedUnion);
+    const typeLiteral = baseNode ? getDiscriminatedType(baseNode, {}) : findNode(typeNode, AST.isTypeLiteral);
+    if (!typeLiteral) {
+      return {};
+    }
+    return Object.fromEntries(getSchemaProperties(typeLiteral, {}).map((prop) => [
+      prop.name,
+      prop.defaultValue
+    ]));
+  };
+  const newValue = useMemo2(() => {
+    if (type === "object" && elementType) {
+      return getDefaultObjectValue(elementType);
+    } else {
+      return SimpleType.getDefaultValue(type);
+    }
   }, [
-    schema,
-    filter,
+    type,
+    elementType
+  ]);
+  const handleAdd = useCallback3(() => {
+    inputProps.onValueChange(type, [
+      ...values,
+      newValue
+    ]);
+  }, [
+    type,
+    elementType,
+    inputProps,
+    newValue,
     values
   ]);
-  useEffect2(() => {
-    if (errors && Object.keys(errors).length) {
-      log2.warn("validation", {
-        errors
-      }, {
-        F: __dxlog_file2,
-        L: 99,
-        S: void 0,
-        C: (f, a) => f(...a)
-      });
-    }
+  const handleRemove = useCallback3((index) => {
+    const newValues = values.filter((_, i) => i !== index);
+    inputProps.onValueChange(type, newValues);
   }, [
-    errors
+    type,
+    inputProps,
+    values
   ]);
-  return /* @__PURE__ */ React6.createElement("div", {
-    role: "form",
-    className: mx2("flex flex-col w-full gap-2 py-2", classNames),
-    "data-testid": testId
-  }, properties.map((property) => {
-    const { ast, name, type, format, title, description, examples, options, array } = property;
-    const key = [
-      ...path,
-      name
-    ];
-    const label = title ?? pipe(name, capitalize);
-    const placeholder = examples?.length ? `Example: "${examples[0]}"` : description;
-    let InputComponent = Custom?.[key.join(".")];
-    if (!InputComponent) {
-      if (options) {
-        return /* @__PURE__ */ React6.createElement("div", {
-          key: name,
-          role: "none",
-          className: padding
-        }, /* @__PURE__ */ React6.createElement(SelectInput, {
-          type,
-          format,
-          property: name,
-          disabled: readonly,
-          label,
-          options: options.map((option) => ({
-            value: option,
-            label: String(option)
-          })),
-          placeholder,
-          ...inputProps
-        }));
-      }
-      InputComponent = getInputComponent(type, format);
-      if (array) {
-        return /* @__PURE__ */ React6.createElement(ArrayField, {
-          key: name,
-          name,
-          type,
-          array: true,
-          label,
-          ast,
-          values,
-          format,
-          readonly,
-          placeholder,
-          inputProps,
-          Custom
-        });
-      }
-    }
-    if (!InputComponent) {
-      if (type === "object") {
-        const baseNode = findNode(ast, isDiscriminatedUnion);
-        const typeLiteral = baseNode ? getDiscriminatedType(baseNode, values[name]) : findNode(ast, AST.isTypeLiteral);
-        if (typeLiteral) {
-          const schema2 = S.make(typeLiteral);
-          return /* @__PURE__ */ React6.createElement("div", {
-            key: name,
-            role: "none"
-          }, /* @__PURE__ */ React6.createElement("div", {
-            className: padding
-          }, label), /* @__PURE__ */ React6.createElement(Form, {
-            schema: schema2,
-            path: key,
-            values: values[name] ?? {},
-            onValuesChanged: (childValues) => {
-              inputProps.onValueChange(name, "object", childValues);
-            },
-            Custom
-          }));
-        }
-      }
-      log2("no renderer for property", {
-        name,
-        type
-      }, {
-        F: __dxlog_file2,
-        L: 184,
-        S: void 0,
-        C: (f, a) => f(...a)
-      });
-      return null;
-    }
-    return /* @__PURE__ */ React6.createElement("div", {
-      key: name,
-      role: "none",
-      className: padding
-    }, /* @__PURE__ */ React6.createElement(InputComponent, {
-      type,
-      format,
-      property: name,
-      disabled: readonly,
-      label,
-      placeholder,
-      ...inputProps
-    }));
-  }).filter(isNotFalsy), (onCancel || onSave) && !autoSave && /* @__PURE__ */ React6.createElement(FormActions, {
-    onCancel,
-    onSubmit: handleSave,
-    canSubmit: canSave,
-    readonly
-  }));
-};
-var ArrayField = ({ name, type, label, ast, values, format, readonly, placeholder, inputProps, Custom }) => {
-  const { t } = useTranslation2(translationKey);
-  const arrayValues = values[name] ?? [];
-  const key = [
-    name
-  ];
-  const tupleType = findNode(ast, AST.isTupleType);
-  const elementType = tupleType?.rest[0]?.type;
-  if (type === "object" && elementType) {
-    const baseNode = findNode(elementType, isDiscriminatedUnion);
-    const typeLiteral = baseNode ? getDiscriminatedType(baseNode, values[name]) : findNode(elementType, AST.isTypeLiteral);
-    if (typeLiteral) {
-      const schema = S.make(typeLiteral);
-      return /* @__PURE__ */ React6.createElement("div", {
-        key: name,
-        role: "none",
-        className: mx2(padding)
-      }, /* @__PURE__ */ React6.createElement(InputHeader, null, label), /* @__PURE__ */ React6.createElement("div", {
-        role: "none",
-        className: "flex flex-col gap-1"
-      }, arrayValues.map((value, index) => {
-        return /* @__PURE__ */ React6.createElement("div", {
-          key: index,
-          role: "none",
-          className: "flex items-center gap-1"
-        }, /* @__PURE__ */ React6.createElement("div", {
-          role: "none",
-          className: "flex-1"
-        }, /* @__PURE__ */ React6.createElement(Form, {
-          schema,
-          path: [
-            ...key,
-            `[${index}]`
-          ],
-          values: value,
-          onValuesChanged: (childValues) => {
-            const newValues = [
-              ...arrayValues
-            ];
-            newValues[index] = childValues;
-            inputProps.onValueChange(name, "object", newValues);
-          },
-          Custom
-        })), /* @__PURE__ */ React6.createElement(IconButton, {
-          icon: "ph--trash--regular",
-          iconOnly: true,
-          label: t("button remove"),
-          onClick: () => {
-            const newValues = arrayValues.filter((_, i) => i !== index);
-            inputProps.onValueChange(name, type, newValues);
-          }
-        }));
-      })), /* @__PURE__ */ React6.createElement("div", {
-        role: "none",
-        className: "flex justify-between items-center plb-1"
-      }, /* @__PURE__ */ React6.createElement(IconButton, {
-        icon: "ph--plus--regular",
-        iconOnly: true,
-        label: t("button add"),
-        onClick: () => {
-          const newValues = [
-            ...arrayValues,
-            {}
-          ];
-          inputProps.onValueChange(name, type, newValues);
-        }
-      })));
-    }
-    return /* @__PURE__ */ React6.createElement("div", {
-      key: name,
-      role: "none"
-    }, "Nested form not supported in arrays, yet.");
-  }
-  const InputComponent = getInputComponent(type, format);
-  if (!InputComponent) {
+  if (!elementType) {
     return null;
   }
-  return /* @__PURE__ */ React6.createElement("div", {
+  return /* @__PURE__ */ React9.createElement("div", {
     role: "none",
-    key: "meta-input",
-    className: mx2(padding)
-  }, /* @__PURE__ */ React6.createElement(InputHeader, null, label), /* @__PURE__ */ React6.createElement("div", {
+    className: mx5(padding)
+  }, /* @__PURE__ */ React9.createElement(InputHeader, null, label), /* @__PURE__ */ React9.createElement("div", {
     role: "none",
     className: "flex flex-col gap-1"
-  }, arrayValues.map((_, index) => /* @__PURE__ */ React6.createElement("div", {
+  }, values.map((_value, index) => /* @__PURE__ */ React9.createElement("div", {
     key: index,
     role: "none",
-    className: "flex items-start gap-1"
-  }, /* @__PURE__ */ React6.createElement("div", {
+    className: "flex items-center gap-1"
+  }, /* @__PURE__ */ React9.createElement("div", {
     role: "none",
     className: "flex-1"
-  }, /* @__PURE__ */ React6.createElement(InputComponent, {
-    type,
-    format,
-    label,
-    inputOnly: true,
-    property: `${name}[${index}]`,
-    disabled: readonly,
-    placeholder,
-    ...inputProps
-  })), /* @__PURE__ */ React6.createElement(IconButton, {
+  }, /* @__PURE__ */ React9.createElement(FormField, {
+    property: {
+      ...property,
+      array: false,
+      ast: elementType
+    },
+    path: [
+      ...path ?? [],
+      index
+    ],
+    readonly,
+    inline: true,
+    Custom,
+    lookupComponent
+  })), /* @__PURE__ */ React9.createElement(IconButton3, {
     icon: "ph--trash--regular",
     iconOnly: true,
     label: t("button remove"),
-    onClick: () => {
-      const newValues = arrayValues.filter((_2, i) => i !== index);
-      inputProps.onValueChange(name, type, newValues);
-    }
-  })))), /* @__PURE__ */ React6.createElement("div", {
+    onClick: () => handleRemove(index)
+  })))), /* @__PURE__ */ React9.createElement("div", {
     role: "none",
     className: "flex justify-between items-center plb-1"
-  }, /* @__PURE__ */ React6.createElement(IconButton, {
+  }, /* @__PURE__ */ React9.createElement(IconButton3, {
     icon: "ph--plus--regular",
     iconOnly: true,
     label: t("button add"),
-    onClick: () => {
-      const newValues = [
-        ...arrayValues,
-        SimpleType.getDefaultValue(type)
-      ];
-      inputProps.onValueChange(name, type, newValues);
-    }
+    onClick: handleAdd
   })));
 };
-var FormActions = ({ onCancel, onSubmit, canSubmit, readonly }) => {
-  const { t } = useTranslation2(translationKey);
-  return /* @__PURE__ */ React6.createElement("div", {
-    role: "none",
-    className: "flex justify-center"
-  }, /* @__PURE__ */ React6.createElement("div", {
+
+// packages/ui/react-ui-form/src/components/Form/factory.tsx
+import { FormatEnum } from "@dxos/echo-schema";
+var getInputComponent = (type, format) => {
+  switch (format) {
+    case FormatEnum.LatLng:
+      return GeoPointInput;
+  }
+  switch (type) {
+    case "string":
+      return TextInput;
+    case "number":
+      return NumberInput;
+    case "boolean":
+      return BooleanInput;
+  }
+};
+
+// packages/ui/react-ui-form/src/components/Form/FormContent.tsx
+var FormField = ({ property, path, readonly, inline, lookupComponent, Custom }) => {
+  const inputProps = useInputProps(path);
+  const { ast, name, type, format, title, description, options, examples, array } = property;
+  const label = useMemo3(() => title ?? pipe2(name, capitalize2), [
+    title,
+    name
+  ]);
+  const placeholder = useMemo3(() => examples?.length ? `Example: "${examples[0]}"` : description, [
+    examples,
+    description
+  ]);
+  const FoundComponent = lookupComponent?.({
+    prop: name,
+    schema: S.make(ast),
+    inputProps: {
+      type,
+      format,
+      label,
+      disabled: readonly,
+      placeholder,
+      ...inputProps
+    }
+  });
+  if (FoundComponent) {
+    return /* @__PURE__ */ React10.createElement("div", {
+      role: "none"
+    }, FoundComponent);
+  }
+  const jsonPath = createJsonPath3(path ?? []);
+  const CustomComponent = Custom?.[jsonPath];
+  if (CustomComponent) {
+    return (
+      // TODO(ZaymonFC): We should try to remove this div wrapper.
+      /* @__PURE__ */ React10.createElement("div", {
+        role: "none"
+      }, /* @__PURE__ */ React10.createElement(CustomComponent, {
+        type,
+        format,
+        label,
+        inputOnly: inline,
+        placeholder,
+        disabled: readonly,
+        ...inputProps
+      }))
+    );
+  }
+  if (array) {
+    return /* @__PURE__ */ React10.createElement(ArrayField, {
+      property,
+      path,
+      inputProps,
+      readonly,
+      Custom
+    });
+  }
+  const InputComponent = getInputComponent(type, format);
+  if (InputComponent) {
+    return /* @__PURE__ */ React10.createElement("div", {
+      role: "none"
+    }, /* @__PURE__ */ React10.createElement(InputComponent, {
+      type,
+      format,
+      label,
+      inputOnly: inline,
+      placeholder,
+      disabled: readonly,
+      ...inputProps
+    }));
+  }
+  if (options) {
+    return /* @__PURE__ */ React10.createElement("div", {
+      role: "none"
+    }, /* @__PURE__ */ React10.createElement(SelectInput, {
+      type,
+      format,
+      disabled: readonly,
+      inputOnly: inline,
+      label,
+      options: options.map((option) => ({
+        value: option,
+        label: String(option)
+      })),
+      placeholder,
+      ...inputProps
+    }));
+  }
+  if (type === "object") {
+    const baseNode = findNode2(ast, isDiscriminatedUnion2);
+    const typeLiteral = baseNode ? getDiscriminatedType2(baseNode, inputProps.getValue()) : findNode2(ast, AST2.isTypeLiteral);
+    if (typeLiteral) {
+      return /* @__PURE__ */ React10.createElement("div", {
+        role: "none"
+      }, !inline && /* @__PURE__ */ React10.createElement("div", null, label), /* @__PURE__ */ React10.createElement(FormFields, {
+        schema: S.make(typeLiteral),
+        path,
+        readonly,
+        Custom
+      }));
+    }
+  }
+  return null;
+};
+var FormFields = ({ schema, path, filter, sort, readonly, lookupComponent, Custom }) => {
+  const values = useFormValues(path);
+  const properties = useMemo3(() => {
+    const props = getSchemaProperties2(schema.ast, values);
+    const filtered = filter ? filter(props) : props;
+    return sort ? filtered.sort((a, b) => sort.indexOf(a.name) - sort.indexOf(b.name)) : filtered;
+  }, [
+    schema,
+    values,
+    filter,
+    sort
+  ]);
+  return /* @__PURE__ */ React10.createElement("div", {
+    role: "form",
+    className: mx6("flex flex-col w-full gap-2 py-2")
+  }, properties.map((property) => {
+    return /* @__PURE__ */ React10.createElement(FormField, {
+      key: property.name,
+      property,
+      path: [
+        ...path ?? [],
+        property.name
+      ],
+      readonly,
+      lookupComponent,
+      Custom
+    });
+  }).filter(isNotFalsy));
+};
+
+// packages/ui/react-ui-form/src/components/Form/Form.tsx
+var Form = ({ classNames, schema, values: initialValues, path = [], readonly, filter, sort, autoSave, testId, onValuesChanged, onValidate, onSave, onCancel, lookupComponent, Custom }) => {
+  const onValid = useMemo4(() => autoSave ? onSave : void 0, [
+    autoSave,
+    onSave
+  ]);
+  return /* @__PURE__ */ React11.createElement(FormProvider, {
+    schema,
+    initialValues,
+    onValuesChanged,
+    onValidate,
+    onValid,
+    onSave
+  }, /* @__PURE__ */ React11.createElement("div", {
     role: "none",
-    className: mx2(onCancel && !readonly && "grid grid-cols-2 gap-2")
-  }, onCancel && !readonly && /* @__PURE__ */ React6.createElement(IconButton, {
-    "data-testid": "cancel-button",
-    icon: "ph--x--regular",
-    label: t("button cancel"),
-    onClick: onCancel
-  }), onSubmit && /* @__PURE__ */ React6.createElement(IconButton, {
-    type: "submit",
-    "data-testid": "save-button",
-    disabled: !canSubmit,
-    icon: "ph--check--regular",
-    label: t("button save"),
-    onClick: onSubmit
+    className: mx7("p-2", classNames),
+    "data-testid": testId
+  }, /* @__PURE__ */ React11.createElement(FormFields, {
+    schema,
+    path,
+    readonly,
+    filter,
+    sort,
+    lookupComponent,
+    Custom
+  }), (onCancel || onSave) && !autoSave && /* @__PURE__ */ React11.createElement(FormActions, {
+    onCancel,
+    readonly
   })));
 };
 
 // packages/ui/react-ui-form/src/components/FieldEditor/FieldEditor.tsx
 var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-form/src/components/FieldEditor/FieldEditor.tsx";
 var FieldEditor = ({ view, projection, field, registry, onSave, onCancel }) => {
-  const { t } = useTranslation3(translationKey);
-  const [props, setProps] = useState2(projection.getFieldProjection(field.id).props);
+  const { t } = useTranslation5(translationKey);
+  const [props, setProps] = useState3(projection.getFieldProjection(field.id).props);
   useEffect3(() => setProps(projection.getFieldProjection(field.id).props), [
     field,
     projection
   ]);
-  const [schemas, setSchemas] = useState2([]);
+  const [schemas, setSchemas] = useState3([]);
   useEffect3(() => {
     if (!registry) {
       return;
@@ -756,17 +1011,17 @@ var FieldEditor = ({ view, projection, field, registry, onSave, onCancel }) => {
   }, [
     registry
   ]);
-  const [schema, setSchema] = useState2();
+  const [referenceSchema, setReferenceSchema] = useState3();
   useEffect3(() => {
-    setSchema(schemas.find((schema2) => schema2.typename === props?.referenceSchema));
+    setReferenceSchema(schemas.find((schema) => schema.typename === props?.referenceSchema));
   }, [
     schemas,
     props?.referenceSchema
   ]);
-  const [{ fieldSchema }, setFieldSchema] = useState2({
+  const [{ fieldSchema }, setFieldSchema] = useState3({
     fieldSchema: getFormatSchema(props?.format)
   });
-  const handleValuesChanged = useCallback2((_props) => {
+  const handleValuesChanged = useCallback4((_props) => {
     setFieldSchema((prev) => {
       const fieldSchema2 = getFormatSchema(_props.format);
       if (prev.fieldSchema === fieldSchema2) {
@@ -776,9 +1031,15 @@ var FieldEditor = ({ view, projection, field, registry, onSave, onCancel }) => {
         fieldSchema: fieldSchema2
       };
     });
-    if (_props.referenceSchema !== props.referenceSchema) {
-      setSchema(schemas.find((schema2) => schema2.typename === _props.referenceSchema));
-    }
+    setReferenceSchema((prev) => {
+      if (_props.referenceSchema !== prev?.typename) {
+        const newSchema = schemas.find((schema) => schema.typename === _props.referenceSchema);
+        if (newSchema) {
+          return newSchema;
+        }
+      }
+      return prev;
+    });
     setProps((props2) => {
       const type = formatToType[_props.format];
       if (props2.type !== type) {
@@ -788,14 +1049,14 @@ var FieldEditor = ({ view, projection, field, registry, onSave, onCancel }) => {
           type
         };
       }
-      return props2;
+      return _props;
     });
   }, [
     schemas,
     props.format,
     props.referenceSchema
   ]);
-  const handleValidate = useCallback2(({ property }) => {
+  const handleValidate = useCallback4(({ property }) => {
     if (property && view.fields.find((f) => f.path === property && f.path !== field.path)) {
       return [
         {
@@ -808,7 +1069,7 @@ var FieldEditor = ({ view, projection, field, registry, onSave, onCancel }) => {
     view.fields,
     field
   ]);
-  const handleSave = useCallback2((props2) => {
+  const handleSave = useCallback4((props2) => {
     projection.setFieldProjection({
       field,
       props: props2
@@ -819,29 +1080,56 @@ var FieldEditor = ({ view, projection, field, registry, onSave, onCancel }) => {
     field,
     onSave
   ]);
-  const handleCancel = useCallback2(() => {
+  const handleCancel = useCallback4(() => {
     requestAnimationFrame(() => onCancel?.());
     onSave();
   }, [
     onSave
   ]);
+  const Custom = useMemo5(() => ({
+    ["format"]: (props2) => /* @__PURE__ */ React12.createElement(SelectInput, {
+      ...props2,
+      options: FormatEnums.filter((value) => value !== FormatEnum2.None).map((value) => ({
+        value,
+        label: t(`format ${value}`)
+      }))
+    }),
+    ["referenceSchema"]: (props2) => /* @__PURE__ */ React12.createElement(SelectInput, {
+      ...props2,
+      options: schemas.map((schema) => ({
+        value: schema.typename
+      }))
+    }),
+    ["referencePath"]: (props2) => /* @__PURE__ */ React12.createElement(SelectInput, {
+      ...props2,
+      options: referenceSchema ? getSchemaProperties3(referenceSchema.ast).sort(sortProperties).map((p) => ({
+        value: p.name
+      })) : []
+    }),
+    ["options"]: (props2) => /* @__PURE__ */ React12.createElement(SelectOptionInput, props2)
+  }), [
+    t,
+    schemas,
+    referenceSchema
+  ]);
+  const propIsNotType = useCallback4((props2) => props2.filter((p) => p.name !== "type"), []);
   if (!fieldSchema) {
-    log3.warn("invalid format", {
+    log2.warn("invalid format", {
       props
     }, {
       F: __dxlog_file3,
-      L: 126,
+      L: 174,
       S: void 0,
       C: (f, a) => f(...a)
     });
     return null;
   }
-  return /* @__PURE__ */ React7.createElement(Form, {
+  return /* @__PURE__ */ React12.createElement(Form, {
     key: field.id,
     autoFocus: true,
     values: props,
     schema: fieldSchema,
-    filter: (props2) => props2.filter((p) => p.name !== "type"),
+    filter: propIsNotType,
     sort: [
       "property",
       "format"
@@ -850,55 +1138,34 @@ var FieldEditor = ({ view, projection, field, registry, onSave, onCancel }) => {
     onValidate: handleValidate,
     onSave: handleSave,
     onCancel: handleCancel,
-    Custom: {
-      ["format"]: (props2) => /* @__PURE__ */ React7.createElement(SelectInput, {
-        ...props2,
-        options: FormatEnums.filter((value) => value !== FormatEnum2.None).map((value) => ({
-          value,
-          label: t(`format ${value}`)
-        }))
-      }),
-      ["referenceSchema"]: (props2) => /* @__PURE__ */ React7.createElement(SelectInput, {
-        ...props2,
-        options: schemas.map((schema2) => ({
-          value: schema2.typename
-        }))
-      }),
-      ["referencePath"]: (props2) => /* @__PURE__ */ React7.createElement(SelectInput, {
-        ...props2,
-        options: schema ? getSchemaProperties2(schema.ast).sort(sortProperties).map((p) => ({
-          value: p.name
-        })) : []
-      })
-    }
+    Custom
   });
 };
 
 // packages/ui/react-ui-form/src/components/ViewEditor/ViewEditor.tsx
-import React8, { useCallback as useCallback3, useMemo as useMemo3, useState as useState3 } from "react";
-import { AST as AST2, Format, S as S2 } from "@dxos/echo-schema";
-import { IconButton as IconButton2, useTranslation as useTranslation4 } from "@dxos/react-ui";
-import { List } from "@dxos/react-ui-list";
-import { ghostHover, inputTextLabel, mx as mx3 } from "@dxos/react-ui-theme";
+import React13, { useCallback as useCallback5, useMemo as useMemo6, useState as useState4 } from "react";
+import { AST as AST3, Format, S as S2 } from "@dxos/echo-schema";
+import { IconButton as IconButton4, useTranslation as useTranslation6 } from "@dxos/react-ui";
+import { List as List2 } from "@dxos/react-ui-list";
+import { ghostHover, inputTextLabel, mx as mx8 } from "@dxos/react-ui-theme";
 import { FieldSchema, ViewProjection, VIEW_FIELD_LIMIT } from "@dxos/schema";
-import { arrayMove } from "@dxos/util";
 var grid = "grid grid-cols-[32px_1fr_32px] min-bs-[2.5rem]";
 var ViewMetaSchema = S2.Struct({
   name: S2.String.annotations({
-    [AST2.TitleAnnotationId]: "View"
+    [AST3.TitleAnnotationId]: "View"
   }),
   typename: Format.DXN.annotations({
-    [AST2.TitleAnnotationId]: "Typename"
+    [AST3.TitleAnnotationId]: "Typename"
   })
 }).pipe(S2.mutable);
-var ViewEditor = ({ classNames, schema, view, registry, readonly, showHeading = false, onDelete }) => {
-  const { t } = useTranslation4(translationKey);
-  const projection = useMemo3(() => new ViewProjection(schema, view), [
+var ViewEditor = ({ classNames, schema, view, registry, readonly, showHeading = false, onTypenameChanged, onDelete }) => {
+  const { t } = useTranslation6(translationKey);
+  const projection = useMemo6(() => new ViewProjection(schema, view), [
     schema,
     view
   ]);
-  const [field, setField] = useState3();
-  const viewValues = useMemo3(() => {
+  const [field, setField] = useState4();
+  const viewValues = useMemo6(() => {
     return {
       name: view.name,
       // TODO(burdon): Need to warn user of possible consequences of editing.
@@ -908,77 +1175,86 @@ var ViewEditor = ({ classNames, schema, view, registry, readonly, showHeading =
   }, [
     view
   ]);
-  const handleViewUpdate = useCallback3(({ name, typename }) => {
+  const handleViewUpdate = useCallback5(({ name, typename }) => {
     requestAnimationFrame(() => {
-      view.name = name;
-      view.query.type = typename;
-      schema.updateTypename(typename);
+      if (view.name !== name) {
+        view.name = name;
+      }
+      if (view.query.type !== typename) {
+        onTypenameChanged(typename);
+      }
     });
   }, [
     view,
-    schema
+    schema,
+    onTypenameChanged
   ]);
-  const handleSelect = useCallback3((field2) => {
+  const handleSelect = useCallback5((field2) => {
     setField((f) => f === field2 ? void 0 : field2);
   }, []);
-  const handleAdd = useCallback3(() => {
+  const handleAdd = useCallback5(() => {
     const field2 = projection.createFieldProjection();
     setField(field2);
   }, [
     view
   ]);
-  const handleMove = useCallback3((fromIndex, toIndex) => {
-    arrayMove(view.fields, fromIndex, toIndex);
+  const handleMove = useCallback5((fromIndex, toIndex) => {
+    const fields = [
+      ...view.fields
+    ];
+    const [moved] = fields.splice(fromIndex, 1);
+    fields.splice(toIndex, 0, moved);
+    view.fields = fields;
   }, [
     view.fields
   ]);
-  const handleClose = useCallback3(() => setField(void 0), []);
-  return /* @__PURE__ */ React8.createElement("div", {
+  const handleClose = useCallback5(() => setField(void 0), []);
+  return /* @__PURE__ */ React13.createElement("div", {
     role: "none",
-    className: mx3("flex flex-col w-full divide-y divide-separator", classNames)
-  }, /* @__PURE__ */ React8.createElement(Form, {
+    className: mx8("flex flex-col w-full divide-y divide-separator", classNames)
+  }, /* @__PURE__ */ React13.createElement(Form, {
     autoFocus: true,
     autoSave: true,
     schema: ViewMetaSchema,
     values: viewValues,
     onSave: handleViewUpdate
-  }), /* @__PURE__ */ React8.createElement("div", null, /* @__PURE__ */ React8.createElement("div", {
+  }), /* @__PURE__ */ React13.createElement("div", null, /* @__PURE__ */ React13.createElement("div", {
     role: "none",
     className: "p-2"
-  }, /* @__PURE__ */ React8.createElement("label", {
-    className: mx3(inputTextLabel)
-  }, t("fields label"))), /* @__PURE__ */ React8.createElement(List.Root, {
+  }, /* @__PURE__ */ React13.createElement("label", {
+    className: mx8(inputTextLabel)
+  }, t("fields label"))), /* @__PURE__ */ React13.createElement(List2.Root, {
     items: view.fields,
     isItem: S2.is(FieldSchema),
     getId: (field2) => field2.id,
     onMove: handleMove
-  }, ({ items: fields }) => /* @__PURE__ */ React8.createElement(React8.Fragment, null, showHeading && /* @__PURE__ */ React8.createElement("div", {
+  }, ({ items: fields }) => /* @__PURE__ */ React13.createElement(React13.Fragment, null, showHeading && /* @__PURE__ */ React13.createElement("div", {
     role: "heading",
     className: grid
-  }, /* @__PURE__ */ React8.createElement("div", null), /* @__PURE__ */ React8.createElement("div", {
+  }, /* @__PURE__ */ React13.createElement("div", null), /* @__PURE__ */ React13.createElement("div", {
     className: "flex items-center text-sm"
-  }, t("field path label"))), /* @__PURE__ */ React8.createElement("div", {
+  }, t("field path label"))), /* @__PURE__ */ React13.createElement("div", {
     role: "list",
     className: "flex flex-col w-full"
-  }, fields?.map((field2) => /* @__PURE__ */ React8.createElement(List.Item, {
+  }, fields?.map((field2) => /* @__PURE__ */ React13.createElement(List2.Item, {
     key: field2.id,
     item: field2,
-    classNames: mx3(grid, ghostHover, "cursor-pointer")
-  }, /* @__PURE__ */ React8.createElement(List.ItemDragHandle, null), /* @__PURE__ */ React8.createElement(List.ItemTitle, {
+    classNames: mx8(grid, ghostHover, "cursor-pointer")
+  }, /* @__PURE__ */ React13.createElement(List2.ItemDragHandle, null), /* @__PURE__ */ React13.createElement(List2.ItemTitle, {
     onClick: () => handleSelect(field2)
-  }, field2.path), /* @__PURE__ */ React8.createElement(List.ItemDeleteButton, {
+  }, field2.path), /* @__PURE__ */ React13.createElement(List2.ItemDeleteButton, {
     disabled: view.fields.length <= 1,
     onClick: () => onDelete(field2.id)
-  }))))))), field && /* @__PURE__ */ React8.createElement(FieldEditor, {
+  }))))))), field && /* @__PURE__ */ React13.createElement(FieldEditor, {
     key: field.id,
     view,
     projection,
     field,
     registry,
     onSave: handleClose
-  }), !readonly && !field && /* @__PURE__ */ React8.createElement("div", {
+  }), !readonly && !field && /* @__PURE__ */ React13.createElement("div", {
     className: "flex p-2 justify-center"
-  }, /* @__PURE__ */ React8.createElement(IconButton2, {
+  }, /* @__PURE__ */ React13.createElement(IconButton4, {
     icon: "ph--plus--regular",
     label: t("button add property"),
     onClick: handleAdd,
@@ -1208,14 +1484,15 @@ var formatForEditing = ({ type, format, value, locale = void 0 }) => {
 };
 export {
   BooleanInput,
+  DeprecatedFormContainer,
   DeprecatedFormInput,
   FieldEditor,
   Form,
-  FormActions,
   GeoPointInput,
   InputHeader,
   NumberInput,
   SelectInput,
+  SelectOptionInput,
   TextInput,
   TupleInput,
   ViewEditor,