@dxos/react-ui-table 0.8.2-main.fbd8ed0 → 0.8.2-staging.7ac8446

package/dist/lib/browser/index.mjs

@@ -1,7 +1,7 @@
 import {
   TableSchema,
   TableType
-} from "./chunk-PFFO5LYM.mjs";
+} from "./chunk-YWNRUF4J.mjs";
 
 // packages/ui/react-ui-table/src/translations.ts
 var translationKey = "table";
@@ -36,13 +36,13 @@ var translations_default = [
 ];
 
 // packages/ui/react-ui-table/src/components/Table/Table.tsx
-import React7, { forwardRef, useCallback as useCallback5, useImperativeHandle, useState as useState2, useMemo as useMemo5, useEffect as useEffect3 } from "react";
+import React7, { forwardRef, useCallback as useCallback4, useImperativeHandle, useState as useState2, useMemo as useMemo4, useEffect as useEffect2 } from "react";
 import { getValue as getValue4 } from "@dxos/echo-schema";
-import { invariant as invariant4 } from "@dxos/invariant";
+import { invariant as invariant3 } 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";
-import { closestCell, Grid, gridSeparatorInlineEnd, gridSeparatorBlockEnd } from "@dxos/react-ui-grid";
+import { closestCell, Grid } from "@dxos/react-ui-grid";
 import { mx as mx2 } from "@dxos/react-ui-theme";
 import { isNotFalsy, safeParseInt } from "@dxos/util";
 
@@ -150,9 +150,9 @@ var ColumnSettings = ({ model, modals, onNewColumn }) => {
 };
 
 // packages/ui/react-ui-table/src/components/Table/CreateRefPanel.tsx
-import { Schema } from "effect";
 import React3, { useCallback as useCallback2, useMemo as useMemo2 } from "react";
-import { live } from "@dxos/react-client/echo";
+import { S } from "@dxos/echo-schema";
+import { create } 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";
@@ -168,7 +168,7 @@ var CreateRefPanel = ({ model, modals, __gridScope }) => {
       typename: state.typename
     }).runSync();
     if (schema2) {
-      const omit = Schema.omit("id");
+      const omit = S.omit("id");
       return omit(schema2);
     }
   }, [
@@ -183,7 +183,7 @@ var CreateRefPanel = ({ model, modals, __gridScope }) => {
       typename: state.typename
     }).runSync();
     if (schema2) {
-      const obj = space.db.add(live(schema2, values));
+      const obj = space.db.add(create(schema2, values));
       state.onCreate?.(obj);
     }
     void modals.close();
@@ -223,8 +223,46 @@ var CreateRefPanel = ({ model, modals, __gridScope }) => {
   }), /* @__PURE__ */ React3.createElement(Popover.Arrow, null))));
 };
 
-// packages/ui/react-ui-table/src/components/Table/RowActionsMenu.tsx
+// packages/ui/react-ui-table/src/components/Table/RefPanel.tsx
 import React4 from "react";
+import { Popover as Popover2 } from "@dxos/react-ui";
+import { Form as Form2 } from "@dxos/react-ui-form";
+var getRefTargetObj = (space, id) => {
+  if (space && id) {
+    return space?.db.getObjectById(id);
+  } else {
+    return void 0;
+  }
+};
+var RefPanel = ({ model, modals }) => {
+  const state = modals.state.value;
+  const space = model?.space;
+  const targetObj = getRefTargetObj(space, state?.type === "refPanel" ? state.targetId : void 0);
+  const schema = space && state?.type === "refPanel" ? space.db.schemaRegistry.getSchema(state.typename) : void 0;
+  if (!model.view || !model.projection) {
+    return null;
+  }
+  return /* @__PURE__ */ React4.createElement(Popover2.Root, {
+    modal: false,
+    open: state?.type === "refPanel" && !!targetObj && !!schema,
+    onOpenChange: (nextOpen) => {
+      if (!nextOpen) {
+        return modals.close();
+      }
+    }
+  }, /* @__PURE__ */ React4.createElement(Popover2.VirtualTrigger, {
+    virtualRef: modals.trigger
+  }), /* @__PURE__ */ React4.createElement(Popover2.Portal, null, /* @__PURE__ */ React4.createElement(Popover2.Content, {
+    classNames: "md:is-64"
+  }, targetObj && schema && /* @__PURE__ */ React4.createElement(Form2, {
+    readonly: true,
+    values: targetObj,
+    schema
+  }), /* @__PURE__ */ React4.createElement(Popover2.Arrow, null))));
+};
+
+// packages/ui/react-ui-table/src/components/Table/RowActionsMenu.tsx
+import React5 from "react";
 import { DropdownMenu as DropdownMenu3, useTranslation as useTranslation2 } from "@dxos/react-ui";
 var RowActionsMenu = ({ model, modals }) => {
   const { t } = useTranslation2(translationKey);
@@ -233,23 +271,23 @@ var RowActionsMenu = ({ model, modals }) => {
   if (state?.type !== "row") {
     return null;
   }
-  return /* @__PURE__ */ React4.createElement(DropdownMenu3.Root, {
+  return /* @__PURE__ */ React5.createElement(DropdownMenu3.Root, {
     modal: false,
     open: true,
     onOpenChange: modals.close
-  }, /* @__PURE__ */ React4.createElement(DropdownMenu3.VirtualTrigger, {
+  }, /* @__PURE__ */ React5.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, {
+  }), /* @__PURE__ */ React5.createElement(DropdownMenu3.Content, null, /* @__PURE__ */ React5.createElement(DropdownMenu3.Viewport, null, model.features.dataEditable !== false && /* @__PURE__ */ React5.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, {
+  }, t(hasSelection ? "bulk delete row label" : "delete row label")), model.rowActions?.map((action) => /* @__PURE__ */ React5.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)));
+  }, t(action.translationKey)))), /* @__PURE__ */ React5.createElement(DropdownMenu3.Arrow, null)));
 };
 
 // packages/ui/react-ui-table/src/model/table-model.ts
@@ -257,7 +295,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 makeRef2 } from "@dxos/live-object";
+import { isReactiveObject, makeRef as makeRef3 } from "@dxos/live-object";
 import { formatForEditing, parseValue } from "@dxos/react-ui-form";
 
 // packages/ui/react-ui-table/src/model/selection-model.ts
@@ -265,10 +303,9 @@ 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 { create as create2, makeRef } from "@dxos/live-object";
 import { createView, getSchemaFromPropertyDefinitions, ViewProjection } from "@dxos/schema";
-var getBaseSchema = ({ typename, properties, jsonSchema, schema }) => {
+var getBaseSchems = ({ typename, properties, jsonSchema, schema }) => {
   if (typename && properties) {
     const schema2 = getSchemaFromPropertyDefinitions(typename, properties);
     return {
@@ -277,8 +314,8 @@ var getBaseSchema = ({ typename, properties, jsonSchema, schema }) => {
     };
   } else if (schema) {
     return {
-      typename: getTypename(schema),
-      jsonSchema: toJsonSchema(schema)
+      typename: schema.typename,
+      jsonSchema: schema.jsonSchema
     };
   } else if (typename && jsonSchema) {
     return {
@@ -298,7 +335,7 @@ var makeDynamicTable = ({ typename, jsonSchema, properties }) => {
       fields: properties.map((property) => property.name)
     }
   });
-  const table = live2(TableType, {
+  const table = create2(TableType, {
     name: "dynamic-table",
     view: makeRef(view)
   });
@@ -345,10 +382,9 @@ var setProperties = (view, projection, properties) => {
 var touch = (value) => value;
 
 // packages/ui/react-ui-table/src/util/table.ts
-import { Schema as Schema2, SchemaAST } from "effect";
-import { Format, FormatEnum, Ref, TypedObject, TypeEnum } from "@dxos/echo-schema";
+import { AST, Format, FormatEnum, S as S2, TypedObject, TypeEnum } from "@dxos/echo-schema";
 import { PublicKey } from "@dxos/react-client";
-import { live as live3 } from "@dxos/react-client/echo";
+import { create as create3, makeRef as makeRef2 } 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) {
@@ -356,8 +392,8 @@ var initializeTable = async ({ client, space, table, typename, initialRow = true
     if (!schema) {
       throw new Error(`Schema not found: ${typename}`);
     }
-    const fields = getSchemaProperties(schema.ast).map((prop) => prop.name);
-    table.view = Ref.make(createView2({
+    const fields = getSchemaProperties(schema.ast).filter((prop) => prop.format !== FormatEnum.Ref).map((prop) => prop.name);
+    table.view = makeRef2(createView2({
       // TODO(ZaymonFC): Don't hardcode name?
       name: "View",
       typename: schema.typename,
@@ -370,7 +406,7 @@ var initializeTable = async ({ client, space, table, typename, initialRow = true
       ContactSchema
     ]);
     const fields = ContactFields;
-    table.view = Ref.make(createView2({
+    table.view = makeRef2(createView2({
       name: "View",
       typename: schema.typename,
       jsonSchema: schema.jsonSchema,
@@ -378,7 +414,7 @@ var initializeTable = async ({ client, space, table, typename, initialRow = true
     }));
     createProjection(schema, table.view.target);
     if (initialRow) {
-      space.db.add(live3(schema, {}));
+      space.db.add(create3(schema, {}));
     }
     return schema;
   }
@@ -387,13 +423,13 @@ var ContactSchema = TypedObject({
   typename: `example.com/type/${PublicKey.random().truncate()}`,
   version: "0.1.0"
 })({
-  name: Schema2.optional(Schema2.String).annotations({
-    [SchemaAST.TitleAnnotationId]: "Name"
+  name: S2.optional(S2.String).annotations({
+    [AST.TitleAnnotationId]: "Name"
   }),
-  active: Schema2.optional(Schema2.Boolean),
-  email: Schema2.optional(Format.Email),
-  salary: Schema2.optional(Format.Currency()).annotations({
-    [SchemaAST.TitleAnnotationId]: "Salary"
+  active: S2.optional(S2.Boolean),
+  email: S2.optional(Format.Email),
+  salary: S2.optional(Format.Currency()).annotations({
+    [AST.TitleAnnotationId]: "Salary"
   })
 });
 var ContactFields = [
@@ -482,6 +518,26 @@ var columnSettingsButton = {
     fieldId: el.getAttribute("data-field-id")
   })
 };
+var referencedCellButton = {
+  attr: BUTTON_IDENTIFIERS.referencedCell,
+  icon: "ph--link-simple-horizontal--regular",
+  render: ({ targetId, schemaId }) => {
+    return createButton({
+      attr: BUTTON_IDENTIFIERS.referencedCell,
+      icon: referencedCellButton.icon,
+      data: {
+        "data-target-id": targetId,
+        "data-schema-id": schemaId
+      },
+      testId: "table-ref-cell-button"
+    });
+  },
+  getData: (el) => ({
+    type: "referencedCell",
+    targetId: el.getAttribute("data-target-id"),
+    schemaId: el.getAttribute("data-schema-id")
+  })
+};
 var rowMenuButton = {
   attr: BUTTON_IDENTIFIERS.rowMenu,
   icon: "ph--dots-three--regular",
@@ -526,6 +582,7 @@ var sortButton = {
 var tableButtons = {
   addColumn: addColumnButton,
   columnSettings: columnSettingsButton,
+  referencedCell: referencedCellButton,
   rowMenu: rowMenuButton,
   sort: sortButton
 };
@@ -584,21 +641,6 @@ 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) {
@@ -851,22 +893,6 @@ var TableSorting = class {
   }
 };
 
-// packages/ui/react-ui-table/src/util/tag.ts
-var TAG_PATTERN_REGEX = /\[([^\]]+)\]\(([^)]+)\)/g;
-var extractTagIds = (value) => {
-  if (typeof value !== "string") {
-    return void 0;
-  }
-  const ids = [];
-  let match;
-  while ((match = TAG_PATTERN_REGEX.exec(value)) !== null) {
-    if (match[2]) {
-      ids.push(match[2]);
-    }
-  }
-  return ids.length > 0 ? ids : void 0;
-};
-
 // packages/ui/react-ui-table/src/model/table-model.ts
 var __dxlog_file = "/home/runner/work/dxos/dxos/packages/ui/react-ui-table/src/model/table-model.ts";
 var defaultFeatures = {
@@ -966,22 +992,8 @@ var TableModel = class extends Resource2 {
       const { props } = this._projection.getFieldProjection(field.id);
       switch (props.format) {
         case FormatEnum3.Ref: {
-          if (isLiveObject(value)) {
-            setValue(this._rows.value[rowIdx], field.path, makeRef2(value));
-          }
-          break;
-        }
-        case FormatEnum3.SingleSelect: {
-          const ids = extractTagIds(value);
-          if (ids && ids.length > 0) {
-            setValue(this._rows.value[rowIdx], field.path, ids[0]);
-          }
-          break;
-        }
-        case FormatEnum3.MultiSelect: {
-          const ids = extractTagIds(value);
-          if (ids) {
-            setValue(this._rows.value[rowIdx], field.path, ids);
+          if (isReactiveObject(value)) {
+            setValue(this._rows.value[rowIdx], field.path, makeRef3(value));
           }
           break;
         }
@@ -1005,7 +1017,7 @@ var TableModel = class extends Resource2 {
     };
     invariant(!(this._features.dataEditable && this._features.selection.enabled && this._features.selection.mode === "single"), "Single selection is not compatible with editable tables.", {
       F: __dxlog_file,
-      L: 115,
+      L: 114,
       S: this,
       A: [
         "!(this._features.dataEditable && this._features.selection.enabled && this._features.selection.mode === 'single')",
@@ -1065,7 +1077,7 @@ var TableModel = class extends Resource2 {
   get columnMeta() {
     invariant(this._columnMeta, void 0, {
       F: __dxlog_file,
-      L: 184,
+      L: 183,
       S: this,
       A: [
         "this._columnMeta",
@@ -1291,8 +1303,7 @@ var ModalController = class {
 
 // packages/ui/react-ui-table/src/model/table-presentation.ts
 import { signal as signal5 } from "@preact/signals-core";
-import { isNotNullable } from "effect/Predicate";
-import { FormatEnum as FormatEnum4, getDXN, getValue as getValue3, TypeEnum as TypeEnum3 } from "@dxos/echo-schema";
+import { FormatEnum as FormatEnum4, getValue as getValue3 } 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";
@@ -1354,9 +1365,6 @@ var TablePresentation = class {
           if (value == null) {
             return "";
           }
-          if (props.type === "array") {
-            return "";
-          }
           switch (props.format) {
             case FormatEnum4.Boolean:
             case FormatEnum4.SingleSelect:
@@ -1394,38 +1402,13 @@ 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 = tableButtons.referencedCell.render({
+            targetId: targetObj.id,
+            schemaId: props.referenceSchema
+          });
         }
       }
       if (props.format === FormatEnum4.Boolean) {
@@ -1459,7 +1442,7 @@ var TablePresentation = class {
             return null;
           }).filter(Boolean).join(" ");
           if (tags) {
-            cell.accessoryHtml = `<div role='none' class="flex flex-row gap-1">${tags}</div>`;
+            cell.accessoryHtml = tags;
           }
         }
       }
@@ -1504,7 +1487,7 @@ var TablePresentation = class {
           fieldId: field.id
         })}
         `,
-        className: "!bg-toolbarSurface"
+        className: "!bg-gridHeader"
       };
     }
     return cells;
@@ -1555,7 +1538,7 @@ var TablePresentation = class {
           col: 0,
           row: 0
         })]: {
-          className: "!bg-toolbarSurface",
+          className: "!bg-gridHeader",
           readonly: true,
           value: ""
         }
@@ -1571,7 +1554,7 @@ var TablePresentation = class {
           header: true,
           checked: this.model.selection.allRowsSeleted.value
         }),
-        className: "!bg-toolbarSurface",
+        className: "!bg-gridHeader",
         readonly: true,
         value: ""
       }
@@ -1586,7 +1569,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-toolbarSurface",
+        className: "!bg-gridHeader",
         readonly: true,
         value: ""
       }
@@ -1617,109 +1600,14 @@ var cellClassesForRowSelection = (selected, selectionMode) => {
 };
 
 // packages/ui/react-ui-table/src/components/TableCellEditor/TableCellEditor.tsx
-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 React6, { 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 { useThemeContext } from "@dxos/react-ui";
 import { createMarkdownExtensions } from "@dxos/react-ui-editor";
-import { cellQuery, editorKeys, parseCellIndex as parseCellIndex2, useGridContext as useGridContext3, GridCellEditor } from "@dxos/react-ui-grid";
+import { cellQuery, editorKeys, parseCellIndex, useGridContext as useGridContext2, 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 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 }) => {
-  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-consistent-width"
-  }, /* @__PURE__ */ React5.createElement(Popover2.Arrow, null), /* @__PURE__ */ React5.createElement(Form2, {
-    values: formValues,
-    schema: narrowedSchema,
-    onSave: handleSave
-  })));
-};
-
 // packages/ui/react-ui-table/src/components/TableCellEditor/extension.ts
 import { autocompletion, pickedCompletion } from "@codemirror/autocomplete";
 import { EditorView } from "@codemirror/view";
@@ -1760,67 +1648,27 @@ var completion = ({ debug, onQuery, onMatch }) => {
 };
 
 // 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 __dxlog_file3 = "/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 TableValueEditor = ({ model, modals, schema, onEnter, onFocus, onQuery, __gridScope }) => {
-  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
-    });
-  }
-  return /* @__PURE__ */ React6.createElement(TableCellEditor, {
-    model,
-    modals,
-    onEnter,
-    onFocus,
-    onQuery,
-    __gridScope
-  });
-};
 var TableCellEditor = ({ model, modals, onEnter, onFocus, onQuery, __gridScope }) => {
-  const { id: gridId, editing, setEditing } = useGridContext3("TableCellEditor", __gridScope);
-  const suppressNextBlur = useRef2(false);
+  const { id: gridId, editing, setEditing } = useGridContext2("TableCellEditor", __gridScope);
+  const suppressNextBlur = useRef(false);
   const { themeMode } = useThemeContext();
-  const fieldProjection = useMemo4(() => {
+  const fieldProjection = useMemo3(() => {
     if (!model || !editing) {
       return;
     }
-    const { col } = parseCellIndex2(editing.index);
+    const { col } = parseCellIndex(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,
+    invariant2(fieldProjection2, void 0, {
+      F: __dxlog_file3,
+      L: 71,
       S: void 0,
       A: [
         "fieldProjection",
@@ -1832,11 +1680,11 @@ var TableCellEditor = ({ model, modals, onEnter, onFocus, onQuery, __gridScope }
     model,
     editing
   ]);
-  const handleEnter = useCallback4((value) => {
+  const handleEnter = useCallback3((value) => {
     if (!model || !editing) {
       return;
     }
-    const cell = parseCellIndex2(editing.index);
+    const cell = parseCellIndex(editing.index);
     model.setCellData(cell, value);
     onEnter?.(cell);
     onFocus?.();
@@ -1848,7 +1696,7 @@ var TableCellEditor = ({ model, modals, onEnter, onFocus, onQuery, __gridScope }
     onFocus,
     setEditing
   ]);
-  const handleBlur = useCallback4((value) => {
+  const handleBlur = useCallback3((value) => {
     if (!model || !editing) {
       return;
     }
@@ -1856,7 +1704,7 @@ var TableCellEditor = ({ model, modals, onEnter, onFocus, onQuery, __gridScope }
       suppressNextBlur.current = false;
       return;
     }
-    const cell = parseCellIndex2(editing.index);
+    const cell = parseCellIndex(editing.index);
     if (value !== void 0) {
       model.setCellData(cell, value);
     }
@@ -1864,11 +1712,11 @@ var TableCellEditor = ({ model, modals, onEnter, onFocus, onQuery, __gridScope }
     model,
     editing
   ]);
-  const handleClose = useCallback4((value, event) => {
+  const handleClose = useCallback3((value, event) => {
     if (!model || !editing || !fieldProjection) {
       return;
     }
-    const cell = parseCellIndex2(editing.index);
+    const cell = parseCellIndex(editing.index);
     onEnter?.(cell);
     if (event && onFocus) {
       onFocus(determineNavigationAxis(event), determineNavigationDelta(event));
@@ -1880,7 +1728,7 @@ var TableCellEditor = ({ model, modals, onEnter, onFocus, onQuery, __gridScope }
     onEnter,
     fieldProjection
   ]);
-  const extension = useMemo4(() => {
+  const extension = useMemo3(() => {
     if (!fieldProjection) {
       return [];
     }
@@ -1961,9 +1809,9 @@ var TableCellEditor = ({ model, modals, onEnter, onFocus, onQuery, __gridScope }
     handleClose,
     themeMode
   ]);
-  const getCellContent = useCallback4(() => {
+  const getCellContent = useCallback3(() => {
     if (model && editing) {
-      const cell = parseCellIndex2(editing.index);
+      const cell = parseCellIndex(editing.index);
       const { col } = cell;
       const field = model.projection.view.fields[col];
       const fieldProjection2 = model.projection.getFieldProjection(field.id);
@@ -2039,19 +1887,21 @@ var determineNavigationDelta = ({ key, shift }) => {
 };
 
 // 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 __dxlog_file4 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-table/src/components/Table/Table.tsx";
+var inlineEndLine = "[&>.dx-grid]:relative [&>.dx-grid]:after:absolute [&>.dx-grid]:after:inset-block-0 [&>.dx-grid]:after:-inline-end-px [&>.dx-grid]:after:is-px [&>.dx-grid]:after:bg-separator";
+var blockEndLine = "[&>.dx-grid]:before:absolute [&>.dx-grid]:before:inset-inline-0 [&>.dx-grid]:before:-block-end-px [&>.dx-grid]:before:bs-px [&>.dx-grid]:before:bg-separator";
 var TableRoot = ({ children, role }) => {
   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);
 };
-var TableMain = /* @__PURE__ */ forwardRef(({ model, presentation, ignoreAttention, schema, onRowClick }, forwardedRef) => {
+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 = useMemo5(() => new ModalController(), []);
-  const frozen = useMemo5(() => {
+  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,
@@ -2061,18 +1911,14 @@ var TableMain = /* @__PURE__ */ forwardRef(({ model, presentation, ignoreAttenti
   }, [
     model
   ]);
-  const getCells = useCallback5((range, plane) => presentation?.getCells(range, plane) ?? {}, [
-    presentation
-  ]);
-  useEffect3(() => {
+  useEffect2(() => {
     if (!presentation || !dxGrid) {
       return;
     }
-    dxGrid.getCells = getCells;
+    dxGrid.getCells = (range, plane) => presentation.getCells(range, plane);
   }, [
     presentation,
-    dxGrid,
-    getCells
+    dxGrid
   ]);
   useImperativeHandle(forwardedRef, () => {
     if (!presentation || !dxGrid) {
@@ -2092,7 +1938,7 @@ var TableMain = /* @__PURE__ */ forwardRef(({ model, presentation, ignoreAttenti
     presentation,
     dxGrid
   ]);
-  const handleGridClick = useCallback5((event) => {
+  const handleGridClick = useCallback4((event) => {
     const rowIndex = safeParseInt(event.target.ariaRowIndex ?? "");
     if (rowIndex != null) {
       if (onRowClick) {
@@ -2128,6 +1974,10 @@ var TableMain = /* @__PURE__ */ forwardRef(({ model, presentation, ignoreAttenti
           modals.showColumnCreator();
           break;
         }
+        case "referencedCell": {
+          modals.showReferencePanel(data.targetId, data.schemaId);
+          break;
+        }
         case "sort": {
           model?.sorting?.toggleSort(data.fieldId);
           break;
@@ -2167,14 +2017,14 @@ var TableMain = /* @__PURE__ */ forwardRef(({ model, presentation, ignoreAttenti
     model,
     modals
   ]);
-  const handleFocus = useCallback5((increment, delta) => {
+  const handleFocus = useCallback4((increment, delta) => {
     if (dxGrid) {
       dxGrid.refocus(increment, delta);
     }
   }, [
     dxGrid
   ]);
-  const handleEnter = useCallback5((cell) => {
+  const handleEnter = useCallback4((cell) => {
     if (!model?.features.dataEditable) {
       return;
     }
@@ -2191,7 +2041,7 @@ var TableMain = /* @__PURE__ */ forwardRef(({ model, presentation, ignoreAttenti
     model,
     dxGrid
   ]);
-  const handleKeyDown = useCallback5((event) => {
+  const handleKeyDown = useCallback4((event) => {
     if (!model?.features.dataEditable) {
       return;
     }
@@ -2209,7 +2059,7 @@ var TableMain = /* @__PURE__ */ forwardRef(({ model, presentation, ignoreAttenti
   }, [
     model
   ]);
-  const handleAxisResize = useCallback5((event) => {
+  const handleAxisResize = useCallback4((event) => {
     if (event.axis === "col") {
       const columnIndex = parseInt(event.index, 10);
       model?.setColumnWidth(columnIndex, event.size);
@@ -2217,7 +2067,7 @@ var TableMain = /* @__PURE__ */ forwardRef(({ model, presentation, ignoreAttenti
   }, [
     model
   ]);
-  const handleWheel = useCallback5((event) => {
+  const handleWheel = useCallback4((event) => {
     if (!ignoreAttention && !hasAttention) {
       event.stopPropagation();
     }
@@ -2225,7 +2075,7 @@ var TableMain = /* @__PURE__ */ forwardRef(({ model, presentation, ignoreAttenti
     hasAttention,
     ignoreAttention
   ]);
-  const handleNewColumn = useCallback5(() => {
+  const handleNewColumn = useCallback4(() => {
     const columns = model?.getColumnCount();
     if (dxGrid && columns) {
       dxGrid.scrollToColumn(columns - 1);
@@ -2234,21 +2084,21 @@ var TableMain = /* @__PURE__ */ forwardRef(({ model, presentation, ignoreAttenti
     model,
     dxGrid
   ]);
-  const handleQuery = useCallback5(async ({ field, props }, text) => {
+  const handleQuery = useCallback4(async ({ field, props }, text) => {
     if (model && props.referenceSchema && field.referencePath) {
       const space = model.space;
-      invariant4(space, void 0, {
-        F: __dxlog_file5,
-        L: 309,
+      invariant3(space, void 0, {
+        F: __dxlog_file4,
+        L: 312,
         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 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") {
@@ -2283,15 +2133,14 @@ var TableMain = /* @__PURE__ */ forwardRef(({ model, presentation, ignoreAttenti
   }
   return /* @__PURE__ */ React7.createElement(Grid.Root, {
     id: model.id ?? "table-grid"
-  }, /* @__PURE__ */ React7.createElement(TableValueEditor, {
+  }, /* @__PURE__ */ React7.createElement(TableCellEditor, {
     model,
     modals,
-    schema,
     onEnter: handleEnter,
     onFocus: handleFocus,
     onQuery: handleQuery
   }), /* @__PURE__ */ React7.createElement(Grid.Content, {
-    className: mx2("[--dx-grid-base:var(--baseSurface)]", gridSeparatorInlineEnd, gridSeparatorBlockEnd),
+    className: mx2("[--dx-grid-base:var(--surface-bg)]", inlineEndLine, blockEndLine),
     frozen,
     // getCells={getCells}
     columns: model.columnMeta.value,
@@ -2316,6 +2165,9 @@ var TableMain = /* @__PURE__ */ forwardRef(({ model, presentation, ignoreAttenti
   }), /* @__PURE__ */ React7.createElement(CreateRefPanel, {
     model,
     modals
+  }), /* @__PURE__ */ React7.createElement(RefPanel, {
+    model,
+    modals
   }));
 });
 var Table = {
@@ -2324,19 +2176,19 @@ var Table = {
 };
 
 // packages/ui/react-ui-table/src/components/Table/DynamicTable.tsx
-import React8, { useRef as useRef3, useMemo as useMemo6, useCallback as useCallback6 } from "react";
+import React8, { useRef as useRef2, useMemo as useMemo5, useCallback as useCallback5 } 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 { effect as effect3 } from "@preact/signals-core";
-import { useEffect as useEffect4, useState as useState3 } from "react";
+import { useEffect as useEffect3, 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();
-  useEffect4(() => {
+  useEffect3(() => {
     if (!table || !projection) {
       return;
     }
@@ -2366,7 +2218,7 @@ var useTableModel = ({ table, projection, rows, rowActions, features, onSelectio
     features,
     rowActions
   ]);
-  useEffect4(() => {
+  useEffect3(() => {
     if (rows) {
       model?.setRows(rows);
     }
@@ -2378,7 +2230,7 @@ var useTableModel = ({ table, projection, rows, rowActions, features, onSelectio
     table?.id,
     table?.view?.target?.query.typename
   ].filter(isNonNullable));
-  useEffect4(() => {
+  useEffect3(() => {
     if (!model) {
       return;
     }
@@ -2402,8 +2254,8 @@ var useTableModel = ({ table, projection, rows, rowActions, features, onSelectio
 
 // 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 } = useMemo6(() => {
-    const props2 = getBaseSchema({
+  const { table, projection } = useMemo5(() => {
+    const props2 = getBaseSchems({
       typename: name,
       properties,
       jsonSchema,
@@ -2419,11 +2271,11 @@ var DynamicTable = ({ classNames, name = "example.com/dynamic-table", rows, prop
     schema,
     jsonSchema
   ]);
-  const tableRef = useRef3(null);
-  const handleCellUpdate = useCallback6((cell) => {
+  const tableRef = useRef2(null);
+  const handleCellUpdate = useCallback5((cell) => {
     tableRef.current?.update?.(cell);
   }, []);
-  const handleRowOrderChange = useCallback6(() => {
+  const handleRowOrderChange = useCallback5(() => {
     tableRef.current?.update?.();
   }, []);
   const features = useDefaultValue(props.features, () => ({
@@ -2442,7 +2294,7 @@ var DynamicTable = ({ classNames, name = "example.com/dynamic-table", rows, prop
     onRowOrderChange: handleRowOrderChange,
     onRowAction
   });
-  const presentation = useMemo6(() => {
+  const presentation = useMemo5(() => {
     if (model) {
       return new TablePresentation(model);
     }
@@ -2465,11 +2317,11 @@ var DynamicTable = ({ classNames, name = "example.com/dynamic-table", rows, prop
 };
 
 // packages/ui/react-ui-table/src/components/TableToolbar/TableToolbar.tsx
-import React9, { useCallback as useCallback7, useMemo as useMemo7 } from "react";
-import { live as live4 } from "@dxos/live-object";
+import React9, { useCallback as useCallback6, useMemo as useMemo6 } from "react";
+import { create as create4 } from "@dxos/live-object";
 import { createGapSeparator, createMenuAction, MenuProvider, ToolbarMenu, useMenuActions } from "@dxos/react-ui-menu";
-var createTableToolbarActions = (state, onAction) => {
-  const add = createMenuAction("add-row", () => onAction(add), {
+var createTableToolbarActions = (state) => {
+  const add = createMenuAction("add-row", {
     type: "add-row",
     icon: "ph--plus--regular",
     label: [
@@ -2480,7 +2332,7 @@ var createTableToolbarActions = (state, onAction) => {
     ],
     testId: "table.toolbar.add-row"
   });
-  const save = createMenuAction("save-view", () => onAction(save), {
+  const save = createMenuAction("save-view", {
     type: "save-view",
     icon: "ph--floppy-disk--regular",
     label: [
@@ -2494,7 +2346,7 @@ var createTableToolbarActions = (state, onAction) => {
     hidden: !state.viewDirty
   });
   const gap = createGapSeparator();
-  const comment = createMenuAction("comment", () => onAction(comment), {
+  const comment = createMenuAction("comment", {
     type: "comment",
     icon: "ph--chat-text--regular",
     label: [
@@ -2520,17 +2372,17 @@ var createTableToolbarActions = (state, onAction) => {
   };
 };
 var TableToolbar = ({ classNames, viewDirty, attendableId, onAction }) => {
-  const state = useMemo7(() => live4({
+  const state = useMemo6(() => create4({
     viewDirty
   }), []);
-  const actionsCreator = useCallback7(() => createTableToolbarActions(state, onAction), [
-    state,
-    onAction
+  const actionsCreator = useCallback6(() => createTableToolbarActions(state), [
+    state
   ]);
   const menu = useMenuActions(actionsCreator);
   return /* @__PURE__ */ React9.createElement(MenuProvider, {
     ...menu,
-    attendableId
+    attendableId,
+    onAction
   }, /* @__PURE__ */ React9.createElement(ToolbarMenu, {
     classNames
   }));
@@ -2549,10 +2401,9 @@ export {
   TableToolbar,
   TableType,
   cellClassesForRowSelection,
-  getBaseSchema,
+  getBaseSchems,
   initializeTable,
   makeDynamicTable,
-  narrowSchema,
   tableButtons,
   tableControls,
   touch,