@dxos/react-ui-table 0.8.2-main.f11618f → 0.8.2-staging.42af850

package/dist/lib/browser/index.mjs

@@ -1,7 +1,7 @@
 import {
   TableSchema,
   TableType
-} from "./chunk-YWNRUF4J.mjs";
+} from "./chunk-U6LL2AVU.mjs";
 
 // packages/ui/react-ui-table/src/translations.ts
 var translationKey = "table";
@@ -36,9 +36,10 @@ var translations_default = [
 ];
 
 // packages/ui/react-ui-table/src/components/Table/Table.tsx
-import React6, { forwardRef, useCallback as useCallback4, useImperativeHandle, useState as useState2, useMemo as useMemo4, useEffect as useEffect2 } from "react";
+import { useSignals as _useSignals7 } from "@preact-signals/safe-react/tracking";
+import React7, { forwardRef, useCallback as useCallback5, useImperativeHandle, useState as useState2, useMemo as useMemo5, useEffect as useEffect3 } from "react";
 import { getValue as getValue4 } from "@dxos/echo-schema";
-import { invariant as invariant3 } from "@dxos/invariant";
+import { invariant as invariant4 } from "@dxos/invariant";
 import { Filter } from "@dxos/react-client/echo";
 import { useTranslation as useTranslation3 } from "@dxos/react-ui";
 import { useAttention } from "@dxos/react-ui-attention";
@@ -47,209 +48,233 @@ import { mx as mx2 } from "@dxos/react-ui-theme";
 import { isNotFalsy, safeParseInt } from "@dxos/util";
 
 // packages/ui/react-ui-table/src/components/Table/ColumnActionsMenu.tsx
+import { useSignals as _useSignals } from "@preact-signals/safe-react/tracking";
 import React from "react";
 import { DropdownMenu, useTranslation } from "@dxos/react-ui";
 var ColumnActionsMenu = ({ model, modals }) => {
-  const { t } = useTranslation(translationKey);
-  const state = modals.state.value;
-  if (state?.type !== "column") {
-    return null;
-  }
-  const currentSort = model.sorting?.sorting;
-  const isCurrentColumnSorted = currentSort?.fieldId === state.fieldId;
-  return /* @__PURE__ */ React.createElement(DropdownMenu.Root, {
-    modal: false,
-    open: true,
-    onOpenChange: modals.close
-  }, /* @__PURE__ */ React.createElement(DropdownMenu.VirtualTrigger, {
-    virtualRef: modals.trigger
-  }), /* @__PURE__ */ React.createElement(DropdownMenu.Portal, null, /* @__PURE__ */ React.createElement(DropdownMenu.Content, null, /* @__PURE__ */ React.createElement(DropdownMenu.Viewport, null, (!isCurrentColumnSorted || currentSort?.direction === "asc") && /* @__PURE__ */ React.createElement(DropdownMenu.Item, {
-    "data-testid": "column-sort-descending",
-    onClick: () => model.sorting?.setSort(state.fieldId, "desc")
-  }, t("column action sort descending")), (!isCurrentColumnSorted || currentSort?.direction === "desc") && /* @__PURE__ */ React.createElement(DropdownMenu.Item, {
-    "data-testid": "column-sort-ascending",
-    onClick: () => model.sorting?.setSort(state.fieldId, "asc")
-  }, t("column action sort ascending")), isCurrentColumnSorted && /* @__PURE__ */ React.createElement(DropdownMenu.Item, {
-    "data-testid": "column-clear-sort",
-    onClick: () => model.sorting?.clearSort()
-  }, t("column action clear sorting")), model.getColumnCount() > 1 && model.features.schemaEditable && /* @__PURE__ */ React.createElement(DropdownMenu.Item, {
-    "data-testid": "column-delete",
-    onClick: () => model.deleteColumn(state.fieldId)
-  }, t("column action delete")), model.features.schemaEditable && /* @__PURE__ */ React.createElement(DropdownMenu.Item, {
-    "data-testid": "column-settings",
-    onClick: () => modals.openColumnSettings()
-  }, t("column action settings"))), /* @__PURE__ */ React.createElement(DropdownMenu.Arrow, null))));
+  var _effect = _useSignals();
+  try {
+    const { t } = useTranslation(translationKey);
+    const state = modals.state.value;
+    if (state?.type !== "column") {
+      return null;
+    }
+    const currentSort = model.sorting?.sorting;
+    const isCurrentColumnSorted = currentSort?.fieldId === state.fieldId;
+    return /* @__PURE__ */ React.createElement(DropdownMenu.Root, {
+      modal: false,
+      open: true,
+      onOpenChange: modals.close
+    }, /* @__PURE__ */ React.createElement(DropdownMenu.VirtualTrigger, {
+      virtualRef: modals.trigger
+    }), /* @__PURE__ */ React.createElement(DropdownMenu.Portal, null, /* @__PURE__ */ React.createElement(DropdownMenu.Content, null, /* @__PURE__ */ React.createElement(DropdownMenu.Viewport, null, (!isCurrentColumnSorted || currentSort?.direction === "asc") && /* @__PURE__ */ React.createElement(DropdownMenu.Item, {
+      "data-testid": "column-sort-descending",
+      onClick: () => model.sorting?.setSort(state.fieldId, "desc")
+    }, t("column action sort descending")), (!isCurrentColumnSorted || currentSort?.direction === "desc") && /* @__PURE__ */ React.createElement(DropdownMenu.Item, {
+      "data-testid": "column-sort-ascending",
+      onClick: () => model.sorting?.setSort(state.fieldId, "asc")
+    }, t("column action sort ascending")), isCurrentColumnSorted && /* @__PURE__ */ React.createElement(DropdownMenu.Item, {
+      "data-testid": "column-clear-sort",
+      onClick: () => model.sorting?.clearSort()
+    }, t("column action clear sorting")), model.getColumnCount() > 1 && model.features.schemaEditable && /* @__PURE__ */ React.createElement(DropdownMenu.Item, {
+      "data-testid": "column-delete",
+      onClick: () => model.deleteColumn(state.fieldId)
+    }, t("column action delete")), model.features.schemaEditable && /* @__PURE__ */ React.createElement(DropdownMenu.Item, {
+      "data-testid": "column-settings",
+      onClick: () => modals.openColumnSettings()
+    }, t("column action settings"))), /* @__PURE__ */ React.createElement(DropdownMenu.Arrow, null))));
+  } finally {
+    _effect.f();
+  }
 };
 
 // packages/ui/react-ui-table/src/components/Table/ColumnSettings.tsx
+import { useSignals as _useSignals2 } from "@preact-signals/safe-react/tracking";
 import React2, { useCallback, useEffect, useMemo, useState } from "react";
 import { DropdownMenu as DropdownMenu2 } from "@dxos/react-ui";
 import { FieldEditor } from "@dxos/react-ui-form";
 var ColumnSettings = ({ model, modals, onNewColumn }) => {
-  const [newField, setNewField] = useState();
-  const state = modals.state.value;
-  const space = model?.space;
-  useEffect(() => {
-    if (state?.type === "columnSettings" && state.mode.type === "create" && model?.projection) {
-      setNewField(model.projection.createFieldProjection());
-      requestAnimationFrame(() => {
-        onNewColumn();
-      });
-    } else {
-      setNewField(void 0);
-    }
-  }, [
-    model?.projection,
-    state
-  ]);
-  const existingField = useMemo(() => {
-    if (state?.type === "columnSettings") {
-      const { mode } = state;
-      if (mode.type === "edit") {
-        return model?.view?.fields.find((f) => f.id === mode.fieldId);
+  var _effect = _useSignals2();
+  try {
+    const [newField, setNewField] = useState();
+    const state = modals.state.value;
+    const space = model?.space;
+    useEffect(() => {
+      if (state?.type === "columnSettings" && state.mode.type === "create" && model?.projection) {
+        setNewField(model.projection.createFieldProjection());
+        requestAnimationFrame(() => {
+          onNewColumn();
+        });
+      } else {
+        setNewField(void 0);
       }
-    }
-    return void 0;
-  }, [
-    model?.view?.fields,
-    state
-  ]);
-  const field = existingField ?? newField;
-  const handleSave = useCallback(() => {
-    modals.close();
-  }, [
-    modals
-  ]);
-  const handleCancel = useCallback(() => {
-    if (state?.type === "columnSettings" && state.mode.type === "create" && newField) {
-      model?.projection?.deleteFieldProjection(newField.id);
-    }
-  }, [
-    model?.projection,
-    state,
-    newField
-  ]);
-  if (!model?.view || !model.projection || !field) {
-    return null;
-  }
-  return /* @__PURE__ */ React2.createElement(DropdownMenu2.Root, {
-    modal: false,
-    open: state?.type === "columnSettings"
-  }, /* @__PURE__ */ React2.createElement(DropdownMenu2.VirtualTrigger, {
-    virtualRef: modals.trigger
-  }), /* @__PURE__ */ React2.createElement(DropdownMenu2.Portal, null, /* @__PURE__ */ React2.createElement(DropdownMenu2.Content, {
-    classNames: "md:is-64"
-  }, /* @__PURE__ */ React2.createElement(DropdownMenu2.Viewport, null, /* @__PURE__ */ React2.createElement(FieldEditor, {
-    view: model.view,
-    projection: model.projection,
-    field,
-    registry: space?.db.schemaRegistry,
-    onSave: handleSave,
-    onCancel: handleCancel
-  })), /* @__PURE__ */ React2.createElement(DropdownMenu2.Arrow, null))));
+    }, [
+      model?.projection,
+      state
+    ]);
+    const existingField = useMemo(() => {
+      if (state?.type === "columnSettings") {
+        const { mode } = state;
+        if (mode.type === "edit") {
+          return model?.view?.fields.find((f) => f.id === mode.fieldId);
+        }
+      }
+      return void 0;
+    }, [
+      model?.view?.fields,
+      state
+    ]);
+    const field = existingField ?? newField;
+    const handleSave = useCallback(() => {
+      modals.close();
+    }, [
+      modals
+    ]);
+    const handleCancel = useCallback(() => {
+      if (state?.type === "columnSettings" && state.mode.type === "create" && newField) {
+        model?.projection?.deleteFieldProjection(newField.id);
+      }
+    }, [
+      model?.projection,
+      state,
+      newField
+    ]);
+    if (!model?.view || !model.projection || !field) {
+      return null;
+    }
+    return /* @__PURE__ */ React2.createElement(DropdownMenu2.Root, {
+      modal: false,
+      open: state?.type === "columnSettings"
+    }, /* @__PURE__ */ React2.createElement(DropdownMenu2.VirtualTrigger, {
+      virtualRef: modals.trigger
+    }), /* @__PURE__ */ React2.createElement(DropdownMenu2.Portal, null, /* @__PURE__ */ React2.createElement(DropdownMenu2.Content, {
+      classNames: "md:is-64"
+    }, /* @__PURE__ */ React2.createElement(DropdownMenu2.Viewport, null, /* @__PURE__ */ React2.createElement(FieldEditor, {
+      view: model.view,
+      projection: model.projection,
+      field,
+      registry: space?.db.schemaRegistry,
+      onSave: handleSave,
+      onCancel: handleCancel
+    })), /* @__PURE__ */ React2.createElement(DropdownMenu2.Arrow, null))));
+  } finally {
+    _effect.f();
+  }
 };
 
 // packages/ui/react-ui-table/src/components/Table/CreateRefPanel.tsx
+import { useSignals as _useSignals3 } from "@preact-signals/safe-react/tracking";
+import { Schema } from "effect";
 import React3, { useCallback as useCallback2, useMemo as useMemo2 } from "react";
-import { S } from "@dxos/echo-schema";
 import { live } from "@dxos/react-client/echo";
 import { Popover } from "@dxos/react-ui";
 import { Form } from "@dxos/react-ui-form";
 import { useGridContext } from "@dxos/react-ui-grid";
 var CreateRefPanel = ({ model, modals, __gridScope }) => {
-  const { id: gridId } = useGridContext("TableCellEditor", __gridScope);
-  const space = model?.space;
-  const state = modals.state.value;
-  const schema = useMemo2(() => {
-    if (!space || state?.type !== "createRefPanel") {
-      return;
-    }
-    const [schema2] = space.db.schemaRegistry.query({
-      typename: state.typename
-    }).runSync();
-    if (schema2) {
-      const omit = S.omit("id");
-      return omit(schema2);
-    }
-  }, [
-    space,
-    state
-  ]);
-  const handleSave = useCallback2((values) => {
-    if (!model || !space || state?.type !== "createRefPanel") {
-      return;
-    }
-    const [schema2] = space.db.schemaRegistry.query({
-      typename: state.typename
-    }).runSync();
-    if (schema2) {
-      const obj = space.db.add(live(schema2, values));
-      state.onCreate?.(obj);
-    }
-    void modals.close();
-  }, [
-    modals,
-    space,
-    state
-  ]);
-  const handleCancel = useCallback2(() => {
-    if (model) {
-      modals.close();
-    }
-  }, [
-    modals
-  ]);
-  if (!model?.view || !model.projection) {
-    return null;
-  }
-  return /* @__PURE__ */ React3.createElement(Popover.Root, {
-    modal: false,
-    open: state?.type === "createRefPanel" && !!schema,
-    onOpenChange: (nextOpen) => {
-      if (model && !nextOpen) {
-        return modals.close();
+  var _effect = _useSignals3();
+  try {
+    const { id: gridId } = useGridContext("TableCellEditor", __gridScope);
+    const space = model?.space;
+    const state = modals.state.value;
+    const schema = useMemo2(() => {
+      if (!space || state?.type !== "createRefPanel") {
+        return;
       }
-    }
-  }, /* @__PURE__ */ React3.createElement(Popover.VirtualTrigger, {
-    virtualRef: modals.trigger
-  }), /* @__PURE__ */ React3.createElement(Popover.Portal, null, /* @__PURE__ */ React3.createElement(Popover.Content, {
-    classNames: "md:is-64",
-    "data-grid": gridId
-  }, state?.type === "createRefPanel" && schema && /* @__PURE__ */ React3.createElement(Form, {
-    schema,
-    values: state.initialValues ?? {},
-    onSave: handleSave,
-    onCancel: handleCancel
-  }), /* @__PURE__ */ React3.createElement(Popover.Arrow, null))));
+      const [schema2] = space.db.schemaRegistry.query({
+        typename: state.typename
+      }).runSync();
+      if (schema2) {
+        const omit = Schema.omit("id");
+        return omit(schema2);
+      }
+    }, [
+      space,
+      state
+    ]);
+    const handleSave = useCallback2((values) => {
+      if (!model || !space || state?.type !== "createRefPanel") {
+        return;
+      }
+      const [schema2] = space.db.schemaRegistry.query({
+        typename: state.typename
+      }).runSync();
+      if (schema2) {
+        const obj = space.db.add(live(schema2, values));
+        state.onCreate?.(obj);
+      }
+      void modals.close();
+    }, [
+      modals,
+      space,
+      state
+    ]);
+    const handleCancel = useCallback2(() => {
+      if (model) {
+        modals.close();
+      }
+    }, [
+      modals
+    ]);
+    if (!model?.view || !model.projection) {
+      return null;
+    }
+    return /* @__PURE__ */ React3.createElement(Popover.Root, {
+      modal: false,
+      open: state?.type === "createRefPanel" && !!schema,
+      onOpenChange: (nextOpen) => {
+        if (model && !nextOpen) {
+          return modals.close();
+        }
+      }
+    }, /* @__PURE__ */ React3.createElement(Popover.VirtualTrigger, {
+      virtualRef: modals.trigger
+    }), /* @__PURE__ */ React3.createElement(Popover.Portal, null, /* @__PURE__ */ React3.createElement(Popover.Content, {
+      classNames: "md:is-64",
+      "data-grid": gridId
+    }, state?.type === "createRefPanel" && schema && /* @__PURE__ */ React3.createElement(Form, {
+      schema,
+      values: state.initialValues ?? {},
+      onSave: handleSave,
+      onCancel: handleCancel
+    }), /* @__PURE__ */ React3.createElement(Popover.Arrow, null))));
+  } finally {
+    _effect.f();
+  }
 };
 
 // packages/ui/react-ui-table/src/components/Table/RowActionsMenu.tsx
+import { useSignals as _useSignals4 } from "@preact-signals/safe-react/tracking";
 import React4 from "react";
 import { DropdownMenu as DropdownMenu3, useTranslation as useTranslation2 } from "@dxos/react-ui";
 var RowActionsMenu = ({ model, modals }) => {
-  const { t } = useTranslation2(translationKey);
-  const hasSelection = model.selection.hasSelection.value;
-  const state = modals.state.value;
-  if (state?.type !== "row") {
-    return null;
-  }
-  return /* @__PURE__ */ React4.createElement(DropdownMenu3.Root, {
-    modal: false,
-    open: true,
-    onOpenChange: modals.close
-  }, /* @__PURE__ */ React4.createElement(DropdownMenu3.VirtualTrigger, {
-    virtualRef: modals.trigger
-  }), /* @__PURE__ */ React4.createElement(DropdownMenu3.Content, null, /* @__PURE__ */ React4.createElement(DropdownMenu3.Viewport, null, model.features.dataEditable !== false && /* @__PURE__ */ React4.createElement(DropdownMenu3.Item, {
-    "data-testid": "row-menu-delete",
-    onClick: () => model.deleteRow(state.rowIndex)
-  }, t(hasSelection ? "bulk delete row label" : "delete row label")), model.rowActions?.map((action) => /* @__PURE__ */ React4.createElement(DropdownMenu3.Item, {
-    key: action.id,
-    "data-testid": `row-action-${action.id}`,
-    onClick: () => {
-      modals.close();
-      model.handleRowAction(action.id, state.rowIndex);
-    }
-  }, t(action.translationKey)))), /* @__PURE__ */ React4.createElement(DropdownMenu3.Arrow, null)));
+  var _effect = _useSignals4();
+  try {
+    const { t } = useTranslation2(translationKey);
+    const hasSelection = model.selection.hasSelection.value;
+    const state = modals.state.value;
+    if (state?.type !== "row") {
+      return null;
+    }
+    return /* @__PURE__ */ React4.createElement(DropdownMenu3.Root, {
+      modal: false,
+      open: true,
+      onOpenChange: modals.close
+    }, /* @__PURE__ */ React4.createElement(DropdownMenu3.VirtualTrigger, {
+      virtualRef: modals.trigger
+    }), /* @__PURE__ */ React4.createElement(DropdownMenu3.Content, null, /* @__PURE__ */ React4.createElement(DropdownMenu3.Viewport, null, model.features.dataEditable !== false && /* @__PURE__ */ React4.createElement(DropdownMenu3.Item, {
+      "data-testid": "row-menu-delete",
+      onClick: () => model.deleteRow(state.rowIndex)
+    }, t(hasSelection ? "bulk delete row label" : "delete row label")), model.rowActions?.map((action) => /* @__PURE__ */ React4.createElement(DropdownMenu3.Item, {
+      key: action.id,
+      "data-testid": `row-action-${action.id}`,
+      onClick: () => {
+        modals.close();
+        model.handleRowAction(action.id, state.rowIndex);
+      }
+    }, t(action.translationKey)))), /* @__PURE__ */ React4.createElement(DropdownMenu3.Arrow, null)));
+  } finally {
+    _effect.f();
+  }
 };
 
 // packages/ui/react-ui-table/src/model/table-model.ts
@@ -257,7 +282,7 @@ import { computed as computed3, effect as effect2, signal as signal3 } from "@pr
 import { Resource as Resource2 } from "@dxos/context";
 import { FormatEnum as FormatEnum3, getValue as getValue2, setValue } from "@dxos/echo-schema";
 import { invariant } from "@dxos/invariant";
-import { isLiveObject, makeRef as makeRef3 } from "@dxos/live-object";
+import { isLiveObject, makeRef as makeRef2 } from "@dxos/live-object";
 import { formatForEditing, parseValue } from "@dxos/react-ui-form";
 
 // packages/ui/react-ui-table/src/model/selection-model.ts
@@ -265,9 +290,10 @@ import { computed, effect, signal } from "@preact/signals-core";
 import { Resource } from "@dxos/context";
 
 // packages/ui/react-ui-table/src/util/dynamic-table.ts
+import { getTypename, toJsonSchema } from "@dxos/echo-schema";
 import { live as live2, makeRef } from "@dxos/live-object";
 import { createView, getSchemaFromPropertyDefinitions, ViewProjection } from "@dxos/schema";
-var getBaseSchems = ({ typename, properties, jsonSchema, schema }) => {
+var getBaseSchema = ({ typename, properties, jsonSchema, schema }) => {
   if (typename && properties) {
     const schema2 = getSchemaFromPropertyDefinitions(typename, properties);
     return {
@@ -276,8 +302,8 @@ var getBaseSchems = ({ typename, properties, jsonSchema, schema }) => {
     };
   } else if (schema) {
     return {
-      typename: schema.typename,
-      jsonSchema: schema.jsonSchema
+      typename: getTypename(schema),
+      jsonSchema: toJsonSchema(schema)
     };
   } else if (typename && jsonSchema) {
     return {
@@ -344,9 +370,10 @@ var setProperties = (view, projection, properties) => {
 var touch = (value) => value;
 
 // packages/ui/react-ui-table/src/util/table.ts
-import { AST, Format, FormatEnum, S as S2, TypedObject, TypeEnum } from "@dxos/echo-schema";
+import { Schema as Schema2 } from "effect";
+import { Format, FormatEnum, Ref, TypedObject, TypeEnum } from "@dxos/echo-schema";
 import { PublicKey } from "@dxos/react-client";
-import { live as live3, makeRef as makeRef2 } from "@dxos/react-client/echo";
+import { live as live3 } from "@dxos/react-client/echo";
 import { createFieldId, createView as createView2, getSchemaProperties, ViewProjection as ViewProjection2 } from "@dxos/schema";
 var initializeTable = async ({ client, space, table, typename, initialRow = true }) => {
   if (typename) {
@@ -355,7 +382,7 @@ var initializeTable = async ({ client, space, table, typename, initialRow = true
       throw new Error(`Schema not found: ${typename}`);
     }
     const fields = getSchemaProperties(schema.ast).map((prop) => prop.name);
-    table.view = makeRef2(createView2({
+    table.view = Ref.make(createView2({
       // TODO(ZaymonFC): Don't hardcode name?
       name: "View",
       typename: schema.typename,
@@ -368,7 +395,7 @@ var initializeTable = async ({ client, space, table, typename, initialRow = true
       ContactSchema
     ]);
     const fields = ContactFields;
-    table.view = makeRef2(createView2({
+    table.view = Ref.make(createView2({
       name: "View",
       typename: schema.typename,
       jsonSchema: schema.jsonSchema,
@@ -385,13 +412,13 @@ var ContactSchema = TypedObject({
   typename: `example.com/type/${PublicKey.random().truncate()}`,
   version: "0.1.0"
 })({
-  name: S2.optional(S2.String).annotations({
-    [AST.TitleAnnotationId]: "Name"
+  name: Schema2.optional(Schema2.String).annotations({
+    title: "Name"
   }),
-  active: S2.optional(S2.Boolean),
-  email: S2.optional(Format.Email),
-  salary: S2.optional(Format.Currency()).annotations({
-    [AST.TitleAnnotationId]: "Salary"
+  active: Schema2.optional(Schema2.Boolean),
+  email: Schema2.optional(Format.Email),
+  salary: Schema2.optional(Format.Currency()).annotations({
+    title: "Salary"
   })
 });
 var ContactFields = [
@@ -444,7 +471,7 @@ var BUTTON_IDENTIFIERS = {
 var createButton = ({ attr, data, disabled = false, icon, testId, type = "primary" }) => {
   const dataAttrs = Object.entries(data).map(([k, v]) => `${k}="${v}"`).join(" ");
   const positionClass = type === "primary" ? "inline-end-2" : "inline-end-9";
-  return `<button ${attr} data-testid="${testId}" class="dx-button is-6 pli-0.5 min-bs-0 absolute inset-block-1 ${positionClass}" ${dataAttrs} ${disabled ? "disabled" : ""}><svg><use href="/icons.svg#${icon}"/></svg></button>`;
+  return `<button ${attr} data-testid="${testId}" class="dx-button is-6 pli-0.5 min-bs-0 absolute inset-block-1 ${positionClass}" ${dataAttrs} ${disabled ? "disabled" : ""}><svg data-size="4"><use href="/icons.svg#${icon}"/></svg></button>`;
 };
 var addColumnButton = {
   attr: BUTTON_IDENTIFIERS.newColumn,
@@ -582,15 +609,25 @@ var tableControls = {
   }
 };
 
+// packages/ui/react-ui-table/src/util/schema.ts
+import { Schema as Schema3 } from "effect";
+import { isTypeLiteral, TypeLiteral } from "effect/SchemaAST";
+var narrowSchema = (schema, paths) => {
+  const ast = schema?.ast;
+  if (isTypeLiteral(ast)) {
+    const propertySignatures = ast.propertySignatures.filter((signature) => paths.includes(signature.name.toString()));
+    if (propertySignatures.length > 0) {
+      const narrowType = new TypeLiteral(propertySignatures, []);
+      return Schema3.make(narrowType);
+    }
+  }
+  return void 0;
+};
+
 // packages/ui/react-ui-table/src/model/selection-model.ts
 var SelectionModel = class extends Resource {
   constructor(_rows, _selectionMode, _onSelectionChanged) {
-    super();
-    this._rows = _rows;
-    this._selectionMode = _selectionMode;
-    this._onSelectionChanged = _onSelectionChanged;
-    this._selection = signal(/* @__PURE__ */ new Set());
-    this._validSelectedIds = computed(() => {
+    super(), this._rows = _rows, this._selectionMode = _selectionMode, this._onSelectionChanged = _onSelectionChanged, this._selection = signal(/* @__PURE__ */ new Set()), this._validSelectedIds = computed(() => {
       const rows = this._rows.value;
       if (!rows) {
         return /* @__PURE__ */ new Set();
@@ -599,27 +636,21 @@ var SelectionModel = class extends Resource {
       return new Set([
         ...this._selection.value
       ].filter((id) => validIds.has(id)));
-    });
-    this._hasSelection = computed(() => this._validSelectedIds.value.size > 0);
-    this._allSelected = computed(() => {
+    }), this._hasSelection = computed(() => this._validSelectedIds.value.size > 0), this._allSelected = computed(() => {
       const rows = this._rows.value;
       if (rows.length === 0) {
         return false;
       }
       return rows.every((row) => this._selection.value.has(row.id));
-    });
-    this.getSelectedRows = () => {
+    }), this.getSelectedRows = () => {
       const selectedIds = this._validSelectedIds.value;
       return this._rows.value.filter((row) => selectedIds.has(row.id));
-    };
-    this.isRowIndexSelected = (rowIndex) => {
+    }, this.isRowIndexSelected = (rowIndex) => {
       const row = this._rows.value[rowIndex];
       return this._selection.value.has(row.id);
-    };
-    this.isObjectSelected = (object) => {
+    }, this.isObjectSelected = (object) => {
       return this._selection.value.has(object.id);
-    };
-    this.toggleSelectionForRowIndex = (rowIndex) => {
+    }, this.toggleSelectionForRowIndex = (rowIndex) => {
       const row = this._rows.value[rowIndex];
       const newSelection = new Set(this._selection.value);
       if (newSelection.has(row.id)) {
@@ -631,8 +662,7 @@ var SelectionModel = class extends Resource {
         newSelection.add(row.id);
       }
       this._selection.value = newSelection;
-    };
-    this.setSelection = (mode) => {
+    }, this.setSelection = (mode) => {
       switch (mode) {
         case "all": {
           this._selection.value = new Set(this._rows.value.map((row) => row.id));
@@ -950,7 +980,7 @@ var TableModel = class extends Resource2 {
       switch (props.format) {
         case FormatEnum3.Ref: {
           if (isLiveObject(value)) {
-            setValue(this._rows.value[rowIdx], field.path, makeRef3(value));
+            setValue(this._rows.value[rowIdx], field.path, makeRef2(value));
           }
           break;
         }
@@ -1274,7 +1304,8 @@ var ModalController = class {
 
 // packages/ui/react-ui-table/src/model/table-presentation.ts
 import { signal as signal5 } from "@preact/signals-core";
-import { FormatEnum as FormatEnum4, getDXN, getValue as getValue3 } from "@dxos/echo-schema";
+import { isNotNullable } from "effect/Predicate";
+import { FormatEnum as FormatEnum4, getDXN, getValue as getValue3, TypeEnum as TypeEnum3 } from "@dxos/echo-schema";
 import { cellClassesForFieldType, formatForDisplay as formatForDisplay2 } from "@dxos/react-ui-form";
 import { toPlaneCellIndex } from "@dxos/react-ui-grid";
 import { mx } from "@dxos/react-ui-theme";
@@ -1336,6 +1367,9 @@ var TablePresentation = class {
           if (value == null) {
             return "";
           }
+          if (props.type === "array") {
+            return "";
+          }
           switch (props.format) {
             case FormatEnum4.Boolean:
             case FormatEnum4.SingleSelect:
@@ -1373,11 +1407,38 @@ var TablePresentation = class {
       if (classes.length > 0) {
         cell.className = mx(classes.flat());
       }
+      if (props.type === TypeEnum3.Array) {
+        const targetArray = getValue3(obj, field.path);
+        if (targetArray && Array.isArray(targetArray)) {
+          const getLabel = (value) => {
+            if (!value) {
+              return void 0;
+            }
+            if (typeof value === "string" || typeof value === "number" || typeof value === "boolean") {
+              return String(value);
+            }
+            if (Array.isArray(value)) {
+              return "Array";
+            }
+            if (typeof value === "object" && value.name) {
+              return value.name;
+            }
+            if (typeof value === "object" && value.value) {
+              return `${value.value}`;
+            }
+            return "Object";
+          };
+          const tags = targetArray.map(getLabel).filter(isNotNullable).map((title) => {
+            return `<span class="dx-tag rounded-xl" data-hue="neutral">${title}</span>`;
+          }).join("");
+          cell.accessoryHtml = `<div role='none' class="flex flex-row gap-1 overflow-x-auto">${tags}</div>`;
+        }
+      }
       if (props.format === FormatEnum4.Ref && props.referenceSchema) {
         const targetObj = getValue3(obj, field.path)?.target;
         if (targetObj) {
           const dxn = getDXN(targetObj)?.toString();
-          cell.accessoryHtml = `<dx-ref-tag ref=${dxn} class="dx-button block is-6 pli-[3px] plb-[3px] pbe-[2px] min-bs-0 absolute inline-end-1"><dx-icon icon="ph--link-simple--regular"/></dx-ref-tag>`;
+          cell.accessoryHtml = `<dx-ref-tag refId=${dxn} class="dx-button block is-6 pli-[3px] plb-[3px] pbe-[2px] min-bs-0 absolute inline-end-1"><dx-icon icon="ph--link-simple--regular"/></dx-ref-tag>`;
         }
       }
       if (props.format === FormatEnum4.Boolean) {
@@ -1411,7 +1472,7 @@ var TablePresentation = class {
             return null;
           }).filter(Boolean).join(" ");
           if (tags) {
-            cell.accessoryHtml = tags;
+            cell.accessoryHtml = `<div role='none' class="flex flex-row gap-1">${tags}</div>`;
           }
         }
       }
@@ -1456,7 +1517,7 @@ var TablePresentation = class {
           fieldId: field.id
         })}
         `,
-        className: "!bg-gridHeader"
+        className: "!bg-toolbarSurface"
       };
     }
     return cells;
@@ -1507,7 +1568,7 @@ var TablePresentation = class {
           col: 0,
           row: 0
         })]: {
-          className: "!bg-gridHeader",
+          className: "!bg-toolbarSurface",
           readonly: true,
           value: ""
         }
@@ -1523,7 +1584,7 @@ var TablePresentation = class {
           header: true,
           checked: this.model.selection.allRowsSeleted.value
         }),
-        className: "!bg-gridHeader",
+        className: "!bg-toolbarSurface",
         readonly: true,
         value: ""
       }
@@ -1538,7 +1599,7 @@ var TablePresentation = class {
         accessoryHtml: this.model.features.schemaEditable ? tableButtons.addColumn.render({
           disabled: (this.model.view?.fields?.length ?? 0) >= VIEW_FIELD_LIMIT
         }) : void 0,
-        className: "!bg-gridHeader",
+        className: "!bg-toolbarSurface",
         readonly: true,
         value: ""
       }
@@ -1569,14 +1630,116 @@ var cellClassesForRowSelection = (selected, selectionMode) => {
 };
 
 // packages/ui/react-ui-table/src/components/TableCellEditor/TableCellEditor.tsx
-import React5, { useCallback as useCallback3, useMemo as useMemo3, useRef } from "react";
-import { FormatEnum as FormatEnum5 } from "@dxos/echo-schema";
-import { invariant as invariant2 } from "@dxos/invariant";
+import { useSignals as _useSignals6 } from "@preact-signals/safe-react/tracking";
+import React6, { useCallback as useCallback4, useMemo as useMemo4, useRef as useRef2 } from "react";
+import { FormatEnum as FormatEnum5, TypeEnum as TypeEnum4 } from "@dxos/echo-schema";
+import { invariant as invariant3 } from "@dxos/invariant";
 import { useThemeContext } from "@dxos/react-ui";
 import { createMarkdownExtensions } from "@dxos/react-ui-editor";
-import { cellQuery, editorKeys, parseCellIndex, useGridContext as useGridContext2, GridCellEditor } from "@dxos/react-ui-grid";
+import { cellQuery, editorKeys, parseCellIndex as parseCellIndex2, useGridContext as useGridContext3, GridCellEditor } from "@dxos/react-ui-grid";
 import { tagPickerExtension, createLinks } from "@dxos/react-ui-tag-picker";
 
+// packages/ui/react-ui-table/src/components/TableCellEditor/FormCellEditor.tsx
+import { useSignals as _useSignals5 } from "@preact-signals/safe-react/tracking";
+import React5, { useCallback as useCallback3, useEffect as useEffect2, useMemo as useMemo3, useRef } from "react";
+import { getSnapshot } from "@dxos/echo-schema";
+import { invariant as invariant2 } from "@dxos/invariant";
+import { Popover as Popover2 } from "@dxos/react-ui";
+import { Form as Form2 } from "@dxos/react-ui-form";
+import { parseCellIndex, useGridContext as useGridContext2 } from "@dxos/react-ui-grid";
+import { getDeep, setDeep } from "@dxos/util";
+var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-table/src/components/TableCellEditor/FormCellEditor.tsx";
+var FormCellEditor = ({ fieldProjection, model, schema, __gridScope }) => {
+  var _effect = _useSignals5();
+  try {
+    const { editing, setEditing } = useGridContext2("ArrayEditor", __gridScope);
+    const cellRef = useRef(null);
+    useEffect2(() => {
+      if (editing && editing.cellElement) {
+        cellRef.current = editing.cellElement;
+      }
+    }, [
+      editing?.cellElement
+    ]);
+    const narrowedSchema = useMemo3(() => {
+      if (!schema) {
+        return void 0;
+      }
+      return narrowSchema(schema, [
+        fieldProjection.field.path
+      ]);
+    }, [
+      JSON.stringify(schema),
+      fieldProjection.field.path
+    ]);
+    const originalRow = useMemo3(() => {
+      if (model && editing) {
+        const cell = parseCellIndex(editing.index);
+        const row = model.getRowAt(cell.row);
+        invariant2(row, void 0, {
+          F: __dxlog_file3,
+          L: 47,
+          S: void 0,
+          A: [
+            "row",
+            ""
+          ]
+        });
+        return row;
+      }
+      return void 0;
+    }, [
+      model,
+      editing
+    ]);
+    const formValues = useMemo3(() => {
+      if (originalRow) {
+        return getSnapshot(originalRow);
+      }
+    }, [
+      originalRow
+    ]);
+    const handleSave = useCallback3((values) => {
+      const path = fieldProjection.field.path;
+      const value = getDeep(values, [
+        path
+      ]);
+      setDeep(originalRow, [
+        path
+      ], value);
+      setEditing(null);
+    }, [
+      fieldProjection.field.path,
+      originalRow
+    ]);
+    const handleOpenChange = useCallback3((nextOpen) => {
+      if (nextOpen === false) {
+        setEditing(null);
+      }
+    }, [
+      setEditing
+    ]);
+    if (!editing) {
+      return null;
+    }
+    return /* @__PURE__ */ React5.createElement(Popover2.Root, {
+      open: editing !== null,
+      onOpenChange: handleOpenChange
+    }, /* @__PURE__ */ React5.createElement(Popover2.VirtualTrigger, {
+      virtualRef: cellRef
+    }), /* @__PURE__ */ React5.createElement(Popover2.Content, {
+      tabIndex: -1,
+      classNames: "popover-card-width"
+    }, /* @__PURE__ */ React5.createElement(Popover2.Arrow, null), /* @__PURE__ */ React5.createElement(Form2, {
+      values: formValues,
+      schema: narrowedSchema,
+      onSave: handleSave
+    })));
+  } finally {
+    _effect.f();
+  }
+};
+
 // packages/ui/react-ui-table/src/components/TableCellEditor/extension.ts
 import { autocompletion, pickedCompletion } from "@codemirror/autocomplete";
 import { EditorView } from "@codemirror/view";
@@ -1617,218 +1780,268 @@ var completion = ({ debug, onQuery, onMatch }) => {
 };
 
 // packages/ui/react-ui-table/src/components/TableCellEditor/TableCellEditor.tsx
-var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-table/src/components/TableCellEditor/TableCellEditor.tsx";
+var __dxlog_file4 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-table/src/components/TableCellEditor/TableCellEditor.tsx";
 var newValue = Symbol.for("newValue");
 var createOption = (text) => ({
   [newValue]: true,
   text
 });
 var isCreateOption = (data) => typeof data === "object" && data[newValue];
-var TableCellEditor = ({ model, modals, onEnter, onFocus, onQuery, __gridScope }) => {
-  const { id: gridId, editing, setEditing } = useGridContext2("TableCellEditor", __gridScope);
-  const suppressNextBlur = useRef(false);
-  const { themeMode } = useThemeContext();
-  const fieldProjection = useMemo3(() => {
-    if (!model || !editing) {
-      return;
+var TableValueEditor = ({ model, modals, schema, onEnter, onFocus, onQuery, __gridScope }) => {
+  var _effect = _useSignals6();
+  try {
+    const { editing } = useGridContext3("TableValueEditor", __gridScope);
+    const fieldProjection = useMemo4(() => {
+      if (!model || !editing) {
+        return;
+      }
+      const { col } = parseCellIndex2(editing.index);
+      const field = model.projection.view.fields[col];
+      const fieldProjection2 = model.projection.getFieldProjection(field.id);
+      invariant3(fieldProjection2, void 0, {
+        F: __dxlog_file4,
+        L: 73,
+        S: void 0,
+        A: [
+          "fieldProjection",
+          ""
+        ]
+      });
+      return fieldProjection2;
+    }, [
+      model,
+      editing
+    ]);
+    if (fieldProjection?.props.type === TypeEnum4.Array) {
+      return /* @__PURE__ */ React6.createElement(FormCellEditor, {
+        fieldProjection,
+        model,
+        schema,
+        __gridScope
+      });
     }
-    const { col } = parseCellIndex(editing.index);
-    const field = model.projection.view.fields[col];
-    const fieldProjection2 = model.projection.getFieldProjection(field.id);
-    invariant2(fieldProjection2, void 0, {
-      F: __dxlog_file3,
-      L: 71,
-      S: void 0,
-      A: [
-        "fieldProjection",
-        ""
-      ]
+    return /* @__PURE__ */ React6.createElement(TableCellEditor, {
+      model,
+      modals,
+      onEnter,
+      onFocus,
+      onQuery,
+      __gridScope
     });
-    return fieldProjection2;
-  }, [
-    model,
-    editing
-  ]);
-  const handleEnter = useCallback3((value) => {
-    if (!model || !editing) {
-      return;
-    }
-    const cell = parseCellIndex(editing.index);
-    model.setCellData(cell, value);
-    onEnter?.(cell);
-    onFocus?.();
-    setEditing(null);
-  }, [
-    model,
-    editing,
-    onEnter,
-    onFocus,
-    setEditing
-  ]);
-  const handleBlur = useCallback3((value) => {
-    if (!model || !editing) {
-      return;
-    }
-    if (suppressNextBlur.current) {
-      suppressNextBlur.current = false;
-      return;
-    }
-    const cell = parseCellIndex(editing.index);
-    if (value !== void 0) {
+  } finally {
+    _effect.f();
+  }
+};
+var TableCellEditor = ({ model, modals, onEnter, onFocus, onQuery, __gridScope }) => {
+  var _effect = _useSignals6();
+  try {
+    const { id: gridId, editing, setEditing } = useGridContext3("TableCellEditor", __gridScope);
+    const suppressNextBlur = useRef2(false);
+    const { themeMode } = useThemeContext();
+    const fieldProjection = useMemo4(() => {
+      if (!model || !editing) {
+        return;
+      }
+      const { col } = parseCellIndex2(editing.index);
+      const field = model.projection.view.fields[col];
+      const fieldProjection2 = model.projection.getFieldProjection(field.id);
+      invariant3(fieldProjection2, void 0, {
+        F: __dxlog_file4,
+        L: 114,
+        S: void 0,
+        A: [
+          "fieldProjection",
+          ""
+        ]
+      });
+      return fieldProjection2;
+    }, [
+      model,
+      editing
+    ]);
+    const handleEnter = useCallback4((value) => {
+      if (!model || !editing) {
+        return;
+      }
+      const cell = parseCellIndex2(editing.index);
       model.setCellData(cell, value);
-    }
-  }, [
-    model,
-    editing
-  ]);
-  const handleClose = useCallback3((value, event) => {
-    if (!model || !editing || !fieldProjection) {
-      return;
-    }
-    const cell = parseCellIndex(editing.index);
-    onEnter?.(cell);
-    if (event && onFocus) {
-      onFocus(determineNavigationAxis(event), determineNavigationDelta(event));
-    }
-  }, [
-    model,
-    editing,
-    onFocus,
-    onEnter,
-    fieldProjection
-  ]);
-  const extension = useMemo3(() => {
-    if (!fieldProjection) {
-      return [];
-    }
-    const extension2 = [
-      editorKeys({
-        onClose: handleClose,
-        ...editing?.initialContent && {
-          onNav: handleClose
-        }
-      })
-    ];
-    const format = fieldProjection.props.format;
-    if (format === FormatEnum5.SingleSelect || format === FormatEnum5.MultiSelect) {
-      extension2.push(createMarkdownExtensions({
-        themeMode
-      }));
-      const options = fieldProjection.props.options || [];
-      const mode = format === FormatEnum5.SingleSelect ? "single-select" : "multi-select";
-      extension2.push(tagPickerExtension({
-        mode,
-        inGrid: true,
-        onSearch: (text, selectedIds) => {
-          return options.filter((option) => selectedIds.indexOf(option.id) === -1 && (text.length === 0 || option.title.toLowerCase().includes(text.toLowerCase()))).map((option) => ({
-            id: option.id,
-            label: option.title,
-            hue: option.color
-          }));
-        },
-        onUpdate: (ids) => {
-          if (model && editing) {
-            if (ids.length === 0) {
-              return;
-            }
-            if (mode === "single-select") {
-              handleEnter(ids[0]);
-            } else {
-              handleEnter(ids);
+      onEnter?.(cell);
+      onFocus?.();
+      setEditing(null);
+    }, [
+      model,
+      editing,
+      onEnter,
+      onFocus,
+      setEditing
+    ]);
+    const handleBlur = useCallback4((value) => {
+      if (!model || !editing) {
+        return;
+      }
+      if (suppressNextBlur.current) {
+        suppressNextBlur.current = false;
+        return;
+      }
+      const cell = parseCellIndex2(editing.index);
+      if (value !== void 0) {
+        model.setCellData(cell, value);
+      }
+    }, [
+      model,
+      editing
+    ]);
+    const handleClose = useCallback4((value, event) => {
+      if (!model || !editing || !fieldProjection) {
+        return;
+      }
+      const cell = parseCellIndex2(editing.index);
+      onEnter?.(cell);
+      if (event && onFocus) {
+        onFocus(determineNavigationAxis(event), determineNavigationDelta(event));
+      }
+    }, [
+      model,
+      editing,
+      onFocus,
+      onEnter,
+      fieldProjection
+    ]);
+    const extension = useMemo4(() => {
+      if (!fieldProjection) {
+        return [];
+      }
+      const extension2 = [
+        editorKeys({
+          onClose: handleClose,
+          ...editing?.initialContent && {
+            onNav: handleClose
+          }
+        })
+      ];
+      const format = fieldProjection.props.format;
+      if (format === FormatEnum5.SingleSelect || format === FormatEnum5.MultiSelect) {
+        extension2.push(createMarkdownExtensions({
+          themeMode
+        }));
+        const options = fieldProjection.props.options || [];
+        const mode = format === FormatEnum5.SingleSelect ? "single-select" : "multi-select";
+        extension2.push(tagPickerExtension({
+          mode,
+          inGrid: true,
+          onSearch: (text, selectedIds) => {
+            return options.filter((option) => selectedIds.indexOf(option.id) === -1 && (text.length === 0 || option.title.toLowerCase().includes(text.toLowerCase()))).map((option) => ({
+              id: option.id,
+              label: option.title,
+              hue: option.color
+            }));
+          },
+          onUpdate: (ids) => {
+            if (model && editing) {
+              if (ids.length === 0) {
+                return;
+              }
+              if (mode === "single-select") {
+                handleEnter(ids[0]);
+              } else {
+                handleEnter(ids);
+              }
             }
           }
-        }
-      }));
-    }
-    if (onQuery) {
-      switch (fieldProjection.props.format) {
-        case FormatEnum5.Ref: {
-          extension2.push([
-            completion({
-              onQuery: (text) => onQuery(fieldProjection, text),
-              onMatch: (data) => {
-                if (model && editing && modals) {
-                  if (isCreateOption(data)) {
-                    const { field, props } = fieldProjection;
-                    if (props.referenceSchema) {
-                      suppressNextBlur.current = true;
-                      modals.openCreateRef(props.referenceSchema, document.querySelector(cellQuery(editing.index, gridId)), {
-                        [field.referencePath]: data.text
-                      }, (data2) => {
-                        handleEnter(data2);
-                      });
+        }));
+      }
+      if (onQuery) {
+        switch (fieldProjection.props.format) {
+          case FormatEnum5.Ref: {
+            extension2.push([
+              completion({
+                onQuery: (text) => onQuery(fieldProjection, text),
+                onMatch: (data) => {
+                  if (model && editing && modals) {
+                    if (isCreateOption(data)) {
+                      const { field, props } = fieldProjection;
+                      if (props.referenceSchema) {
+                        suppressNextBlur.current = true;
+                        modals.openCreateRef(props.referenceSchema, document.querySelector(cellQuery(editing.index, gridId)), {
+                          [field.referencePath]: data.text
+                        }, (data2) => {
+                          handleEnter(data2);
+                        });
+                      }
+                    } else {
+                      handleEnter(data);
                     }
-                  } else {
-                    handleEnter(data);
                   }
                 }
-              }
-            })
-          ]);
-          break;
+              })
+            ]);
+            break;
+          }
         }
       }
-    }
-    return extension2;
-  }, [
-    model,
-    modals,
-    editing,
-    fieldProjection,
-    handleClose,
-    themeMode
-  ]);
-  const getCellContent = useCallback3(() => {
-    if (model && editing) {
-      const cell = parseCellIndex(editing.index);
-      const { col } = cell;
-      const field = model.projection.view.fields[col];
-      const fieldProjection2 = model.projection.getFieldProjection(field.id);
-      if (fieldProjection2?.props.format === FormatEnum5.SingleSelect || fieldProjection2?.props.format === FormatEnum5.MultiSelect) {
-        const value2 = model.getCellData(cell);
-        if (value2 !== void 0) {
-          const options = fieldProjection2.props.options || [];
-          if (fieldProjection2.props.format === FormatEnum5.MultiSelect && Array.isArray(value2)) {
-            const tagItems = value2.map((id) => {
-              const option = options.find((o) => o.id === id);
+      return extension2;
+    }, [
+      model,
+      modals,
+      editing,
+      fieldProjection,
+      handleClose,
+      themeMode
+    ]);
+    const getCellContent = useCallback4(() => {
+      if (model && editing) {
+        const cell = parseCellIndex2(editing.index);
+        const { col } = cell;
+        const field = model.projection.view.fields[col];
+        const fieldProjection2 = model.projection.getFieldProjection(field.id);
+        if (fieldProjection2?.props.format === FormatEnum5.SingleSelect || fieldProjection2?.props.format === FormatEnum5.MultiSelect) {
+          const value2 = model.getCellData(cell);
+          if (value2 !== void 0) {
+            const options = fieldProjection2.props.options || [];
+            if (fieldProjection2.props.format === FormatEnum5.MultiSelect && Array.isArray(value2)) {
+              const tagItems = value2.map((id) => {
+                const option = options.find((o) => o.id === id);
+                if (option) {
+                  return {
+                    id,
+                    label: option.title,
+                    hue: option.color
+                  };
+                }
+                return void 0;
+              }).filter((item) => item !== void 0);
+              return createLinks(tagItems);
+            } else {
+              const option = options.find((o) => o.id === value2);
               if (option) {
-                return {
-                  id,
+                const tagItem = {
+                  id: value2,
                   label: option.title,
                   hue: option.color
                 };
+                return createLinks([
+                  tagItem
+                ]);
               }
-              return void 0;
-            }).filter((item) => item !== void 0);
-            return createLinks(tagItems);
-          } else {
-            const option = options.find((o) => o.id === value2);
-            if (option) {
-              const tagItem = {
-                id: value2,
-                label: option.title,
-                hue: option.color
-              };
-              return createLinks([
-                tagItem
-              ]);
             }
           }
+          return "";
         }
-        return "";
+        const value = model.getCellData(cell);
+        return value !== void 0 ? String(value) : "";
       }
-      const value = model.getCellData(cell);
-      return value !== void 0 ? String(value) : "";
-    }
-  }, [
-    model,
-    editing
-  ]);
-  return /* @__PURE__ */ React5.createElement(GridCellEditor, {
-    extension,
-    getCellContent,
-    onBlur: handleBlur
-  });
+    }, [
+      model,
+      editing
+    ]);
+    return /* @__PURE__ */ React6.createElement(GridCellEditor, {
+      extension,
+      getCellContent,
+      onBlur: handleBlur
+    });
+  } finally {
+    _effect.f();
+  }
 };
 var determineNavigationAxis = ({ key }) => {
   switch (key) {
@@ -1856,283 +2069,294 @@ var determineNavigationDelta = ({ key, shift }) => {
 };
 
 // packages/ui/react-ui-table/src/components/Table/Table.tsx
-var __dxlog_file4 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-table/src/components/Table/Table.tsx";
+var __dxlog_file5 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-table/src/components/Table/Table.tsx";
 var TableRoot = ({ children, role }) => {
-  return /* @__PURE__ */ React6.createElement("div", {
-    role: "none",
-    className: mx2("relative !border-separator", role === "section" ? "attention-surface overflow-hidden [&_.dx-grid]:max-is-[--dx-grid-content-inline-size]" : "flex flex-col [&_.dx-grid]:grow [&_.dx-grid]:max-is-[--dx-grid-content-inline-size] [&_.dx-grid]:bs-0 [&_.dx-grid]:max-bs-[--dx-grid-content-block-size]")
-  }, children);
+  var _effect = _useSignals7();
+  try {
+    return /* @__PURE__ */ React7.createElement("div", {
+      role: "none",
+      className: mx2("relative !border-separator", role === "section" ? "attention-surface overflow-hidden [&_.dx-grid]:max-is-[--dx-grid-content-inline-size]" : "flex flex-col [&_.dx-grid]:grow [&_.dx-grid]:max-is-[--dx-grid-content-inline-size] [&_.dx-grid]:bs-0 [&_.dx-grid]:max-bs-[--dx-grid-content-block-size]")
+    }, children);
+  } finally {
+    _effect.f();
+  }
 };
-var TableMain = /* @__PURE__ */ forwardRef(({ model, presentation, ignoreAttention, onRowClick }, forwardedRef) => {
-  const [dxGrid, setDxGrid] = useState2(null);
-  const { hasAttention } = useAttention(model?.id ?? "table");
-  const { t } = useTranslation3(translationKey);
-  const modals = useMemo4(() => new ModalController(), []);
-  const frozen = useMemo4(() => {
-    const noActionColumn = model?.features.dataEditable === false && model?.features.schemaEditable === false && model.rowActions.length === 0;
-    return {
-      frozenRowsStart: 1,
-      frozenColsStart: model?.features.selection.enabled ? 1 : 0,
-      frozenColsEnd: noActionColumn ? 0 : 1
-    };
-  }, [
-    model
-  ]);
-  const getCells = useCallback4((range, plane) => presentation?.getCells(range, plane) ?? {}, [
-    presentation
-  ]);
-  useEffect2(() => {
-    if (!presentation || !dxGrid) {
-      return;
-    }
-    dxGrid.getCells = getCells;
-  }, [
-    presentation,
-    dxGrid,
-    getCells
-  ]);
-  useImperativeHandle(forwardedRef, () => {
-    if (!presentation || !dxGrid) {
-      return {};
-    }
-    return {
-      update: (cell) => {
-        if (cell) {
-          dxGrid.updateIfWithinBounds(cell);
-        } else {
-          dxGrid.updateCells(true);
-          dxGrid.requestUpdate();
-        }
+var TableMain = /* @__PURE__ */ forwardRef(({ model, presentation, ignoreAttention, schema, onRowClick }, forwardedRef) => {
+  var _effect = _useSignals7();
+  try {
+    const [dxGrid, setDxGrid] = useState2(null);
+    const { hasAttention } = useAttention(model?.id ?? "table");
+    const { t } = useTranslation3(translationKey);
+    const modals = useMemo5(() => new ModalController(), []);
+    const frozen = useMemo5(() => {
+      const noActionColumn = model?.features.dataEditable === false && model?.features.schemaEditable === false && model.rowActions.length === 0;
+      return {
+        frozenRowsStart: 1,
+        frozenColsStart: model?.features.selection.enabled ? 1 : 0,
+        frozenColsEnd: noActionColumn ? 0 : 1
+      };
+    }, [
+      model
+    ]);
+    const getCells = useCallback5((range, plane) => presentation?.getCells(range, plane) ?? {}, [
+      presentation
+    ]);
+    useEffect3(() => {
+      if (!presentation || !dxGrid) {
+        return;
       }
-    };
-  }, [
-    presentation,
-    dxGrid
-  ]);
-  const handleGridClick = useCallback4((event) => {
-    const rowIndex = safeParseInt(event.target.ariaRowIndex ?? "");
-    if (rowIndex != null) {
-      if (onRowClick) {
-        const row = model?.getRowAt(rowIndex);
-        row && onRowClick(row);
-      }
-      if (model?.features.selection.enabled && model?.selection.selectionMode === "single") {
-        model.selection.toggleSelectionForRowIndex(rowIndex);
+      dxGrid.getCells = getCells;
+    }, [
+      presentation,
+      dxGrid,
+      getCells
+    ]);
+    useImperativeHandle(forwardedRef, () => {
+      if (!presentation || !dxGrid) {
+        return {};
       }
-    }
-    if (!modals) {
-      return;
-    }
-    const buttonSelector = Object.values(tableButtons).map((button) => `button[${button.attr}]`).join(",");
-    const tableButtonElement = event.target.closest(buttonSelector);
-    if (tableButtonElement) {
-      const button = Object.values(tableButtons).find((btn) => tableButtonElement.hasAttribute(btn.attr));
-      if (!button) {
+      return {
+        update: (cell) => {
+          if (cell) {
+            dxGrid.updateIfWithinBounds(cell);
+          } else {
+            dxGrid.updateCells(true);
+            dxGrid.requestUpdate();
+          }
+        }
+      };
+    }, [
+      presentation,
+      dxGrid
+    ]);
+    const handleGridClick = useCallback5((event) => {
+      const rowIndex = safeParseInt(event.target.ariaRowIndex ?? "");
+      if (rowIndex != null) {
+        if (onRowClick) {
+          const row = model?.getRowAt(rowIndex);
+          row && onRowClick(row);
+        }
+        if (model?.features.selection.enabled && model?.selection.selectionMode === "single") {
+          model.selection.toggleSelectionForRowIndex(rowIndex);
+        }
+      }
+      if (!modals) {
         return;
       }
-      modals.setTrigger(tableButtonElement);
-      const data = button.getData(tableButtonElement);
-      switch (data.type) {
-        case "rowMenu": {
-          modals.showRowMenu(data.rowIndex);
-          break;
+      const buttonSelector = Object.values(tableButtons).map((button) => `button[${button.attr}]`).join(",");
+      const tableButtonElement = event.target.closest(buttonSelector);
+      if (tableButtonElement) {
+        const button = Object.values(tableButtons).find((btn) => tableButtonElement.hasAttribute(btn.attr));
+        if (!button) {
+          return;
         }
-        case "columnSettings": {
-          modals.showColumnMenu(data.fieldId);
-          break;
+        modals.setTrigger(tableButtonElement);
+        const data = button.getData(tableButtonElement);
+        switch (data.type) {
+          case "rowMenu": {
+            modals.showRowMenu(data.rowIndex);
+            break;
+          }
+          case "columnSettings": {
+            modals.showColumnMenu(data.fieldId);
+            break;
+          }
+          case "newColumn": {
+            modals.showColumnCreator();
+            break;
+          }
+          case "sort": {
+            model?.sorting?.toggleSort(data.fieldId);
+            break;
+          }
         }
-        case "newColumn": {
-          modals.showColumnCreator();
-          break;
+        return;
+      }
+      const controlSelector = Object.values(tableControls).map((control) => `input[${control.attr}]`).join(",");
+      const controlElement = event.target.closest(controlSelector);
+      if (controlElement) {
+        const control = Object.values(tableControls).find((ctrl) => controlElement.hasAttribute(ctrl.attr));
+        if (!control) {
+          return;
         }
-        case "sort": {
-          model?.sorting?.toggleSort(data.fieldId);
-          break;
+        const data = control.getData(controlElement);
+        switch (data.type) {
+          case "checkbox": {
+            if (data.header) {
+              model?.selection.setSelection(model.selection.allRowsSeleted.value ? "none" : "all");
+            } else {
+              model?.selection.toggleSelectionForRowIndex(data.rowIndex);
+            }
+            break;
+          }
+          case "switch": {
+            if (model) {
+              model.updateCellData({
+                row: data.rowIndex,
+                col: data.colIndex
+              }, (value) => !value);
+            }
+            break;
+          }
         }
       }
-      return;
-    }
-    const controlSelector = Object.values(tableControls).map((control) => `input[${control.attr}]`).join(",");
-    const controlElement = event.target.closest(controlSelector);
-    if (controlElement) {
-      const control = Object.values(tableControls).find((ctrl) => controlElement.hasAttribute(ctrl.attr));
-      if (!control) {
+    }, [
+      model,
+      modals
+    ]);
+    const handleFocus = useCallback5((increment, delta) => {
+      if (dxGrid) {
+        dxGrid.refocus(increment, delta);
+      }
+    }, [
+      dxGrid
+    ]);
+    const handleEnter = useCallback5((cell) => {
+      if (!model?.features.dataEditable) {
         return;
       }
-      const data = control.getData(controlElement);
-      switch (data.type) {
-        case "checkbox": {
-          if (data.header) {
-            model?.selection.setSelection(model.selection.allRowsSeleted.value ? "none" : "all");
-          } else {
-            model?.selection.toggleSelectionForRowIndex(data.rowIndex);
-          }
-          break;
+      if (model && cell.row === model.getRowCount() - 1) {
+        model.insertRow(cell.row);
+        if (dxGrid) {
+          requestAnimationFrame(() => {
+            dxGrid?.scrollToRow(cell.row + 1);
+            dxGrid?.refocus("row", 1);
+          });
         }
-        case "switch": {
-          if (model) {
-            model.updateCellData({
-              row: data.rowIndex,
-              col: data.colIndex
-            }, (value) => !value);
-          }
+      }
+    }, [
+      model,
+      dxGrid
+    ]);
+    const handleKeyDown = useCallback5((event) => {
+      if (!model?.features.dataEditable) {
+        return;
+      }
+      const cell = closestCell(event.target);
+      if (!model || !cell) {
+        return;
+      }
+      switch (event.key) {
+        case "Backspace":
+        case "Delete": {
+          model.setCellData(cell, void 0);
           break;
         }
       }
-    }
-  }, [
-    model,
-    modals
-  ]);
-  const handleFocus = useCallback4((increment, delta) => {
-    if (dxGrid) {
-      dxGrid.refocus(increment, delta);
-    }
-  }, [
-    dxGrid
-  ]);
-  const handleEnter = useCallback4((cell) => {
-    if (!model?.features.dataEditable) {
-      return;
-    }
-    if (model && cell.row === model.getRowCount() - 1) {
-      model.insertRow(cell.row);
-      if (dxGrid) {
-        requestAnimationFrame(() => {
-          dxGrid?.scrollToRow(cell.row + 1);
-          dxGrid?.refocus("row", 1);
-        });
+    }, [
+      model
+    ]);
+    const handleAxisResize = useCallback5((event) => {
+      if (event.axis === "col") {
+        const columnIndex = parseInt(event.index, 10);
+        model?.setColumnWidth(columnIndex, event.size);
       }
-    }
-  }, [
-    model,
-    dxGrid
-  ]);
-  const handleKeyDown = useCallback4((event) => {
-    if (!model?.features.dataEditable) {
-      return;
-    }
-    const cell = closestCell(event.target);
-    if (!model || !cell) {
-      return;
-    }
-    switch (event.key) {
-      case "Backspace":
-      case "Delete": {
-        model.setCellData(cell, void 0);
-        break;
+    }, [
+      model
+    ]);
+    const handleWheel = useCallback5((event) => {
+      if (!ignoreAttention && !hasAttention) {
+        event.stopPropagation();
       }
-    }
-  }, [
-    model
-  ]);
-  const handleAxisResize = useCallback4((event) => {
-    if (event.axis === "col") {
-      const columnIndex = parseInt(event.index, 10);
-      model?.setColumnWidth(columnIndex, event.size);
-    }
-  }, [
-    model
-  ]);
-  const handleWheel = useCallback4((event) => {
-    if (!ignoreAttention && !hasAttention) {
-      event.stopPropagation();
-    }
-  }, [
-    hasAttention,
-    ignoreAttention
-  ]);
-  const handleNewColumn = useCallback4(() => {
-    const columns = model?.getColumnCount();
-    if (dxGrid && columns) {
-      dxGrid.scrollToColumn(columns - 1);
-    }
-  }, [
-    model,
-    dxGrid
-  ]);
-  const handleQuery = useCallback4(async ({ field, props }, text) => {
-    if (model && props.referenceSchema && field.referencePath) {
-      const space = model.space;
-      invariant3(space, void 0, {
-        F: __dxlog_file4,
-        L: 307,
-        S: void 0,
-        A: [
-          "space",
-          ""
-        ]
-      });
-      const schema = space.db.schemaRegistry.getSchema(props.referenceSchema);
-      if (schema) {
-        const { objects } = await space.db.query(Filter.schema(schema)).run();
-        const options = objects.map((obj) => {
-          const value = getValue4(obj, field.referencePath);
-          if (!value || typeof value !== "string") {
-            return void 0;
-          }
-          return {
-            label: value,
-            data: obj
-          };
-        }).filter(isNotFalsy);
-        return [
-          ...options,
-          {
-            label: t("create new object label", {
-              text
-            }),
-            data: createOption(text)
-          }
-        ];
+    }, [
+      hasAttention,
+      ignoreAttention
+    ]);
+    const handleNewColumn = useCallback5(() => {
+      const columns = model?.getColumnCount();
+      if (dxGrid && columns) {
+        dxGrid.scrollToColumn(columns - 1);
+      }
+    }, [
+      model,
+      dxGrid
+    ]);
+    const handleQuery = useCallback5(async ({ field, props }, text) => {
+      if (model && props.referenceSchema && field.referencePath) {
+        const space = model.space;
+        invariant4(space, void 0, {
+          F: __dxlog_file5,
+          L: 309,
+          S: void 0,
+          A: [
+            "space",
+            ""
+          ]
+        });
+        const schema2 = space.db.schemaRegistry.getSchema(props.referenceSchema);
+        if (schema2) {
+          const { objects } = await space.db.query(Filter.type(schema2)).run();
+          const options = objects.map((obj) => {
+            const value = getValue4(obj, field.referencePath);
+            if (!value || typeof value !== "string") {
+              return void 0;
+            }
+            return {
+              label: value,
+              data: obj
+            };
+          }).filter(isNotFalsy);
+          return [
+            ...options,
+            {
+              label: t("create new object label", {
+                text
+              }),
+              data: createOption(text)
+            }
+          ];
+        }
       }
+      return [];
+    }, [
+      model,
+      t
+    ]);
+    if (!model || !modals) {
+      return /* @__PURE__ */ React7.createElement("span", {
+        role: "none",
+        className: "attention-surface"
+      });
     }
-    return [];
-  }, [
-    model,
-    t
-  ]);
-  if (!model || !modals) {
-    return /* @__PURE__ */ React6.createElement("span", {
-      role: "none",
-      className: "attention-surface"
-    });
+    return /* @__PURE__ */ React7.createElement(Grid.Root, {
+      id: model.id ?? "table-grid"
+    }, /* @__PURE__ */ React7.createElement(TableValueEditor, {
+      model,
+      modals,
+      schema,
+      onEnter: handleEnter,
+      onFocus: handleFocus,
+      onQuery: handleQuery
+    }), /* @__PURE__ */ React7.createElement(Grid.Content, {
+      className: mx2("[--dx-grid-base:var(--baseSurface)]", gridSeparatorInlineEnd, gridSeparatorBlockEnd),
+      frozen,
+      // getCells={getCells}
+      columns: model.columnMeta.value,
+      limitRows: model.getRowCount() ?? 0,
+      limitColumns: model.view?.fields?.length ?? 0,
+      overscroll: "trap",
+      onAxisResize: handleAxisResize,
+      onClick: handleGridClick,
+      onKeyDown: handleKeyDown,
+      onWheelCapture: handleWheel,
+      ref: setDxGrid
+    }), /* @__PURE__ */ React7.createElement(RowActionsMenu, {
+      model,
+      modals
+    }), /* @__PURE__ */ React7.createElement(ColumnActionsMenu, {
+      model,
+      modals
+    }), /* @__PURE__ */ React7.createElement(ColumnSettings, {
+      model,
+      modals,
+      onNewColumn: handleNewColumn
+    }), /* @__PURE__ */ React7.createElement(CreateRefPanel, {
+      model,
+      modals
+    }));
+  } finally {
+    _effect.f();
   }
-  return /* @__PURE__ */ React6.createElement(Grid.Root, {
-    id: model.id ?? "table-grid"
-  }, /* @__PURE__ */ React6.createElement(TableCellEditor, {
-    model,
-    modals,
-    onEnter: handleEnter,
-    onFocus: handleFocus,
-    onQuery: handleQuery
-  }), /* @__PURE__ */ React6.createElement(Grid.Content, {
-    className: mx2("[--dx-grid-base:var(--surface-bg)]", gridSeparatorInlineEnd, gridSeparatorBlockEnd),
-    frozen,
-    // getCells={getCells}
-    columns: model.columnMeta.value,
-    limitRows: model.getRowCount() ?? 0,
-    limitColumns: model.view?.fields?.length ?? 0,
-    overscroll: "trap",
-    onAxisResize: handleAxisResize,
-    onClick: handleGridClick,
-    onKeyDown: handleKeyDown,
-    onWheelCapture: handleWheel,
-    ref: setDxGrid
-  }), /* @__PURE__ */ React6.createElement(RowActionsMenu, {
-    model,
-    modals
-  }), /* @__PURE__ */ React6.createElement(ColumnActionsMenu, {
-    model,
-    modals
-  }), /* @__PURE__ */ React6.createElement(ColumnSettings, {
-    model,
-    modals,
-    onNewColumn: handleNewColumn
-  }), /* @__PURE__ */ React6.createElement(CreateRefPanel, {
-    model,
-    modals
-  }));
 });
 var Table = {
   Root: TableRoot,
@@ -2140,152 +2364,167 @@ var Table = {
 };
 
 // packages/ui/react-ui-table/src/components/Table/DynamicTable.tsx
-import React7, { useRef as useRef2, useMemo as useMemo5, useCallback as useCallback5 } from "react";
+import { useSignals as _useSignals9 } from "@preact-signals/safe-react/tracking";
+import React8, { useRef as useRef3, useMemo as useMemo6, useCallback as useCallback6 } from "react";
 import { useDefaultValue } from "@dxos/react-ui";
 import { mx as mx3 } from "@dxos/react-ui-theme";
 
 // packages/ui/react-ui-table/src/hooks/useTableModel.ts
+import { useSignals as _useSignals8 } from "@preact-signals/safe-react/tracking";
 import { effect as effect3 } from "@preact/signals-core";
-import { useEffect as useEffect3, useState as useState3 } from "react";
+import { useEffect as useEffect4, useState as useState3 } from "react";
 import { fullyQualifiedId, getSpace } from "@dxos/react-client/echo";
 import { useSelectionActions } from "@dxos/react-ui-attention";
 import { isNonNullable } from "@dxos/util";
 var useTableModel = ({ table, projection, rows, rowActions, features, onSelectionChanged, onRowAction, ...props }) => {
-  const [model, setModel] = useState3();
-  useEffect3(() => {
-    if (!table || !projection) {
-      return;
-    }
-    let model2;
-    const t = setTimeout(async () => {
-      model2 = new TableModel({
-        id: fullyQualifiedId(table),
-        space: getSpace(table),
-        view: table.view?.target,
-        projection,
-        features,
-        rowActions,
-        onRowAction,
-        ...props
+  var _effect = _useSignals8();
+  try {
+    const [model, setModel] = useState3();
+    useEffect4(() => {
+      if (!table || !projection) {
+        return;
+      }
+      let model2;
+      const t = setTimeout(async () => {
+        model2 = new TableModel({
+          id: fullyQualifiedId(table),
+          space: getSpace(table),
+          view: table.view?.target,
+          projection,
+          features,
+          rowActions,
+          onRowAction,
+          ...props
+        });
+        await model2.open();
+        setModel(model2);
       });
-      await model2.open();
-      setModel(model2);
-    });
-    return () => {
-      clearTimeout(t);
-      void model2?.close();
-    };
-  }, [
-    table,
-    projection,
-    table?.view?.target,
-    features,
-    rowActions
-  ]);
-  useEffect3(() => {
-    if (rows) {
-      model?.setRows(rows);
-    }
-  }, [
-    model,
-    rows
-  ]);
-  const { select, clear } = useSelectionActions([
-    table?.id,
-    table?.view?.target?.query.typename
-  ].filter(isNonNullable));
-  useEffect3(() => {
-    if (!model) {
-      return;
-    }
-    const unsubscribe = effect3(() => {
-      const selectedItems = [
-        ...model.selection.selection.value
-      ];
-      select(selectedItems);
-      onSelectionChanged?.(selectedItems);
-    });
-    return () => {
-      clear();
-      unsubscribe();
-    };
-  }, [
-    model,
-    onSelectionChanged
-  ]);
-  return model;
+      return () => {
+        clearTimeout(t);
+        void model2?.close();
+      };
+    }, [
+      table,
+      projection,
+      table?.view?.target,
+      features,
+      rowActions
+    ]);
+    useEffect4(() => {
+      if (rows) {
+        model?.setRows(rows);
+      }
+    }, [
+      model,
+      rows
+    ]);
+    const { multiSelect, clear } = useSelectionActions([
+      table?.id,
+      table?.view?.target?.query.typename
+    ].filter(isNonNullable));
+    useEffect4(() => {
+      if (!model) {
+        return;
+      }
+      const unsubscribe = effect3(() => {
+        const selectedItems = [
+          ...model.selection.selection.value
+        ];
+        multiSelect(selectedItems);
+        onSelectionChanged?.(selectedItems);
+      });
+      return () => {
+        clear();
+        unsubscribe();
+      };
+    }, [
+      model,
+      onSelectionChanged
+    ]);
+    return model;
+  } finally {
+    _effect.f();
+  }
 };
 
 // packages/ui/react-ui-table/src/components/Table/DynamicTable.tsx
 var DynamicTable = ({ classNames, name = "example.com/dynamic-table", rows, properties, jsonSchema, schema, rowActions, onRowClick, onRowAction, ...props }) => {
-  const { table, projection } = useMemo5(() => {
-    const props2 = getBaseSchems({
-      typename: name,
+  var _effect = _useSignals9();
+  try {
+    const { table, projection } = useMemo6(() => {
+      const props2 = getBaseSchema({
+        typename: name,
+        properties,
+        jsonSchema,
+        schema
+      });
+      return makeDynamicTable({
+        ...props2,
+        properties
+      });
+    }, [
+      name,
       properties,
-      jsonSchema,
-      schema
-    });
-    return makeDynamicTable({
-      ...props2,
-      properties
+      schema,
+      jsonSchema
+    ]);
+    const tableRef = useRef3(null);
+    const handleCellUpdate = useCallback6((cell) => {
+      tableRef.current?.update?.(cell);
+    }, []);
+    const handleRowOrderChange = useCallback6(() => {
+      tableRef.current?.update?.();
+    }, []);
+    const features = useDefaultValue(props.features, () => ({
+      selection: {
+        enabled: false
+      },
+      dataEditable: false
+    }));
+    const model = useTableModel({
+      table,
+      rows,
+      projection,
+      features,
+      rowActions,
+      onCellUpdate: handleCellUpdate,
+      onRowOrderChange: handleRowOrderChange,
+      onRowAction
     });
-  }, [
-    name,
-    properties,
-    schema,
-    jsonSchema
-  ]);
-  const tableRef = useRef2(null);
-  const handleCellUpdate = useCallback5((cell) => {
-    tableRef.current?.update?.(cell);
-  }, []);
-  const handleRowOrderChange = useCallback5(() => {
-    tableRef.current?.update?.();
-  }, []);
-  const features = useDefaultValue(props.features, () => ({
-    selection: {
-      enabled: false
-    },
-    dataEditable: false
-  }));
-  const model = useTableModel({
-    table,
-    rows,
-    projection,
-    features,
-    rowActions,
-    onCellUpdate: handleCellUpdate,
-    onRowOrderChange: handleRowOrderChange,
-    onRowAction
-  });
-  const presentation = useMemo5(() => {
-    if (model) {
-      return new TablePresentation(model);
-    }
-  }, [
-    model
-  ]);
-  return /* @__PURE__ */ React7.createElement("div", {
-    role: "none",
-    className: mx3("is-full bs-full grow grid", classNames)
-  }, /* @__PURE__ */ React7.createElement("div", {
-    role: "none",
-    className: "grid min-bs-0 overflow-hidden"
-  }, /* @__PURE__ */ React7.createElement(Table.Root, null, /* @__PURE__ */ React7.createElement(Table.Main, {
-    ref: tableRef,
-    model,
-    presentation,
-    ignoreAttention: true,
-    onRowClick
-  }))));
+    const presentation = useMemo6(() => {
+      if (model) {
+        return new TablePresentation(model);
+      }
+    }, [
+      model
+    ]);
+    return /* @__PURE__ */ React8.createElement("div", {
+      role: "none",
+      className: mx3("is-full bs-full grow grid", classNames)
+    }, /* @__PURE__ */ React8.createElement("div", {
+      role: "none",
+      className: "grid min-bs-0 overflow-hidden"
+    }, /* @__PURE__ */ React8.createElement(Table.Root, null, /* @__PURE__ */ React8.createElement(Table.Main, {
+      ref: tableRef,
+      model,
+      presentation,
+      ignoreAttention: true,
+      onRowClick
+    }))));
+  } finally {
+    _effect.f();
+  }
 };
 
 // packages/ui/react-ui-table/src/components/TableToolbar/TableToolbar.tsx
-import React8, { useCallback as useCallback6, useMemo as useMemo6 } from "react";
+import { useSignals as _useSignals10 } from "@preact-signals/safe-react/tracking";
+import { Rx } from "@effect-rx/rx-react";
+import React9, { useMemo as useMemo7 } from "react";
 import { live as live4 } from "@dxos/live-object";
 import { createGapSeparator, createMenuAction, MenuProvider, ToolbarMenu, useMenuActions } from "@dxos/react-ui-menu";
-var createTableToolbarActions = (state) => {
-  const add = createMenuAction("add-row", {
+import { rxFromSignal } from "@dxos/react-ui-menu";
+var createTableToolbarActions = ({ state, onAdd, onSave, customActions }) => Rx.make((get) => {
+  const add = createMenuAction("add-row", onAdd, {
     type: "add-row",
     icon: "ph--plus--regular",
     label: [
@@ -2296,7 +2535,7 @@ var createTableToolbarActions = (state) => {
     ],
     testId: "table.toolbar.add-row"
   });
-  const save = createMenuAction("save-view", {
+  const save = createMenuAction("save-view", onSave, {
     type: "save-view",
     icon: "ph--floppy-disk--regular",
     label: [
@@ -2307,49 +2546,55 @@ var createTableToolbarActions = (state) => {
     ],
     testId: "table.toolbar.save-view",
     iconOnly: false,
-    hidden: !state.viewDirty
+    hidden: get(rxFromSignal(() => !state.viewDirty))
   });
   const gap = createGapSeparator();
-  const comment = createMenuAction("comment", {
-    type: "comment",
-    icon: "ph--chat-text--regular",
-    label: [
-      "create comment",
-      {
-        ns: translationKey
-      }
-    ],
-    testId: "table.toolbar.comment"
-  });
   const nodes = [
     add,
     save,
-    ...gap.nodes,
-    comment
+    ...gap.nodes
   ];
+  const edges = nodes.map(({ id: target }) => ({
+    source: "root",
+    target
+  }));
+  if (customActions) {
+    const custom = get(customActions);
+    nodes.push(...custom.nodes);
+    edges.push(...custom.edges);
+  }
   return {
     nodes,
-    edges: nodes.map(({ id: target }) => ({
-      source: "root",
-      target
-    }))
+    edges
   };
-};
-var TableToolbar = ({ classNames, viewDirty, attendableId, onAction }) => {
-  const state = useMemo6(() => live4({
-    viewDirty
-  }), []);
-  const actionsCreator = useCallback6(() => createTableToolbarActions(state), [
-    state
-  ]);
-  const menu = useMenuActions(actionsCreator);
-  return /* @__PURE__ */ React8.createElement(MenuProvider, {
-    ...menu,
-    attendableId,
-    onAction
-  }, /* @__PURE__ */ React8.createElement(ToolbarMenu, {
-    classNames
-  }));
+});
+var TableToolbar = ({ classNames, viewDirty, attendableId, onAdd, onSave, customActions }) => {
+  var _effect = _useSignals10();
+  try {
+    const state = useMemo7(() => live4({
+      viewDirty
+    }), []);
+    const actionsCreator = useMemo7(() => createTableToolbarActions({
+      state,
+      onAdd,
+      onSave,
+      customActions
+    }), [
+      state,
+      onAdd,
+      onSave,
+      customActions
+    ]);
+    const menu = useMenuActions(actionsCreator);
+    return /* @__PURE__ */ React9.createElement(MenuProvider, {
+      ...menu,
+      attendableId
+    }, /* @__PURE__ */ React9.createElement(ToolbarMenu, {
+      classNames
+    }));
+  } finally {
+    _effect.f();
+  }
 };
 export {
   BUTTON_IDENTIFIERS,
@@ -2365,9 +2610,10 @@ export {
   TableToolbar,
   TableType,
   cellClassesForRowSelection,
-  getBaseSchems,
+  getBaseSchema,
   initializeTable,
   makeDynamicTable,
+  narrowSchema,
   tableButtons,
   tableControls,
   touch,