@dxos/react-ui-form 0.7.5-labs.a279d8c → 0.7.5-labs.c0e040f

package/dist/lib/node/index.cjs

@@ -29,13 +29,16 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var node_exports = {};
 __export(node_exports, {
   BooleanInput: () => BooleanInput,
+  DeprecatedFormContainer: () => DeprecatedFormContainer,
   DeprecatedFormInput: () => DeprecatedFormInput,
   FieldEditor: () => FieldEditor,
   Form: () => Form,
   GeoPointInput: () => GeoPointInput,
   InputHeader: () => InputHeader,
+  MarkdownInput: () => MarkdownInput,
   NumberInput: () => NumberInput,
   SelectInput: () => SelectInput,
+  SelectOptionInput: () => SelectOptionInput,
   TextInput: () => TextInput,
   TupleInput: () => TupleInput,
   ViewEditor: () => ViewEditor,
@@ -46,68 +49,75 @@ __export(node_exports, {
   parseValue: () => parseValue,
   pathNotUniqueError: () => pathNotUniqueError,
   translations: () => translations_default,
-  useForm: () => useForm
+  useForm: () => useForm,
+  useFormValues: () => useFormValues
 });
 module.exports = __toCommonJS(node_exports);
 var import_react = __toESM(require("react"));
 var import_react_ui = require("@dxos/react-ui");
+var import_react_ui_theme = require("@dxos/react-ui-theme");
 var import_react2 = __toESM(require("react"));
 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_react3 = __toESM(require("react"));
+var import_debug = require("@dxos/debug");
+var import_echo_schema2 = require("@dxos/echo-schema");
+var import_effect = require("@dxos/effect");
+var import_react4 = require("react");
+var import_echo_schema3 = require("@dxos/echo-schema");
+var import_effect2 = require("@dxos/effect");
+var import_invariant = require("@dxos/invariant");
+var import_log2 = require("@dxos/log");
+var import_schema2 = require("@dxos/schema");
+var import_react5 = __toESM(require("react"));
 var import_react_ui3 = require("@dxos/react-ui");
 var import_util = require("@dxos/util");
-var import_react4 = __toESM(require("react"));
+var import_react6 = __toESM(require("react"));
 var import_react_ui4 = require("@dxos/react-ui");
-var import_react_ui_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_util2 = require("@dxos/util");
-var import_react6 = __toESM(require("react"));
-var import_react_ui6 = require("@dxos/react-ui");
 var import_react7 = __toESM(require("react"));
+var import_keys = require("@dxos/keys");
+var import_react_ui5 = require("@dxos/react-ui");
+var import_react_ui_list = require("@dxos/react-ui-list");
+var import_react_ui_pickers = require("@dxos/react-ui-pickers");
 var import_react_ui_theme3 = require("@dxos/react-ui-theme");
 var import_react8 = __toESM(require("react"));
-var import_react_ui7 = require("@dxos/react-ui");
+var import_react_ui6 = require("@dxos/react-ui");
 var import_react_ui_theme4 = require("@dxos/react-ui-theme");
+var import_util2 = require("@dxos/util");
 var import_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_react_ui7 = require("@dxos/react-ui");
+var import_react10 = __toESM(require("react"));
+var import_react_ui_theme5 = require("@dxos/react-ui-theme");
+var import_react11 = __toESM(require("react"));
+var import_react_ui8 = require("@dxos/react-ui");
+var import_react_ui_theme6 = require("@dxos/react-ui-theme");
 var import_effect3 = require("effect");
 var import_String = require("effect/String");
-var import_react11 = __toESM(require("react"));
+var import_react12 = __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_react_ui_theme7 = 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_react13 = __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_react_ui9 = require("@dxos/react-ui");
+var import_react_ui_theme8 = 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_react14 = __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_react_ui10 = require("@dxos/react-ui");
+var import_react_ui_list2 = require("@dxos/react-ui-list");
+var import_react_ui_theme9 = 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";
@@ -146,6 +156,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",
@@ -155,11 +166,26 @@ 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"
       }
     }
   }
 ];
+var DeprecatedFormContainer = ({ children, classNames }) => {
+  return /* @__PURE__ */ import_react.default.createElement("div", {
+    role: "none",
+    className: "w-full p-4 justify-center overflow-x-hidden overflow-y-auto"
+  }, /* @__PURE__ */ import_react.default.createElement("div", {
+    role: "form",
+    className: (0, import_react_ui_theme.mx)("flex flex-col", import_react_ui_theme.textBlockWidth, classNames)
+  }, children));
+};
 var DeprecatedFormInput = ({ label, description, secondary, children }) => {
   const primary = /* @__PURE__ */ import_react.default.createElement("div", {
     role: "none",
@@ -168,179 +194,47 @@ var DeprecatedFormInput = ({ label, description, secondary, children }) => {
     role: "none",
     className: "flex flex-col w-full"
   }, /* @__PURE__ */ import_react.default.createElement(import_react_ui.Input.Label, {
-    classNames: "flex min-h-[40px] items-center"
+    classNames: "flex min-bs-[--rail-action] items-center",
+    style: {
+      fontSize: "unset"
+    }
   }, label), description && /* @__PURE__ */ import_react.default.createElement(import_react_ui.Input.DescriptionAndValidation, {
     classNames: "mbs-0.5"
   }, /* @__PURE__ */ import_react.default.createElement(import_react_ui.Input.Description, null, description))), /* @__PURE__ */ import_react.default.createElement("div", {
     role: "none"
   }, /* @__PURE__ */ import_react.default.createElement("div", {
     role: "none",
-    className: "flex min-h-[40px] items-center"
+    className: "flex min-bs-[--rail-action] items-center"
   }, children))));
   if (secondary) {
     return /* @__PURE__ */ import_react.default.createElement("div", {
-      role: "none",
-      className: "flex flex-col w-full"
+      role: "none"
     }, primary, secondary);
   }
   return primary;
 };
-var InputHeader = ({ children, error }) => {
-  return /* @__PURE__ */ import_react4.default.createElement("div", {
-    role: "none",
-    className: "flex justify-between items-center mb-1"
-  }, children, error && /* @__PURE__ */ import_react4.default.createElement(import_react_ui4.Tooltip.Root, null, /* @__PURE__ */ import_react4.default.createElement(import_react_ui4.Tooltip.Trigger, {
-    asChild: true
-  }, /* @__PURE__ */ import_react4.default.createElement(import_react_ui4.Icon, {
-    icon: "ph--warning--regular",
-    size: 4,
-    classNames: import_react_ui_theme.errorText
-  })), /* @__PURE__ */ import_react4.default.createElement(import_react_ui4.Tooltip.Content, {
-    side: "bottom"
-  }, /* @__PURE__ */ import_react4.default.createElement(import_react_ui4.Tooltip.Arrow, null), error)));
-};
-var GeoPointInput = ({ type, label, disabled, getStatus, getValue: getValue3, onValueChange, onBlur }) => {
-  const { t } = (0, import_react_ui3.useTranslation)(translationKey);
-  const { status, error } = getStatus();
-  const [lng = 0, lat = 0] = getValue3() ?? [];
-  return /* @__PURE__ */ import_react3.default.createElement(import_react_ui3.Input.Root, {
-    validationValence: status
-  }, /* @__PURE__ */ import_react3.default.createElement(InputHeader, {
-    error
-  }, /* @__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: getValue3() ?? "",
-    onChange: (event) => onValueChange(type, event.target.value),
-    onBlur
-  }), inputOnly && /* @__PURE__ */ import_react6.default.createElement(import_react_ui6.Input.Validation, null, error));
-};
-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_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, {
-    type: "number",
-    disabled,
-    placeholder,
-    value: getValue3() ?? 0,
-    onChange: (event) => onValueChange(type, event.target.value),
-    onBlur
-  }), inputOnly && /* @__PURE__ */ import_react6.default.createElement(import_react_ui6.Input.DescriptionAndValidation, null, error));
-};
-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_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.Switch, {
-    checked: getValue3(),
-    onCheckedChange: (value) => onValueChange(type, value)
-  }), inputOnly && /* @__PURE__ */ import_react6.default.createElement(import_react_ui6.Input.DescriptionAndValidation, null, error));
-};
-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_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.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_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_react6.default.createElement(import_react_ui6.Select.Option, {
-      key: String(value),
-      value: String(value)
-    }, label2 ?? String(value))
-  )))))), 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 }) => {
   (0, import_invariant.invariant)(import_effect2.AST.isTypeLiteral(schema.ast), void 0, {
     F: __dxlog_file,
-    L: 91,
+    L: 92,
     S: void 0,
     A: [
       "AST.isTypeLiteral(schema.ast)",
       ""
     ]
   });
-  const [values, setValues] = (0, import_react10.useState)(initialValues);
-  (0, import_react10.useEffect)(() => {
+  const [values, setValues] = (0, import_react4.useState)(initialValues);
+  (0, import_react4.useEffect)(() => {
     setValues(initialValues);
   }, [
     initialValues
   ]);
-  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) => {
+  const [touched, setTouched] = (0, import_react4.useState)(createKeySet(initialValues, false));
+  const [changed, setChanged] = (0, import_react4.useState)(createKeySet(initialValues, false));
+  const [errors, setErrors] = (0, import_react4.useState)({});
+  const [saving, setSaving] = (0, import_react4.useState)(false);
+  const validate = (0, import_react4.useCallback)((values2) => {
     let errors2 = (0, import_schema2.validateSchema)(schema, values2) ?? [];
     if (errors2.length === 0 && onValidate) {
       const validatedValues = values2;
@@ -353,11 +247,11 @@ var useForm = ({ schema, initialValues, onValuesChanged, onValidate, onValid, on
     schema,
     onValidate
   ]);
-  const [schemaDirty, setSchemaDirty] = (0, import_react10.useState)(false);
-  (0, import_react10.useEffect)(() => setSchemaDirty(true), [
+  const [schemaDirty, setSchemaDirty] = (0, import_react4.useState)(false);
+  (0, import_react4.useEffect)(() => setSchemaDirty(true), [
     schema
   ]);
-  (0, import_react10.useEffect)(() => {
+  (0, import_react4.useEffect)(() => {
     if (schemaDirty) {
       validate(values);
       setSchemaDirty(false);
@@ -366,13 +260,18 @@ var useForm = ({ schema, initialValues, onValuesChanged, onValidate, onValid, on
     values,
     schemaDirty
   ]);
-  const canSave = (0, import_react10.useMemo)(() => !saving && // Check if any error paths that are touched have errors
+  const formIsValid = (0, import_react4.useMemo)(() => {
+    return Object.keys(errors).length === 0;
+  }, [
+    errors
+  ]);
+  const canSave = (0, import_react4.useMemo)(() => !saving && // Check if any error paths that are touched have errors
   !Object.entries(touched).some(([path, isTouched]) => isTouched && Object.keys(errors).some((errorPath) => errorPath === path || errorPath.startsWith(`${path}.`) || errorPath.startsWith(`${path}[`))), [
     touched,
     errors,
     saving
   ]);
-  const handleSave = (0, import_react10.useCallback)(async () => {
+  const handleSave = (0, import_react4.useCallback)(async () => {
     if (validate(values)) {
       setSaving(true);
       try {
@@ -389,7 +288,7 @@ var useForm = ({ schema, initialValues, onValuesChanged, onValidate, onValid, on
     onSave,
     changed
   ]);
-  const getStatus = (0, import_react10.useCallback)((path) => {
+  const getStatus = (0, import_react4.useCallback)((path) => {
     const jsonPath = Array.isArray(path) ? (0, import_effect2.createJsonPath)(path) : path;
     const matchingError = Object.entries(errors).find(([errorPath]) => errorPath === jsonPath || errorPath.startsWith(`${jsonPath}.`) || errorPath.startsWith(`${jsonPath}[`));
     return {
@@ -412,7 +311,7 @@ var useForm = ({ schema, initialValues, onValuesChanged, onValidate, onValid, on
     } catch (err) {
       import_log2.log.catch(err, void 0, {
         F: __dxlog_file,
-        L: 194,
+        L: 198,
         S: void 0,
         C: (f, a) => f(...a)
       });
@@ -434,7 +333,7 @@ var useForm = ({ schema, initialValues, onValuesChanged, onValidate, onValid, on
       });
     }
   };
-  const onTouched = (0, import_react10.useCallback)((path) => {
+  const onTouched = (0, import_react4.useCallback)((path) => {
     const jsonPath = (0, import_effect2.createJsonPath)(path);
     setTouched((touched2) => ({
       ...touched2,
@@ -453,6 +352,7 @@ var useForm = ({ schema, initialValues, onValuesChanged, onValidate, onValid, on
     changed,
     canSave,
     handleSave,
+    formIsValid,
     // Field utils.
     getStatus,
     getValue: getFormValue,
@@ -463,7 +363,7 @@ var useForm = ({ schema, initialValues, onValuesChanged, onValidate, onValid, on
 var createKeySet = (obj, value) => {
   (0, import_invariant.invariant)(obj, void 0, {
     F: __dxlog_file,
-    L: 236,
+    L: 241,
     S: void 0,
     A: [
       "obj",
@@ -484,9 +384,9 @@ var flatMap = (errors) => {
     return result;
   }, {});
 };
-var FormContext = /* @__PURE__ */ (0, import_react9.createContext)(void 0);
+var FormContext = /* @__PURE__ */ (0, import_react3.createContext)(void 0);
 var useFormContext = () => {
-  return (0, import_react9.useContext)(FormContext) ?? (0, import_debug.raise)(new Error("Missing FormContext"));
+  return (0, import_react3.useContext)(FormContext) ?? (0, import_debug.raise)(new Error("Missing FormContext"));
 };
 var useFormValues = (path = []) => {
   const { values: formValues } = useFormContext();
@@ -502,27 +402,406 @@ var useInputProps = (path = []) => {
     onBlur: () => onTouched(path)
   };
 };
-var FormProvider = ({ children, ...formOptions }) => {
-  const formHandler = useForm(formOptions);
-  return /* @__PURE__ */ import_react9.default.createElement(FormContext.Provider, {
-    value: formHandler
+var FormProvider = ({ children, formRef, autoSave, ...formOptions }) => {
+  const form = useForm(formOptions);
+  (0, import_react3.useEffect)(() => {
+    if (!formRef?.current) {
+      return;
+    }
+    const handleKeyDown = (event) => {
+      const keyIsEnter = event.key === "Enter";
+      const modifierUsed = event.ctrlKey || event.altKey || event.metaKey || event.shiftKey;
+      const inputIsTextarea = event.target.tagName.toLowerCase() === "textarea";
+      const inputOptOut = event.target.hasAttribute("data-no-submit");
+      const shouldSubmitRegularInput = !inputIsTextarea && keyIsEnter && !modifierUsed;
+      const shouldSubmitTextarea = inputIsTextarea && keyIsEnter && event.metaKey;
+      if ((shouldSubmitRegularInput || shouldSubmitTextarea) && !inputOptOut) {
+        if (!autoSave && form.canSave) {
+          form.handleSave();
+        }
+        if (autoSave && form.formIsValid) {
+          event.target.blur();
+        }
+      }
+    };
+    const formElement = formRef.current;
+    formElement.addEventListener("keydown", handleKeyDown);
+    return () => formElement.removeEventListener("keydown", handleKeyDown);
+  }, [
+    formRef,
+    form.canSave,
+    form.formIsValid,
+    form.handleSave,
+    autoSave
+  ]);
+  return /* @__PURE__ */ import_react3.default.createElement(FormContext.Provider, {
+    value: form
   }, children);
 };
+var InputHeader = ({ children, error }) => {
+  return /* @__PURE__ */ import_react6.default.createElement("div", {
+    role: "none",
+    className: "flex justify-between items-center mb-1"
+  }, children, error && /* @__PURE__ */ import_react6.default.createElement(import_react_ui4.Tooltip.Root, null, /* @__PURE__ */ import_react6.default.createElement(import_react_ui4.Tooltip.Trigger, {
+    asChild: true
+  }, /* @__PURE__ */ import_react6.default.createElement(import_react_ui4.Icon, {
+    icon: "ph--warning--regular",
+    size: 4,
+    classNames: import_react_ui_theme2.errorText
+  })), /* @__PURE__ */ import_react6.default.createElement(import_react_ui4.Tooltip.Content, {
+    side: "bottom"
+  }, /* @__PURE__ */ import_react6.default.createElement(import_react_ui4.Tooltip.Arrow, null), error)));
+};
+var GeoPointInput = ({ type, label, disabled, getStatus, getValue: getValue3, onValueChange, onBlur }) => {
+  const { t } = (0, import_react_ui3.useTranslation)(translationKey);
+  const { status, error } = getStatus();
+  const [lng = 0, lat = 0] = getValue3() ?? [];
+  return /* @__PURE__ */ import_react5.default.createElement(import_react_ui3.Input.Root, {
+    validationValence: status
+  }, /* @__PURE__ */ import_react5.default.createElement(InputHeader, {
+    error
+  }, /* @__PURE__ */ import_react5.default.createElement(import_react_ui3.Input.Label, null, label)), /* @__PURE__ */ import_react5.default.createElement("div", {
+    className: "grid grid-cols-2 gap-2"
+  }, /* @__PURE__ */ import_react5.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_react5.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 SelectOptionInput = ({ type, label, disabled, getStatus, getValue: getValue3, onValueChange }) => {
+  const [selected, setSelectedId] = (0, import_react7.useState)(null);
+  const [isNewOption, setIsNewOption] = (0, import_react7.useState)(false);
+  const inputRef = (0, import_react7.useRef)(null);
+  const { t } = (0, import_react_ui5.useTranslation)(translationKey);
+  const { status, error } = getStatus();
+  const options = getValue3();
+  (0, import_react7.useEffect)(() => {
+    if (options === void 0) {
+      onValueChange(type, []);
+    }
+  }, [
+    options,
+    onValueChange,
+    type
+  ]);
+  const randomHue = () => {
+    const usedHues = new Set(options?.map((option) => option.color) ?? []);
+    const unusedHues = import_react_ui_theme3.hues.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 = import_react_ui_theme3.hues.filter((hue) => !lastThree.has(hue));
+    return availableHues[Math.floor(Math.random() * availableHues.length)] ?? import_react_ui_theme3.hues[Math.floor(Math.random() * import_react_ui_theme3.hues.length)];
+  };
+  const handleAdd = (0, import_react7.useCallback)(() => {
+    const newId = import_keys.PublicKey.random().truncate();
+    const newOption = {
+      id: newId,
+      title: "",
+      color: randomHue()
+    };
+    onValueChange(type, [
+      ...options ?? [],
+      newOption
+    ]);
+    setSelectedId(newId);
+    setIsNewOption(true);
+  }, [
+    options,
+    type,
+    onValueChange
+  ]);
+  const handleDelete = (0, import_react7.useCallback)((id) => {
+    const newOptions = options?.filter((option) => option.id !== id) ?? [];
+    onValueChange(type, newOptions);
+    setSelectedId(null);
+  }, [
+    options,
+    type,
+    onValueChange
+  ]);
+  const handleMove = (0, import_react7.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 = (0, import_react7.useCallback)((id) => {
+    setSelectedId((current) => current === id ? null : id);
+  }, []);
+  const handleTitleChange = (0, import_react7.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 = (0, import_react7.useCallback)((e) => {
+    if (e.key === "Enter") {
+      setSelectedId(null);
+    }
+  }, []);
+  const handleColorChange = (0, import_react7.useCallback)((id) => (hue) => {
+    const newOptions = options?.map((o) => o.id === id ? {
+      ...o,
+      color: hue
+    } : o);
+    onValueChange(type, newOptions ?? []);
+  }, [
+    options,
+    type,
+    onValueChange
+  ]);
+  (0, import_react7.useEffect)(() => {
+    if (selected && isNewOption && inputRef.current) {
+      inputRef.current.focus();
+      setIsNewOption(false);
+    }
+  }, [
+    selected,
+    isNewOption
+  ]);
+  return /* @__PURE__ */ import_react7.default.createElement(import_react_ui5.Input.Root, {
+    validationValence: status
+  }, /* @__PURE__ */ import_react7.default.createElement(InputHeader, {
+    error
+  }, /* @__PURE__ */ import_react7.default.createElement(import_react_ui5.Input.Label, null, label)), /* @__PURE__ */ import_react7.default.createElement("div", {
+    role: "none"
+  }, options && /* @__PURE__ */ import_react7.default.createElement(import_react_ui_list.List.Root, {
+    items: options,
+    isItem: (item) => true,
+    onMove: handleMove
+  }, ({ items }) => /* @__PURE__ */ import_react7.default.createElement("div", {
+    role: "list",
+    className: "w-full overflow-auto"
+  }, items?.map((item) => /* @__PURE__ */ import_react7.default.createElement("div", {
+    key: item.id
+  }, /* @__PURE__ */ import_react7.default.createElement(import_react_ui_list.List.Item, {
+    role: "button",
+    item,
+    classNames: (0, import_react_ui_theme3.mx)("p-1 plb-2", "flex flex-col", "cursor-pointer", "hover:bg-hoverOverlay"),
+    "aria-expanded": selected === item.id
+  }, /* @__PURE__ */ import_react7.default.createElement("div", {
+    className: "flex items-center"
+  }, /* @__PURE__ */ import_react7.default.createElement(import_react_ui_list.List.ItemDragHandle, null), /* @__PURE__ */ import_react7.default.createElement(import_react_ui_list.List.ItemTitle, {
+    onClick: () => handleClick(item.id),
+    classNames: "flex-1"
+  }, /* @__PURE__ */ import_react7.default.createElement(import_react_ui5.Tag, {
+    palette: item.color
+  }, item.title || "\u200B")), /* @__PURE__ */ import_react7.default.createElement(import_react_ui5.Icon, {
+    icon: selected === item.id ? "ph--caret-down--regular" : "ph--caret-right--regular",
+    onClick: () => handleClick(item.id)
+  })), selected === item.id && /* @__PURE__ */ import_react7.default.createElement("div", {
+    className: "mis-4 mbs-2 flex flex-col gap-1"
+  }, /* @__PURE__ */ import_react7.default.createElement(import_react_ui5.Input.Label, {
+    classNames: "text-xs"
+  }, t("select option label")), /* @__PURE__ */ import_react7.default.createElement("div", {
+    className: "flex flex-row items-center gap-1"
+  }, /* @__PURE__ */ import_react7.default.createElement(import_react_ui5.Input.TextInput, {
+    placeholder: t("select option label placeholder"),
+    ref: selected === item.id ? inputRef : void 0,
+    value: item.title,
+    onChange: handleTitleChange(item.id),
+    onKeyDown: handleKeyDown,
+    classNames: "flex-1",
+    "data-no-submit": true
+  }), /* @__PURE__ */ import_react7.default.createElement(import_react_ui5.Toolbar.Root, {
+    classNames: "p-0 m-0 !is-auto"
+  }, /* @__PURE__ */ import_react7.default.createElement(import_react_ui_pickers.HuePickerToolbarButton, {
+    hue: item.color,
+    onChangeHue: handleColorChange(item.id)
+  })), /* @__PURE__ */ import_react7.default.createElement(import_react_ui5.IconButton, {
+    icon: "ph--trash--fill",
+    iconOnly: true,
+    label: t("select option delete"),
+    onClick: () => handleDelete(item.id)
+  })))))), /* @__PURE__ */ import_react7.default.createElement("div", {
+    role: "listitem"
+  }, /* @__PURE__ */ import_react7.default.createElement("div", {
+    role: "button",
+    className: (0, import_react_ui_theme3.mx)("p-1 plb-2", "flex flex-col", "cursor-pointer", "hover:bg-hoverOverlay"),
+    onClick: handleAdd
+  }, /* @__PURE__ */ import_react7.default.createElement("div", {
+    className: "flex items-center gap-1"
+  }, /* @__PURE__ */ import_react7.default.createElement(import_react_ui5.Icon, {
+    icon: "ph--plus--regular"
+  }), /* @__PURE__ */ import_react7.default.createElement("span", {
+    className: "text-sm"
+  }, t("select option add")))))))));
+};
+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_react8.default.createElement(import_react_ui6.Input.Root, {
+    validationValence: status
+  }, /* @__PURE__ */ import_react8.default.createElement(InputHeader, {
+    error
+  }, /* @__PURE__ */ import_react8.default.createElement(import_react_ui6.Input.Label, null, label)), /* @__PURE__ */ import_react8.default.createElement("div", {
+    className: (0, import_react_ui_theme4.mx)("grid gap-2", gridCols[binding.length - 1])
+  }, binding.map((prop) => /* @__PURE__ */ import_react8.default.createElement(import_react_ui6.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_react9.default.createElement(import_react_ui7.Input.Root, {
+    validationValence: status
+  }, !inputOnly && /* @__PURE__ */ import_react9.default.createElement(InputHeader, {
+    error
+  }, /* @__PURE__ */ import_react9.default.createElement(import_react_ui7.Input.Label, null, label)), /* @__PURE__ */ import_react9.default.createElement(import_react_ui7.Input.TextInput, {
+    disabled,
+    placeholder,
+    value: getValue3() ?? "",
+    onChange: (event) => onValueChange(type, event.target.value),
+    onBlur
+  }), inputOnly && /* @__PURE__ */ import_react9.default.createElement(import_react_ui7.Input.Validation, null, error));
+};
+var NumberInput = ({ type, label, inputOnly, disabled, placeholder, getStatus, getValue: getValue3, onValueChange, onBlur }) => {
+  const { status, error } = getStatus();
+  return /* @__PURE__ */ import_react9.default.createElement(import_react_ui7.Input.Root, {
+    validationValence: status
+  }, !inputOnly && /* @__PURE__ */ import_react9.default.createElement(InputHeader, {
+    error
+  }, /* @__PURE__ */ import_react9.default.createElement(import_react_ui7.Input.Label, null, label)), /* @__PURE__ */ import_react9.default.createElement(import_react_ui7.Input.TextInput, {
+    type: "number",
+    disabled,
+    placeholder,
+    value: getValue3() ?? 0,
+    onChange: (event) => onValueChange(type, event.target.value),
+    onBlur
+  }), inputOnly && /* @__PURE__ */ import_react9.default.createElement(import_react_ui7.Input.DescriptionAndValidation, null, error));
+};
+var BooleanInput = ({ type, label, inputOnly, getStatus, getValue: getValue3, onValueChange }) => {
+  const { status, error } = getStatus();
+  const checked = Boolean(getValue3());
+  return /* @__PURE__ */ import_react9.default.createElement(import_react_ui7.Input.Root, {
+    validationValence: status
+  }, !inputOnly && /* @__PURE__ */ import_react9.default.createElement(InputHeader, {
+    error
+  }, /* @__PURE__ */ import_react9.default.createElement(import_react_ui7.Input.Label, null, label)), /* @__PURE__ */ import_react9.default.createElement(import_react_ui7.Input.Switch, {
+    checked,
+    onCheckedChange: (value) => onValueChange(type, value)
+  }), inputOnly && /* @__PURE__ */ import_react9.default.createElement(import_react_ui7.Input.DescriptionAndValidation, null, error));
+};
+var SelectInput = ({ type, label, inputOnly, disabled, placeholder, options, getStatus, getValue: getValue3, onValueChange }) => {
+  const { status, error } = getStatus();
+  return /* @__PURE__ */ import_react9.default.createElement(import_react_ui7.Input.Root, {
+    validationValence: status
+  }, !inputOnly && /* @__PURE__ */ import_react9.default.createElement(InputHeader, {
+    error
+  }, /* @__PURE__ */ import_react9.default.createElement(import_react_ui7.Input.Label, null, label)), /* @__PURE__ */ import_react9.default.createElement(import_react_ui7.Select.Root, {
+    value: getValue3(),
+    onValueChange: (value) => onValueChange(type, value)
+  }, /* @__PURE__ */ import_react9.default.createElement(import_react_ui7.Select.TriggerButton, {
+    classNames: "is-full",
+    disabled,
+    placeholder
+  }), /* @__PURE__ */ import_react9.default.createElement(import_react_ui7.Select.Portal, null, /* @__PURE__ */ import_react9.default.createElement(import_react_ui7.Select.Content, null, /* @__PURE__ */ import_react9.default.createElement(import_react_ui7.Select.Viewport, null, options?.map(({ value, label: label2 }) => (
+    // NOTE: Numeric values are converted to and from strings.
+    /* @__PURE__ */ import_react9.default.createElement(import_react_ui7.Select.Option, {
+      key: String(value),
+      value: String(value)
+    }, label2 ?? String(value))
+  )))))), inputOnly && /* @__PURE__ */ import_react9.default.createElement(import_react_ui7.Input.DescriptionAndValidation, null, error));
+};
+var MarkdownInput = ({ type, label, inputOnly, disabled, placeholder, getStatus, getValue: getValue3, onValueChange, onBlur }) => {
+  const { status, error } = getStatus();
+  const textareaRef = (0, import_react9.useRef)(null);
+  const adjustHeight = (0, import_react9.useCallback)(() => {
+    const textarea = textareaRef.current;
+    if (textarea) {
+      textarea.style.blockSize = "auto";
+      textarea.style.blockSize = `${textarea.scrollHeight + 2}px`;
+    }
+  }, []);
+  (0, import_react9.useEffect)(() => {
+    adjustHeight();
+  }, [
+    adjustHeight
+  ]);
+  (0, import_react9.useEffect)(() => {
+    adjustHeight();
+  }, [
+    getValue3(),
+    adjustHeight
+  ]);
+  return /* @__PURE__ */ import_react9.default.createElement(import_react_ui7.Input.Root, {
+    validationValence: status
+  }, !inputOnly && /* @__PURE__ */ import_react9.default.createElement(InputHeader, {
+    error
+  }, /* @__PURE__ */ import_react9.default.createElement(import_react_ui7.Input.Label, null, label)), /* @__PURE__ */ import_react9.default.createElement(import_react_ui7.Input.TextArea, {
+    ref: textareaRef,
+    disabled,
+    placeholder,
+    value: getValue3() ?? "",
+    classNames: "min-bs-auto overflow-hidden",
+    onChange: (event) => onValueChange(type, event.target.value),
+    onBlur,
+    style: {
+      resize: "none"
+    },
+    spellCheck: false
+  }), inputOnly && /* @__PURE__ */ import_react9.default.createElement(import_react_ui7.Input.Validation, null, error));
+};
 var FormActions = ({ onCancel, readonly }) => {
-  const { t } = (0, import_react_ui7.useTranslation)(translationKey);
+  const { t } = (0, import_react_ui8.useTranslation)(translationKey);
   const { canSave, handleSave } = useFormContext();
-  return /* @__PURE__ */ import_react8.default.createElement("div", {
+  return /* @__PURE__ */ import_react11.default.createElement("div", {
     role: "none",
-    className: "flex justify-center"
-  }, /* @__PURE__ */ import_react8.default.createElement("div", {
+    className: "mt-2 flex justify-center"
+  }, /* @__PURE__ */ import_react11.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, {
+    className: (0, import_react_ui_theme6.mx)(onCancel && !readonly && "grid grid-cols-2 gap-2")
+  }, onCancel && !readonly && /* @__PURE__ */ import_react11.default.createElement(import_react_ui8.IconButton, {
     "data-testid": "cancel-button",
     icon: "ph--x--regular",
     label: t("button cancel"),
     onClick: onCancel
-  }), handleSave && /* @__PURE__ */ import_react8.default.createElement(import_react_ui7.IconButton, {
+  }), handleSave && /* @__PURE__ */ import_react11.default.createElement(import_react_ui8.IconButton, {
     type: "submit",
     "data-testid": "save-button",
     disabled: !canSave,
@@ -534,16 +813,16 @@ var FormActions = ({ onCancel, readonly }) => {
 var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-form/src/components/Form/ArrayField.tsx";
 var padding = "px-2";
 var ArrayField = ({ property, readonly, path, inputProps, Custom, lookupComponent }) => {
-  const { t } = (0, import_react_ui8.useTranslation)(translationKey);
+  const { t } = (0, import_react_ui9.useTranslation)(translationKey);
   const { ast, name, type, title } = property;
   const values = useFormValues(path ?? []);
-  (0, import_invariant2.invariant)(Array.isArray(values), void 0, {
+  (0, import_invariant2.invariant)(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 label = title ?? (0, import_effect5.pipe)(name, import_String2.capitalize);
@@ -560,7 +839,7 @@ var ArrayField = ({ property, readonly, path, inputProps, Custom, lookupComponen
       prop.defaultValue
     ]));
   };
-  const newValue = (0, import_react12.useMemo)(() => {
+  const newValue = (0, import_react13.useMemo)(() => {
     if (type === "object" && elementType) {
       return getDefaultObjectValue(elementType);
     } else {
@@ -570,7 +849,7 @@ var ArrayField = ({ property, readonly, path, inputProps, Custom, lookupComponen
     type,
     elementType
   ]);
-  const handleAdd = (0, import_react12.useCallback)(() => {
+  const handleAdd = (0, import_react13.useCallback)(() => {
     inputProps.onValueChange(type, [
       ...values,
       newValue
@@ -582,7 +861,7 @@ var ArrayField = ({ property, readonly, path, inputProps, Custom, lookupComponen
     newValue,
     values
   ]);
-  const handleRemove = (0, import_react12.useCallback)((index) => {
+  const handleRemove = (0, import_react13.useCallback)((index) => {
     const newValues = values.filter((_, i) => i !== index);
     inputProps.onValueChange(type, newValues);
   }, [
@@ -593,20 +872,20 @@ var ArrayField = ({ property, readonly, path, inputProps, Custom, lookupComponen
   if (!elementType) {
     return null;
   }
-  return /* @__PURE__ */ import_react12.default.createElement("div", {
+  return /* @__PURE__ */ import_react13.default.createElement("div", {
     role: "none",
-    className: (0, import_react_ui_theme6.mx)(padding)
-  }, /* @__PURE__ */ import_react12.default.createElement(InputHeader, null, label), /* @__PURE__ */ import_react12.default.createElement("div", {
+    className: (0, import_react_ui_theme8.mx)(padding)
+  }, /* @__PURE__ */ import_react13.default.createElement(InputHeader, null, label), /* @__PURE__ */ import_react13.default.createElement("div", {
     role: "none",
     className: "flex flex-col gap-1"
-  }, values.map((_value, index) => /* @__PURE__ */ import_react12.default.createElement("div", {
+  }, values.map((_value, index) => /* @__PURE__ */ import_react13.default.createElement("div", {
     key: index,
     role: "none",
     className: "flex items-center gap-1"
-  }, /* @__PURE__ */ import_react12.default.createElement("div", {
+  }, /* @__PURE__ */ import_react13.default.createElement("div", {
     role: "none",
     className: "flex-1"
-  }, /* @__PURE__ */ import_react12.default.createElement(FormField, {
+  }, /* @__PURE__ */ import_react13.default.createElement(FormField, {
     property: {
       ...property,
       array: false,
@@ -620,15 +899,15 @@ var ArrayField = ({ property, readonly, path, inputProps, Custom, lookupComponen
     inline: true,
     Custom,
     lookupComponent
-  })), /* @__PURE__ */ import_react12.default.createElement(import_react_ui8.IconButton, {
+  })), /* @__PURE__ */ import_react13.default.createElement(import_react_ui9.IconButton, {
     icon: "ph--trash--regular",
     iconOnly: true,
     label: t("button remove"),
     onClick: () => handleRemove(index)
-  })))), /* @__PURE__ */ import_react12.default.createElement("div", {
+  })))), /* @__PURE__ */ import_react13.default.createElement("div", {
     role: "none",
     className: "flex justify-between items-center plb-1"
-  }, /* @__PURE__ */ import_react12.default.createElement(import_react_ui8.IconButton, {
+  }, /* @__PURE__ */ import_react13.default.createElement(import_react_ui9.IconButton, {
     icon: "ph--plus--regular",
     iconOnly: true,
     label: t("button add"),
@@ -639,6 +918,8 @@ var getInputComponent = (type, format) => {
   switch (format) {
     case import_echo_schema6.FormatEnum.LatLng:
       return GeoPointInput;
+    case import_echo_schema6.FormatEnum.Markdown:
+      return MarkdownInput;
   }
   switch (type) {
     case "string":
@@ -652,23 +933,14 @@ var getInputComponent = (type, format) => {
 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), [
+  const label = (0, import_react12.useMemo)(() => title ?? (0, import_effect3.pipe)(name, import_String.capitalize), [
     title,
     name
   ]);
-  const placeholder = (0, import_react11.useMemo)(() => examples?.length ? `Example: "${examples[0]}"` : description, [
+  const placeholder = (0, import_react12.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),
@@ -682,12 +954,37 @@ var FormField = ({ property, path, readonly, inline, lookupComponent, Custom })
     }
   });
   if (FoundComponent) {
-    return /* @__PURE__ */ import_react11.default.createElement("div", null, FoundComponent);
+    return /* @__PURE__ */ import_react12.default.createElement("div", {
+      role: "none"
+    }, FoundComponent);
   }
   const jsonPath = (0, import_effect4.createJsonPath)(path ?? []);
-  const InputComponent = Custom?.[jsonPath] || getInputComponent(type, format);
+  const CustomComponent = Custom?.[jsonPath];
+  if (CustomComponent) {
+    return /* @__PURE__ */ import_react12.default.createElement(CustomComponent, {
+      type,
+      format,
+      label,
+      inputOnly: inline,
+      placeholder,
+      disabled: readonly,
+      ...inputProps
+    });
+  }
+  if (array) {
+    return /* @__PURE__ */ import_react12.default.createElement(ArrayField, {
+      property,
+      path,
+      inputProps,
+      readonly,
+      Custom
+    });
+  }
+  const InputComponent = getInputComponent(type, format);
   if (InputComponent) {
-    return /* @__PURE__ */ import_react11.default.createElement("div", null, /* @__PURE__ */ import_react11.default.createElement(InputComponent, {
+    return /* @__PURE__ */ import_react12.default.createElement("div", {
+      role: "none"
+    }, /* @__PURE__ */ import_react12.default.createElement(InputComponent, {
       type,
       format,
       label,
@@ -698,9 +995,9 @@ var FormField = ({ property, path, readonly, inline, lookupComponent, Custom })
     }));
   }
   if (options) {
-    return /* @__PURE__ */ import_react11.default.createElement("div", {
+    return /* @__PURE__ */ import_react12.default.createElement("div", {
       role: "none"
-    }, /* @__PURE__ */ import_react11.default.createElement(SelectInput, {
+    }, /* @__PURE__ */ import_react12.default.createElement(SelectInput, {
       type,
       format,
       disabled: readonly,
@@ -718,7 +1015,9 @@ var FormField = ({ property, path, readonly, inline, lookupComponent, Custom })
     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, {
+      return /* @__PURE__ */ import_react12.default.createElement("div", {
+        role: "none"
+      }, !inline && /* @__PURE__ */ import_react12.default.createElement("div", null, label), /* @__PURE__ */ import_react12.default.createElement(FormFields, {
         schema: import_echo_schema4.S.make(typeLiteral),
         path,
         readonly,
@@ -730,7 +1029,7 @@ var FormField = ({ property, path, readonly, inline, lookupComponent, Custom })
 };
 var FormFields = ({ schema, path, filter, sort, readonly, lookupComponent, Custom }) => {
   const values = useFormValues(path);
-  const properties = (0, import_react11.useMemo)(() => {
+  const properties = (0, import_react12.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;
@@ -740,11 +1039,11 @@ var FormFields = ({ schema, path, filter, sort, readonly, lookupComponent, Custo
     filter,
     sort
   ]);
-  return /* @__PURE__ */ import_react11.default.createElement("div", {
+  return /* @__PURE__ */ import_react12.default.createElement("div", {
     role: "form",
-    className: (0, import_react_ui_theme5.mx)("flex flex-col w-full gap-2 py-2")
+    className: (0, import_react_ui_theme7.mx)("flex flex-col w-full gap-2")
   }, properties.map((property) => {
-    return /* @__PURE__ */ import_react11.default.createElement(FormField, {
+    return /* @__PURE__ */ import_react12.default.createElement(FormField, {
       key: property.name,
       property,
       path: [
@@ -757,23 +1056,37 @@ var FormFields = ({ schema, path, filter, sort, readonly, lookupComponent, Custo
     });
   }).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, [
+var Form = ({ classNames, schema, values: initialValues, path = [], autoFocus, readonly, filter, sort, autoSave, testId, onValuesChanged, onValidate, onSave, onCancel, lookupComponent, Custom }) => {
+  const formRef = (0, import_react10.useRef)(null);
+  const onValid = (0, import_react10.useMemo)(() => autoSave ? onSave : void 0, [
     autoSave,
     onSave
   ]);
-  return /* @__PURE__ */ import_react7.default.createElement(FormProvider, {
+  (0, import_react10.useEffect)(() => {
+    if (autoFocus && formRef.current) {
+      const input = formRef.current.querySelector("input");
+      if (input) {
+        input.focus();
+      }
+    }
+  }, [
+    autoFocus
+  ]);
+  return /* @__PURE__ */ import_react10.default.createElement(FormProvider, {
+    formRef,
     schema,
+    autoSave,
     initialValues,
     onValuesChanged,
     onValidate,
     onValid,
     onSave
-  }, /* @__PURE__ */ import_react7.default.createElement("div", {
+  }, /* @__PURE__ */ import_react10.default.createElement("div", {
+    ref: formRef,
     role: "none",
-    className: (0, import_react_ui_theme3.mx)("p-2", classNames),
+    className: (0, import_react_ui_theme5.mx)("p-2", classNames),
     "data-testid": testId
-  }, /* @__PURE__ */ import_react7.default.createElement(FormFields, {
+  }, /* @__PURE__ */ import_react10.default.createElement(FormFields, {
     schema,
     path,
     readonly,
@@ -781,7 +1094,7 @@ var Form = ({ classNames, schema, values: initialValues, path = [], readonly, fi
     sort,
     lookupComponent,
     Custom
-  }), (onCancel || onSave) && !autoSave && /* @__PURE__ */ import_react7.default.createElement(FormActions, {
+  }), (onCancel || onSave) && !autoSave && /* @__PURE__ */ import_react10.default.createElement(FormActions, {
     onCancel,
     readonly
   })));
@@ -851,7 +1164,7 @@ var FieldEditor = ({ view, projection, field, registry, onSave, onCancel }) => {
           type
         };
       }
-      return props2;
+      return _props;
     });
   }, [
     schemas,
@@ -907,7 +1220,8 @@ var FieldEditor = ({ view, projection, field, registry, onSave, onCancel }) => {
       options: referenceSchema ? (0, import_schema.getSchemaProperties)(referenceSchema.ast).sort(import_schema.sortProperties).map((p) => ({
         value: p.name
       })) : []
-    })
+    }),
+    ["options"]: (props2) => /* @__PURE__ */ import_react2.default.createElement(SelectOptionInput, props2)
   }), [
     t,
     schemas,
@@ -919,7 +1233,7 @@ var FieldEditor = ({ view, projection, field, registry, onSave, onCancel }) => {
       props
     }, {
       F: __dxlog_file3,
-      L: 173,
+      L: 174,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -947,18 +1261,18 @@ var ViewMetaSchema = import_echo_schema7.S.Struct({
   name: import_echo_schema7.S.String.annotations({
     [import_echo_schema7.AST.TitleAnnotationId]: "View"
   }),
-  typename: import_echo_schema7.Format.DXN.annotations({
+  typename: import_echo_schema7.Format.URL.annotations({
     [import_echo_schema7.AST.TitleAnnotationId]: "Typename"
   })
 }).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), [
+  const { t } = (0, import_react_ui10.useTranslation)(translationKey);
+  const projection = (0, import_react14.useMemo)(() => new import_schema5.ViewProjection(schema, view), [
     schema,
     view
   ]);
-  const [field, setField] = (0, import_react13.useState)();
-  const viewValues = (0, import_react13.useMemo)(() => {
+  const [field, setField] = (0, import_react14.useState)();
+  const viewValues = (0, import_react14.useMemo)(() => {
     return {
       name: view.name,
       // TODO(burdon): Need to warn user of possible consequences of editing.
@@ -968,7 +1282,7 @@ var ViewEditor = ({ classNames, schema, view, registry, readonly, showHeading =
   }, [
     view
   ]);
-  const handleViewUpdate = (0, import_react13.useCallback)(({ name, typename }) => {
+  const handleViewUpdate = (0, import_react14.useCallback)(({ name, typename }) => {
     requestAnimationFrame(() => {
       if (view.name !== name) {
         view.name = name;
@@ -982,67 +1296,71 @@ var ViewEditor = ({ classNames, schema, view, registry, readonly, showHeading =
     schema,
     onTypenameChanged
   ]);
-  const handleSelect = (0, import_react13.useCallback)((field2) => {
+  const handleSelect = (0, import_react14.useCallback)((field2) => {
     setField((f) => f === field2 ? void 0 : field2);
   }, []);
-  const handleAdd = (0, import_react13.useCallback)(() => {
+  const handleAdd = (0, import_react14.useCallback)(() => {
     const field2 = projection.createFieldProjection();
     setField(field2);
   }, [
     view
   ]);
-  const handleMove = (0, import_react13.useCallback)((fromIndex, toIndex) => {
-    (0, import_util4.arrayMove)(view.fields, fromIndex, toIndex);
+  const handleMove = (0, import_react14.useCallback)((fromIndex, toIndex) => {
+    const fields = [
+      ...view.fields
+    ];
+    const [moved] = fields.splice(fromIndex, 1);
+    fields.splice(toIndex, 0, moved);
+    view.fields = fields;
   }, [
     view.fields
   ]);
-  const handleClose = (0, import_react13.useCallback)(() => setField(void 0), []);
-  return /* @__PURE__ */ import_react13.default.createElement("div", {
+  const handleClose = (0, import_react14.useCallback)(() => setField(void 0), []);
+  return /* @__PURE__ */ import_react14.default.createElement("div", {
     role: "none",
-    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,
+    className: (0, import_react_ui_theme9.mx)("flex flex-col w-full divide-y divide-separator", classNames)
+  }, /* @__PURE__ */ import_react14.default.createElement(Form, {
     autoSave: true,
     schema: ViewMetaSchema,
     values: viewValues,
     onSave: handleViewUpdate
-  }), /* @__PURE__ */ import_react13.default.createElement("div", null, /* @__PURE__ */ import_react13.default.createElement("div", {
+  }), /* @__PURE__ */ import_react14.default.createElement("div", null, /* @__PURE__ */ import_react14.default.createElement("div", {
     role: "none",
     className: "p-2"
-  }, /* @__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, {
+  }, /* @__PURE__ */ import_react14.default.createElement("label", {
+    className: (0, import_react_ui_theme9.mx)(import_react_ui_theme9.inputTextLabel)
+  }, t("fields label"))), /* @__PURE__ */ import_react14.default.createElement(import_react_ui_list2.List.Root, {
     items: view.fields,
     isItem: import_echo_schema7.S.is(import_schema5.FieldSchema),
     getId: (field2) => field2.id,
     onMove: handleMove
-  }, ({ items: fields }) => /* @__PURE__ */ import_react13.default.createElement(import_react13.default.Fragment, null, showHeading && /* @__PURE__ */ import_react13.default.createElement("div", {
+  }, ({ items: fields }) => /* @__PURE__ */ import_react14.default.createElement(import_react14.default.Fragment, null, showHeading && /* @__PURE__ */ import_react14.default.createElement("div", {
     role: "heading",
     className: grid
-  }, /* @__PURE__ */ import_react13.default.createElement("div", null), /* @__PURE__ */ import_react13.default.createElement("div", {
+  }, /* @__PURE__ */ import_react14.default.createElement("div", null), /* @__PURE__ */ import_react14.default.createElement("div", {
     className: "flex items-center text-sm"
-  }, t("field path label"))), /* @__PURE__ */ import_react13.default.createElement("div", {
+  }, t("field path label"))), /* @__PURE__ */ import_react14.default.createElement("div", {
     role: "list",
     className: "flex flex-col w-full"
-  }, fields?.map((field2) => /* @__PURE__ */ import_react13.default.createElement(import_react_ui_list.List.Item, {
+  }, fields?.map((field2) => /* @__PURE__ */ import_react14.default.createElement(import_react_ui_list2.List.Item, {
     key: field2.id,
     item: field2,
-    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, {
+    classNames: (0, import_react_ui_theme9.mx)(grid, import_react_ui_theme9.ghostHover, "cursor-pointer")
+  }, /* @__PURE__ */ import_react14.default.createElement(import_react_ui_list2.List.ItemDragHandle, null), /* @__PURE__ */ import_react14.default.createElement(import_react_ui_list2.List.ItemTitle, {
     onClick: () => handleSelect(field2)
-  }, field2.path), /* @__PURE__ */ import_react13.default.createElement(import_react_ui_list.List.ItemDeleteButton, {
+  }, field2.path), /* @__PURE__ */ import_react14.default.createElement(import_react_ui_list2.List.ItemDeleteButton, {
     disabled: view.fields.length <= 1,
     onClick: () => onDelete(field2.id)
-  }))))))), field && /* @__PURE__ */ import_react13.default.createElement(FieldEditor, {
+  }))))))), field && /* @__PURE__ */ import_react14.default.createElement(FieldEditor, {
     key: field.id,
     view,
     projection,
     field,
     registry,
     onSave: handleClose
-  }), !readonly && !field && /* @__PURE__ */ import_react13.default.createElement("div", {
+  }), !readonly && !field && /* @__PURE__ */ import_react14.default.createElement("div", {
     className: "flex p-2 justify-center"
-  }, /* @__PURE__ */ import_react13.default.createElement(import_react_ui9.IconButton, {
+  }, /* @__PURE__ */ import_react14.default.createElement(import_react_ui10.IconButton, {
     icon: "ph--plus--regular",
     label: t("button add property"),
     onClick: handleAdd,
@@ -1267,13 +1585,16 @@ var formatForEditing = ({ type, format, value, locale = void 0 }) => {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   BooleanInput,
+  DeprecatedFormContainer,
   DeprecatedFormInput,
   FieldEditor,
   Form,
   GeoPointInput,
   InputHeader,
+  MarkdownInput,
   NumberInput,
   SelectInput,
+  SelectOptionInput,
   TextInput,
   TupleInput,
   ViewEditor,
@@ -1284,6 +1605,7 @@ var formatForEditing = ({ type, format, value, locale = void 0 }) => {
   parseValue,
   pathNotUniqueError,
   translations,
-  useForm
+  useForm,
+  useFormValues
 });
 //# sourceMappingURL=index.cjs.map