@dxos/react-ui-form 0.8.4-main.3f58842 → 0.8.4-main.406dc2a

package/dist/lib/browser/index.mjs

@@ -18,6 +18,12 @@ var translations = [
         "field limit reached": "Maximum number of fields reached",
         "boolean input true value": "Yes",
         "boolean input false value": "No",
+        "show field label": "Show field",
+        "hide field label": "Hide field",
+        "delete field label": "Delete field",
+        "ref field combobox input placeholder": "Search\u2026",
+        "ref field placeholder_one": "Select\u2026",
+        "ref field placeholder_other": "Select items\u2026",
         // TODO(burdon): Factor out?
         "button cancel": "Cancel",
         "button save": "Save",
@@ -34,7 +40,7 @@ var translations = [
         "format hostname": "Hostname",
         "format integer": "Integer",
         "format json": "JSON",
-        "format latlng": "Geopoint",
+        "format lnglat": "Geopoint",
         "format markdown": "Markdown",
         "format percent": "Percent",
         "format ref": "Reference",
@@ -50,9 +56,9 @@ var translations = [
         "format uri": "URI",
         "format url": "URL",
         "format uuid": "UUID",
-        // Placeholders.
-        "placeholder latitude": "Latitude",
-        "placeholder longitude": "Longitude",
+        // GeoPointInput.
+        "latitude label": "Latitude",
+        "longitude label": "Longitude",
         // SelectOptionsInput.
         "select option label": "Label",
         "select option label placeholder": "Option label",
@@ -60,86 +66,38 @@ var translations = [
         "select option delete": "Delete",
         "select option add": "Add option",
         // System schema message.
-        "system schema title": "System Schema",
-        "system schema description": "This is a system schema and cannot be modified."
+        "system schema title": "System record type",
+        "system schema description": "This is a system record type and cannot be modified, though the view can still be configured."
       }
     }
   }
 ];
 
-// src/components/deprecated/FormInput.tsx
+// src/components/ControlSection/ControlSection.tsx
 import { useSignals as _useSignals } from "@preact-signals/safe-react/tracking";
 import React from "react";
-import { Input } from "@dxos/react-ui";
-import { mx, textBlockWidth } from "@dxos/react-ui-theme";
-var DeprecatedFormContainer = ({ children, classNames }) => {
-  var _effect = _useSignals();
-  try {
-    return /* @__PURE__ */ React.createElement("div", {
-      role: "none",
-      className: "container-max-width p-4 justify-center overflow-x-hidden overflow-y-auto"
-    }, /* @__PURE__ */ React.createElement("div", {
-      role: "form",
-      className: mx("flex flex-col", textBlockWidth, classNames)
-    }, children));
-  } finally {
-    _effect.f();
-  }
-};
-var DeprecatedFormInput = ({ label, description, secondary, children }) => {
+import { Button, Input, toLocalizedString, useTranslation } from "@dxos/react-ui";
+import { StackItem } from "@dxos/react-ui-stack";
+import { mx } from "@dxos/react-ui-theme";
+var ControlPage = ({ children, classNames, ...props }) => {
   var _effect = _useSignals();
   try {
-    const primary = /* @__PURE__ */ React.createElement("div", {
-      role: "none",
-      className: "flex w-full gap-4 py-1"
-    }, /* @__PURE__ */ React.createElement(Input.Root, null, /* @__PURE__ */ React.createElement("div", {
-      role: "none",
-      className: "flex flex-col w-full"
-    }, /* @__PURE__ */ React.createElement(Input.Label, {
-      classNames: "flex min-bs-[--rail-action] items-center",
-      style: {
-        fontSize: "unset"
-      }
-    }, label), description && /* @__PURE__ */ React.createElement(Input.DescriptionAndValidation, {
-      classNames: "mbs-0.5"
-    }, /* @__PURE__ */ React.createElement(Input.Description, null, description))), /* @__PURE__ */ React.createElement("div", {
-      role: "none"
+    return /* @__PURE__ */ React.createElement(StackItem.Content, {
+      scrollable: true,
+      classNames: "[--control-spacing:var(--dx-trimMd)]"
     }, /* @__PURE__ */ React.createElement("div", {
       role: "none",
-      className: "flex min-bs-[--rail-action] items-center"
-    }, children))));
-    if (secondary) {
-      return /* @__PURE__ */ React.createElement("div", {
-        role: "none"
-      }, primary, secondary);
-    }
-    return primary;
-  } finally {
-    _effect.f();
-  }
-};
-
-// src/components/ControlSection/ControlSection.tsx
-import { useSignals as _useSignals2 } from "@preact-signals/safe-react/tracking";
-import React2 from "react";
-import { Button, Input as Input2, toLocalizedString, useTranslation } from "@dxos/react-ui";
-import { mx as mx2 } from "@dxos/react-ui-theme";
-var ControlPage = ({ children, classNames, ...props }) => {
-  var _effect = _useSignals2();
-  try {
-    return /* @__PURE__ */ React2.createElement("div", {
-      role: "none",
-      className: mx2("pli-cardSpacingInline", classNames),
+      className: mx("pli-cardSpacingInline pbe-trimLg", classNames),
       ...props
-    }, children);
+    }, children));
   } finally {
     _effect.f();
   }
 };
 var ControlSection = ({ title, description, children }) => {
-  var _effect = _useSignals2();
+  var _effect = _useSignals();
   try {
-    return /* @__PURE__ */ React2.createElement(React2.Fragment, null, /* @__PURE__ */ React2.createElement(ControlSectionHeading, {
+    return /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(ControlSectionHeading, {
       title,
       description
     }), children);
@@ -148,12 +106,12 @@ var ControlSection = ({ title, description, children }) => {
   }
 };
 var ControlSectionHeading = ({ title, description }) => {
-  var _effect = _useSignals2();
+  var _effect = _useSignals();
   try {
     const { t } = useTranslation(translationKey);
-    return /* @__PURE__ */ React2.createElement(React2.Fragment, null, /* @__PURE__ */ React2.createElement("h2", {
+    return /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement("h2", {
       className: "pli-trimMd container-max-width text-xl mbs-trimLg mbe-trimMd"
-    }, toLocalizedString(title, t)), description && /* @__PURE__ */ React2.createElement("p", {
+    }, toLocalizedString(title, t)), description && /* @__PURE__ */ React.createElement("p", {
       className: "pli-trimMd mlb-trimMd container-max-width text-description"
     }, toLocalizedString(description, t)));
   } finally {
@@ -161,9 +119,9 @@ var ControlSectionHeading = ({ title, description }) => {
   }
 };
 var ControlGroupButton = ({ classNames, ...props }) => {
-  var _effect = _useSignals2();
+  var _effect = _useSignals();
   try {
-    return /* @__PURE__ */ React2.createElement(Button, {
+    return /* @__PURE__ */ React.createElement(Button, {
       ...props,
       classNames: [
         "md:col-span-2",
@@ -175,41 +133,46 @@ var ControlGroupButton = ({ classNames, ...props }) => {
   }
 };
 var ControlGroup = ({ children, classNames }) => {
-  var _effect = _useSignals2();
+  var _effect = _useSignals();
   try {
-    return /* @__PURE__ */ React2.createElement("div", {
+    return /* @__PURE__ */ React.createElement("div", {
       role: "none",
-      className: mx2("group container-max-width grid grid-cols-1 md:grid-cols-[1fr_min-content] gap-trimMd", classNames)
+      className: mx("group container-max-width grid grid-cols-1 md:grid-cols-[1fr_min-content] gap-trimMd", "[--control-spacing:0px] [&_input]:justify-self-end [&_button]:justify-self-end", classNames)
     }, children);
   } finally {
     _effect.f();
   }
 };
 var ControlFrame = ({ children }) => {
-  var _effect = _useSignals2();
+  var _effect = _useSignals();
   try {
-    return /* @__PURE__ */ React2.createElement("div", {
+    return /* @__PURE__ */ React.createElement("div", {
       role: "none",
-      className: "p-trimMd container-max-width grid grid-cols-1 md:grid-cols-[1fr_1fr] gap-trimSm md:gap-trimMd border border-separator rounded-md"
+      className: mx("container-max-width grid grid-cols-1 md:grid-cols-[1fr_1fr] gap-trimSm md:gap-trimMd p-trimMd", "border border-separator rounded-md")
     }, children);
   } finally {
     _effect.f();
   }
 };
-var controlItemClasses = "pli-trimMd plb-trimMd container-max-width grid md:col-span-2 grid-cols-subgrid items-center gap-trimSm border border-separator rounded-md *:first:!mbs-0 *:last:!mbe-0";
-var controlItemTitleClasses = "text-lg font-normal";
-var controlItemDescriptionClasses = "text-base mlb-trimSm md:mbe-0 text-description";
+var controlItemClasses = mx([
+  "container-max-width grid md:col-span-2 grid-cols-subgrid gap-trimSm items-center",
+  // TODO(burdon): Use grid gap consistently or apply margins consistently?
+  "mlb-[--control-spacing] *:first:!mbs-0 *:last:!mbe-0 pli-trimMd plb-trimMd",
+  "border border-separator rounded-md"
+]);
+var controlItemTitleClasses = "mbe-0 text-lg text-baseText font-normal";
+var controlItemDescriptionClasses = "mlb-trimSm md:mbe-0 text-base text-description";
 var ControlItem = ({ title, description, children }) => {
-  var _effect = _useSignals2();
+  var _effect = _useSignals();
   try {
     const { t } = useTranslation(translationKey);
-    return /* @__PURE__ */ React2.createElement("div", {
+    return /* @__PURE__ */ React.createElement("div", {
       className: controlItemClasses
-    }, /* @__PURE__ */ React2.createElement("div", {
+    }, /* @__PURE__ */ React.createElement("div", {
       role: "none"
-    }, /* @__PURE__ */ React2.createElement("h3", {
+    }, /* @__PURE__ */ React.createElement("h3", {
       className: controlItemTitleClasses
-    }, toLocalizedString(title, t)), description && /* @__PURE__ */ React2.createElement("p", {
+    }, toLocalizedString(title, t)), description && /* @__PURE__ */ React.createElement("p", {
       className: controlItemDescriptionClasses
     }, toLocalizedString(description, t))), children);
   } finally {
@@ -217,16 +180,16 @@ var ControlItem = ({ title, description, children }) => {
   }
 };
 var ControlItemInput = ({ title, description, children }) => {
-  var _effect = _useSignals2();
+  var _effect = _useSignals();
   try {
     const { t } = useTranslation(translationKey);
-    return /* @__PURE__ */ React2.createElement(Input2.Root, null, /* @__PURE__ */ React2.createElement("div", {
+    return /* @__PURE__ */ React.createElement(Input.Root, null, /* @__PURE__ */ React.createElement("div", {
       className: controlItemClasses
-    }, /* @__PURE__ */ React2.createElement("div", {
+    }, /* @__PURE__ */ React.createElement("div", {
       role: "none"
-    }, /* @__PURE__ */ React2.createElement(Input2.Label, {
+    }, /* @__PURE__ */ React.createElement(Input.Label, {
       classNames: controlItemTitleClasses
-    }, toLocalizedString(title, t)), description && /* @__PURE__ */ React2.createElement(Input2.DescriptionAndValidation, null, /* @__PURE__ */ React2.createElement(Input2.Description, {
+    }, toLocalizedString(title, t)), description && /* @__PURE__ */ React.createElement(Input.DescriptionAndValidation, null, /* @__PURE__ */ React.createElement(Input.Description, {
       classNames: controlItemDescriptionClasses
     }, toLocalizedString(description, t)))), children));
   } finally {
@@ -234,15 +197,15 @@ var ControlItemInput = ({ title, description, children }) => {
   }
 };
 var ControlFrameItem = ({ title, description, children }) => {
-  var _effect = _useSignals2();
+  var _effect = _useSignals();
   try {
     const { t } = useTranslation(translationKey);
-    return /* @__PURE__ */ React2.createElement("div", {
+    return /* @__PURE__ */ React.createElement("div", {
       role: "group",
       className: "min-is-0"
-    }, /* @__PURE__ */ React2.createElement("h3", {
+    }, /* @__PURE__ */ React.createElement("h3", {
       className: "text-lg mbe-2"
-    }, toLocalizedString(title, t)), description && /* @__PURE__ */ React2.createElement("p", {
+    }, toLocalizedString(title, t)), description && /* @__PURE__ */ React.createElement("p", {
       className: "mlb-trimSm md:mbe-0 text-description"
     }, toLocalizedString(description, t)), children);
   } finally {
@@ -252,40 +215,40 @@ var ControlFrameItem = ({ title, description, children }) => {
 
 // src/components/FieldEditor/FieldEditor.tsx
 import { useSignals as _useSignals14 } from "@preact-signals/safe-react/tracking";
-import React14, { useCallback as useCallback9, useEffect as useEffect8, useMemo as useMemo7, useState as useState5 } from "react";
-import { FormatEnum as FormatEnum5, FormatEnums, formatToType } from "@dxos/echo-schema";
+import React14, { useCallback as useCallback12, useEffect as useEffect8, useMemo as useMemo7, useState as useState6 } from "react";
+import { FormatEnum as FormatEnum5, FormatEnums, formatToType } from "@dxos/echo/internal";
 import { log as log3 } from "@dxos/log";
-import { useTranslation as useTranslation8 } from "@dxos/react-ui";
-import { getFormatSchema, getSchemaProperties as getSchemaProperties3, sortProperties } from "@dxos/schema";
+import { useAsyncEffect, useTranslation as useTranslation9 } from "@dxos/react-ui";
+import { formatToAdditionalPropertyAttributes, getFormatSchema, getSchemaProperties as getSchemaProperties3, sortProperties } from "@dxos/schema";
 
 // src/components/Form/custom/GeoPointInput.tsx
-import { useSignals as _useSignals4 } from "@preact-signals/safe-react/tracking";
-import React4, { useCallback, useState, useEffect, useMemo } from "react";
-import { GeoLocation } from "@dxos/echo-schema";
-import { Input as Input4, useTranslation as useTranslation2 } from "@dxos/react-ui";
+import { useSignals as _useSignals3 } from "@preact-signals/safe-react/tracking";
+import React3, { useCallback, useEffect, useMemo, useState } from "react";
+import { GeoLocation } from "@dxos/echo/internal";
+import { Input as Input3, useTranslation as useTranslation2 } from "@dxos/react-ui";
 import { safeParseFloat } from "@dxos/util";
 
 // src/components/Form/Input.tsx
-import { useSignals as _useSignals3 } from "@preact-signals/safe-react/tracking";
-import React3 from "react";
-import { Icon, Input as Input3, Tooltip } from "@dxos/react-ui";
+import { useSignals as _useSignals2 } from "@preact-signals/safe-react/tracking";
+import React2 from "react";
+import { Icon, Input as Input2, Tooltip } from "@dxos/react-ui";
 import { labelSpacing } from "@dxos/react-ui-stack";
-import { errorText, mx as mx3 } from "@dxos/react-ui-theme";
+import { errorText, mx as mx2 } from "@dxos/react-ui-theme";
 var InputHeader = ({ error, label, readonly }) => {
-  var _effect = _useSignals3();
+  var _effect = _useSignals2();
   try {
-    const Label = readonly ? "span" : Input3.Label;
+    const Label = readonly ? "span" : Input2.Label;
     const labelProps = readonly ? {} : {
       classNames: "!mlb-0"
     };
-    return /* @__PURE__ */ React3.createElement("div", {
+    return /* @__PURE__ */ React2.createElement("div", {
       role: "none",
-      className: mx3("flex justify-between items-center", labelSpacing)
-    }, /* @__PURE__ */ React3.createElement(Label, labelProps, label), error && /* @__PURE__ */ React3.createElement(Tooltip.Trigger, {
+      className: mx2("flex justify-between items-center", labelSpacing)
+    }, /* @__PURE__ */ React2.createElement(Label, labelProps, label), error && /* @__PURE__ */ React2.createElement(Tooltip.Trigger, {
       asChild: true,
       content: error,
       side: "bottom"
-    }, /* @__PURE__ */ React3.createElement(Icon, {
+    }, /* @__PURE__ */ React2.createElement(Icon, {
       icon: "ph--warning--regular",
       size: 4,
       classNames: errorText
@@ -296,8 +259,8 @@ var InputHeader = ({ error, label, readonly }) => {
 };
 
 // src/components/Form/custom/GeoPointInput.tsx
-var GeoPointInput = ({ type, label, disabled, getStatus, getValue: getValue3, onValueChange, onBlur }) => {
-  var _effect = _useSignals4();
+var GeoPointInput = ({ type, label, readonly, getStatus, getValue: getValue3, onValueChange, onBlur }) => {
+  var _effect = _useSignals3();
   try {
     const { t } = useTranslation2(translationKey);
     const { status, error } = getStatus();
@@ -342,46 +305,52 @@ var GeoPointInput = ({ type, label, disabled, getStatus, getValue: getValue3, on
       onValueChange,
       type
     ]);
-    return /* @__PURE__ */ React4.createElement(Input4.Root, {
+    return /* @__PURE__ */ React3.createElement(Input3.Root, {
       validationValence: status
-    }, /* @__PURE__ */ React4.createElement(InputHeader, {
+    }, /* @__PURE__ */ React3.createElement(InputHeader, {
       error,
       label
-    }), /* @__PURE__ */ React4.createElement("div", {
+    }), /* @__PURE__ */ React3.createElement("div", {
       role: "none",
       className: "grid grid-cols-2 gap-2"
-    }, /* @__PURE__ */ React4.createElement(Input4.TextInput, {
-      type: "text",
-      pattern: "^-?[0-9]*\\.?[0-9]*$",
-      disabled,
-      placeholder: t("placeholder latitude"),
+    }, /* @__PURE__ */ React3.createElement("div", {
+      role: "none"
+    }, /* @__PURE__ */ React3.createElement(Input3.Label, null, t("latitude label")), /* @__PURE__ */ React3.createElement(Input3.TextInput, {
+      type: "number",
+      step: "0.00001",
+      min: "-90",
+      max: "90",
+      disabled: !!readonly,
       value: latitudeText,
       onChange: handleCoordinateChange("latitude", setLatitudeText),
       onBlur
-    }), /* @__PURE__ */ React4.createElement(Input4.TextInput, {
-      type: "text",
-      pattern: "^-?[0-9]*\\.?[0-9]*$",
-      disabled,
-      placeholder: t("placeholder longitude"),
+    })), /* @__PURE__ */ React3.createElement("div", {
+      role: "none"
+    }, /* @__PURE__ */ React3.createElement(Input3.Label, null, t("longitude label")), /* @__PURE__ */ React3.createElement(Input3.TextInput, {
+      type: "number",
+      step: "0.00001",
+      min: "-180",
+      max: "180",
+      disabled: !!readonly,
       value: longitudeText,
       onChange: handleCoordinateChange("longitude", setLongitudeText),
       onBlur
-    })));
+    }))));
   } finally {
     _effect.f();
   }
 };
 
 // src/components/Form/custom/SelectOptionsInput.tsx
-import { useSignals as _useSignals5 } from "@preact-signals/safe-react/tracking";
-import React5, { useCallback as useCallback2, useEffect as useEffect2, useState as useState2, useRef } from "react";
+import { useSignals as _useSignals4 } from "@preact-signals/safe-react/tracking";
+import React4, { useCallback as useCallback2, useEffect as useEffect2, useRef, useState as useState2 } from "react";
 import { PublicKey } from "@dxos/keys";
-import { Icon as Icon2, IconButton, Input as Input5, Tag, Toolbar, useTranslation as useTranslation3 } from "@dxos/react-ui";
+import { IconButton, Input as Input4, Tag, useTranslation as useTranslation3 } from "@dxos/react-ui";
 import { List } from "@dxos/react-ui-list";
 import { HuePicker } from "@dxos/react-ui-pickers";
-import { hues, mx as mx4 } from "@dxos/react-ui-theme";
-var SelectOptionInput = ({ type, label, disabled, getStatus, getValue: getValue3, onValueChange }) => {
-  var _effect = _useSignals5();
+import { hues, subtleHover } from "@dxos/react-ui-theme";
+var SelectOptionInput = ({ type, label, readonly, getStatus, getValue: getValue3, onValueChange }) => {
+  var _effect = _useSignals4();
   try {
     const [selected, setSelectedId] = useState2(null);
     const [isNewOption, setIsNewOption] = useState2(false);
@@ -489,49 +458,56 @@ var SelectOptionInput = ({ type, label, disabled, getStatus, getValue: getValue3
       selected,
       isNewOption
     ]);
-    return /* @__PURE__ */ React5.createElement(Input5.Root, {
+    return /* @__PURE__ */ React4.createElement(Input4.Root, {
       validationValence: status
-    }, /* @__PURE__ */ React5.createElement(InputHeader, {
+    }, /* @__PURE__ */ React4.createElement(InputHeader, {
       error,
       label
-    }), /* @__PURE__ */ React5.createElement("div", {
+    }), /* @__PURE__ */ React4.createElement("div", {
       role: "none"
-    }, options && /* @__PURE__ */ React5.createElement(List.Root, {
+    }, options && /* @__PURE__ */ React4.createElement(List.Root, {
       items: options,
       isItem: (item) => true,
-      onMove: handleMove
-    }, ({ items }) => /* @__PURE__ */ React5.createElement("div", {
+      onMove: readonly ? void 0 : handleMove,
+      readonly: !!readonly
+    }, ({ items }) => /* @__PURE__ */ React4.createElement("div", {
       role: "list",
       className: "w-full overflow-auto"
-    }, items?.map((item) => /* @__PURE__ */ React5.createElement("div", {
+    }, items?.map((item) => /* @__PURE__ */ React4.createElement("div", {
       key: item.id
-    }, /* @__PURE__ */ React5.createElement(List.Item, {
+    }, /* @__PURE__ */ React4.createElement(List.Item, {
       role: "button",
       item,
       classNames: [
-        "p-1 plb-2",
-        "flex flex-col",
-        "cursor-pointer",
-        "hover:bg-hoverOverlay"
+        subtleHover,
+        "flex flex-col cursor-pointer rounded-sm"
       ],
       "aria-expanded": selected === item.id
-    }, /* @__PURE__ */ React5.createElement("div", {
+    }, /* @__PURE__ */ React4.createElement("div", {
       className: "flex items-center"
-    }, /* @__PURE__ */ React5.createElement(List.ItemDragHandle, null), /* @__PURE__ */ React5.createElement(List.ItemTitle, {
+    }, /* @__PURE__ */ React4.createElement(List.ItemDragHandle, {
+      disabled: !!readonly
+    }), /* @__PURE__ */ React4.createElement(List.ItemTitle, {
       onClick: () => handleClick(item.id),
       classNames: "flex-1"
-    }, /* @__PURE__ */ React5.createElement(Tag, {
+    }, /* @__PURE__ */ React4.createElement(Tag, {
       palette: item.color
-    }, item.title || "\u200B")), /* @__PURE__ */ React5.createElement(Icon2, {
+    }, item.title || "\u200B")), /* @__PURE__ */ React4.createElement(IconButton, {
+      iconOnly: true,
+      variant: "ghost",
+      label: t(selected === item.id ? "collapse label" : "expand label", {
+        ns: "os"
+      }),
       icon: selected === item.id ? "ph--caret-down--regular" : "ph--caret-right--regular",
       onClick: () => handleClick(item.id)
-    })), selected === item.id && /* @__PURE__ */ React5.createElement("div", {
-      className: "mis-4 mbs-2 flex flex-col gap-1"
-    }, /* @__PURE__ */ React5.createElement(Input5.Label, {
+    })), selected === item.id && /* @__PURE__ */ React4.createElement("div", {
+      className: "pli-cardSpacingInline plb-cardSpacingBlock flex flex-col gap-1 density-fine"
+    }, /* @__PURE__ */ React4.createElement(Input4.Label, {
       classNames: "text-xs"
-    }, t("select option label")), /* @__PURE__ */ React5.createElement("div", {
-      className: "flex flex-row items-center gap-1"
-    }, /* @__PURE__ */ React5.createElement(Input5.TextInput, {
+    }, t("select option label")), /* @__PURE__ */ React4.createElement("div", {
+      className: "grid grid-cols-[1fr_min-content_min-content] gap-1"
+    }, /* @__PURE__ */ React4.createElement(Input4.TextInput, {
+      disabled: !!readonly,
       placeholder: t("select option label placeholder"),
       ref: selected === item.id ? inputRef : void 0,
       value: item.title,
@@ -539,40 +515,34 @@ var SelectOptionInput = ({ type, label, disabled, getStatus, getValue: getValue3
       onKeyDown: handleKeyDown,
       classNames: "flex-1",
       "data-no-submit": true
-    }), /* @__PURE__ */ React5.createElement(Toolbar.Root, {
-      classNames: "p-0 m-0 !is-auto"
-    }, /* @__PURE__ */ React5.createElement(HuePicker, {
+    }), /* @__PURE__ */ React4.createElement(HuePicker, {
+      disabled: !!readonly,
       value: item.color,
-      onChange: handleColorChange(item.id),
-      rootVariant: "toolbar-button"
-    })), /* @__PURE__ */ React5.createElement(IconButton, {
+      onChange: handleColorChange(item.id)
+    }), /* @__PURE__ */ React4.createElement(IconButton, {
+      disabled: !!readonly,
       icon: "ph--trash--fill",
       iconOnly: true,
       label: t("select option delete"),
       onClick: () => handleDelete(item.id)
-    })))))), /* @__PURE__ */ React5.createElement("div", {
-      role: "listitem"
-    }, /* @__PURE__ */ React5.createElement("div", {
-      role: "button",
-      className: mx4("p-1 plb-2", "flex flex-col", "cursor-pointer", "hover:bg-hoverOverlay"),
-      onClick: handleAdd
-    }, /* @__PURE__ */ React5.createElement("div", {
-      className: "flex items-center gap-1"
-    }, /* @__PURE__ */ React5.createElement(Icon2, {
-      icon: "ph--plus--regular"
-    }), /* @__PURE__ */ React5.createElement("span", {
-      className: "text-sm"
-    }, t("select option add")))))))));
+    })))))), /* @__PURE__ */ React4.createElement(IconButton, {
+      variant: "ghost",
+      icon: "ph--plus--regular",
+      label: t("select option add"),
+      onClick: handleAdd,
+      disabled: !!readonly,
+      classNames: "is-full"
+    })))));
   } finally {
     _effect.f();
   }
 };
 
 // src/components/Form/custom/TupleInput.tsx
-import { useSignals as _useSignals6 } from "@preact-signals/safe-react/tracking";
-import React6 from "react";
-import { Input as Input6 } from "@dxos/react-ui";
-import { mx as mx5 } from "@dxos/react-ui-theme";
+import { useSignals as _useSignals5 } from "@preact-signals/safe-react/tracking";
+import React5 from "react";
+import { Input as Input5 } from "@dxos/react-ui";
+import { mx as mx3 } from "@dxos/react-ui-theme";
 import { safeParseFloat as safeParseFloat2 } from "@dxos/util";
 var gridCols = [
   "grid-cols-1",
@@ -580,22 +550,22 @@ var gridCols = [
   "grid-cols-3",
   "grid-cols-4"
 ];
-var TupleInput = ({ binding, type, label, disabled, getStatus, getValue: getValue3, onValueChange, onBlur }) => {
-  var _effect = _useSignals6();
+var TupleInput = ({ binding, type, label, readonly, getStatus, getValue: getValue3, onValueChange, onBlur }) => {
+  var _effect = _useSignals5();
   try {
     const { status, error } = getStatus();
     const values = getValue3() ?? {};
-    return /* @__PURE__ */ React6.createElement(Input6.Root, {
+    return /* @__PURE__ */ React5.createElement(Input5.Root, {
       validationValence: status
-    }, /* @__PURE__ */ React6.createElement(InputHeader, {
+    }, /* @__PURE__ */ React5.createElement(InputHeader, {
       error,
       label
-    }), /* @__PURE__ */ React6.createElement("div", {
-      className: mx5("grid gap-2", gridCols[binding.length - 1])
-    }, binding.map((prop) => /* @__PURE__ */ React6.createElement(Input6.TextInput, {
+    }), /* @__PURE__ */ React5.createElement("div", {
+      className: mx3("grid gap-2", gridCols[binding.length - 1])
+    }, binding.map((prop) => /* @__PURE__ */ React5.createElement(Input5.TextInput, {
       key: prop,
       type: "number",
-      disabled,
+      disabled: !!readonly,
       value: values[prop],
       onChange: (event) => onValueChange(type, {
         ...values,
@@ -609,103 +579,104 @@ var TupleInput = ({ binding, type, label, disabled, getStatus, getValue: getValu
 };
 
 // src/components/Form/Defaults.tsx
-import { useSignals as _useSignals7 } from "@preact-signals/safe-react/tracking";
-import React7, { useCallback as useCallback3, useEffect as useEffect3, useRef as useRef2 } from "react";
-import { Input as Input7, Select, useTranslation as useTranslation4 } from "@dxos/react-ui";
-var TextInput = ({ type, label, inputOnly, disabled, placeholder, getStatus, getValue: getValue3, onValueChange, onBlur }) => {
-  var _effect = _useSignals7();
+import { useSignals as _useSignals6 } from "@preact-signals/safe-react/tracking";
+import React6, { useCallback as useCallback3, useEffect as useEffect3, useRef as useRef2 } from "react";
+import { Input as Input6, Select, useTranslation as useTranslation4 } from "@dxos/react-ui";
+var TextInput = ({ type, label, inputOnly, readonly, placeholder, getStatus, getValue: getValue3, onValueChange, onBlur }) => {
+  var _effect = _useSignals6();
   try {
     const { status, error } = getStatus();
-    return disabled && !getValue3() ? null : disabled && inputOnly ? /* @__PURE__ */ React7.createElement("p", null, getValue3() ?? "") : /* @__PURE__ */ React7.createElement(Input7.Root, {
+    return readonly && !getValue3() ? null : readonly === "static" && inputOnly ? /* @__PURE__ */ React6.createElement("p", null, getValue3() ?? "") : /* @__PURE__ */ React6.createElement(Input6.Root, {
       validationValence: status
-    }, !inputOnly && /* @__PURE__ */ React7.createElement(InputHeader, {
+    }, !inputOnly && /* @__PURE__ */ React6.createElement(InputHeader, {
       error,
       label
-    }), disabled ? /* @__PURE__ */ React7.createElement("p", null, getValue3() ?? "") : /* @__PURE__ */ React7.createElement(Input7.TextInput, {
-      disabled,
+    }), readonly === "static" ? /* @__PURE__ */ React6.createElement("p", null, getValue3() ?? "") : /* @__PURE__ */ React6.createElement(Input6.TextInput, {
+      disabled: !!readonly,
       placeholder,
       value: getValue3() ?? "",
       onChange: (event) => onValueChange(type, event.target.value),
       onBlur
-    }), inputOnly && /* @__PURE__ */ React7.createElement(Input7.Validation, null, error));
+    }), inputOnly && /* @__PURE__ */ React6.createElement(Input6.Validation, null, error));
   } finally {
     _effect.f();
   }
 };
-var NumberInput = ({ type, label, inputOnly, disabled, placeholder, getStatus, getValue: getValue3, onValueChange, onBlur }) => {
-  var _effect = _useSignals7();
+var NumberInput = ({ type, label, inputOnly, readonly, placeholder, getStatus, getValue: getValue3, onValueChange, onBlur }) => {
+  var _effect = _useSignals6();
   try {
     const { status, error } = getStatus();
-    return disabled && !getValue3() ? null : disabled && inputOnly ? /* @__PURE__ */ React7.createElement("p", null, getValue3() ?? "") : /* @__PURE__ */ React7.createElement(Input7.Root, {
+    return readonly && !getValue3() ? null : readonly === "static" && inputOnly ? /* @__PURE__ */ React6.createElement("p", null, getValue3() ?? "") : /* @__PURE__ */ React6.createElement(Input6.Root, {
       validationValence: status
-    }, !inputOnly && /* @__PURE__ */ React7.createElement(InputHeader, {
+    }, !inputOnly && /* @__PURE__ */ React6.createElement(InputHeader, {
       error,
       label
-    }), disabled ? /* @__PURE__ */ React7.createElement("p", null, getValue3() ?? "") : /* @__PURE__ */ React7.createElement(Input7.TextInput, {
+    }), readonly === "static" ? /* @__PURE__ */ React6.createElement("p", null, getValue3() ?? "") : /* @__PURE__ */ React6.createElement(Input6.TextInput, {
       type: "number",
-      disabled,
+      disabled: !!readonly,
       placeholder,
-      value: getValue3() ?? 0,
+      value: getValue3(),
       onChange: (event) => onValueChange(type, event.target.value),
       onBlur
-    }), inputOnly && /* @__PURE__ */ React7.createElement(Input7.DescriptionAndValidation, null, error));
+    }), inputOnly && /* @__PURE__ */ React6.createElement(Input6.DescriptionAndValidation, null, error));
   } finally {
     _effect.f();
   }
 };
-var BooleanInput = ({ type, label, inputOnly, getStatus, getValue: getValue3, onValueChange, disabled }) => {
-  var _effect = _useSignals7();
+var BooleanInput = ({ type, label, inputOnly, getStatus, getValue: getValue3, onValueChange, readonly }) => {
+  var _effect = _useSignals6();
   try {
     const { status, error } = getStatus();
     const checked = Boolean(getValue3());
     const { t } = useTranslation4(translationKey);
-    return /* @__PURE__ */ React7.createElement(Input7.Root, {
+    return /* @__PURE__ */ React6.createElement(Input6.Root, {
       validationValence: status
-    }, !inputOnly && /* @__PURE__ */ React7.createElement(InputHeader, {
+    }, !inputOnly && /* @__PURE__ */ React6.createElement(InputHeader, {
       error,
       label
-    }), disabled ? /* @__PURE__ */ React7.createElement("p", null, t(checked ? "boolean input true value" : "boolean input false value")) : /* @__PURE__ */ React7.createElement(Input7.Switch, {
+    }), readonly === "static" ? /* @__PURE__ */ React6.createElement("p", null, t(checked ? "boolean input true value" : "boolean input false value")) : /* @__PURE__ */ React6.createElement(Input6.Switch, {
+      disabled: !!readonly,
       checked,
-      onCheckedChange: (value) => onValueChange(type, value)
-    }), inputOnly && /* @__PURE__ */ React7.createElement(Input7.DescriptionAndValidation, null, error));
+      onCheckedChange: (value2) => onValueChange(type, value2)
+    }), inputOnly && /* @__PURE__ */ React6.createElement(Input6.DescriptionAndValidation, null, error));
   } finally {
     _effect.f();
   }
 };
-var SelectInput = ({ type, label, inputOnly, disabled, placeholder, options, getStatus, getValue: getValue3, onValueChange }) => {
-  var _effect = _useSignals7();
+var SelectInput = ({ type, label, inputOnly, readonly, placeholder, options, getStatus, getValue: getValue3, onValueChange }) => {
+  var _effect = _useSignals6();
   try {
     const { status, error } = getStatus();
-    const value = getValue3();
-    const handleValueChange = useCallback3((value2) => onValueChange(type, value2), [
+    const value2 = getValue3();
+    const handleValueChange = useCallback3((value3) => onValueChange(type, value3), [
       type,
       onValueChange
     ]);
-    return disabled && !value ? null : /* @__PURE__ */ React7.createElement(Input7.Root, {
+    return readonly && !value2 ? null : /* @__PURE__ */ React6.createElement(Input6.Root, {
       validationValence: status
-    }, !inputOnly && /* @__PURE__ */ React7.createElement(InputHeader, {
+    }, !inputOnly && /* @__PURE__ */ React6.createElement(InputHeader, {
       error,
       label
-    }), disabled ? /* @__PURE__ */ React7.createElement("p", null, options?.find(({ value: optionValue }) => optionValue === value)?.label ?? String(value)) : /* @__PURE__ */ React7.createElement(Select.Root, {
-      value,
+    }), readonly === "static" ? /* @__PURE__ */ React6.createElement("p", null, options?.find(({ value: optionValue }) => optionValue === value2)?.label ?? String(value2)) : /* @__PURE__ */ React6.createElement(Select.Root, {
+      value: value2,
       onValueChange: handleValueChange
-    }, /* @__PURE__ */ React7.createElement(Select.TriggerButton, {
+    }, /* @__PURE__ */ React6.createElement(Select.TriggerButton, {
       classNames: "is-full",
-      disabled,
+      disabled: !!readonly,
       placeholder
-    }), /* @__PURE__ */ React7.createElement(Select.Portal, null, /* @__PURE__ */ React7.createElement(Select.Content, null, /* @__PURE__ */ React7.createElement(Select.Viewport, null, options?.map(({ value: value2, label: label2 }) => (
+    }), /* @__PURE__ */ React6.createElement(Select.Portal, null, /* @__PURE__ */ React6.createElement(Select.Content, null, /* @__PURE__ */ React6.createElement(Select.Viewport, null, options?.map(({ value: value3, label: label2 }) => (
       // NOTE: Numeric values are converted to and from strings.
-      /* @__PURE__ */ React7.createElement(Select.Option, {
-        key: String(value2),
-        value: String(value2)
-      }, label2 ?? String(value2))
-    )))))), inputOnly && /* @__PURE__ */ React7.createElement(Input7.DescriptionAndValidation, null, error));
+      /* @__PURE__ */ React6.createElement(Select.Option, {
+        key: String(value3),
+        value: String(value3)
+      }, label2 ?? String(value3))
+    ))), /* @__PURE__ */ React6.createElement(Select.Arrow, null)))), inputOnly && /* @__PURE__ */ React6.createElement(Input6.DescriptionAndValidation, null, error));
   } finally {
     _effect.f();
   }
 };
-var MarkdownInput = ({ type, label, inputOnly, disabled, placeholder, getStatus, getValue: getValue3, onValueChange, onBlur }) => {
-  var _effect = _useSignals7();
+var MarkdownInput = ({ type, label, inputOnly, readonly, placeholder, getStatus, getValue: getValue3, onValueChange, onBlur }) => {
+  var _effect = _useSignals6();
   try {
     const { status, error } = getStatus();
     const textareaRef = useRef2(null);
@@ -727,14 +698,14 @@ var MarkdownInput = ({ type, label, inputOnly, disabled, placeholder, getStatus,
       getValue3(),
       adjustHeight
     ]);
-    return /* @__PURE__ */ React7.createElement(Input7.Root, {
+    return /* @__PURE__ */ React6.createElement(Input6.Root, {
       validationValence: status
-    }, !inputOnly && /* @__PURE__ */ React7.createElement(InputHeader, {
+    }, !inputOnly && /* @__PURE__ */ React6.createElement(InputHeader, {
       error,
       label
-    }), disabled ? /* @__PURE__ */ React7.createElement("p", null, getValue3() ?? "") : /* @__PURE__ */ React7.createElement(Input7.TextArea, {
+    }), readonly === "static" ? /* @__PURE__ */ React6.createElement("p", null, getValue3() ?? "") : /* @__PURE__ */ React6.createElement(Input6.TextArea, {
       ref: textareaRef,
-      disabled,
+      disabled: !!readonly,
       placeholder,
       value: getValue3() ?? "",
       classNames: "min-bs-auto max-h-40 overflow-auto",
@@ -744,7 +715,7 @@ var MarkdownInput = ({ type, label, inputOnly, disabled, placeholder, getStatus,
         resize: "none"
       },
       spellCheck: false
-    }), inputOnly && /* @__PURE__ */ React7.createElement(Input7.Validation, null, error));
+    }), inputOnly && /* @__PURE__ */ React6.createElement(Input6.Validation, null, error));
   } finally {
     _effect.f();
   }
@@ -752,27 +723,28 @@ var MarkdownInput = ({ type, label, inputOnly, disabled, placeholder, getStatus,
 
 // src/components/Form/Form.tsx
 import { useSignals as _useSignals13 } from "@preact-signals/safe-react/tracking";
-import React13, { useEffect as useEffect7, useMemo as useMemo6, useRef as useRef3 } from "react";
+import { useFocusFinders } from "@fluentui/react-tabster";
+import React13, { useCallback as useCallback11, useEffect as useEffect7, useRef as useRef3 } from "react";
 import { cardDialogOverflow, cardSpacing as cardSpacing2 } from "@dxos/react-ui-stack";
 
 // src/components/Form/FormActions.tsx
-import { useSignals as _useSignals9 } from "@preact-signals/safe-react/tracking";
-import React9 from "react";
+import { useSignals as _useSignals8 } from "@preact-signals/safe-react/tracking";
+import React8 from "react";
 import { IconButton as IconButton2, useTranslation as useTranslation5 } from "@dxos/react-ui";
 import { cardSpacing } from "@dxos/react-ui-stack";
-import { mx as mx6 } from "@dxos/react-ui-theme";
+import { mx as mx4 } from "@dxos/react-ui-theme";
 
 // src/components/Form/FormContext.tsx
-import { useSignals as _useSignals8 } from "@preact-signals/safe-react/tracking";
-import React8, { createContext, useContext, useEffect as useEffect6, useMemo as useMemo3, useCallback as useCallback6 } from "react";
+import { useSignals as _useSignals7 } from "@preact-signals/safe-react/tracking";
+import React7, { createContext, useCallback as useCallback7, useContext, useEffect as useEffect6, useMemo as useMemo3 } from "react";
 import { raise } from "@dxos/debug";
-import { getValue as getValue2 } from "@dxos/echo-schema";
+import { getValue as getValue2 } from "@dxos/echo/internal";
 import { createJsonPath as createJsonPath2 } from "@dxos/effect";
 
 // src/hooks/useForm.ts
-import { SchemaAST } from "effect";
+import * as SchemaAST from "effect/SchemaAST";
 import { useCallback as useCallback4, useEffect as useEffect4, useMemo as useMemo2, useState as useState3 } from "react";
-import { getValue, setValue } from "@dxos/echo-schema";
+import { getValue, setValue } from "@dxos/echo/internal";
 import { createJsonPath, fromEffectValidationPath } from "@dxos/effect";
 import { invariant } from "@dxos/invariant";
 import { log } from "@dxos/log";
@@ -781,7 +753,7 @@ var __dxlog_file = "/__w/dxos/dxos/packages/ui/react-ui-form/src/hooks/useForm.t
 var useForm = ({ schema, initialValues, onValuesChanged, onValidate, onValid, onSave }) => {
   invariant(SchemaAST.isTypeLiteral(schema.ast), void 0, {
     F: __dxlog_file,
-    L: 93,
+    L: 96,
     S: void 0,
     A: [
       "SchemaAST.isTypeLiteral(schema.ast)",
@@ -875,17 +847,17 @@ var useForm = ({ schema, initialValues, onValuesChanged, onValidate, onValid, on
   }, [
     values
   ]);
-  const onValueChange = useCallback4((path, type, value) => {
+  const onValueChange = useCallback4((path, type, value2) => {
     const jsonPath = createJsonPath(path);
-    let parsedValue = value;
+    let parsedValue = value2;
     try {
       if (type === "number") {
-        parsedValue = parseFloat(value) || 0;
+        parsedValue = parseFloat(value2) || 0;
       }
     } catch (err) {
       log.catch(err, void 0, {
         F: __dxlog_file,
-        L: 213,
+        L: 217,
         S: void 0,
         C: (f, a) => f(...a)
       });
@@ -895,15 +867,16 @@ var useForm = ({ schema, initialValues, onValuesChanged, onValidate, onValid, on
       ...setValue(values, jsonPath, parsedValue)
     };
     setValues(newValues);
-    setChanged((prev) => ({
-      ...prev,
+    const newChanged = {
+      ...changed,
       [jsonPath]: true
-    }));
+    };
+    setChanged(newChanged);
     onValuesChanged?.(newValues);
     const isValid = validate(newValues);
     if (isValid && onValid) {
       onValid(newValues, {
-        changed
+        changed: newChanged
       });
     }
   }, [
@@ -953,10 +926,10 @@ var useForm = ({ schema, initialValues, onValuesChanged, onValidate, onValid, on
     onTouched
   ]);
 };
-var createKeySet = (obj, value) => {
+var createKeySet = (obj, value2) => {
   invariant(obj, void 0, {
     F: __dxlog_file,
-    L: 275,
+    L: 280,
     S: void 0,
     A: [
       "obj",
@@ -965,7 +938,7 @@ var createKeySet = (obj, value) => {
   });
   return Object.keys(obj).reduce((acc, key) => ({
     ...acc,
-    [key]: value
+    [key]: value2
   }), {});
 };
 var flatMap = (errors) => {
@@ -980,7 +953,8 @@ var flatMap = (errors) => {
 
 // src/hooks/useRefQueryLookupHandler.ts
 import { useCallback as useCallback5 } from "react";
-import { getObjectDXN } from "@dxos/echo-schema";
+import { Obj } from "@dxos/echo";
+import { getObjectDXN } from "@dxos/echo/internal";
 import { Filter } from "@dxos/react-client/echo";
 import { isNonNullable } from "@dxos/util";
 var useRefQueryLookupHandler = ({ space }) => {
@@ -997,7 +971,7 @@ var useRefQueryLookupHandler = ({ space }) => {
       }
       const item = {
         dxn,
-        label: object?.name ?? object?.id ?? ""
+        label: Obj.getLabel(object) ?? object?.id ?? ""
       };
       return item;
     }).filter(isNonNullable);
@@ -1007,12 +981,14 @@ var useRefQueryLookupHandler = ({ space }) => {
 };
 
 // src/hooks/useQueryRefOptions.ts
-import { useEffect as useEffect5, useState as useState4 } from "react";
+import { useCallback as useCallback6, useEffect as useEffect5, useState as useState4 } from "react";
 import { log as log2 } from "@dxos/log";
 var __dxlog_file2 = "/__w/dxos/dxos/packages/ui/react-ui-form/src/hooks/useQueryRefOptions.ts";
 var useQueryRefOptions = ({ refTypeInfo, onQueryRefOptions }) => {
   const [options, setOptions] = useState4([]);
   const [loading, setLoading] = useState4(false);
+  const [state, setState] = useState4({});
+  const update = useCallback6(() => setState({}), []);
   useEffect5(() => {
     if (!refTypeInfo || !onQueryRefOptions) {
       return;
@@ -1032,7 +1008,7 @@ var useQueryRefOptions = ({ refTypeInfo, onQueryRefOptions }) => {
       } catch (error) {
         log2.error("Failed to fetch ref options:", error, {
           F: __dxlog_file2,
-          L: 42,
+          L: 51,
           S: void 0,
           C: (f, a) => f(...a)
         });
@@ -1044,10 +1020,12 @@ var useQueryRefOptions = ({ refTypeInfo, onQueryRefOptions }) => {
     void fetchOptions();
   }, [
     refTypeInfo,
-    onQueryRefOptions
+    onQueryRefOptions,
+    state
   ]);
   return {
     options,
+    update,
     loading
   };
 };
@@ -1070,7 +1048,7 @@ var useInputProps = (path = []) => {
   return useMemo3(() => ({
     getStatus: () => getStatus(stablePath),
     getValue: () => getFormValue(stablePath),
-    onValueChange: (type, value) => onValueChange(stablePath, type, value),
+    onValueChange: (type, value2) => onValueChange(stablePath, type, value2),
     onBlur: () => onTouched(stablePath)
   }), [
     getStatus,
@@ -1081,10 +1059,10 @@ var useInputProps = (path = []) => {
   ]);
 };
 var FormProvider = ({ children, formRef, autoSave, ...formOptions }) => {
-  var _effect = _useSignals8();
+  var _effect = _useSignals7();
   try {
     const form = useForm(formOptions);
-    const handleKeyDown = useCallback6((event) => {
+    const handleKeyDown = useCallback7((event) => {
       const keyIsEnter = event.key === "Enter";
       const modifierUsed = event.ctrlKey || event.altKey || event.metaKey || event.shiftKey;
       const inputIsTextarea = event.target.tagName.toLowerCase() === "textarea";
@@ -1100,7 +1078,9 @@ var FormProvider = ({ children, formRef, autoSave, ...formOptions }) => {
         }
       }
     }, [
-      form,
+      form.canSave,
+      form.formIsValid,
+      form.handleSave,
       autoSave
     ]);
     useEffect6(() => {
@@ -1117,7 +1097,7 @@ var FormProvider = ({ children, formRef, autoSave, ...formOptions }) => {
       form.handleSave,
       autoSave
     ]);
-    return /* @__PURE__ */ React8.createElement(FormContext.Provider, {
+    return /* @__PURE__ */ React7.createElement(FormContext.Provider, {
       value: form
     }, children);
   } finally {
@@ -1127,19 +1107,19 @@ var FormProvider = ({ children, formRef, autoSave, ...formOptions }) => {
 
 // src/components/Form/FormActions.tsx
 var FormActions = ({ readonly, onCancel, outerSpacing = true }) => {
-  var _effect = _useSignals9();
+  var _effect = _useSignals8();
   try {
     const { t } = useTranslation5(translationKey);
     const { canSave, handleSave } = useFormContext();
-    return /* @__PURE__ */ React9.createElement("div", {
+    return /* @__PURE__ */ React8.createElement("div", {
       role: "none",
-      className: mx6(outerSpacing === "scroll-fields" ? "pli-cardSpacingInline mbe-cardSpacingBlock" : outerSpacing ? cardSpacing : "mbs-cardSpacingBlock", "flex [&_button]:grow gap-1 first:mbs-0")
-    }, onCancel && !readonly && /* @__PURE__ */ React9.createElement(IconButton2, {
+      className: mx4(outerSpacing === "scroll-fields" ? "pli-cardSpacingInline mbe-cardSpacingBlock" : outerSpacing ? cardSpacing : "mbs-cardSpacingBlock", "flex [&_button]:grow gap-1 first:mbs-0")
+    }, onCancel && !readonly && /* @__PURE__ */ React8.createElement(IconButton2, {
       "data-testid": "cancel-button",
       icon: "ph--x--regular",
       label: t("button cancel"),
       onClick: onCancel
-    }), handleSave && /* @__PURE__ */ React9.createElement(IconButton2, {
+    }), handleSave && /* @__PURE__ */ React8.createElement(IconButton2, {
       type: "submit",
       "data-testid": "save-button",
       disabled: !canSave,
@@ -1154,53 +1134,45 @@ var FormActions = ({ readonly, onCancel, outerSpacing = true }) => {
 
 // src/components/Form/FormContent.tsx
 import { useSignals as _useSignals12 } from "@preact-signals/safe-react/tracking";
-import { Schema, SchemaAST as SchemaAST4, pipe as pipe2 } from "effect";
-import { capitalize as capitalize2 } from "effect/String";
-import React12, { forwardRef, useMemo as useMemo5 } from "react";
+import * as Function2 from "effect/Function";
+import * as Schema from "effect/Schema";
+import * as SchemaAST4 from "effect/SchemaAST";
+import * as StringEffect from "effect/String";
+import React12, { forwardRef as forwardRef2, useMemo as useMemo6 } from "react";
 import { createJsonPath as createJsonPath3, findNode as findNode3, getDiscriminatedType as getDiscriminatedType2, isDiscriminatedUnion as isDiscriminatedUnion2 } from "@dxos/effect";
-import { mx as mx8 } from "@dxos/react-ui-theme";
+import { mx as mx6 } from "@dxos/react-ui-theme";
 import { getSchemaProperties as getSchemaProperties2 } from "@dxos/schema";
-import { isNotFalsy } from "@dxos/util";
-
-// src/components/Form/ArrayField.tsx
-import { useSignals as _useSignals10 } from "@preact-signals/safe-react/tracking";
-import { SchemaAST as SchemaAST3, pipe } from "effect";
-import { capitalize } from "effect/String";
-import React10, { Fragment, useCallback as useCallback7 } from "react";
-import { findNode as findNode2, getDiscriminatedType, isDiscriminatedUnion, SimpleType } from "@dxos/effect";
-import { invariant as invariant2 } from "@dxos/invariant";
-import { IconButton as IconButton3, useTranslation as useTranslation6 } from "@dxos/react-ui";
-import { getSchemaProperties } from "@dxos/schema";
+import { isTruthy } from "@dxos/util";
 
 // src/util/field.ts
-import { FormatEnum, GeoLocation as GeoLocation2, TypeEnum } from "@dxos/echo-schema";
-var parseValue = ({ type, format, value }) => {
-  if (value === void 0 || value === null || value === "") {
+import { FormatEnum, GeoLocation as GeoLocation2, TypeEnum } from "@dxos/echo/internal";
+var parseValue = ({ type, format, value: value2 }) => {
+  if (value2 === void 0 || value2 === null || value2 === "") {
     return void 0;
   }
   const parseScalar = (type2) => {
     switch (type2) {
       case TypeEnum.Boolean: {
-        if (typeof value === "string") {
-          const lowercaseValue = value.toLowerCase();
+        if (typeof value2 === "string") {
+          const lowercaseValue = value2.toLowerCase();
           if (lowercaseValue === "0" || lowercaseValue === "false") {
             return false;
           } else if (lowercaseValue === "1" || lowercaseValue === "true") {
             return true;
           }
         }
-        return Boolean(value);
+        return Boolean(value2);
       }
       case TypeEnum.Number: {
-        const cleaned = typeof value === "string" ? value.replace(/[^0-9.-]+/g, "") : value;
+        const cleaned = typeof value2 === "string" ? value2.replace(/[^0-9.-]+/g, "") : value2;
         const num = Number(cleaned);
         return Number.isNaN(num) ? null : num;
       }
       case TypeEnum.String:
       case TypeEnum.Ref:
-        return String(value);
+        return String(value2);
       default: {
-        return value;
+        return value2;
       }
     }
   };
@@ -1224,12 +1196,12 @@ var parseValue = ({ type, format, value }) => {
     case FormatEnum.Date:
     case FormatEnum.Time:
     case FormatEnum.Timestamp: {
-      const date = new Date(value);
+      const date = new Date(value2);
       return isNaN(date.getTime()) ? null : date;
     }
     case FormatEnum.GeoPoint: {
-      if (typeof value === "string") {
-        const cleaned = value.replace(/[^0-9.,-]+/g, "");
+      if (typeof value2 === "string") {
+        const cleaned = value2.replace(/[^0-9.,-]+/g, "");
         const parts = cleaned.split(",");
         if (parts.length === 2) {
           const lat = parseFloat(parts[0]);
@@ -1248,33 +1220,12 @@ var parseValue = ({ type, format, value }) => {
       ];
     }
     default: {
-      return value;
+      return value2;
     }
   }
 };
 var cellClassesForFieldType = ({ type, format }) => {
-  if (!format) {
-    switch (type) {
-      case TypeEnum.Number:
-        return [
-          "text-right",
-          "font-mono"
-        ];
-      case TypeEnum.Boolean:
-        return [
-          "text-right",
-          "font-mono"
-        ];
-      case TypeEnum.String:
-        return void 0;
-      case TypeEnum.Ref:
-        return void 0;
-      default: {
-        return void 0;
-      }
-    }
-  }
-  switch (format) {
+  switch (format || type) {
     case FormatEnum.Markdown:
       return void 0;
     case FormatEnum.Time:
@@ -1295,6 +1246,16 @@ var cellClassesForFieldType = ({ type, format }) => {
       return [
         "font-mono"
       ];
+    case TypeEnum.Number:
+    case TypeEnum.Boolean:
+      return [
+        "text-right",
+        "font-mono"
+      ];
+    case TypeEnum.String:
+      return void 0;
+    case TypeEnum.Ref:
+      return void 0;
     default:
       return void 0;
   }
@@ -1306,19 +1267,19 @@ var pathNotUniqueError = (path) => ({
 
 // src/util/formatting.ts
 import { format as formatDate } from "date-fns/format";
-import { FormatEnum as FormatEnum2, GeoLocation as GeoLocation3, TypeEnum as TypeEnum2 } from "@dxos/echo-schema";
-var formatForDisplay = ({ type, format, value, locale = void 0 }) => {
+import { FormatEnum as FormatEnum2, GeoLocation as GeoLocation3, TypeEnum as TypeEnum2 } from "@dxos/echo/internal";
+var formatForDisplay = ({ type, format, value: value2, locale = void 0 }) => {
   const formatScalar = (type2) => {
     switch (type2) {
       case TypeEnum2.Boolean:
-        return value.toLocaleString().toUpperCase();
+        return value2.toLocaleString().toUpperCase();
       case TypeEnum2.Number:
-        return value.toLocaleString(locale);
+        return value2.toLocaleString(locale);
       case TypeEnum2.String:
       case TypeEnum2.Ref:
-        return String(value);
+        return String(value2);
       default: {
-        return String(value);
+        return String(value2);
       }
     }
   };
@@ -1337,10 +1298,10 @@ var formatForDisplay = ({ type, format, value, locale = void 0 }) => {
       return formatScalar(TypeEnum2.String);
     }
     case FormatEnum2.Percent: {
-      return `${value * 100}%`;
+      return `${value2 * 100}%`;
     }
     case FormatEnum2.Currency: {
-      return value.toLocaleString(locale, {
+      return value2.toLocaleString(locale, {
         style: "currency",
         currency: "USD",
         minimumFractionDigits: 2,
@@ -1349,53 +1310,53 @@ var formatForDisplay = ({ type, format, value, locale = void 0 }) => {
     }
     case FormatEnum2.Date: {
       try {
-        return formatDate(new Date(value), "yyyy-MM-dd");
+        return formatDate(new Date(value2), "yyyy-MM-dd");
       } catch (error) {
         return "Invalid Date";
       }
     }
     case FormatEnum2.Time: {
       try {
-        return formatDate(new Date(value), "HH:mm:ss");
+        return formatDate(new Date(value2), "HH:mm:ss");
       } catch (error) {
         return "Invalid Time";
       }
     }
     case FormatEnum2.DateTime: {
       try {
-        return formatDate(new Date(value), "yyyy-MM-dd HH:mm:ss");
+        return formatDate(new Date(value2), "yyyy-MM-dd HH:mm:ss");
       } catch (error) {
         return "Invalid DateTime";
       }
     }
     case FormatEnum2.GeoPoint: {
-      if (value === null || value === void 0) {
+      if (value2 === null || value2 === void 0) {
         return "";
       }
-      if (Array.isArray(value) && value.length >= 2 && value.every(Number.isFinite)) {
-        const { latitude, longitude } = GeoLocation3.fromGeoPoint(value);
+      if (Array.isArray(value2) && value2.length >= 2 && value2.every(Number.isFinite)) {
+        const { latitude, longitude } = GeoLocation3.fromGeoPoint(value2);
         return `${latitude},${longitude}`;
       }
-      return String(value);
+      return String(value2);
     }
     default: {
-      if (value === null || value === "undefined") {
+      if (value2 === null || value2 === "undefined") {
         return "";
       }
-      return String(value);
+      return String(value2);
     }
   }
 };
-var formatForEditing = ({ type, format, value, locale = void 0 }) => {
+var formatForEditing = ({ type, format, value: value2, locale = void 0 }) => {
   const formatScalar = (type2) => {
     switch (type2) {
       case TypeEnum2.Boolean:
       case TypeEnum2.Number:
       case TypeEnum2.String:
       case TypeEnum2.Ref:
-        return String(value);
+        return String(value2);
       default:
-        return String(value);
+        return String(value2);
     }
   };
   if (!format) {
@@ -1409,50 +1370,49 @@ var formatForEditing = ({ type, format, value, locale = void 0 }) => {
       return formatScalar(type);
     }
     case FormatEnum2.Percent: {
-      return String(value * 100);
+      return String(value2 * 100);
     }
     case FormatEnum2.Currency: {
-      return String(value);
+      return String(value2);
     }
     case FormatEnum2.DateTime: {
-      const date = new Date(value);
+      const date = new Date(value2);
       return date.toISOString();
     }
     case FormatEnum2.Date: {
-      const date = new Date(value);
+      const date = new Date(value2);
       return date.toISOString().split("T")[0];
     }
     case FormatEnum2.Time: {
-      const date = new Date(value);
+      const date = new Date(value2);
       return date.toISOString().split("T")[1].split(".")[0];
     }
     case FormatEnum2.GeoPoint: {
-      if (value === null || value === void 0) {
+      if (value2 === null || value2 === void 0) {
         return "";
       }
-      if (Array.isArray(value) && value.length >= 2 && value.every(Number.isFinite)) {
-        const { latitude, longitude } = GeoLocation3.fromGeoPoint(value);
+      if (Array.isArray(value2) && value2.length >= 2 && value2.every(Number.isFinite)) {
+        const { latitude, longitude } = GeoLocation3.fromGeoPoint(value2);
         return `${latitude},${longitude}`;
       }
-      return String(value);
+      return String(value2);
     }
     default: {
-      return String(value);
+      return String(value2);
     }
   }
 };
 
 // src/util/refs.ts
-import { FormatEnum as FormatEnum3, ReferenceAnnotationId } from "@dxos/echo-schema";
+import { FormatEnum as FormatEnum3, ReferenceAnnotationId } from "@dxos/echo/internal";
 import { findAnnotation } from "@dxos/effect";
 
 // src/util/schema.ts
-import { SchemaAST as SchemaAST2 } from "effect";
+import * as SchemaAST2 from "effect/SchemaAST";
 import { findNode } from "@dxos/effect";
 var findArrayElementType = (ast) => {
   const tupleType = findNode(ast, SchemaAST2.isTupleType);
-  const elementType = tupleType?.rest[0]?.type;
-  return elementType;
+  return tupleType?.rest[0]?.type;
 };
 
 // src/util/refs.ts
@@ -1480,23 +1440,32 @@ var getRefProps = (property) => {
 };
 
 // src/components/Form/ArrayField.tsx
+import { useSignals as _useSignals9 } from "@preact-signals/safe-react/tracking";
+import * as Function from "effect/Function";
+import * as SchemaAST3 from "effect/SchemaAST";
+import * as String2 from "effect/String";
+import React9, { Fragment, useCallback as useCallback8 } from "react";
+import { SimpleType, findNode as findNode2, getDiscriminatedType, isDiscriminatedUnion } from "@dxos/effect";
+import { invariant as invariant2 } from "@dxos/invariant";
+import { IconButton as IconButton3, useTranslation as useTranslation6 } from "@dxos/react-ui";
+import { getSchemaProperties } from "@dxos/schema";
 var __dxlog_file3 = "/__w/dxos/dxos/packages/ui/react-ui-form/src/components/Form/ArrayField.tsx";
 var ArrayField = ({ property, readonly, path, inputProps, Custom, lookupComponent }) => {
-  var _effect = _useSignals10();
+  var _effect = _useSignals9();
   try {
     const { t } = useTranslation6(translationKey);
     const { ast, name, type, title } = property;
     const values = useFormValues(path ?? []) ?? [];
     invariant2(Array.isArray(values), `Values at path ${path?.join(".")} must be an array.`, {
       F: __dxlog_file3,
-      L: 36,
+      L: 37,
       S: void 0,
       A: [
         "Array.isArray(values)",
         "`Values at path ${path?.join('.')} must be an array.`"
       ]
     });
-    const label = title ?? pipe(name, capitalize);
+    const label = title ?? Function.pipe(name, String2.capitalize);
     const elementType = findArrayElementType(ast);
     const getDefaultObjectValue = (typeNode) => {
       const baseNode = findNode2(typeNode, isDiscriminatedUnion);
@@ -1510,7 +1479,7 @@ var ArrayField = ({ property, readonly, path, inputProps, Custom, lookupComponen
       ]));
     };
     const getDefaultValue = () => type === "object" && elementType ? getDefaultObjectValue(elementType) : SimpleType.getDefaultValue(type);
-    const handleAdd = useCallback7(() => {
+    const handleAdd = useCallback8(() => {
       inputProps.onValueChange(type, [
         ...values,
         getDefaultValue()
@@ -1521,7 +1490,7 @@ var ArrayField = ({ property, readonly, path, inputProps, Custom, lookupComponen
       inputProps,
       values
     ]);
-    const handleRemove = useCallback7((index) => {
+    const handleRemove = useCallback8((index) => {
       const newValues = values.filter((_, i) => i !== index);
       inputProps.onValueChange(type, newValues);
     }, [
@@ -1532,14 +1501,14 @@ var ArrayField = ({ property, readonly, path, inputProps, Custom, lookupComponen
     if (!elementType) {
       return null;
     }
-    return readonly && values.length < 1 ? null : /* @__PURE__ */ React10.createElement(React10.Fragment, null, /* @__PURE__ */ React10.createElement(InputHeader, {
+    return readonly && values.length < 1 ? null : /* @__PURE__ */ React9.createElement(React9.Fragment, null, /* @__PURE__ */ React9.createElement(InputHeader, {
       readonly: true,
       label
-    }), /* @__PURE__ */ React10.createElement("div", {
+    }), /* @__PURE__ */ React9.createElement("div", {
       role: "none",
       className: readonly ? "flex flex-wrap gap-1 mlb-1" : values.length > 0 ? "grid gap-1 grid-cols-[1fr_min-content] mlb-1" : "hidden"
     }, values.map((_value, index) => {
-      const field = /* @__PURE__ */ React10.createElement(FormField, {
+      const field = /* @__PURE__ */ React9.createElement(FormField, {
         property: {
           ...property,
           array: false,
@@ -1554,18 +1523,18 @@ var ArrayField = ({ property, readonly, path, inputProps, Custom, lookupComponen
         Custom,
         lookupComponent
       });
-      return readonly ? field : /* @__PURE__ */ React10.createElement(Fragment, {
+      return readonly ? field : /* @__PURE__ */ React9.createElement(Fragment, {
         key: index
-      }, /* @__PURE__ */ React10.createElement("div", {
+      }, /* @__PURE__ */ React9.createElement("div", {
         role: "none"
-      }, field), /* @__PURE__ */ React10.createElement(IconButton3, {
+      }, field), /* @__PURE__ */ React9.createElement(IconButton3, {
         icon: "ph--trash--regular",
         iconOnly: true,
         label: t("button remove"),
         onClick: () => handleRemove(index),
         classNames: "self-center"
       }));
-    })), !readonly && /* @__PURE__ */ React10.createElement(IconButton3, {
+    })), !readonly && /* @__PURE__ */ React9.createElement(IconButton3, {
       classNames: "is-full mlb-cardSpacingBlock flex",
       icon: "ph--plus--regular",
       label: t("add field"),
@@ -1576,25 +1545,144 @@ var ArrayField = ({ property, readonly, path, inputProps, Custom, lookupComponen
   }
 };
 
+// src/components/Form/factory.tsx
+import { FormatEnum as FormatEnum4 } from "@dxos/echo/internal";
+var getInputComponent = (type, format) => {
+  switch (format) {
+    case FormatEnum4.GeoPoint:
+      return GeoPointInput;
+    case FormatEnum4.Markdown:
+      return MarkdownInput;
+  }
+  switch (type) {
+    case "string":
+      return TextInput;
+    case "number":
+      return NumberInput;
+    case "boolean":
+      return BooleanInput;
+  }
+};
+
 // src/components/Form/RefField.tsx
 import { useSignals as _useSignals11 } from "@preact-signals/safe-react/tracking";
-import React11, { useCallback as useCallback8, useMemo as useMemo4 } from "react";
-import { Expando, getTypeAnnotation, Ref, ReferenceAnnotationId as ReferenceAnnotationId2 } from "@dxos/echo-schema";
+import "@dxos/lit-ui/dx-tag-picker.pcss";
+import React11, { useCallback as useCallback10, useMemo as useMemo5 } from "react";
+import { Expando, Ref, ReferenceAnnotationId as ReferenceAnnotationId2, getTypeAnnotation } from "@dxos/echo/internal";
 import { findAnnotation as findAnnotation2 } from "@dxos/effect";
 import { DXN } from "@dxos/keys";
-import { DxRefTag } from "@dxos/lit-ui/react";
-import { Input as Input8, useTranslation as useTranslation7 } from "@dxos/react-ui";
-import { TagPicker } from "@dxos/react-ui-tag-picker";
-import { descriptionText, mx as mx7 } from "@dxos/react-ui-theme";
+import { DxAnchor, DxTagPickerItem } from "@dxos/lit-ui/react";
+import { Button as Button2, Icon as Icon3, Input as Input7, useTranslation as useTranslation8 } from "@dxos/react-ui";
+import { descriptionText, mx as mx5 } from "@dxos/react-ui-theme";
 import { isNonNullable as isNonNullable2 } from "@dxos/util";
-var RefField = ({ type, label, disabled, placeholder, inputOnly, array, ast, getValue: getValue3, onBlur, onQueryRefOptions, onValueChange, ...restInputProps }) => {
-  var _effect = _useSignals11();
+
+// src/components/ObjectPicker/ObjectPicker.tsx
+import { useSignals as _useSignals10 } from "@preact-signals/safe-react/tracking";
+import React10, { forwardRef, useCallback as useCallback9, useMemo as useMemo4, useState as useState5 } from "react";
+import { Icon as Icon2, Popover, useTranslation as useTranslation7 } from "@dxos/react-ui";
+import { Combobox } from "@dxos/react-ui-searchlist";
+var ObjectPickerContent = /* @__PURE__ */ forwardRef(({ options, selectedIds, createSchema, createOptionLabel, createOptionIcon, createInitialValuePath, onSelect, onCreate, ...props }, ref) => {
+  var _effect = _useSignals10();
   try {
     const { t } = useTranslation7(translationKey);
-    const refTypeInfo = useMemo4(() => ast ? findAnnotation2(ast, ReferenceAnnotationId2) : void 0, [
+    const [searchString, setSearchString] = useState5("");
+    const [showForm, setShowForm] = useState5(false);
+    const handleFormSave = useCallback9((values) => {
+      onCreate?.(values);
+      setShowForm(false);
+      setSearchString("");
+    }, [
+      onCreate
+    ]);
+    const handleFormCancel = useCallback9(() => {
+      setShowForm(false);
+      setSearchString("");
+    }, []);
+    const handleClick = useCallback9((event) => {
+      if (createSchema && event.target.closest('[data-value="__create__"]')) {
+        event.stopPropagation();
+        event.preventDefault();
+        setShowForm(true);
+      }
+    }, [
+      createSchema
+    ]);
+    const handleKeyDown = useCallback9((event) => {
+      if (event.key === "Enter" && createSchema && event.currentTarget.querySelector('[role="option"][aria-selected="true"][data-value="__create__"]')) {
+        event.stopPropagation();
+        event.preventDefault();
+        setShowForm(true);
+      }
+    }, [
+      createSchema
+    ]);
+    const labelById = useMemo4(() => options.reduce((acc, option) => {
+      acc[option.id.toLowerCase()] = option.label.toLowerCase();
+      return acc;
+    }, {}), [
+      options
+    ]);
+    return /* @__PURE__ */ React10.createElement(Combobox.Content, {
+      ...props,
+      ref,
+      filter: (value2, search) => value2 === "__create__" || labelById[value2]?.includes(search.toLowerCase()) ? 1 : 0,
+      onClickCapture: handleClick,
+      onKeyDownCapture: handleKeyDown
+    }, showForm && createSchema ? /* @__PURE__ */ React10.createElement(Popover.Viewport, null, /* @__PURE__ */ React10.createElement(Form, {
+      schema: createSchema,
+      values: createInitialValuePath ? {
+        [createInitialValuePath]: searchString
+      } : {},
+      onSave: handleFormSave,
+      onCancel: handleFormCancel,
+      testId: "create-referenced-object-form"
+    })) : /* @__PURE__ */ React10.createElement(React10.Fragment, null, /* @__PURE__ */ React10.createElement(Combobox.Input, {
+      placeholder: t("ref field combobox input placeholder"),
+      value: searchString,
+      onValueChange: setSearchString,
+      autoFocus: true
+    }), /* @__PURE__ */ React10.createElement(Combobox.List, null, options.map((option) => /* @__PURE__ */ React10.createElement(Combobox.Item, {
+      key: option.id,
+      value: option.id,
+      onSelect: () => onSelect(option.id),
+      classNames: "flex items-center gap-2"
+    }, /* @__PURE__ */ React10.createElement("span", {
+      className: "grow"
+    }, option.label), selectedIds?.includes(option.id) && /* @__PURE__ */ React10.createElement(Icon2, {
+      icon: "ph--check--regular"
+    }))), searchString.length > 0 && createOptionLabel && createOptionIcon && createSchema && onCreate && /* @__PURE__ */ React10.createElement(Combobox.Item, {
+      value: "__create__",
+      classNames: "flex items-center gap-2"
+    }, /* @__PURE__ */ React10.createElement(Icon2, {
+      icon: createOptionIcon
+    }), t(createOptionLabel[0], {
+      ns: createOptionLabel[1].ns,
+      text: searchString
+    })))), /* @__PURE__ */ React10.createElement(Combobox.Arrow, null));
+  } finally {
+    _effect.f();
+  }
+});
+ObjectPickerContent.displayName = "ObjectPickerContent";
+var ObjectPicker = {
+  Root: Combobox.Root,
+  Trigger: Combobox.Trigger,
+  VirtualTrigger: Combobox.VirtualTrigger,
+  Content: ObjectPickerContent
+};
+
+// src/components/Form/RefField.tsx
+var isRefSnapShot = (val) => {
+  return typeof val === "object" && typeof val?.["/"] === "string";
+};
+var RefField = ({ type, label, readonly, placeholder, inputOnly, array, ast, getValue: getValue3, createOptionLabel, createOptionIcon, onBlur, onCreate, createSchema, createInitialValuePath, onQueryRefOptions, onValueChange, ...restInputProps }) => {
+  var _effect = _useSignals11();
+  try {
+    const { t } = useTranslation8(translationKey);
+    const refTypeInfo = useMemo5(() => ast ? findAnnotation2(ast, ReferenceAnnotationId2) : void 0, [
       ast
     ]);
-    const { options: availableOptions, loading: _loading } = useQueryRefOptions({
+    const { options: availableOptions, update: updateOptions, loading: _loading } = useQueryRefOptions({
       refTypeInfo,
       onQueryRefOptions
     });
@@ -1603,7 +1691,7 @@ var RefField = ({ type, label, disabled, placeholder, inputOnly, array, ast, get
         type,
         label,
         placeholder,
-        disabled,
+        readonly,
         inputOnly,
         getValue: getValue3,
         onBlur,
@@ -1611,11 +1699,12 @@ var RefField = ({ type, label, disabled, placeholder, inputOnly, array, ast, get
         ...restInputProps
       });
     }
-    const handleGetValue = useCallback8(() => {
+    const handleGetValue = useCallback10(() => {
       const formValue = getValue3();
       const unknownToRefOption = (val) => {
-        if (Ref.isRef(val)) {
-          const dxnString = val.dxn.toString();
+        const isRef = Ref.isRef(val);
+        if (isRef || isRefSnapShot(val)) {
+          const dxnString = isRef ? val.dxn.toString() : val["/"];
           const matchingOption = availableOptions.find((option2) => option2.id === dxnString);
           if (matchingOption) {
             return matchingOption;
@@ -1638,14 +1727,7 @@ var RefField = ({ type, label, disabled, placeholder, inputOnly, array, ast, get
       availableOptions,
       array
     ]);
-    const handleSearch = useCallback8((text, ids) => availableOptions.filter((option) => !ids.includes(option.id)).filter((option) => option.label.toLowerCase().includes(text.toLowerCase())).map((option) => ({
-      id: option.id,
-      label: option.label,
-      hue: option.hue
-    })), [
-      availableOptions
-    ]);
-    const handleUpdate = useCallback8((ids) => {
+    const handleUpdate = useCallback10((ids) => {
       if (ids.length === 0) {
         onValueChange("object", void 0);
         return;
@@ -1668,44 +1750,98 @@ var RefField = ({ type, label, disabled, placeholder, inputOnly, array, ast, get
       array,
       onValueChange
     ]);
-    const tagPickerMode = useMemo4(() => array ? "multi-select" : "single-select", [
-      array
+    const handleCreate = useCallback10((values) => {
+      onCreate?.(values);
+      updateOptions();
+    }, [
+      onCreate,
+      updateOptions
     ]);
     if (!refTypeInfo) {
       return null;
     }
     const { status, error } = restInputProps.getStatus();
     const items = handleGetValue();
-    return disabled && items.length < 1 ? null : /* @__PURE__ */ React11.createElement(Input8.Root, {
+    const selectedIds = useMemo5(() => items.map((i) => i.id), [
+      items
+    ]);
+    const toggleSelect = useCallback10((id) => {
+      if (array) {
+        const nextIds = selectedIds.includes(id) ? selectedIds.filter((x) => x !== id) : [
+          ...selectedIds,
+          id
+        ];
+        handleUpdate(nextIds);
+      } else {
+        if (selectedIds[0] === id) {
+          handleUpdate([]);
+        } else {
+          handleUpdate([
+            id
+          ]);
+        }
+      }
+    }, [
+      array,
+      selectedIds,
+      handleUpdate
+    ]);
+    return readonly && items.length < 1 ? null : /* @__PURE__ */ React11.createElement(Input7.Root, {
       validationValence: status
     }, !inputOnly && /* @__PURE__ */ React11.createElement(InputHeader, {
       error,
       label
     }), /* @__PURE__ */ React11.createElement("div", {
       "data-no-submit": true
-    }, disabled ? items.length < 1 ? /* @__PURE__ */ React11.createElement("p", {
-      className: mx7(descriptionText, "mbe-2")
-    }, t("empty readonly ref field label")) : items.map((item) => /* @__PURE__ */ React11.createElement(DxRefTag, {
+    }, readonly ? items.length < 1 ? /* @__PURE__ */ React11.createElement("p", {
+      className: mx5(descriptionText, "mbe-2")
+    }, t("empty readonly ref field label")) : items.map((item) => /* @__PURE__ */ React11.createElement(DxAnchor, {
       key: item.id,
       refid: item.id,
-      rootclassname: "mie-1",
-      style: {
-        marginInlineEnd: ".25rem"
+      rootclassname: "mie-1"
+    }, item.label)) : /* @__PURE__ */ React11.createElement(ObjectPicker.Root, null, /* @__PURE__ */ React11.createElement(ObjectPicker.Trigger, {
+      asChild: true
+    }, /* @__PURE__ */ React11.createElement(Button2, {
+      variant: "ghost",
+      classNames: "is-full text-start gap-2"
+    }, /* @__PURE__ */ React11.createElement("div", {
+      role: "none",
+      className: "grow"
+    }, items?.length ? items?.map((item) => /* @__PURE__ */ React11.createElement(DxTagPickerItem, {
+      key: item.id,
+      itemId: item.id,
+      label: item.label,
+      ...item.hue ? {
+        hue: item.hue
+      } : {},
+      removeLabel: t("remove item label"),
+      onItemClick: (event) => {
+        if (event.action === "remove") {
+          toggleSelect(item.id);
+        }
       }
-    }, item.label)) : /* @__PURE__ */ React11.createElement(TagPicker, {
-      readonly: disabled,
-      items,
-      mode: tagPickerMode,
-      onBlur: (event) => onBlur(event),
-      onUpdate: handleUpdate,
-      onSearch: handleSearch,
-      classNames: "bg-inputSurface p-1.5 rounded-sm"
-    })), inputOnly && /* @__PURE__ */ React11.createElement(Input8.DescriptionAndValidation, null, error));
+    })) : /* @__PURE__ */ React11.createElement("span", {
+      className: "text-description"
+    }, placeholder ?? t("ref field placeholder", {
+      count: array ? 99 : 1
+    }))), /* @__PURE__ */ React11.createElement(Icon3, {
+      size: 3,
+      icon: "ph--caret-down--bold"
+    }))), /* @__PURE__ */ React11.createElement(ObjectPicker.Content, {
+      options: availableOptions,
+      selectedIds,
+      onSelect: toggleSelect,
+      createSchema,
+      createOptionLabel,
+      createOptionIcon,
+      createInitialValuePath,
+      onCreate: handleCreate
+    }))), inputOnly && /* @__PURE__ */ React11.createElement(Input7.DescriptionAndValidation, null, error));
   } finally {
     _effect.f();
   }
 };
-var RefFieldFallback = ({ type, label, disabled, placeholder, inputOnly, getValue: getValue3, onValueChange, ...restInputProps }) => {
+var RefFieldFallback = ({ type, label, readonly, placeholder, inputOnly, getValue: getValue3, onValueChange, ...restInputProps }) => {
   var _effect = _useSignals11();
   try {
     const handleOnValueChange = (_type, dxnString) => {
@@ -1731,7 +1867,7 @@ var RefFieldFallback = ({ type, label, disabled, placeholder, inputOnly, getValu
     return /* @__PURE__ */ React11.createElement(TextInput, {
       type,
       label,
-      disabled,
+      readonly,
       placeholder,
       inputOnly,
       getValue: handleGetValue,
@@ -1743,36 +1879,17 @@ var RefFieldFallback = ({ type, label, disabled, placeholder, inputOnly, getValu
   }
 };
 
-// src/components/Form/factory.tsx
-import { FormatEnum as FormatEnum4 } from "@dxos/echo-schema";
-var getInputComponent = (type, format) => {
-  switch (format) {
-    case FormatEnum4.GeoPoint:
-      return GeoPointInput;
-    case FormatEnum4.Markdown:
-      return MarkdownInput;
-  }
-  switch (type) {
-    case "string":
-      return TextInput;
-    case "number":
-      return NumberInput;
-    case "boolean":
-      return BooleanInput;
-  }
-};
-
 // src/components/Form/FormContent.tsx
-var FormField = ({ property, path, readonly, inline, onQueryRefOptions, lookupComponent, Custom }) => {
+var FormField = ({ property, path, readonly, inline, projection, onQueryRefOptions, createOptionLabel, createOptionIcon, onCreate, createSchema, createInitialValuePath, lookupComponent, Custom }) => {
   var _effect = _useSignals12();
   try {
     const { ast, name, type, format, title, description, options, examples, array } = property;
     const inputProps = useInputProps(path);
-    const label = useMemo5(() => title ?? pipe2(name, capitalize2), [
+    const label = useMemo6(() => title ?? Function2.pipe(name, StringEffect.capitalize), [
       title,
       name
     ]);
-    const placeholder = useMemo5(() => examples?.length ? `Example: "${examples[0]}"` : description, [
+    const placeholder = useMemo6(() => examples?.length ? `Example: "${examples[0]}"` : description, [
       examples,
       description
     ]);
@@ -1783,7 +1900,7 @@ var FormField = ({ property, path, readonly, inline, onQueryRefOptions, lookupCo
         type,
         format,
         label,
-        disabled: readonly,
+        readonly,
         placeholder,
         ...inputProps
       }
@@ -1800,7 +1917,7 @@ var FormField = ({ property, path, readonly, inline, onQueryRefOptions, lookupCo
         label,
         inputOnly: inline,
         placeholder,
-        disabled: readonly,
+        readonly,
         ...inputProps
       });
     }
@@ -1813,9 +1930,14 @@ var FormField = ({ property, path, readonly, inline, onQueryRefOptions, lookupCo
         format,
         label,
         placeholder,
-        disabled: readonly,
+        readonly,
         inputOnly: inline,
         onQueryRefOptions,
+        createOptionLabel,
+        createOptionIcon,
+        onCreate,
+        createSchema,
+        createInitialValuePath,
         ...inputProps
       });
     }
@@ -1836,7 +1958,7 @@ var FormField = ({ property, path, readonly, inline, onQueryRefOptions, lookupCo
         label,
         inputOnly: inline,
         placeholder,
-        disabled: readonly,
+        readonly,
         ...inputProps
       });
     }
@@ -1844,7 +1966,7 @@ var FormField = ({ property, path, readonly, inline, onQueryRefOptions, lookupCo
       return /* @__PURE__ */ React12.createElement(SelectInput, {
         type,
         format,
-        disabled: readonly,
+        readonly,
         inputOnly: inline,
         label,
         options: options.map((option) => ({
@@ -1860,12 +1982,16 @@ var FormField = ({ property, path, readonly, inline, onQueryRefOptions, lookupCo
       const typeLiteral = baseNode ? getDiscriminatedType2(baseNode, inputProps.getValue()) : findNode3(ast, SchemaAST4.isTypeLiteral);
       if (typeLiteral) {
         return /* @__PURE__ */ React12.createElement(React12.Fragment, null, !inline && /* @__PURE__ */ React12.createElement("h3", {
-          className: mx8("text-lg mlb-inputSpacingBlock first:mbs-0")
+          className: mx6("text-lg mlb-inputSpacingBlock first:mbs-0")
         }, label), /* @__PURE__ */ React12.createElement(FormFields, {
           schema: Schema.make(typeLiteral),
           path,
           readonly,
+          projection,
           onQueryRefOptions,
+          createOptionLabel,
+          createOptionIcon,
+          onCreate,
           Custom,
           lookupComponent
         }));
@@ -1876,24 +2002,42 @@ var FormField = ({ property, path, readonly, inline, onQueryRefOptions, lookupCo
     _effect.f();
   }
 };
-var FormFields = /* @__PURE__ */ forwardRef(({ classNames, testId, schema, path, filter, sort, readonly, lookupComponent, Custom, onQueryRefOptions }, forwardRef2) => {
+var FormFields = /* @__PURE__ */ forwardRef2(({ classNames, schema, path, filter, sort, projection, readonly, lookupComponent, Custom, onQueryRefOptions, ...props }, forwardRef4) => {
   var _effect = _useSignals12();
   try {
     const values = useFormValues(path);
-    const properties = useMemo5(() => {
-      const props = getSchemaProperties2(schema.ast, values);
-      const filtered = filter ? filter(props) : props;
+    const properties = useMemo6(() => {
+      const props2 = getSchemaProperties2(schema.ast, values);
+      if (projection) {
+        const fieldProjections = projection.getFieldProjections();
+        const hiddenProperties = new Set(projection.getHiddenProperties());
+        const visibleProps = props2.filter((prop) => !hiddenProperties.has(prop.name));
+        const orderedProps = [];
+        for (const fieldProjection of fieldProjections) {
+          const fieldPath = String(fieldProjection.field.path);
+          const prop = visibleProps.find((p) => p.name === fieldPath);
+          if (prop) {
+            orderedProps.push(prop);
+          }
+        }
+        const projectionPaths = new Set(fieldProjections.map((fp) => String(fp.field.path)));
+        const remainingProps = visibleProps.filter((prop) => !projectionPaths.has(prop.name));
+        orderedProps.push(...remainingProps);
+        return orderedProps;
+      }
+      const filtered = filter ? filter(props2) : props2;
       return sort ? filtered.sort((a, b) => sort.indexOf(a.name) - sort.indexOf(b.name)) : filtered;
     }, [
       schema,
       values,
       filter,
-      sort
+      sort,
+      projection?.fields
     ]);
     return /* @__PURE__ */ React12.createElement("div", {
       role: "form",
-      className: mx8("is-full", classNames),
-      ref: forwardRef2
+      className: mx6("is-full", classNames),
+      ref: forwardRef4
     }, properties.map((property) => {
       return /* @__PURE__ */ React12.createElement(FormField, {
         key: property.name,
@@ -1903,35 +2047,42 @@ var FormFields = /* @__PURE__ */ forwardRef(({ classNames, testId, schema, path,
           property.name
         ],
         readonly,
+        projection,
         onQueryRefOptions,
         lookupComponent,
-        Custom
+        Custom,
+        ...props
       });
-    }).filter(isNotFalsy));
+    }).filter(isTruthy));
   } finally {
     _effect.f();
   }
 });
 
 // src/components/Form/Form.tsx
-var Form = ({ classNames, testId, values: initialValues, autoFocus, readonly, autoSave, outerSpacing = true, onCancel, schema, onValuesChanged, onValidate, onSave, ...props }) => {
+var Form = ({ classNames, testId, values: initialValues, autoFocus, readonly, autoSave, outerSpacing = true, schema, onCancel, onValuesChanged, onValidate, onSave, ...props }) => {
   var _effect = _useSignals13();
   try {
     const formRef = useRef3(null);
-    const handleValid = useMemo6(() => autoSave ? onSave : void 0, [
-      autoSave,
-      onSave
-    ]);
+    const { findFirstFocusable } = useFocusFinders();
     useEffect7(() => {
       if (autoFocus && formRef.current) {
-        const input = formRef.current.querySelector("input");
-        if (input) {
-          input.focus();
+        const firstFocusable = findFirstFocusable(formRef.current);
+        if (firstFocusable) {
+          firstFocusable.focus();
         }
       }
     }, [
       autoFocus
     ]);
+    const handleValid = useCallback11(async (values, meta) => {
+      if (autoSave) {
+        await onSave?.(values, meta);
+      }
+    }, [
+      autoSave,
+      onSave
+    ]);
     return /* @__PURE__ */ React13.createElement(FormProvider, {
       formRef,
       schema,
@@ -1955,7 +2106,7 @@ var Form = ({ classNames, testId, values: initialValues, autoFocus, readonly, au
       ],
       readonly,
       schema
-    }), (onCancel || onSave) && !autoSave && /* @__PURE__ */ React13.createElement(FormActions, {
+    }), (onCancel || onSave) && !autoSave && !readonly && /* @__PURE__ */ React13.createElement(FormActions, {
       readonly,
       onCancel,
       outerSpacing
@@ -1967,45 +2118,40 @@ var Form = ({ classNames, testId, values: initialValues, autoFocus, readonly, au
 
 // src/components/FieldEditor/FieldEditor.tsx
 var __dxlog_file4 = "/__w/dxos/dxos/packages/ui/react-ui-form/src/components/FieldEditor/FieldEditor.tsx";
-var FieldEditor = ({ projection, field, registry, onSave, onCancel, outerSpacing }) => {
+var FieldEditor = ({ readonly, projection, field, registry, onSave, onCancel, outerSpacing }) => {
   var _effect = _useSignals14();
   try {
-    const { t } = useTranslation8(translationKey);
-    const [props, setProps] = useState5(projection.getFieldProjection(field.id).props);
+    const { t } = useTranslation9(translationKey);
+    const [props, setProps] = useState6(projection.getFieldProjection(field.id).props);
     useEffect8(() => setProps(projection.getFieldProjection(field.id).props), [
       field,
       projection
     ]);
-    const [schemas, setSchemas] = useState5([]);
-    useEffect8(() => {
+    const [schemas, setSchemas] = useState6([]);
+    useAsyncEffect(async () => {
       if (!registry) {
         return;
       }
       const subscription = registry.query().subscribe((query) => setSchemas(query.results), {
         fire: true
       });
-      const t2 = setTimeout(async () => {
-        const schemas2 = await registry.query().run();
-        setSchemas(schemas2);
-      });
-      return () => {
-        clearTimeout(t2);
-        subscription?.();
-      };
+      const schemas2 = await registry.query().run();
+      setSchemas(schemas2);
+      return () => subscription?.();
     }, [
       registry
     ]);
-    const [referenceSchema, setReferenceSchema] = useState5();
+    const [referenceSchema, setReferenceSchema] = useState6();
     useEffect8(() => {
       setReferenceSchema(schemas.find((schema) => schema.typename === props?.referenceSchema));
     }, [
       schemas,
       props?.referenceSchema
     ]);
-    const [{ fieldSchema }, setFieldSchema] = useState5({
+    const [{ fieldSchema }, setFieldSchema] = useState6({
       fieldSchema: getFormatSchema(props?.format)
     });
-    const handleValuesChanged = useCallback9((_props) => {
+    const handleValuesChanged = useCallback12((_props) => {
       setFieldSchema((prev) => {
         const fieldSchema2 = getFormatSchema(_props.format);
         if (prev.fieldSchema === fieldSchema2) {
@@ -2026,10 +2172,12 @@ var FieldEditor = ({ projection, field, registry, onSave, onCancel, outerSpacing
       });
       setProps((props2) => {
         const type = formatToType[_props.format];
+        const additionalProps = formatToAdditionalPropertyAttributes[_props.format];
         if (props2.type !== type) {
           return {
             ...props2,
             ..._props,
+            ...additionalProps,
             type
           };
         }
@@ -2040,7 +2188,7 @@ var FieldEditor = ({ projection, field, registry, onSave, onCancel, outerSpacing
       props.format,
       props.referenceSchema
     ]);
-    const handleValidate = useCallback9(({ property }) => {
+    const handleValidate = useCallback12(({ property }) => {
       if (property && projection.fields.find((f) => f.path === property && f.path !== field.path)) {
         return [
           {
@@ -2053,7 +2201,7 @@ var FieldEditor = ({ projection, field, registry, onSave, onCancel, outerSpacing
       projection.fields,
       field
     ]);
-    const handleSave = useCallback9((props2) => {
+    const handleSave = useCallback12((props2) => {
       projection.setFieldProjection({
         field,
         props: props2
@@ -2064,7 +2212,7 @@ var FieldEditor = ({ projection, field, registry, onSave, onCancel, outerSpacing
       field,
       onSave
     ]);
-    const handleCancel = useCallback9(() => {
+    const handleCancel = useCallback12(() => {
       requestAnimationFrame(() => onCancel?.());
       onSave();
     }, [
@@ -2073,9 +2221,9 @@ var FieldEditor = ({ projection, field, registry, onSave, onCancel, outerSpacing
     const custom = useMemo7(() => ({
       ["format"]: (props2) => /* @__PURE__ */ React14.createElement(SelectInput, {
         ...props2,
-        options: FormatEnums.filter((value) => value !== FormatEnum5.None).map((value) => ({
-          value,
-          label: t(`format ${value}`)
+        options: FormatEnums.filter((value2) => value2 !== FormatEnum5.None).map((value2) => ({
+          value: value2,
+          label: t(`format ${value2}`)
         }))
       }),
       ["referenceSchema"]: (props2) => /* @__PURE__ */ React14.createElement(SelectInput, {
@@ -2096,13 +2244,13 @@ var FieldEditor = ({ projection, field, registry, onSave, onCancel, outerSpacing
       schemas,
       referenceSchema
     ]);
-    const propIsNotType = useCallback9((props2) => props2.filter((p) => p.name !== "type"), []);
+    const propIsNotType = useCallback12((props2) => props2.filter((p) => p.name !== "type"), []);
     if (!fieldSchema) {
       log3.warn("invalid format", {
         props
       }, {
         F: __dxlog_file4,
-        L: 173,
+        L: 180,
         S: void 0,
         C: (f, a) => f(...a)
       });
@@ -2111,6 +2259,7 @@ var FieldEditor = ({ projection, field, registry, onSave, onCancel, outerSpacing
     return /* @__PURE__ */ React14.createElement(Form, {
       key: field.id,
       autoFocus: true,
+      readonly,
       values: props,
       schema: fieldSchema,
       filter: propIsNotType,
@@ -2132,73 +2281,104 @@ var FieldEditor = ({ projection, field, registry, onSave, onCancel, outerSpacing
 
 // src/components/ViewEditor/ViewEditor.tsx
 import { useSignals as _useSignals15 } from "@preact-signals/safe-react/tracking";
-import { Schema as Schema2 } from "effect";
-import React15, { useCallback as useCallback10, useMemo as useMemo8, useState as useState6 } from "react";
-import { EchoSchema, Format, isMutable, toJsonSchema } from "@dxos/echo-schema";
+import * as Array2 from "effect/Array";
+import * as Match from "effect/Match";
+import * as Option from "effect/Option";
+import * as Schema2 from "effect/Schema";
+import React15, { forwardRef as forwardRef3, useCallback as useCallback13, useImperativeHandle, useMemo as useMemo8, useState as useState7 } from "react";
+import { QueryAST } from "@dxos/echo";
+import { EchoSchema, Format, isMutable, toJsonSchema } from "@dxos/echo/internal";
+import { Filter as Filter2, Query } from "@dxos/echo-db";
 import { invariant as invariant3 } from "@dxos/invariant";
-import { Callout, IconButton as IconButton4, useTranslation as useTranslation9 } from "@dxos/react-ui";
+import { Callout, IconButton as IconButton4, Input as Input8, useTranslation as useTranslation10 } from "@dxos/react-ui";
+import { QueryForm } from "@dxos/react-ui-components";
 import { List as List2 } from "@dxos/react-ui-list";
 import { cardSpacing as cardSpacing3 } from "@dxos/react-ui-stack";
-import { ghostHover, inputTextLabel, mx as mx9 } from "@dxos/react-ui-theme";
-import { FieldSchema, VIEW_FIELD_LIMIT, ProjectionModel } from "@dxos/schema";
+import { inputTextLabel, mx as mx7, subtleHover as subtleHover2 } from "@dxos/react-ui-theme";
+import { FieldSchema, ProjectionModel, VIEW_FIELD_LIMIT, getTypenameFromQuery } from "@dxos/schema";
 var __dxlog_file5 = "/__w/dxos/dxos/packages/ui/react-ui-form/src/components/ViewEditor/ViewEditor.tsx";
-var grid = "grid grid-cols-[32px_1fr_32px_32px] min-bs-[2.5rem]";
-var ViewMetaSchema = Schema2.Struct({
-  typename: Format.URL.annotations({
-    title: "Typename"
-  })
-}).pipe(Schema2.mutable);
-var ViewEditor = ({ classNames, schema, view, registry, readonly: _readonly, showHeading = false, onTypenameChanged, onDelete, outerSpacing = true }) => {
+var listGrid = "grid grid-cols-[min-content_1fr_min-content_min-content_min-content]";
+var listItemGrid = "grid grid-cols-subgrid col-span-5";
+var ViewEditor = /* @__PURE__ */ forwardRef3(({ classNames, schema, view, mode = "schema", registry, readonly, showHeading = false, types, tags, onQueryChanged, onDelete, outerSpacing = true }, forwardedRef) => {
   var _effect = _useSignals15();
   try {
-    const { t } = useTranslation9(translationKey);
-    const projection = useMemo8(() => {
+    const schemaReadonly = !isMutable(schema);
+    const { t } = useTranslation10(translationKey);
+    const projectionModel = useMemo8(() => {
       const jsonSchema = schema instanceof EchoSchema ? schema.jsonSchema : toJsonSchema(schema);
       return new ProjectionModel(jsonSchema, view.projection);
     }, [
       schema,
-      view.projection
+      JSON.stringify(view.projection)
     ]);
-    const [field, setField] = useState6();
-    const readonly = _readonly || !isMutable(schema);
-    const viewValues = useMemo8(() => {
-      return {
-        // TODO(burdon): Need to warn user of possible consequences of editing.
-        // TODO(burdon): Settings should have domain name owned by user.
-        typename: view.query.typename
-      };
-    }, [
-      view.query.typename
+    useImperativeHandle(forwardedRef, () => projectionModel, [
+      projectionModel
     ]);
-    const handleSelect = useCallback10((field2) => {
-      if (readonly) {
-        return;
+    const [expandedField, setExpandedField] = useState7();
+    const queueTarget = Match.value(view.query.ast).pipe(Match.when({
+      type: "options"
+    }, ({ options }) => {
+      return Option.fromNullable(options.queues).pipe(Option.flatMap((queues) => Array2.head(queues)), Option.getOrUndefined);
+    }), Match.orElse(() => void 0));
+    const viewSchema = useMemo8(() => {
+      const base = Schema2.Struct({
+        query: mode === "schema" ? Format.URL.annotations({
+          title: "Record type"
+        }) : QueryAST.Query.annotations({
+          title: "Query"
+        })
+      });
+      if (mode === "query") {
+        return Schema2.Struct({
+          name: Schema2.optional(Schema2.String.annotations({
+            title: "Name"
+          })),
+          ...base.fields,
+          target: Schema2.optional(Schema2.String.annotations({
+            title: "Target Queue"
+          }))
+        }).pipe(Schema2.mutable);
       }
-      setField((f) => f === field2 ? void 0 : field2);
+      return base.pipe(Schema2.mutable);
+    }, [
+      mode
+    ]);
+    const viewValues = useMemo8(() => ({
+      name: view.name,
+      query: mode === "schema" ? getTypenameFromQuery(view.query.ast) : view.query.ast,
+      target: queueTarget
+    }), [
+      view.name,
+      mode,
+      view.query.ast,
+      queueTarget
+    ]);
+    const handleToggleField = useCallback13((field) => {
+      setExpandedField((prevExpandedFieldId) => prevExpandedFieldId === field.id ? void 0 : field.id);
     }, [
       readonly
     ]);
-    const handleAdd = useCallback10(() => {
+    const handleAdd = useCallback13(() => {
       invariant3(!readonly, void 0, {
         F: __dxlog_file5,
-        L: 88,
+        L: 131,
         S: void 0,
         A: [
           "!readonly",
           ""
         ]
       });
-      const field2 = projection.createFieldProjection();
-      setField(field2);
+      const field = projectionModel.createFieldProjection();
+      setExpandedField(field.id);
     }, [
       schema,
-      projection,
+      projectionModel,
       readonly
     ]);
-    const handleUpdate = useCallback10(({ typename }) => {
+    const handleUpdate = useCallback13((values) => {
       invariant3(!readonly, void 0, {
         F: __dxlog_file5,
-        L: 95,
+        L: 138,
         S: void 0,
         A: [
           "!readonly",
@@ -2206,38 +2386,43 @@ var ViewEditor = ({ classNames, schema, view, registry, readonly: _readonly, sho
         ]
       });
       requestAnimationFrame(() => {
-        if (view.query.typename !== typename && !readonly) {
-          onTypenameChanged?.(typename);
+        if ("name" in values && view.name !== values.name) {
+          view.name = values.name;
+          return;
         }
+        const query = mode === "schema" ? Query.select(Filter2.typename(values.query)).ast : values.query;
+        onQueryChanged?.(query, values.target);
       });
     }, [
-      view.query.typename,
-      onTypenameChanged,
-      readonly
+      onQueryChanged,
+      readonly,
+      view,
+      queueTarget,
+      mode
     ]);
-    const handleDelete = useCallback10((fieldId) => {
+    const handleDelete = useCallback13((fieldId) => {
       invariant3(!readonly, void 0, {
         F: __dxlog_file5,
-        L: 107,
+        L: 154,
         S: void 0,
         A: [
           "!readonly",
           ""
         ]
       });
-      if (fieldId === field?.id) {
-        setField(void 0);
+      if (fieldId === expandedField) {
+        setExpandedField(void 0);
       }
       onDelete?.(fieldId);
     }, [
-      field,
+      expandedField,
       onDelete,
       readonly
     ]);
-    const handleMove = useCallback10((fromIndex, toIndex) => {
+    const handleMove = useCallback13((fromIndex, toIndex) => {
       invariant3(!readonly, void 0, {
         F: __dxlog_file5,
-        L: 119,
+        L: 166,
         S: void 0,
         A: [
           "!readonly",
@@ -2254,95 +2439,107 @@ var ViewEditor = ({ classNames, schema, view, registry, readonly: _readonly, sho
       view.projection.fields,
       readonly
     ]);
-    const handleClose = useCallback10(() => setField(void 0), []);
-    const hiddenProperties = projection.getHiddenProperties();
-    const handleHide = useCallback10((fieldId) => {
-      setField(void 0);
-      projection.hideFieldProjection(fieldId);
+    const handleClose = useCallback13(() => setExpandedField(void 0), []);
+    const handleHide = useCallback13((fieldId) => {
+      setExpandedField(void 0);
+      projectionModel.hideFieldProjection(fieldId);
     }, [
-      projection
+      projectionModel
     ]);
-    const handleShow = useCallback10((property) => {
-      setField(void 0);
-      projection.showFieldProjection(property);
+    const handleShow = useCallback13((property) => {
+      setExpandedField(void 0);
+      projectionModel.showFieldProjection(property);
     }, [
-      projection
+      projectionModel
+    ]);
+    const custom = useMemo8(() => mode === "query" ? customFields({
+      types,
+      tags
+    }) : void 0, [
+      types,
+      tags,
+      mode
     ]);
     return /* @__PURE__ */ React15.createElement("div", {
       role: "none",
-      className: mx9(classNames)
-    }, readonly && /* @__PURE__ */ React15.createElement("div", {
-      role: "none",
-      className: mx9("is-full", outerSpacing && "plb-cardSpacingBlock pli-cardSpacingInline")
-    }, /* @__PURE__ */ React15.createElement(Callout.Root, {
-      valence: "info"
-    }, /* @__PURE__ */ React15.createElement(Callout.Title, null, t("system schema description")))), /* @__PURE__ */ React15.createElement(Form, {
+      className: mx7(classNames)
+    }, schemaReadonly && mode === "schema" && /* @__PURE__ */ React15.createElement(Callout.Root, {
+      valence: "info",
+      classNames: [
+        "mlb-cardSpacingBlock",
+        outerSpacing && "mli-cardSpacingInline"
+      ]
+    }, /* @__PURE__ */ React15.createElement(Callout.Title, null, t("system schema description"))), /* @__PURE__ */ React15.createElement(Form, {
       autoSave: true,
-      schema: ViewMetaSchema,
+      schema: viewSchema,
       values: viewValues,
-      readonly,
+      readonly: readonly ? "disabled-input" : false,
       onSave: handleUpdate,
-      outerSpacing
+      outerSpacing,
+      Custom: custom
     }), /* @__PURE__ */ React15.createElement("div", {
       role: "none",
       className: outerSpacing ? cardSpacing3 : "mlb-cardSpacingBlock"
-    }, /* @__PURE__ */ React15.createElement("label", {
-      className: mx9(inputTextLabel)
+    }, /* @__PURE__ */ React15.createElement("h2", {
+      className: mx7(inputTextLabel)
     }, t("fields label")), /* @__PURE__ */ React15.createElement(List2.Root, {
       items: view.projection.fields,
       isItem: Schema2.is(FieldSchema),
-      getId: (field2) => field2.id,
-      readonly,
-      onMove: readonly ? void 0 : handleMove
-    }, ({ items: fields }) => /* @__PURE__ */ React15.createElement(React15.Fragment, null, showHeading && /* @__PURE__ */ React15.createElement("div", {
-      role: "heading",
-      className: grid
-    }, /* @__PURE__ */ React15.createElement("div", null), /* @__PURE__ */ React15.createElement("div", {
-      className: "flex items-center text-sm"
-    }, t("field path label"))), /* @__PURE__ */ React15.createElement("div", {
-      role: "list",
-      className: "flex flex-col is-full"
-    }, fields?.map((field2) => /* @__PURE__ */ React15.createElement(List2.Item, {
-      key: field2.id,
-      item: field2,
-      classNames: mx9(grid, ghostHover, "overflow-hidden", !readonly && "cursor-pointer")
-    }, /* @__PURE__ */ React15.createElement(List2.ItemDragHandle, null), /* @__PURE__ */ React15.createElement(List2.ItemTitle, {
-      onClick: () => handleSelect(field2)
-    }, field2.path), /* @__PURE__ */ React15.createElement(List2.ItemButton, {
-      "data-testid": "hide-field-button",
-      icon: "ph--eye-slash--regular",
-      // TDOO(burdon): Is this the correct test?
-      disabled: view.projection.fields.length <= 1,
-      onClick: () => handleHide(field2.id)
-    }), !readonly && /* @__PURE__ */ React15.createElement(List2.ItemDeleteButton, {
-      disabled: view.projection.fields.length <= 1,
-      onClick: () => handleDelete(field2.id)
-    })))))), hiddenProperties.length > 0 && /* @__PURE__ */ React15.createElement(React15.Fragment, null, /* @__PURE__ */ React15.createElement("label", {
-      className: mx9(inputTextLabel)
-    }, t("hidden fields label")), /* @__PURE__ */ React15.createElement(List2.Root, {
-      items: hiddenProperties,
-      isItem: (item) => typeof item === "string",
-      getId: (property) => property
-    }, ({ items: properties }) => /* @__PURE__ */ React15.createElement("div", {
+      getId: (field) => field.id,
+      onMove: readonly ? void 0 : handleMove,
+      readonly
+    }, ({ items: fields }) => /* @__PURE__ */ React15.createElement(React15.Fragment, null, showHeading && /* @__PURE__ */ React15.createElement("h3", {
+      className: "text-sm"
+    }, t("field path label")), /* @__PURE__ */ React15.createElement("div", {
       role: "list",
-      className: "flex flex-col is-full"
-    }, properties?.map((property) => /* @__PURE__ */ React15.createElement(List2.Item, {
-      key: property,
-      item: property,
-      classNames: mx9(grid, ghostHover, !readonly && "cursor-pointer")
-    }, /* @__PURE__ */ React15.createElement(List2.ItemDragHandle, {
-      disabled: true
-    }), /* @__PURE__ */ React15.createElement(List2.ItemTitle, null, property), /* @__PURE__ */ React15.createElement(List2.ItemButton, {
-      icon: "ph--eye--regular",
-      onClick: () => handleShow(property),
-      "data-testid": "show-field-button"
-    }))))))), field && /* @__PURE__ */ React15.createElement(FieldEditor, {
-      key: field.id,
-      projection,
-      field,
-      registry,
-      onSave: handleClose
-    }), !readonly && !field && /* @__PURE__ */ React15.createElement("div", {
+      className: listGrid
+    }, fields?.map((field) => {
+      const hidden = field.visible === false;
+      return /* @__PURE__ */ React15.createElement(List2.Item, {
+        key: field.id,
+        item: field,
+        classNames: listItemGrid,
+        "aria-expanded": expandedField === field.id
+      }, /* @__PURE__ */ React15.createElement("div", {
+        role: "none",
+        className: mx7(subtleHover2, listItemGrid, "rounded-sm cursor-pointer min-bs-10")
+      }, /* @__PURE__ */ React15.createElement(List2.ItemDragHandle, {
+        disabled: readonly
+      }), /* @__PURE__ */ React15.createElement(List2.ItemTitle, {
+        classNames: hidden && "text-subdued",
+        onClick: () => handleToggleField(field)
+      }, field.path), /* @__PURE__ */ React15.createElement(List2.ItemButton, {
+        label: t(hidden ? "show field label" : "hide field label"),
+        "data-testid": hidden ? "show-field-button" : "hide-field-button",
+        icon: hidden ? "ph--eye-closed--regular" : "ph--eye--regular",
+        autoHide: false,
+        disabled: readonly || !hidden && projectionModel.fields.length <= 1,
+        onClick: () => hidden ? handleShow(field.path) : handleHide(field.id)
+      }), mode === "schema" && /* @__PURE__ */ React15.createElement(React15.Fragment, null, /* @__PURE__ */ React15.createElement(List2.ItemDeleteButton, {
+        label: t("delete field label"),
+        autoHide: false,
+        disabled: readonly || schemaReadonly || view.projection.fields.length <= 1,
+        onClick: () => handleDelete(field.id),
+        "data-testid": "field.delete"
+      }), /* @__PURE__ */ React15.createElement(IconButton4, {
+        iconOnly: true,
+        variant: "ghost",
+        label: t("toggle expand label", {
+          ns: "os"
+        }),
+        icon: expandedField === field.id ? "ph--caret-down--regular" : "ph--caret-right--regular",
+        onClick: () => handleToggleField(field)
+      }))), expandedField === field.id && mode === "schema" && /* @__PURE__ */ React15.createElement("div", {
+        role: "none",
+        className: "col-span-5 mbs-1 mbe-1 border border-separator rounded-md"
+      }, /* @__PURE__ */ React15.createElement(FieldEditor, {
+        readonly: readonly || schemaReadonly ? "disabled-input" : false,
+        projection: projectionModel,
+        field,
+        registry,
+        onSave: handleClose
+      })));
+    }))))), !readonly && !expandedField && mode === "schema" && /* @__PURE__ */ React15.createElement("div", {
       role: "none",
       className: outerSpacing ? cardSpacing3 : "mlb-cardSpacingBlock"
     }, /* @__PURE__ */ React15.createElement(IconButton4, {
@@ -2351,12 +2548,27 @@ var ViewEditor = ({ classNames, schema, view, registry, readonly: _readonly, sho
       onClick: readonly ? void 0 : handleAdd,
       // TODO(burdon): Show field limit in ux (not tooltip).
       disabled: view.projection.fields.length >= VIEW_FIELD_LIMIT,
-      classNames: "flex is-full"
+      classNames: "is-full"
     })));
   } finally {
     _effect.f();
   }
-};
+});
+var customFields = ({ types, tags }) => ({
+  query: (props) => {
+    const handleChange = useCallback13((query) => props.onValueChange("object", query.ast), [
+      props.onValueChange
+    ]);
+    return /* @__PURE__ */ React15.createElement(Input8.Root, null, /* @__PURE__ */ React15.createElement(InputHeader, {
+      label: props.label
+    }), /* @__PURE__ */ React15.createElement(QueryForm, {
+      initialQuery: props.getValue(),
+      types,
+      tags,
+      onChange: handleChange
+    }));
+  }
+});
 export {
   BooleanInput,
   ControlFrame,
@@ -2368,8 +2580,6 @@ export {
   ControlPage,
   ControlSection,
   ControlSectionHeading,
-  DeprecatedFormContainer,
-  DeprecatedFormInput,
   FieldEditor,
   Form,
   FormProvider,
@@ -2377,6 +2587,7 @@ export {
   InputHeader,
   MarkdownInput,
   NumberInput,
+  ObjectPicker,
   SelectInput,
   SelectOptionInput,
   TextInput,