@dxos/react-ui-form 0.7.4 → 0.7.5-labs.5f04cf6

package/dist/lib/node/index.cjs

@@ -32,12 +32,12 @@ __export(node_exports, {
   DeprecatedFormInput: () => DeprecatedFormInput,
   FieldEditor: () => FieldEditor,
   Form: () => Form,
-  FormActions: () => FormActions,
-  GeiPointInput: () => GeiPointInput,
+  GeoPointInput: () => GeoPointInput,
   InputHeader: () => InputHeader,
   NumberInput: () => NumberInput,
   SelectInput: () => SelectInput,
   TextInput: () => TextInput,
+  TupleInput: () => TupleInput,
   ViewEditor: () => ViewEditor,
   cellClassesForFieldType: () => cellClassesForFieldType,
   cellClassesForRowSelection: () => cellClassesForRowSelection,
@@ -56,37 +56,60 @@ var import_echo_schema = require("@dxos/echo-schema");
 var import_log = require("@dxos/log");
 var import_react_ui2 = require("@dxos/react-ui");
 var import_schema = require("@dxos/schema");
-var import_effect = require("effect");
-var import_String = require("effect/String");
 var import_react3 = __toESM(require("react"));
-var import_echo_schema2 = require("@dxos/echo-schema");
-var import_effect2 = require("@dxos/effect");
-var import_log2 = require("@dxos/log");
 var import_react_ui3 = require("@dxos/react-ui");
-var import_react_ui_theme = require("@dxos/react-ui-theme");
-var import_schema2 = require("@dxos/schema");
 var import_util = require("@dxos/util");
 var import_react4 = __toESM(require("react"));
 var import_react_ui4 = require("@dxos/react-ui");
+var import_react_ui_theme = require("@dxos/react-ui-theme");
 var import_react5 = __toESM(require("react"));
 var import_react_ui5 = require("@dxos/react-ui");
 var import_react_ui_theme2 = require("@dxos/react-ui-theme");
-var import_echo_schema3 = require("@dxos/echo-schema");
+var import_util2 = require("@dxos/util");
 var import_react6 = __toESM(require("react"));
 var import_react_ui6 = require("@dxos/react-ui");
-var import_react7 = require("react");
-var import_invariant = require("@dxos/invariant");
-var import_log3 = require("@dxos/log");
-var import_schema3 = require("@dxos/schema");
+var import_react7 = __toESM(require("react"));
+var import_react_ui_theme3 = require("@dxos/react-ui-theme");
 var import_react8 = __toESM(require("react"));
-var import_echo_schema4 = require("@dxos/echo-schema");
 var import_react_ui7 = require("@dxos/react-ui");
-var import_react_ui_list = require("@dxos/react-ui-list");
-var import_react_ui_theme3 = require("@dxos/react-ui-theme");
-var import_schema4 = require("@dxos/schema");
-var import_util2 = require("@dxos/util");
+var import_react_ui_theme4 = require("@dxos/react-ui-theme");
+var import_react9 = __toESM(require("react"));
+var import_debug = require("@dxos/debug");
+var import_echo_schema2 = require("@dxos/echo-schema");
+var import_effect = require("@dxos/effect");
+var import_react10 = require("react");
+var import_echo_schema3 = require("@dxos/echo-schema");
+var import_effect2 = require("@dxos/effect");
+var import_invariant = require("@dxos/invariant");
+var import_log2 = require("@dxos/log");
+var import_schema2 = require("@dxos/schema");
+var import_effect3 = require("effect");
+var import_String = require("effect/String");
+var import_react11 = __toESM(require("react"));
+var import_echo_schema4 = require("@dxos/echo-schema");
+var import_effect4 = require("@dxos/effect");
+var import_react_ui_theme5 = require("@dxos/react-ui-theme");
+var import_schema3 = require("@dxos/schema");
+var import_util3 = require("@dxos/util");
+var import_effect5 = require("effect");
+var import_String2 = require("effect/String");
+var import_react12 = __toESM(require("react"));
 var import_echo_schema5 = require("@dxos/echo-schema");
+var import_effect6 = require("@dxos/effect");
+var import_invariant2 = require("@dxos/invariant");
+var import_react_ui8 = require("@dxos/react-ui");
+var import_react_ui_theme6 = require("@dxos/react-ui-theme");
+var import_schema4 = require("@dxos/schema");
 var import_echo_schema6 = require("@dxos/echo-schema");
+var import_react13 = __toESM(require("react"));
+var import_echo_schema7 = require("@dxos/echo-schema");
+var import_react_ui9 = require("@dxos/react-ui");
+var import_react_ui_list = require("@dxos/react-ui-list");
+var import_react_ui_theme7 = require("@dxos/react-ui-theme");
+var import_schema5 = require("@dxos/schema");
+var import_util4 = require("@dxos/util");
+var import_echo_schema8 = require("@dxos/echo-schema");
+var import_echo_schema9 = require("@dxos/echo-schema");
 var translationKey = "react-ui-form";
 var translations_default = [
   {
@@ -163,161 +186,178 @@ var DeprecatedFormInput = ({ label, description, secondary, children }) => {
   return primary;
 };
 var InputHeader = ({ children, error }) => {
-  return /* @__PURE__ */ import_react5.default.createElement("div", {
+  return /* @__PURE__ */ import_react4.default.createElement("div", {
     role: "none",
     className: "flex justify-between items-center mb-1"
-  }, children, error && /* @__PURE__ */ import_react5.default.createElement(import_react_ui5.Tooltip.Root, null, /* @__PURE__ */ import_react5.default.createElement(import_react_ui5.Tooltip.Trigger, {
+  }, children, error && /* @__PURE__ */ import_react4.default.createElement(import_react_ui4.Tooltip.Root, null, /* @__PURE__ */ import_react4.default.createElement(import_react_ui4.Tooltip.Trigger, {
     asChild: true
-  }, /* @__PURE__ */ import_react5.default.createElement(import_react_ui5.Icon, {
+  }, /* @__PURE__ */ import_react4.default.createElement(import_react_ui4.Icon, {
     icon: "ph--warning--regular",
     size: 4,
-    classNames: import_react_ui_theme2.errorText
-  })), /* @__PURE__ */ import_react5.default.createElement(import_react_ui5.Tooltip.Content, {
+    classNames: import_react_ui_theme.errorText
+  })), /* @__PURE__ */ import_react4.default.createElement(import_react_ui4.Tooltip.Content, {
     side: "bottom"
-  }, /* @__PURE__ */ import_react5.default.createElement(import_react_ui5.Tooltip.Arrow, null), error)));
+  }, /* @__PURE__ */ import_react4.default.createElement(import_react_ui4.Tooltip.Arrow, null), error)));
 };
-var TextInput = ({ property, type, label, inputOnly, disabled, placeholder, getStatus, getValue, onValueChange, onBlur }) => {
-  const { status, error } = getStatus?.(property);
-  return /* @__PURE__ */ import_react4.default.createElement(import_react_ui4.Input.Root, {
+var GeoPointInput = ({ type, label, disabled, getStatus, getValue: getValue3, onValueChange, onBlur }) => {
+  const { t } = (0, import_react_ui3.useTranslation)(translationKey);
+  const { status, error } = getStatus();
+  const [lng = 0, lat = 0] = getValue3() ?? [];
+  return /* @__PURE__ */ import_react3.default.createElement(import_react_ui3.Input.Root, {
     validationValence: status
-  }, !inputOnly && /* @__PURE__ */ import_react4.default.createElement(InputHeader, {
+  }, /* @__PURE__ */ import_react3.default.createElement(InputHeader, {
     error
-  }, /* @__PURE__ */ import_react4.default.createElement(import_react_ui4.Input.Label, null, label)), /* @__PURE__ */ import_react4.default.createElement(import_react_ui4.Input.TextInput, {
+  }, /* @__PURE__ */ import_react3.default.createElement(import_react_ui3.Input.Label, null, label)), /* @__PURE__ */ import_react3.default.createElement("div", {
+    className: "grid grid-cols-2 gap-2"
+  }, /* @__PURE__ */ import_react3.default.createElement(import_react_ui3.Input.TextInput, {
+    type: "number",
+    disabled,
+    placeholder: t("placeholder longitude"),
+    value: lng,
+    onChange: (event) => onValueChange(type, [
+      lat,
+      (0, import_util.safeParseFloat)(event.target.value, 0)
+    ]),
+    onBlur
+  }), /* @__PURE__ */ import_react3.default.createElement(import_react_ui3.Input.TextInput, {
+    type: "number",
+    disabled,
+    placeholder: t("placeholder latitude"),
+    value: lat,
+    onChange: (event) => onValueChange(type, [
+      (0, import_util.safeParseFloat)(event.target.value, 0),
+      lng
+    ]),
+    onBlur
+  })));
+};
+var gridCols = [
+  "grid-cols-1",
+  "grid-cols-2",
+  "grid-cols-3",
+  "grid-cols-4"
+];
+var TupleInput = ({ binding, type, label, disabled, getStatus, getValue: getValue3, onValueChange, onBlur }) => {
+  const { status, error } = getStatus();
+  const values = getValue3() ?? {};
+  return /* @__PURE__ */ import_react5.default.createElement(import_react_ui5.Input.Root, {
+    validationValence: status
+  }, /* @__PURE__ */ import_react5.default.createElement(InputHeader, {
+    error
+  }, /* @__PURE__ */ import_react5.default.createElement(import_react_ui5.Input.Label, null, label)), /* @__PURE__ */ import_react5.default.createElement("div", {
+    className: (0, import_react_ui_theme2.mx)("grid gap-2", gridCols[binding.length - 1])
+  }, binding.map((prop) => /* @__PURE__ */ import_react5.default.createElement(import_react_ui5.Input.TextInput, {
+    key: prop,
+    type: "number",
+    disabled,
+    value: values[prop],
+    onChange: (event) => onValueChange(type, {
+      ...values,
+      [prop]: (0, import_util2.safeParseFloat)(event.target.value, 0)
+    }),
+    onBlur
+  }))));
+};
+var TextInput = ({ type, label, inputOnly, disabled, placeholder, getStatus, getValue: getValue3, onValueChange, onBlur }) => {
+  const { status, error } = getStatus();
+  return /* @__PURE__ */ import_react6.default.createElement(import_react_ui6.Input.Root, {
+    validationValence: status
+  }, !inputOnly && /* @__PURE__ */ import_react6.default.createElement(InputHeader, {
+    error
+  }, /* @__PURE__ */ import_react6.default.createElement(import_react_ui6.Input.Label, null, label)), /* @__PURE__ */ import_react6.default.createElement(import_react_ui6.Input.TextInput, {
     disabled,
     placeholder,
-    value: getValue(property) ?? "",
-    onChange: (event) => onValueChange(property, type, event.target.value),
+    value: getValue3() ?? "",
+    onChange: (event) => onValueChange(type, event.target.value),
     onBlur
-  }), inputOnly && /* @__PURE__ */ import_react4.default.createElement(import_react_ui4.Input.Validation, null, error));
+  }), inputOnly && /* @__PURE__ */ import_react6.default.createElement(import_react_ui6.Input.Validation, null, error));
 };
-var NumberInput = ({ property, type, label, inputOnly, disabled, placeholder, getStatus, getValue, onValueChange, onBlur }) => {
-  const { status, error } = getStatus?.(property);
-  return /* @__PURE__ */ import_react4.default.createElement(import_react_ui4.Input.Root, {
+var NumberInput = ({ type, label, inputOnly, disabled, placeholder, getStatus, getValue: getValue3, onValueChange, onBlur }) => {
+  const { status, error } = getStatus();
+  return /* @__PURE__ */ import_react6.default.createElement(import_react_ui6.Input.Root, {
     validationValence: status
-  }, !inputOnly && /* @__PURE__ */ import_react4.default.createElement(InputHeader, {
+  }, !inputOnly && /* @__PURE__ */ import_react6.default.createElement(InputHeader, {
     error
-  }, /* @__PURE__ */ import_react4.default.createElement(import_react_ui4.Input.Label, null, label)), /* @__PURE__ */ import_react4.default.createElement(import_react_ui4.Input.TextInput, {
+  }, /* @__PURE__ */ import_react6.default.createElement(import_react_ui6.Input.Label, null, label)), /* @__PURE__ */ import_react6.default.createElement(import_react_ui6.Input.TextInput, {
     type: "number",
     disabled,
     placeholder,
-    value: getValue(property) ?? 0,
-    onChange: (event) => onValueChange(property, type, event.target.value),
+    value: getValue3() ?? 0,
+    onChange: (event) => onValueChange(type, event.target.value),
     onBlur
-  }), inputOnly && /* @__PURE__ */ import_react4.default.createElement(import_react_ui4.Input.DescriptionAndValidation, null, error));
+  }), inputOnly && /* @__PURE__ */ import_react6.default.createElement(import_react_ui6.Input.DescriptionAndValidation, null, error));
 };
-var BooleanInput = ({ property, type, label, inputOnly, getStatus, getValue, onValueChange }) => {
-  const { status, error } = getStatus?.(property);
-  return /* @__PURE__ */ import_react4.default.createElement(import_react_ui4.Input.Root, {
+var BooleanInput = ({ type, label, inputOnly, getStatus, getValue: getValue3, onValueChange }) => {
+  const { status, error } = getStatus();
+  return /* @__PURE__ */ import_react6.default.createElement(import_react_ui6.Input.Root, {
     validationValence: status
-  }, !inputOnly && /* @__PURE__ */ import_react4.default.createElement(InputHeader, {
+  }, !inputOnly && /* @__PURE__ */ import_react6.default.createElement(InputHeader, {
     error
-  }, /* @__PURE__ */ import_react4.default.createElement(import_react_ui4.Input.Label, null, label)), /* @__PURE__ */ import_react4.default.createElement(import_react_ui4.Input.Switch, {
-    checked: getValue(property),
-    onCheckedChange: (value) => onValueChange(property, type, value)
-  }), inputOnly && /* @__PURE__ */ import_react4.default.createElement(import_react_ui4.Input.DescriptionAndValidation, null, error));
+  }, /* @__PURE__ */ import_react6.default.createElement(import_react_ui6.Input.Label, null, label)), /* @__PURE__ */ import_react6.default.createElement(import_react_ui6.Input.Switch, {
+    checked: getValue3(),
+    onCheckedChange: (value) => onValueChange(type, value)
+  }), inputOnly && /* @__PURE__ */ import_react6.default.createElement(import_react_ui6.Input.DescriptionAndValidation, null, error));
 };
-var SelectInput = ({ property, type, label, inputOnly, disabled, placeholder, options, getStatus, getValue, onValueChange }) => {
-  const { status, error } = getStatus?.(property);
-  return /* @__PURE__ */ import_react4.default.createElement(import_react_ui4.Input.Root, {
+var SelectInput = ({ type, label, inputOnly, disabled, placeholder, options, getStatus, getValue: getValue3, onValueChange }) => {
+  const { status, error } = getStatus();
+  return /* @__PURE__ */ import_react6.default.createElement(import_react_ui6.Input.Root, {
     validationValence: status
-  }, !inputOnly && /* @__PURE__ */ import_react4.default.createElement(InputHeader, {
+  }, !inputOnly && /* @__PURE__ */ import_react6.default.createElement(InputHeader, {
     error
-  }, /* @__PURE__ */ import_react4.default.createElement(import_react_ui4.Input.Label, null, label)), /* @__PURE__ */ import_react4.default.createElement(import_react_ui4.Select.Root, {
-    value: getValue(property),
-    onValueChange: (value) => onValueChange(property, type, value)
-  }, /* @__PURE__ */ import_react4.default.createElement(import_react_ui4.Select.TriggerButton, {
+  }, /* @__PURE__ */ import_react6.default.createElement(import_react_ui6.Input.Label, null, label)), /* @__PURE__ */ import_react6.default.createElement(import_react_ui6.Select.Root, {
+    value: getValue3(),
+    onValueChange: (value) => onValueChange(type, value)
+  }, /* @__PURE__ */ import_react6.default.createElement(import_react_ui6.Select.TriggerButton, {
     classNames: "is-full",
     disabled,
     placeholder
-  }), /* @__PURE__ */ import_react4.default.createElement(import_react_ui4.Select.Portal, null, /* @__PURE__ */ import_react4.default.createElement(import_react_ui4.Select.Content, null, /* @__PURE__ */ import_react4.default.createElement(import_react_ui4.Select.Viewport, null, options?.map(({ value, label: label2 }) => (
+  }), /* @__PURE__ */ import_react6.default.createElement(import_react_ui6.Select.Portal, null, /* @__PURE__ */ import_react6.default.createElement(import_react_ui6.Select.Content, null, /* @__PURE__ */ import_react6.default.createElement(import_react_ui6.Select.Viewport, null, options?.map(({ value, label: label2 }) => (
     // NOTE: Numeric values are converted to and from strings.
-    /* @__PURE__ */ import_react4.default.createElement(import_react_ui4.Select.Option, {
+    /* @__PURE__ */ import_react6.default.createElement(import_react_ui6.Select.Option, {
       key: String(value),
       value: String(value)
     }, label2 ?? String(value))
-  )))))), inputOnly && /* @__PURE__ */ import_react4.default.createElement(import_react_ui4.Input.DescriptionAndValidation, null, error));
-};
-var GeiPointInput = ({ property, type, label, disabled, getStatus, getValue, onValueChange, onBlur }) => {
-  const { t } = (0, import_react_ui6.useTranslation)(translationKey);
-  const { status, error } = getStatus?.(property);
-  const [lng = 0, lat = 0] = getValue(property) ?? [];
-  return /* @__PURE__ */ import_react6.default.createElement(import_react_ui6.Input.Root, {
-    validationValence: status
-  }, /* @__PURE__ */ import_react6.default.createElement(InputHeader, {
-    error
-  }, /* @__PURE__ */ import_react6.default.createElement(import_react_ui6.Input.Label, null, label)), /* @__PURE__ */ import_react6.default.createElement("div", {
-    className: "grid grid-cols-2 gap-2"
-  }, /* @__PURE__ */ import_react6.default.createElement(import_react_ui6.Input.TextInput, {
-    type: "number",
-    disabled,
-    placeholder: t("placeholder longitude"),
-    value: lng,
-    onChange: (event) => onValueChange(property, type, [
-      lat,
-      safeParseFloat(event.target.value, 0)
-    ]),
-    onBlur
-  }), /* @__PURE__ */ import_react6.default.createElement(import_react_ui6.Input.TextInput, {
-    type: "number",
-    disabled,
-    placeholder: t("placeholder latitude"),
-    value: lat,
-    onChange: (event) => onValueChange(property, type, [
-      safeParseFloat(event.target.value, 0),
-      lng
-    ]),
-    onBlur
-  })));
-};
-var safeParseFloat = (str, defaultValue) => {
-  try {
-    return parseFloat(str);
-  } catch {
-    return defaultValue ?? 0;
-  }
-};
-var getInputComponent = (type, format) => {
-  switch (format) {
-    case import_echo_schema3.FormatEnum.LatLng:
-      return GeiPointInput;
-  }
-  switch (type) {
-    case "string":
-      return TextInput;
-    case "number":
-      return NumberInput;
-    case "boolean":
-      return BooleanInput;
-  }
+  )))))), inputOnly && /* @__PURE__ */ import_react6.default.createElement(import_react_ui6.Input.DescriptionAndValidation, null, error));
 };
 var __dxlog_file = "/home/runner/work/dxos/dxos/packages/ui/react-ui-form/src/hooks/useForm.ts";
 var useForm = ({ schema, initialValues, onValuesChanged, onValidate, onValid, onSave }) => {
-  const [values, setValues] = (0, import_react7.useState)(initialValues);
-  (0, import_react7.useEffect)(() => {
+  (0, import_invariant.invariant)(import_effect2.AST.isTypeLiteral(schema.ast), void 0, {
+    F: __dxlog_file,
+    L: 91,
+    S: void 0,
+    A: [
+      "AST.isTypeLiteral(schema.ast)",
+      ""
+    ]
+  });
+  const [values, setValues] = (0, import_react10.useState)(initialValues);
+  (0, import_react10.useEffect)(() => {
     setValues(initialValues);
   }, [
     initialValues
   ]);
-  const [touched, setTouched] = (0, import_react7.useState)(createKeySet(initialValues, false));
-  const [changed, setChanged] = (0, import_react7.useState)(createKeySet(initialValues, false));
-  const [errors, setErrors] = (0, import_react7.useState)({});
-  const [saving, setSaving] = (0, import_react7.useState)(false);
-  const validate = (0, import_react7.useCallback)((values2) => {
-    let errors2 = (0, import_schema3.validateSchema)(schema, values2) ?? [];
+  const [touched, setTouched] = (0, import_react10.useState)(createKeySet(initialValues, false));
+  const [changed, setChanged] = (0, import_react10.useState)(createKeySet(initialValues, false));
+  const [errors, setErrors] = (0, import_react10.useState)({});
+  const [saving, setSaving] = (0, import_react10.useState)(false);
+  const validate = (0, import_react10.useCallback)((values2) => {
+    let errors2 = (0, import_schema2.validateSchema)(schema, values2) ?? [];
     if (errors2.length === 0 && onValidate) {
-      errors2 = onValidate(values2) ?? [];
+      const validatedValues = values2;
+      errors2 = onValidate(validatedValues) ?? [];
     }
     setErrors(flatMap(errors2));
-    return errors2.length === 0;
+    const valid = errors2.length === 0;
+    return valid;
   }, [
     schema,
     onValidate
   ]);
-  const [schemaDirty, setSchemaDirty] = (0, import_react7.useState)(false);
-  (0, import_react7.useEffect)(() => setSchemaDirty(true), [
+  const [schemaDirty, setSchemaDirty] = (0, import_react10.useState)(false);
+  (0, import_react10.useEffect)(() => setSchemaDirty(true), [
     schema
   ]);
-  (0, import_react7.useEffect)(() => {
+  (0, import_react10.useEffect)(() => {
     if (schemaDirty) {
       validate(values);
       setSchemaDirty(false);
@@ -326,13 +366,13 @@ var useForm = ({ schema, initialValues, onValuesChanged, onValidate, onValid, on
     values,
     schemaDirty
   ]);
-  const canSave = (0, import_react7.useMemo)(() => !saving && Object.keys(values).every((property) => touched[property] === false || !errors[property]), [
-    values,
+  const canSave = (0, import_react10.useMemo)(() => !saving && // Check if any error paths that are touched have errors
+  !Object.entries(touched).some(([path, isTouched]) => isTouched && Object.keys(errors).some((errorPath) => errorPath === path || errorPath.startsWith(`${path}.`) || errorPath.startsWith(`${path}[`))), [
     touched,
     errors,
     saving
   ]);
-  const handleSave = (0, import_react7.useCallback)(async () => {
+  const handleSave = (0, import_react10.useCallback)(async () => {
     if (validate(values)) {
       setSaving(true);
       try {
@@ -346,38 +386,45 @@ var useForm = ({ schema, initialValues, onValuesChanged, onValidate, onValid, on
   }, [
     values,
     validate,
-    onSave
+    onSave,
+    changed
   ]);
-  const getStatus = (0, import_react7.useCallback)((property) => ({
-    status: errors[property] ? "error" : void 0,
-    error: errors[property] ? errors[property] : void 0
-  }), [
-    touched,
+  const getStatus = (0, import_react10.useCallback)((path) => {
+    const jsonPath = Array.isArray(path) ? (0, import_effect2.createJsonPath)(path) : path;
+    const matchingError = Object.entries(errors).find(([errorPath]) => errorPath === jsonPath || errorPath.startsWith(`${jsonPath}.`) || errorPath.startsWith(`${jsonPath}[`));
+    return {
+      status: matchingError ? "error" : void 0,
+      error: matchingError ? matchingError[1] : void 0
+    };
+  }, [
     errors
   ]);
-  const getValue = (property) => {
-    return getByPath(values, property);
+  const getFormValue = (path) => {
+    return (0, import_echo_schema3.getValue)(values, (0, import_effect2.createJsonPath)(path));
   };
-  const onValueChange = (property, type, value) => {
+  const onValueChange = (path, type, value) => {
+    const jsonPath = (0, import_effect2.createJsonPath)(path);
     let parsedValue = value;
     try {
       if (type === "number") {
         parsedValue = parseFloat(value) || 0;
       }
     } catch (err) {
-      import_log3.log.catch(err, void 0, {
+      import_log2.log.catch(err, void 0, {
         F: __dxlog_file,
-        L: 183,
+        L: 194,
         S: void 0,
         C: (f, a) => f(...a)
       });
       parsedValue = void 0;
     }
-    const newValues = setByPath(values, property, parsedValue);
+    const newValues = {
+      ...(0, import_echo_schema3.setValue)(values, jsonPath, parsedValue)
+    };
     setValues(newValues);
     setChanged((prev) => ({
       ...prev,
-      [property]: true
+      [jsonPath]: true
     }));
     onValuesChanged?.(newValues);
     const isValid = validate(newValues);
@@ -387,15 +434,12 @@ var useForm = ({ schema, initialValues, onValuesChanged, onValidate, onValid, on
       });
     }
   };
-  const onBlur = (0, import_react7.useCallback)((event) => {
-    const { name } = event.target;
+  const onTouched = (0, import_react10.useCallback)((path) => {
+    const jsonPath = (0, import_effect2.createJsonPath)(path);
     setTouched((touched2) => ({
       ...touched2,
-      [name]: true
+      [jsonPath]: true
     }));
-    if (event.relatedTarget?.getAttribute("type") === "submit") {
-      setTouched(createKeySet(values, true));
-    }
     validate(values);
   }, [
     validate,
@@ -411,15 +455,15 @@ var useForm = ({ schema, initialValues, onValuesChanged, onValidate, onValid, on
     handleSave,
     // Field utils.
     getStatus,
-    getValue,
+    getValue: getFormValue,
     onValueChange,
-    onBlur
+    onTouched
   };
 };
 var createKeySet = (obj, value) => {
   (0, import_invariant.invariant)(obj, void 0, {
     F: __dxlog_file,
-    L: 234,
+    L: 236,
     S: void 0,
     A: [
       "obj",
@@ -433,316 +477,313 @@ var createKeySet = (obj, value) => {
 };
 var flatMap = (errors) => {
   return errors.reduce((result, { path, message }) => {
-    if (!(path in result)) {
-      result[path] = message;
+    const jsonPath = (0, import_effect2.fromEffectValidationPath)(path);
+    if (!(jsonPath in result)) {
+      result[jsonPath] = message;
     }
     return result;
   }, {});
 };
-var getByPath = (obj, path) => {
-  const [key, index] = path.split(".");
-  return index === void 0 ? obj[key] : obj[key][parseInt(index)];
+var FormContext = /* @__PURE__ */ (0, import_react9.createContext)(void 0);
+var useFormContext = () => {
+  return (0, import_react9.useContext)(FormContext) ?? (0, import_debug.raise)(new Error("Missing FormContext"));
+};
+var useFormValues = (path = []) => {
+  const { values: formValues } = useFormContext();
+  const jsonPath = (0, import_effect.createJsonPath)(path);
+  return (0, import_echo_schema2.getValue)(formValues, jsonPath);
 };
-var setByPath = (obj, path, value) => {
-  const [key, index] = path.split(".");
-  const newValue = index === void 0 ? value : [
-    ...obj[key]
-  ].map((v, i) => i === parseInt(index) ? value : v);
+var useInputProps = (path = []) => {
+  const { getStatus, getValue: getFormValue, onValueChange, onTouched } = useFormContext();
   return {
-    ...obj,
-    [key]: newValue
+    getStatus: () => getStatus(path),
+    getValue: () => getFormValue(path),
+    onValueChange: (type, value) => onValueChange(path, type, value),
+    onBlur: () => onTouched(path)
   };
 };
-var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-form/src/components/Form/Form.tsx";
+var FormProvider = ({ children, ...formOptions }) => {
+  const formHandler = useForm(formOptions);
+  return /* @__PURE__ */ import_react9.default.createElement(FormContext.Provider, {
+    value: formHandler
+  }, children);
+};
+var FormActions = ({ onCancel, readonly }) => {
+  const { t } = (0, import_react_ui7.useTranslation)(translationKey);
+  const { canSave, handleSave } = useFormContext();
+  return /* @__PURE__ */ import_react8.default.createElement("div", {
+    role: "none",
+    className: "flex justify-center"
+  }, /* @__PURE__ */ import_react8.default.createElement("div", {
+    role: "none",
+    className: (0, import_react_ui_theme4.mx)(onCancel && !readonly && "grid grid-cols-2 gap-2")
+  }, onCancel && !readonly && /* @__PURE__ */ import_react8.default.createElement(import_react_ui7.IconButton, {
+    "data-testid": "cancel-button",
+    icon: "ph--x--regular",
+    label: t("button cancel"),
+    onClick: onCancel
+  }), handleSave && /* @__PURE__ */ import_react8.default.createElement(import_react_ui7.IconButton, {
+    type: "submit",
+    "data-testid": "save-button",
+    disabled: !canSave,
+    icon: "ph--check--regular",
+    label: t("button save"),
+    onClick: handleSave
+  })));
+};
+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 = (0, import_react3.useMemo)(() => 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 } = (0, import_react_ui8.useTranslation)(translationKey);
+  const { ast, name, type, title } = property;
+  const values = useFormValues(path ?? []);
+  (0, import_invariant2.invariant)(Array.isArray(values), void 0, {
+    F: __dxlog_file2,
+    L: 37,
+    S: void 0,
+    A: [
+      "Array.isArray(values)",
+      ""
+    ]
   });
-  const properties = (0, import_react3.useMemo)(() => {
-    const props = (0, import_schema2.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 ?? (0, import_effect5.pipe)(name, import_String2.capitalize);
+  const tupleType = (0, import_effect6.findNode)(ast, import_echo_schema5.AST.isTupleType);
+  const elementType = tupleType?.rest[0]?.type;
+  const getDefaultObjectValue = (typeNode) => {
+    const baseNode = (0, import_effect6.findNode)(typeNode, import_effect6.isDiscriminatedUnion);
+    const typeLiteral = baseNode ? (0, import_effect6.getDiscriminatedType)(baseNode, {}) : (0, import_effect6.findNode)(typeNode, import_echo_schema5.AST.isTypeLiteral);
+    if (!typeLiteral) {
+      return {};
+    }
+    return Object.fromEntries((0, import_schema4.getSchemaProperties)(typeLiteral, {}).map((prop) => [
+      prop.name,
+      prop.defaultValue
+    ]));
+  };
+  const newValue = (0, import_react12.useMemo)(() => {
+    if (type === "object" && elementType) {
+      return getDefaultObjectValue(elementType);
+    } else {
+      return import_effect6.SimpleType.getDefaultValue(type);
+    }
   }, [
-    schema,
-    filter,
+    type,
+    elementType
+  ]);
+  const handleAdd = (0, import_react12.useCallback)(() => {
+    inputProps.onValueChange(type, [
+      ...values,
+      newValue
+    ]);
+  }, [
+    type,
+    elementType,
+    inputProps,
+    newValue,
     values
   ]);
-  (0, import_react3.useEffect)(() => {
-    if (errors && Object.keys(errors).length) {
-      import_log2.log.warn("validation", {
-        errors
-      }, {
-        F: __dxlog_file2,
-        L: 100,
-        S: void 0,
-        C: (f, a) => f(...a)
-      });
-    }
+  const handleRemove = (0, import_react12.useCallback)((index) => {
+    const newValues = values.filter((_, i) => i !== index);
+    inputProps.onValueChange(type, newValues);
   }, [
-    errors
+    type,
+    inputProps,
+    values
   ]);
-  return /* @__PURE__ */ import_react3.default.createElement("div", {
-    role: "form",
-    className: (0, import_react_ui_theme.mx)("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 ?? (0, import_effect.pipe)(name, import_String.capitalize);
-    const placeholder = examples?.length ? `Example: "${examples[0]}"` : description;
-    let InputComponent = Custom?.[key.join(".")];
-    if (!InputComponent) {
-      if (options) {
-        return /* @__PURE__ */ import_react3.default.createElement("div", {
-          key: name,
-          role: "none",
-          className: padding
-        }, /* @__PURE__ */ import_react3.default.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__ */ import_react3.default.createElement(ArrayField, {
-          key: name,
-          name,
-          type,
-          array: true,
-          label,
-          ast,
-          values,
-          format,
-          readonly,
-          placeholder,
-          inputProps,
-          Custom
-        });
-      }
-    }
-    if (!InputComponent) {
-      if (type === "object") {
-        const baseNode = (0, import_effect2.findNode)(ast, import_effect2.isDiscriminatedUnion);
-        const typeLiteral = baseNode ? (0, import_effect2.getDiscriminatedType)(baseNode, values[name]) : (0, import_effect2.findNode)(ast, import_echo_schema2.AST.isTypeLiteral);
-        if (typeLiteral) {
-          const schema2 = import_echo_schema2.S.make(typeLiteral);
-          return /* @__PURE__ */ import_react3.default.createElement("div", {
-            key: name,
-            role: "none"
-          }, /* @__PURE__ */ import_react3.default.createElement("div", {
-            className: padding
-          }, label), /* @__PURE__ */ import_react3.default.createElement(Form, {
-            schema: schema2,
-            path: key,
-            values: values[name] ?? {},
-            onValuesChanged: (childValues) => {
-              inputProps.onValueChange(name, "object", childValues);
-            },
-            Custom
-          }));
-        }
-      }
-      (0, import_log2.log)("no renderer for property", {
-        name,
-        type
-      }, {
-        F: __dxlog_file2,
-        L: 185,
-        S: void 0,
-        C: (f, a) => f(...a)
-      });
-      return null;
-    }
-    return /* @__PURE__ */ import_react3.default.createElement("div", {
-      key: name,
-      role: "none",
-      className: padding
-    }, /* @__PURE__ */ import_react3.default.createElement(InputComponent, {
-      type,
-      format,
-      property: name,
-      disabled: readonly,
-      label,
-      placeholder,
-      ...inputProps
-    }));
-  }).filter(import_util.isNotFalsy), (onCancel || onSave) && !autoSave && /* @__PURE__ */ import_react3.default.createElement(FormActions, {
-    onCancel,
-    onSubmit: handleSave,
-    canSubmit: canSave,
-    readonly
-  }));
-};
-var ArrayField = ({ name, type, label, ast, values, format, readonly, placeholder, inputProps, Custom }) => {
-  const { t } = (0, import_react_ui3.useTranslation)(translationKey);
-  const arrayValues = values[name] ?? [];
-  const key = [
-    name
-  ];
-  const tupleType = (0, import_effect2.findNode)(ast, import_echo_schema2.AST.isTupleType);
-  const elementType = tupleType?.rest[0]?.type;
-  if (type === "object" && elementType) {
-    const baseNode = (0, import_effect2.findNode)(elementType, import_effect2.isDiscriminatedUnion);
-    const typeLiteral = baseNode ? (0, import_effect2.getDiscriminatedType)(baseNode, values[name]) : (0, import_effect2.findNode)(elementType, import_echo_schema2.AST.isTypeLiteral);
-    if (typeLiteral) {
-      const schema = import_echo_schema2.S.make(typeLiteral);
-      return /* @__PURE__ */ import_react3.default.createElement("div", {
-        key: name,
-        role: "none",
-        className: (0, import_react_ui_theme.mx)(padding)
-      }, /* @__PURE__ */ import_react3.default.createElement(InputHeader, null, label), /* @__PURE__ */ import_react3.default.createElement("div", {
-        role: "none",
-        className: "flex flex-col gap-1"
-      }, arrayValues.map((value, index) => {
-        return /* @__PURE__ */ import_react3.default.createElement("div", {
-          key: index,
-          role: "none",
-          className: "flex items-center gap-1"
-        }, /* @__PURE__ */ import_react3.default.createElement("div", {
-          role: "none",
-          className: "flex-1"
-        }, /* @__PURE__ */ import_react3.default.createElement(Form, {
-          schema,
-          path: [
-            ...key,
-            index.toString()
-          ],
-          values: value,
-          onValuesChanged: (childValues) => {
-            const newValues = [
-              ...arrayValues
-            ];
-            newValues[index] = childValues;
-            inputProps.onValueChange(name, "object", newValues);
-          },
-          Custom
-        })), /* @__PURE__ */ import_react3.default.createElement(import_react_ui3.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__ */ import_react3.default.createElement("div", {
-        role: "none",
-        className: "flex justify-between items-center plb-1"
-      }, /* @__PURE__ */ import_react3.default.createElement(import_react_ui3.IconButton, {
-        icon: "ph--plus--regular",
-        iconOnly: true,
-        label: t("button add"),
-        onClick: () => {
-          const newValues = [
-            ...arrayValues,
-            {}
-          ];
-          inputProps.onValueChange(name, type, newValues);
-        }
-      })));
-    }
-    return /* @__PURE__ */ import_react3.default.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__ */ import_react3.default.createElement("div", {
+  return /* @__PURE__ */ import_react12.default.createElement("div", {
     role: "none",
-    key: "meta-input",
-    className: (0, import_react_ui_theme.mx)(padding)
-  }, /* @__PURE__ */ import_react3.default.createElement(InputHeader, null, label), /* @__PURE__ */ import_react3.default.createElement("div", {
+    className: (0, import_react_ui_theme6.mx)(padding)
+  }, /* @__PURE__ */ import_react12.default.createElement(InputHeader, null, label), /* @__PURE__ */ import_react12.default.createElement("div", {
     role: "none",
     className: "flex flex-col gap-1"
-  }, arrayValues.map((_, index) => /* @__PURE__ */ import_react3.default.createElement("div", {
+  }, values.map((_value, index) => /* @__PURE__ */ import_react12.default.createElement("div", {
     key: index,
     role: "none",
-    className: "flex items-start gap-1"
-  }, /* @__PURE__ */ import_react3.default.createElement("div", {
+    className: "flex items-center gap-1"
+  }, /* @__PURE__ */ import_react12.default.createElement("div", {
     role: "none",
     className: "flex-1"
-  }, /* @__PURE__ */ import_react3.default.createElement(InputComponent, {
-    type,
-    format,
-    label,
-    inputOnly: true,
-    property: `${name}.${index}`,
-    disabled: readonly,
-    placeholder,
-    ...inputProps
-  })), /* @__PURE__ */ import_react3.default.createElement(import_react_ui3.IconButton, {
+  }, /* @__PURE__ */ import_react12.default.createElement(FormField, {
+    property: {
+      ...property,
+      array: false,
+      ast: elementType
+    },
+    path: [
+      ...path ?? [],
+      index
+    ],
+    readonly,
+    inline: true,
+    Custom,
+    lookupComponent
+  })), /* @__PURE__ */ import_react12.default.createElement(import_react_ui8.IconButton, {
     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__ */ import_react3.default.createElement("div", {
+    onClick: () => handleRemove(index)
+  })))), /* @__PURE__ */ import_react12.default.createElement("div", {
     role: "none",
     className: "flex justify-between items-center plb-1"
-  }, /* @__PURE__ */ import_react3.default.createElement(import_react_ui3.IconButton, {
+  }, /* @__PURE__ */ import_react12.default.createElement(import_react_ui8.IconButton, {
     icon: "ph--plus--regular",
     iconOnly: true,
     label: t("button add"),
-    onClick: () => {
-      const newValues = [
-        ...arrayValues,
-        import_effect2.SimpleType.getDefaultValue(type)
-      ];
-      inputProps.onValueChange(name, type, newValues);
-    }
+    onClick: handleAdd
   })));
 };
-var FormActions = ({ onCancel, onSubmit, canSubmit, readonly }) => {
-  const { t } = (0, import_react_ui3.useTranslation)(translationKey);
-  return /* @__PURE__ */ import_react3.default.createElement("div", {
-    role: "none",
-    className: "flex justify-center"
-  }, /* @__PURE__ */ import_react3.default.createElement("div", {
+var getInputComponent = (type, format) => {
+  switch (format) {
+    case import_echo_schema6.FormatEnum.LatLng:
+      return GeoPointInput;
+  }
+  switch (type) {
+    case "string":
+      return TextInput;
+    case "number":
+      return NumberInput;
+    case "boolean":
+      return BooleanInput;
+  }
+};
+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 = (0, import_react11.useMemo)(() => title ?? (0, import_effect3.pipe)(name, import_String.capitalize), [
+    title,
+    name
+  ]);
+  const placeholder = (0, import_react11.useMemo)(() => examples?.length ? `Example: "${examples[0]}"` : description, [
+    examples,
+    description
+  ]);
+  if (array) {
+    return /* @__PURE__ */ import_react11.default.createElement(ArrayField, {
+      property,
+      path,
+      inputProps,
+      readonly,
+      Custom
+    });
+  }
+  const FoundComponent = lookupComponent?.({
+    prop: name,
+    schema: import_echo_schema4.S.make(ast),
+    inputProps: {
+      type,
+      format,
+      label,
+      disabled: readonly,
+      placeholder,
+      ...inputProps
+    }
+  });
+  if (FoundComponent) {
+    return /* @__PURE__ */ import_react11.default.createElement("div", null, FoundComponent);
+  }
+  const jsonPath = (0, import_effect4.createJsonPath)(path ?? []);
+  const InputComponent = Custom?.[jsonPath] || getInputComponent(type, format);
+  if (InputComponent) {
+    return /* @__PURE__ */ import_react11.default.createElement("div", null, /* @__PURE__ */ import_react11.default.createElement(InputComponent, {
+      type,
+      format,
+      label,
+      inputOnly: inline,
+      placeholder,
+      disabled: readonly,
+      ...inputProps
+    }));
+  }
+  if (options) {
+    return /* @__PURE__ */ import_react11.default.createElement("div", {
+      role: "none"
+    }, /* @__PURE__ */ import_react11.default.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 = (0, import_effect4.findNode)(ast, import_effect4.isDiscriminatedUnion);
+    const typeLiteral = baseNode ? (0, import_effect4.getDiscriminatedType)(baseNode, inputProps.getValue()) : (0, import_effect4.findNode)(ast, import_echo_schema4.AST.isTypeLiteral);
+    if (typeLiteral) {
+      return /* @__PURE__ */ import_react11.default.createElement("div", null, !inline && /* @__PURE__ */ import_react11.default.createElement("div", null, label), /* @__PURE__ */ import_react11.default.createElement(FormFields, {
+        schema: import_echo_schema4.S.make(typeLiteral),
+        path,
+        readonly,
+        Custom
+      }));
+    }
+  }
+  return null;
+};
+var FormFields = ({ schema, path, filter, sort, readonly, lookupComponent, Custom }) => {
+  const values = useFormValues(path);
+  const properties = (0, import_react11.useMemo)(() => {
+    const props = (0, import_schema3.getSchemaProperties)(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__ */ import_react11.default.createElement("div", {
+    role: "form",
+    className: (0, import_react_ui_theme5.mx)("flex flex-col w-full gap-2 py-2")
+  }, properties.map((property) => {
+    return /* @__PURE__ */ import_react11.default.createElement(FormField, {
+      key: property.name,
+      property,
+      path: [
+        ...path ?? [],
+        property.name
+      ],
+      readonly,
+      lookupComponent,
+      Custom
+    });
+  }).filter(import_util3.isNotFalsy));
+};
+var Form = ({ classNames, schema, values: initialValues, path = [], readonly, filter, sort, autoSave, testId, onValuesChanged, onValidate, onSave, onCancel, lookupComponent, Custom }) => {
+  const onValid = (0, import_react7.useMemo)(() => autoSave ? onSave : void 0, [
+    autoSave,
+    onSave
+  ]);
+  return /* @__PURE__ */ import_react7.default.createElement(FormProvider, {
+    schema,
+    initialValues,
+    onValuesChanged,
+    onValidate,
+    onValid,
+    onSave
+  }, /* @__PURE__ */ import_react7.default.createElement("div", {
     role: "none",
-    className: (0, import_react_ui_theme.mx)(onCancel && !readonly && "grid grid-cols-2 gap-2")
-  }, onCancel && !readonly && /* @__PURE__ */ import_react3.default.createElement(import_react_ui3.IconButton, {
-    "data-testid": "cancel-button",
-    icon: "ph--x--regular",
-    label: t("button cancel"),
-    onClick: onCancel
-  }), onSubmit && /* @__PURE__ */ import_react3.default.createElement(import_react_ui3.IconButton, {
-    type: "submit",
-    "data-testid": "save-button",
-    disabled: !canSubmit,
-    icon: "ph--check--regular",
-    label: t("button save"),
-    onClick: onSubmit
+    className: (0, import_react_ui_theme3.mx)("p-2", classNames),
+    "data-testid": testId
+  }, /* @__PURE__ */ import_react7.default.createElement(FormFields, {
+    schema,
+    path,
+    readonly,
+    filter,
+    sort,
+    lookupComponent,
+    Custom
+  }), (onCancel || onSave) && !autoSave && /* @__PURE__ */ import_react7.default.createElement(FormActions, {
+    onCancel,
+    readonly
   })));
 };
 var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-form/src/components/FieldEditor/FieldEditor.tsx";
@@ -758,9 +799,11 @@ var FieldEditor = ({ view, projection, field, registry, onSave, onCancel }) => {
     if (!registry) {
       return;
     }
-    const subscription = registry.subscribe(setSchemas);
+    const subscription = registry.query().subscribe((query) => setSchemas(query.results), {
+      fire: true
+    });
     const t2 = setTimeout(async () => {
-      const schemas2 = await registry.query();
+      const schemas2 = await registry.query().run();
       setSchemas(schemas2);
     });
     return () => {
@@ -770,9 +813,9 @@ var FieldEditor = ({ view, projection, field, registry, onSave, onCancel }) => {
   }, [
     registry
   ]);
-  const [schema, setSchema] = (0, import_react2.useState)();
+  const [referenceSchema, setReferenceSchema] = (0, import_react2.useState)();
   (0, import_react2.useEffect)(() => {
-    setSchema(schemas.find((schema2) => schema2.typename === props?.referenceSchema));
+    setReferenceSchema(schemas.find((schema) => schema.typename === props?.referenceSchema));
   }, [
     schemas,
     props?.referenceSchema
@@ -781,14 +824,24 @@ var FieldEditor = ({ view, projection, field, registry, onSave, onCancel }) => {
     fieldSchema: (0, import_schema.getFormatSchema)(props?.format)
   });
   const handleValuesChanged = (0, import_react2.useCallback)((_props) => {
-    if (_props.format !== props.format) {
-      setFieldSchema({
-        fieldSchema: (0, import_schema.getFormatSchema)(_props.format)
-      });
-    }
-    if (_props.referenceSchema !== props.referenceSchema) {
-      setSchema(schemas.find((schema2) => schema2.typename === _props.referenceSchema));
-    }
+    setFieldSchema((prev) => {
+      const fieldSchema2 = (0, import_schema.getFormatSchema)(_props.format);
+      if (prev.fieldSchema === fieldSchema2) {
+        return prev;
+      }
+      return {
+        fieldSchema: fieldSchema2
+      };
+    });
+    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 = import_echo_schema.formatToType[_props.format];
       if (props2.type !== type) {
@@ -802,7 +855,8 @@ var FieldEditor = ({ view, projection, field, registry, onSave, onCancel }) => {
     });
   }, [
     schemas,
-    props
+    props.format,
+    props.referenceSchema
   ]);
   const handleValidate = (0, import_react2.useCallback)(({ property }) => {
     if (property && view.fields.find((f) => f.path === property && f.path !== field.path)) {
@@ -834,12 +888,38 @@ var FieldEditor = ({ view, projection, field, registry, onSave, onCancel }) => {
   }, [
     onSave
   ]);
+  const Custom = (0, import_react2.useMemo)(() => ({
+    ["format"]: (props2) => /* @__PURE__ */ import_react2.default.createElement(SelectInput, {
+      ...props2,
+      options: import_echo_schema.FormatEnums.filter((value) => value !== import_echo_schema.FormatEnum.None).map((value) => ({
+        value,
+        label: t(`format ${value}`)
+      }))
+    }),
+    ["referenceSchema"]: (props2) => /* @__PURE__ */ import_react2.default.createElement(SelectInput, {
+      ...props2,
+      options: schemas.map((schema) => ({
+        value: schema.typename
+      }))
+    }),
+    ["referencePath"]: (props2) => /* @__PURE__ */ import_react2.default.createElement(SelectInput, {
+      ...props2,
+      options: referenceSchema ? (0, import_schema.getSchemaProperties)(referenceSchema.ast).sort(import_schema.sortProperties).map((p) => ({
+        value: p.name
+      })) : []
+    })
+  }), [
+    t,
+    schemas,
+    referenceSchema
+  ]);
+  const propIsNotType = (0, import_react2.useCallback)((props2) => props2.filter((p) => p.name !== "type"), []);
   if (!fieldSchema) {
     import_log.log.warn("invalid format", {
       props
     }, {
       F: __dxlog_file3,
-      L: 118,
+      L: 173,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -850,7 +930,7 @@ var FieldEditor = ({ view, projection, field, registry, onSave, onCancel }) => {
     autoFocus: true,
     values: props,
     schema: fieldSchema,
-    filter: (props2) => props2.filter((p) => p.name !== "type"),
+    filter: propIsNotType,
     sort: [
       "property",
       "format"
@@ -859,46 +939,26 @@ var FieldEditor = ({ view, projection, field, registry, onSave, onCancel }) => {
     onValidate: handleValidate,
     onSave: handleSave,
     onCancel: handleCancel,
-    Custom: {
-      ["format"]: (props2) => /* @__PURE__ */ import_react2.default.createElement(SelectInput, {
-        ...props2,
-        options: import_echo_schema.FormatEnums.filter((value) => value !== import_echo_schema.FormatEnum.None).map((value) => ({
-          value,
-          label: t(`format ${value}`)
-        }))
-      }),
-      ["referenceSchema"]: (props2) => /* @__PURE__ */ import_react2.default.createElement(SelectInput, {
-        ...props2,
-        options: schemas.map((schema2) => ({
-          value: schema2.typename
-        }))
-      }),
-      ["referencePath"]: (props2) => /* @__PURE__ */ import_react2.default.createElement(SelectInput, {
-        ...props2,
-        options: schema ? (0, import_schema.getSchemaProperties)(schema.schema.ast).sort(import_schema.sortProperties).map((p) => ({
-          value: p.name
-        })) : []
-      })
-    }
+    Custom
   });
 };
 var grid = "grid grid-cols-[32px_1fr_32px] min-bs-[2.5rem]";
-var ViewMetaSchema = import_echo_schema4.S.Struct({
-  name: import_echo_schema4.S.String.annotations({
-    [import_echo_schema4.AST.TitleAnnotationId]: "View"
+var ViewMetaSchema = import_echo_schema7.S.Struct({
+  name: import_echo_schema7.S.String.annotations({
+    [import_echo_schema7.AST.TitleAnnotationId]: "View"
   }),
-  typename: import_echo_schema4.Format.DXN.annotations({
-    [import_echo_schema4.AST.TitleAnnotationId]: "Typename"
+  typename: import_echo_schema7.Format.DXN.annotations({
+    [import_echo_schema7.AST.TitleAnnotationId]: "Typename"
   })
-}).pipe(import_echo_schema4.S.mutable);
-var ViewEditor = ({ classNames, schema, view, registry, readonly, showHeading = false, onDelete }) => {
-  const { t } = (0, import_react_ui7.useTranslation)(translationKey);
-  const projection = (0, import_react8.useMemo)(() => new import_schema4.ViewProjection(schema, view), [
+}).pipe(import_echo_schema7.S.mutable);
+var ViewEditor = ({ classNames, schema, view, registry, readonly, showHeading = false, onTypenameChanged, onDelete }) => {
+  const { t } = (0, import_react_ui9.useTranslation)(translationKey);
+  const projection = (0, import_react13.useMemo)(() => new import_schema5.ViewProjection(schema, view), [
     schema,
     view
   ]);
-  const [field, setField] = (0, import_react8.useState)();
-  const viewValues = (0, import_react8.useMemo)(() => {
+  const [field, setField] = (0, import_react13.useState)();
+  const viewValues = (0, import_react13.useMemo)(() => {
     return {
       name: view.name,
       // TODO(burdon): Need to warn user of possible consequences of editing.
@@ -908,82 +968,86 @@ var ViewEditor = ({ classNames, schema, view, registry, readonly, showHeading =
   }, [
     view
   ]);
-  const handleViewUpdate = (0, import_react8.useCallback)(({ name, typename }) => {
+  const handleViewUpdate = (0, import_react13.useCallback)(({ 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 = (0, import_react8.useCallback)((field2) => {
+  const handleSelect = (0, import_react13.useCallback)((field2) => {
     setField((f) => f === field2 ? void 0 : field2);
   }, []);
-  const handleAdd = (0, import_react8.useCallback)(() => {
+  const handleAdd = (0, import_react13.useCallback)(() => {
     const field2 = projection.createFieldProjection();
     setField(field2);
   }, [
     view
   ]);
-  const handleMove = (0, import_react8.useCallback)((fromIndex, toIndex) => {
-    (0, import_util2.arrayMove)(view.fields, fromIndex, toIndex);
+  const handleMove = (0, import_react13.useCallback)((fromIndex, toIndex) => {
+    (0, import_util4.arrayMove)(view.fields, fromIndex, toIndex);
   }, [
     view.fields
   ]);
-  const handleClose = (0, import_react8.useCallback)(() => setField(void 0), []);
-  return /* @__PURE__ */ import_react8.default.createElement("div", {
+  const handleClose = (0, import_react13.useCallback)(() => setField(void 0), []);
+  return /* @__PURE__ */ import_react13.default.createElement("div", {
     role: "none",
-    className: (0, import_react_ui_theme3.mx)("flex flex-col w-full divide-y divide-separator", classNames)
-  }, /* @__PURE__ */ import_react8.default.createElement(Form, {
+    className: (0, import_react_ui_theme7.mx)("flex flex-col w-full divide-y divide-separator", classNames)
+  }, /* @__PURE__ */ import_react13.default.createElement(Form, {
     autoFocus: true,
     autoSave: true,
     schema: ViewMetaSchema,
     values: viewValues,
     onSave: handleViewUpdate
-  }), /* @__PURE__ */ import_react8.default.createElement("div", null, /* @__PURE__ */ import_react8.default.createElement("div", {
+  }), /* @__PURE__ */ import_react13.default.createElement("div", null, /* @__PURE__ */ import_react13.default.createElement("div", {
     role: "none",
     className: "p-2"
-  }, /* @__PURE__ */ import_react8.default.createElement("label", {
-    className: (0, import_react_ui_theme3.mx)(import_react_ui_theme3.inputTextLabel)
-  }, t("fields label"))), /* @__PURE__ */ import_react8.default.createElement(import_react_ui_list.List.Root, {
+  }, /* @__PURE__ */ import_react13.default.createElement("label", {
+    className: (0, import_react_ui_theme7.mx)(import_react_ui_theme7.inputTextLabel)
+  }, t("fields label"))), /* @__PURE__ */ import_react13.default.createElement(import_react_ui_list.List.Root, {
     items: view.fields,
-    isItem: import_echo_schema4.S.is(import_schema4.FieldSchema),
+    isItem: import_echo_schema7.S.is(import_schema5.FieldSchema),
     getId: (field2) => field2.id,
     onMove: handleMove
-  }, ({ items: fields }) => /* @__PURE__ */ import_react8.default.createElement(import_react8.default.Fragment, null, showHeading && /* @__PURE__ */ import_react8.default.createElement("div", {
+  }, ({ items: fields }) => /* @__PURE__ */ import_react13.default.createElement(import_react13.default.Fragment, null, showHeading && /* @__PURE__ */ import_react13.default.createElement("div", {
     role: "heading",
     className: grid
-  }, /* @__PURE__ */ import_react8.default.createElement("div", null), /* @__PURE__ */ import_react8.default.createElement("div", {
+  }, /* @__PURE__ */ import_react13.default.createElement("div", null), /* @__PURE__ */ import_react13.default.createElement("div", {
     className: "flex items-center text-sm"
-  }, t("field path label"))), /* @__PURE__ */ import_react8.default.createElement("div", {
+  }, t("field path label"))), /* @__PURE__ */ import_react13.default.createElement("div", {
     role: "list",
     className: "flex flex-col w-full"
-  }, fields?.map((field2) => /* @__PURE__ */ import_react8.default.createElement(import_react_ui_list.List.Item, {
+  }, fields?.map((field2) => /* @__PURE__ */ import_react13.default.createElement(import_react_ui_list.List.Item, {
     key: field2.id,
     item: field2,
-    classNames: (0, import_react_ui_theme3.mx)(grid, import_react_ui_theme3.ghostHover, "cursor-pointer")
-  }, /* @__PURE__ */ import_react8.default.createElement(import_react_ui_list.List.ItemDragHandle, null), /* @__PURE__ */ import_react8.default.createElement(import_react_ui_list.List.ItemTitle, {
+    classNames: (0, import_react_ui_theme7.mx)(grid, import_react_ui_theme7.ghostHover, "cursor-pointer")
+  }, /* @__PURE__ */ import_react13.default.createElement(import_react_ui_list.List.ItemDragHandle, null), /* @__PURE__ */ import_react13.default.createElement(import_react_ui_list.List.ItemTitle, {
     onClick: () => handleSelect(field2)
-  }, field2.path), /* @__PURE__ */ import_react8.default.createElement(import_react_ui_list.List.ItemDeleteButton, {
+  }, field2.path), /* @__PURE__ */ import_react13.default.createElement(import_react_ui_list.List.ItemDeleteButton, {
     disabled: view.fields.length <= 1,
     onClick: () => onDelete(field2.id)
-  }))))))), field && /* @__PURE__ */ import_react8.default.createElement(FieldEditor, {
+  }))))))), field && /* @__PURE__ */ import_react13.default.createElement(FieldEditor, {
     key: field.id,
     view,
     projection,
     field,
     registry,
     onSave: handleClose
-  }), !readonly && !field && /* @__PURE__ */ import_react8.default.createElement("div", {
+  }), !readonly && !field && /* @__PURE__ */ import_react13.default.createElement("div", {
     className: "flex p-2 justify-center"
-  }, /* @__PURE__ */ import_react8.default.createElement(import_react_ui7.IconButton, {
+  }, /* @__PURE__ */ import_react13.default.createElement(import_react_ui9.IconButton, {
     icon: "ph--plus--regular",
     label: t("button add property"),
     onClick: handleAdd,
     // TODO(burdon): Show field limit in ux (not tooltip).
-    disabled: view.fields.length >= import_schema4.VIEW_FIELD_LIMIT
+    disabled: view.fields.length >= import_schema5.VIEW_FIELD_LIMIT
   })));
 };
 var parseValue = ({ type, format, value }) => {
@@ -992,7 +1056,7 @@ var parseValue = ({ type, format, value }) => {
   }
   const parseScalar = (type2) => {
     switch (type2) {
-      case import_echo_schema5.TypeEnum.Boolean: {
+      case import_echo_schema8.TypeEnum.Boolean: {
         if (typeof value === "string") {
           const lowercaseValue = value.toLowerCase();
           if (lowercaseValue === "0" || lowercaseValue === "false") {
@@ -1003,13 +1067,13 @@ var parseValue = ({ type, format, value }) => {
         }
         return Boolean(value);
       }
-      case import_echo_schema5.TypeEnum.Number: {
+      case import_echo_schema8.TypeEnum.Number: {
         const cleaned = typeof value === "string" ? value.replace(/[^0-9.-]+/g, "") : value;
         const num = Number(cleaned);
         return Number.isNaN(num) ? null : num;
       }
-      case import_echo_schema5.TypeEnum.String:
-      case import_echo_schema5.TypeEnum.Ref:
+      case import_echo_schema8.TypeEnum.String:
+      case import_echo_schema8.TypeEnum.Ref:
         return String(value);
       default: {
         return value;
@@ -1020,22 +1084,22 @@ var parseValue = ({ type, format, value }) => {
     return parseScalar(type);
   }
   switch (format) {
-    case import_echo_schema5.FormatEnum.Boolean:
-      return parseScalar(import_echo_schema5.TypeEnum.Boolean);
-    case import_echo_schema5.FormatEnum.Number:
-    case import_echo_schema5.FormatEnum.Percent:
-    case import_echo_schema5.FormatEnum.Currency:
-      return parseScalar(import_echo_schema5.TypeEnum.Number);
-    case import_echo_schema5.FormatEnum.String:
-    case import_echo_schema5.FormatEnum.Markdown: {
-      return parseScalar(import_echo_schema5.TypeEnum.String);
+    case import_echo_schema8.FormatEnum.Boolean:
+      return parseScalar(import_echo_schema8.TypeEnum.Boolean);
+    case import_echo_schema8.FormatEnum.Number:
+    case import_echo_schema8.FormatEnum.Percent:
+    case import_echo_schema8.FormatEnum.Currency:
+      return parseScalar(import_echo_schema8.TypeEnum.Number);
+    case import_echo_schema8.FormatEnum.String:
+    case import_echo_schema8.FormatEnum.Markdown: {
+      return parseScalar(import_echo_schema8.TypeEnum.String);
     }
-    case import_echo_schema5.FormatEnum.Ref:
-      throw new Error(`unexpected format: ${import_echo_schema5.FormatEnum.Ref}`);
-    case import_echo_schema5.FormatEnum.DateTime:
-    case import_echo_schema5.FormatEnum.Date:
-    case import_echo_schema5.FormatEnum.Time:
-    case import_echo_schema5.FormatEnum.Timestamp: {
+    case import_echo_schema8.FormatEnum.Ref:
+      throw new Error(`unexpected format: ${import_echo_schema8.FormatEnum.Ref}`);
+    case import_echo_schema8.FormatEnum.DateTime:
+    case import_echo_schema8.FormatEnum.Date:
+    case import_echo_schema8.FormatEnum.Time:
+    case import_echo_schema8.FormatEnum.Timestamp: {
       const date = new Date(value);
       return isNaN(date.getTime()) ? null : date;
     }
@@ -1047,19 +1111,19 @@ var parseValue = ({ type, format, value }) => {
 var cellClassesForFieldType = ({ type, format }) => {
   if (!format) {
     switch (type) {
-      case import_echo_schema5.TypeEnum.Number:
+      case import_echo_schema8.TypeEnum.Number:
         return [
           "text-right",
           "font-mono"
         ];
-      case import_echo_schema5.TypeEnum.Boolean:
+      case import_echo_schema8.TypeEnum.Boolean:
         return [
           "text-right",
           "font-mono"
         ];
-      case import_echo_schema5.TypeEnum.String:
+      case import_echo_schema8.TypeEnum.String:
         return void 0;
-      case import_echo_schema5.TypeEnum.Ref:
+      case import_echo_schema8.TypeEnum.Ref:
         return void 0;
       default: {
         return void 0;
@@ -1067,20 +1131,20 @@ var cellClassesForFieldType = ({ type, format }) => {
     }
   }
   switch (format) {
-    case import_echo_schema5.FormatEnum.Markdown:
+    case import_echo_schema8.FormatEnum.Markdown:
       return void 0;
-    case import_echo_schema5.FormatEnum.Timestamp:
-    case import_echo_schema5.FormatEnum.DateTime:
-    case import_echo_schema5.FormatEnum.Date:
-    case import_echo_schema5.FormatEnum.Time:
+    case import_echo_schema8.FormatEnum.Timestamp:
+    case import_echo_schema8.FormatEnum.DateTime:
+    case import_echo_schema8.FormatEnum.Date:
+    case import_echo_schema8.FormatEnum.Time:
       return [
         "font-mono"
       ];
-    case import_echo_schema5.FormatEnum.Currency:
+    case import_echo_schema8.FormatEnum.Currency:
       return [
         "text-right"
       ];
-    case import_echo_schema5.FormatEnum.JSON:
+    case import_echo_schema8.FormatEnum.JSON:
       return [
         "font-mono"
       ];
@@ -1098,12 +1162,12 @@ var pathNotUniqueError = (path) => ({
 var formatForDisplay = ({ type, format, value, locale = void 0 }) => {
   const formatScalar = (type2) => {
     switch (type2) {
-      case import_echo_schema6.TypeEnum.Boolean:
+      case import_echo_schema9.TypeEnum.Boolean:
         return value.toLocaleString().toUpperCase();
-      case import_echo_schema6.TypeEnum.Number:
+      case import_echo_schema9.TypeEnum.Number:
         return value.toLocaleString(locale);
-      case import_echo_schema6.TypeEnum.String:
-      case import_echo_schema6.TypeEnum.Ref:
+      case import_echo_schema9.TypeEnum.String:
+      case import_echo_schema9.TypeEnum.Ref:
         return String(value);
       default: {
         return String(value);
@@ -1114,20 +1178,20 @@ var formatForDisplay = ({ type, format, value, locale = void 0 }) => {
     return formatScalar(type);
   }
   switch (format) {
-    case import_echo_schema6.FormatEnum.Boolean: {
-      return formatScalar(import_echo_schema6.TypeEnum.Boolean);
+    case import_echo_schema9.FormatEnum.Boolean: {
+      return formatScalar(import_echo_schema9.TypeEnum.Boolean);
     }
-    case import_echo_schema6.FormatEnum.Number: {
-      return formatScalar(import_echo_schema6.TypeEnum.Number);
+    case import_echo_schema9.FormatEnum.Number: {
+      return formatScalar(import_echo_schema9.TypeEnum.Number);
     }
-    case import_echo_schema6.FormatEnum.String:
-    case import_echo_schema6.FormatEnum.Ref: {
-      return formatScalar(import_echo_schema6.TypeEnum.String);
+    case import_echo_schema9.FormatEnum.String:
+    case import_echo_schema9.FormatEnum.Ref: {
+      return formatScalar(import_echo_schema9.TypeEnum.String);
     }
-    case import_echo_schema6.FormatEnum.Percent: {
+    case import_echo_schema9.FormatEnum.Percent: {
       return `${value * 100}%`;
     }
-    case import_echo_schema6.FormatEnum.Currency: {
+    case import_echo_schema9.FormatEnum.Currency: {
       return value.toLocaleString(locale, {
         style: "currency",
         currency: "USD",
@@ -1135,13 +1199,13 @@ var formatForDisplay = ({ type, format, value, locale = void 0 }) => {
         maximumFractionDigits: 2
       });
     }
-    case import_echo_schema6.FormatEnum.DateTime:
-    case import_echo_schema6.FormatEnum.Date:
-    case import_echo_schema6.FormatEnum.Time: {
+    case import_echo_schema9.FormatEnum.DateTime:
+    case import_echo_schema9.FormatEnum.Date:
+    case import_echo_schema9.FormatEnum.Time: {
       const date = new Date(value);
-      if (format === import_echo_schema6.FormatEnum.DateTime) {
+      if (format === import_echo_schema9.FormatEnum.DateTime) {
         return date.toLocaleString(locale);
-      } else if (format === import_echo_schema6.FormatEnum.Date) {
+      } else if (format === import_echo_schema9.FormatEnum.Date) {
         return date.toLocaleDateString(locale);
       } else {
         return date.toLocaleTimeString(locale);
@@ -1158,10 +1222,10 @@ var formatForDisplay = ({ type, format, value, locale = void 0 }) => {
 var formatForEditing = ({ type, format, value, locale = void 0 }) => {
   const formatScalar = (type2) => {
     switch (type2) {
-      case import_echo_schema6.TypeEnum.Boolean:
-      case import_echo_schema6.TypeEnum.Number:
-      case import_echo_schema6.TypeEnum.String:
-      case import_echo_schema6.TypeEnum.Ref:
+      case import_echo_schema9.TypeEnum.Boolean:
+      case import_echo_schema9.TypeEnum.Number:
+      case import_echo_schema9.TypeEnum.String:
+      case import_echo_schema9.TypeEnum.Ref:
         return String(value);
       default:
         return String(value);
@@ -1171,27 +1235,27 @@ var formatForEditing = ({ type, format, value, locale = void 0 }) => {
     return formatScalar(type);
   }
   switch (format) {
-    case import_echo_schema6.FormatEnum.Boolean:
-    case import_echo_schema6.FormatEnum.Number:
-    case import_echo_schema6.FormatEnum.String:
-    case import_echo_schema6.FormatEnum.Ref: {
+    case import_echo_schema9.FormatEnum.Boolean:
+    case import_echo_schema9.FormatEnum.Number:
+    case import_echo_schema9.FormatEnum.String:
+    case import_echo_schema9.FormatEnum.Ref: {
       return formatScalar(type);
     }
-    case import_echo_schema6.FormatEnum.Percent: {
+    case import_echo_schema9.FormatEnum.Percent: {
       return String(value * 100);
     }
-    case import_echo_schema6.FormatEnum.Currency: {
+    case import_echo_schema9.FormatEnum.Currency: {
       return String(value);
     }
-    case import_echo_schema6.FormatEnum.DateTime: {
+    case import_echo_schema9.FormatEnum.DateTime: {
       const date = new Date(value);
       return date.toISOString();
     }
-    case import_echo_schema6.FormatEnum.Date: {
+    case import_echo_schema9.FormatEnum.Date: {
       const date = new Date(value);
       return date.toISOString().split("T")[0];
     }
-    case import_echo_schema6.FormatEnum.Time: {
+    case import_echo_schema9.FormatEnum.Time: {
       const date = new Date(value);
       return date.toISOString().split("T")[1].split(".")[0];
     }
@@ -1206,12 +1270,12 @@ var formatForEditing = ({ type, format, value, locale = void 0 }) => {
   DeprecatedFormInput,
   FieldEditor,
   Form,
-  FormActions,
-  GeiPointInput,
+  GeoPointInput,
   InputHeader,
   NumberInput,
   SelectInput,
   TextInput,
+  TupleInput,
   ViewEditor,
   cellClassesForFieldType,
   cellClassesForRowSelection,