@dxos/react-ui-table 0.8.2-main.12df754 → 0.8.2-main.2f9c567

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/react-ui-table",
-  "version": "0.8.2-main.12df754",
+  "version": "0.8.2-main.2f9c567",
   "description": "A table component.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -51,31 +51,33 @@
     "@radix-ui/react-slot": "1.1.2",
     "@radix-ui/react-use-controllable-state": "1.1.0",
     "date-fns": "^3.3.1",
+    "effect": "3.14.21",
     "lodash.orderby": "^4.6.0",
-    "@dxos/context": "0.8.2-main.12df754",
-    "@dxos/debug": "0.8.2-main.12df754",
-    "@dxos/echo-schema": "0.8.2-main.12df754",
-    "@dxos/keys": "0.8.2-main.12df754",
-    "@dxos/effect": "0.8.2-main.12df754",
-    "@dxos/lit-grid": "0.8.2-main.12df754",
-    "@dxos/invariant": "0.8.2-main.12df754",
-    "@dxos/live-object": "0.8.2-main.12df754",
-    "@dxos/plugin-search": "0.8.2-main.12df754",
-    "@dxos/log": "0.8.2-main.12df754",
-    "@dxos/plugin-space": "0.8.2-main.12df754",
-    "@dxos/react-client": "0.8.2-main.12df754",
-    "@dxos/react-ui-editor": "0.8.2-main.12df754",
-    "@dxos/react-ui-attention": "0.8.2-main.12df754",
-    "@dxos/react-ui-grid": "0.8.2-main.12df754",
-    "@dxos/react-ui-menu": "0.8.2-main.12df754",
-    "@dxos/react-ui-form": "0.8.2-main.12df754",
-    "@dxos/react-ui-stack": "0.8.2-main.12df754",
-    "@dxos/react-ui-searchlist": "0.8.2-main.12df754",
-    "@dxos/react-ui-types": "0.8.2-main.12df754",
-    "@dxos/react-ui-tag-picker": "0.8.2-main.12df754",
-    "@dxos/schema": "0.8.2-main.12df754",
-    "@dxos/react-ui-syntax-highlighter": "0.8.2-main.12df754",
-    "@dxos/util": "0.8.2-main.12df754"
+    "@dxos/debug": "0.8.2-main.2f9c567",
+    "@dxos/echo-schema": "0.8.2-main.2f9c567",
+    "@dxos/effect": "0.8.2-main.2f9c567",
+    "@dxos/context": "0.8.2-main.2f9c567",
+    "@dxos/invariant": "0.8.2-main.2f9c567",
+    "@dxos/lit-grid": "0.8.2-main.2f9c567",
+    "@dxos/echo": "0.8.2-main.2f9c567",
+    "@dxos/keys": "0.8.2-main.2f9c567",
+    "@dxos/live-object": "0.8.2-main.2f9c567",
+    "@dxos/log": "0.8.2-main.2f9c567",
+    "@dxos/plugin-search": "0.8.2-main.2f9c567",
+    "@dxos/plugin-space": "0.8.2-main.2f9c567",
+    "@dxos/react-client": "0.8.2-main.2f9c567",
+    "@dxos/react-ui-attention": "0.8.2-main.2f9c567",
+    "@dxos/react-ui-editor": "0.8.2-main.2f9c567",
+    "@dxos/react-ui-form": "0.8.2-main.2f9c567",
+    "@dxos/react-ui-grid": "0.8.2-main.2f9c567",
+    "@dxos/react-ui-menu": "0.8.2-main.2f9c567",
+    "@dxos/react-ui-stack": "0.8.2-main.2f9c567",
+    "@dxos/react-ui-searchlist": "0.8.2-main.2f9c567",
+    "@dxos/react-ui-tag-picker": "0.8.2-main.2f9c567",
+    "@dxos/react-ui-syntax-highlighter": "0.8.2-main.2f9c567",
+    "@dxos/react-ui-types": "0.8.2-main.2f9c567",
+    "@dxos/schema": "0.8.2-main.2f9c567",
+    "@dxos/util": "0.8.2-main.2f9c567"
   },
   "devDependencies": {
     "@phosphor-icons/react": "^2.1.5",
@@ -86,19 +88,19 @@
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "vite": "5.4.7",
-    "@dxos/random": "0.8.2-main.12df754",
-    "@dxos/echo-signals": "0.8.2-main.12df754",
-    "@dxos/react-ui": "0.8.2-main.12df754",
-    "@dxos/react-ui-theme": "0.8.2-main.12df754",
-    "@dxos/storybook-utils": "0.8.2-main.12df754",
-    "@dxos/test-utils": "0.8.2-main.12df754"
+    "@dxos/echo-signals": "0.8.2-main.2f9c567",
+    "@dxos/random": "0.8.2-main.2f9c567",
+    "@dxos/react-ui": "0.8.2-main.2f9c567",
+    "@dxos/react-ui-theme": "0.8.2-main.2f9c567",
+    "@dxos/storybook-utils": "0.8.2-main.2f9c567",
+    "@dxos/test-utils": "0.8.2-main.2f9c567"
   },
   "peerDependencies": {
     "@phosphor-icons/react": "^2.1.5",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.2-main.12df754",
-    "@dxos/react-ui-theme": "0.8.2-main.12df754"
+    "@dxos/react-ui": "0.8.2-main.2f9c567",
+    "@dxos/react-ui-theme": "0.8.2-main.2f9c567"
   },
   "publishConfig": {
     "access": "public"

package/src/components/Table/CreateRefPanel.tsx

@@ -2,9 +2,9 @@
 // Copyright 2024 DXOS.org
 //
 
+import { Schema } from 'effect';
 import React, { useCallback, useMemo } 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';
@@ -20,14 +20,14 @@ export const CreateRefPanel = ({ model, modals, __gridScope }: GridScopedProps<C
   const space = model?.space;
   const state = modals.state.value;
 
-  const schema = useMemo<S.Schema<any> | undefined>(() => {
+  const schema = useMemo<Schema.Schema<any> | undefined>(() => {
     if (!space || state?.type !== 'createRefPanel') {
       return;
     }
 
     const [schema] = space.db.schemaRegistry.query({ typename: state.typename }).runSync();
     if (schema) {
-      const omit = S.omit<any, any, ['id']>('id');
+      const omit = Schema.omit<any, any, ['id']>('id');
       return omit(schema);
     }
   }, [space, state]);

package/src/components/Table/Table.stories.tsx

@@ -28,8 +28,7 @@ import { TableType } from '../../types';
 import { initializeTable } from '../../util';
 import { TableToolbar } from '../TableToolbar';
 
-// NOTE(ZaymonFC): We rely on this seed being 0 in the smoke tests.
-faker.seed(0);
+faker.seed(0); // NOTE(ZaymonFC): Required for smoke tests.
 
 /**
  * Custom hook to create and manage a test table model for storybook demonstrations.
@@ -247,7 +246,7 @@ export const StaticSchema: StoryObj = {
   parameters: { translations },
   decorators: [
     withClientProvider({
-      types: [TableType, ViewType, Testing.Contact, Testing.Org],
+      types: [TableType, ViewType, Testing.Contact, Testing.Organization],
       createIdentity: true,
       createSpace: true,
       onSpaceCreated: async ({ client, space }) => {
@@ -257,7 +256,7 @@ export const StaticSchema: StoryObj = {
         const factory = createObjectFactory(space.db, faker as any);
         await factory([
           { type: Testing.Contact, count: 10 },
-          { type: Testing.Org, count: 1 },
+          { type: Testing.Organization, count: 1 },
         ]);
       },
     }),

package/src/components/Table/Table.tsx

@@ -19,27 +19,29 @@ import { invariant } from '@dxos/invariant';
 import { Filter } from '@dxos/react-client/echo';
 import { useTranslation } from '@dxos/react-ui';
 import { useAttention } from '@dxos/react-ui-attention';
-import { closestCell, type DxGridElement, type DxGridPosition, type GridContentProps, Grid } from '@dxos/react-ui-grid';
+import {
+  closestCell,
+  type DxGridElement,
+  type DxGridPosition,
+  type GridContentProps,
+  Grid,
+  type DxGridPlane,
+  type DxGridPlaneRange,
+  gridSeparatorInlineEnd,
+  gridSeparatorBlockEnd,
+} from '@dxos/react-ui-grid';
 import { mx } from '@dxos/react-ui-theme';
 import { isNotFalsy, safeParseInt } from '@dxos/util';
 
 import { ColumnActionsMenu } from './ColumnActionsMenu';
 import { ColumnSettings } from './ColumnSettings';
 import { CreateRefPanel } from './CreateRefPanel';
-import { RefPanel } from './RefPanel';
 import { RowActionsMenu } from './RowActionsMenu';
 import { ModalController, type TableModel, type TablePresentation } from '../../model';
 import { translationKey } from '../../translations';
 import { tableButtons, tableControls } from '../../util';
 import { createOption, TableCellEditor, type TableCellEditorProps } from '../TableCellEditor';
 
-// NOTE(Zan): These fragments add border to inline-end and block-end of the grid using pseudo-elements.
-// These are offset by 1px to avoid double borders in planks.
-const 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';
-const 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';
-
 //
 // Table.Root
 //
@@ -98,20 +100,17 @@ const TableMain = forwardRef<TableController, TableMainProps>(
       };
     }, [model]);
 
-    // TODO(burdon): Replace useEffect below.
-    // const getCells = useCallback<GridContentProps['getCells']>(
-    //   (range: DxGridRange, plane: DxGridPlane) => presentation?.getCells(range, plane) ?? {},
-    //   [presentation],
-    // );
+    const getCells = useCallback<NonNullable<GridContentProps['getCells']>>(
+      (range: DxGridPlaneRange, plane: DxGridPlane) => presentation?.getCells(range, plane) ?? {},
+      [presentation],
+    );
 
     useEffect(() => {
       if (!presentation || !dxGrid) {
         return;
       }
-
-      // TODO(burdon): Pass to Grid.Content?
-      dxGrid.getCells = (range, plane) => presentation.getCells(range, plane);
-    }, [presentation, dxGrid]);
+      dxGrid.getCells = getCells;
+    }, [presentation, dxGrid, getCells]);
 
     /**
      * Provides an external controller that can be called to repaint the table.
@@ -181,10 +180,6 @@ const TableMain = forwardRef<TableController, TableMainProps>(
               modals.showColumnCreator();
               break;
             }
-            case 'referencedCell': {
-              modals.showReferencePanel(data.targetId, data.schemaId);
-              break;
-            }
             case 'sort': {
               model?.sorting?.toggleSort(data.fieldId);
               break;
@@ -356,7 +351,7 @@ const TableMain = forwardRef<TableController, TableMainProps>(
           onQuery={handleQuery}
         />
         <Grid.Content
-          className={mx('[--dx-grid-base:var(--surface-bg)]', inlineEndLine, blockEndLine)}
+          className={mx('[--dx-grid-base:var(--surface-bg)]', gridSeparatorInlineEnd, gridSeparatorBlockEnd)}
           frozen={frozen}
           // getCells={getCells}
           columns={model.columnMeta.value}
@@ -373,7 +368,6 @@ const TableMain = forwardRef<TableController, TableMainProps>(
         <ColumnActionsMenu model={model} modals={modals} />
         <ColumnSettings model={model} modals={modals} onNewColumn={handleNewColumn} />
         <CreateRefPanel model={model} modals={modals} />
-        <RefPanel model={model} modals={modals} />
       </Grid.Root>
     );
   },

package/src/components/Table/relations.stories.tsx

@@ -5,20 +5,21 @@
 import '@dxos-theme';
 
 import { type StoryObj, type Meta } from '@storybook/react';
+import { SchemaAST } from 'effect';
 import React, { useEffect, useMemo } from 'react';
 
-import { AST, type BaseObject, ImmutableSchema, type BaseSchema, type HasId } from '@dxos/echo-schema';
+import { type BaseObject, ImmutableSchema, type BaseSchema, type HasId } from '@dxos/echo-schema';
 import { getAnnotation } from '@dxos/effect';
 import { faker } from '@dxos/random';
-import { live, makeRef, type Live } from '@dxos/react-client/echo';
-import { withClientProvider } from '@dxos/react-client/testing';
-import { createView, ViewProjection, ViewType } from '@dxos/schema';
-import { createGenerator, Testing, type ValueGenerator } from '@dxos/schema/testing';
+import { live, makeRef } from '@dxos/react-client/echo';
+import { useClientProvider, withClientProvider } from '@dxos/react-client/testing';
+import { DataType, createView, ViewProjection, ViewType } from '@dxos/schema';
+import { createAsyncGenerator, type ValueGenerator } from '@dxos/schema/testing';
 import { withLayout, withTheme } from '@dxos/storybook-utils';
 
 import { Table } from './Table';
 import { useTableModel } from '../../hooks';
-import { TablePresentation, type TableRow } from '../../model';
+import { type TableFeatures, TablePresentation, type TableRow } from '../../model';
 import translations from '../../translations';
 import { TableType } from '../../types';
 
@@ -30,10 +31,12 @@ const generator: ValueGenerator = faker as any;
 // TODO(burdon): Reconcile schemas types and utils (see API PR).
 // TODO(burdon): Base type for T (with id); see ECHO API PR?
 const useTestModel = <T extends BaseObject & HasId>(schema: BaseSchema<T>, count: number) => {
+  const { space } = useClientProvider();
+
   const table = useMemo(() => {
-    // const { typename } = pipe(schema.ast, AST.getAnnotation<TypeAnnotation>(TypeAnnotationId), Option.getOrThrow);
+    // const { typename } = pipe(schema.ast, SchemaAST.getAnnotation<TypeAnnotation>(TypeAnnotationId), Option.getOrThrow);
     const typename = schema.typename;
-    const name = getAnnotation<string>(AST.TitleAnnotationId)(schema.ast) ?? typename;
+    const name = getAnnotation<string>(SchemaAST.TitleAnnotationId)(schema.ast) ?? typename;
     const view = createView({ name, typename, jsonSchema: schema.jsonSchema });
     return live(TableType, { view: makeRef(view) });
   }, [schema]);
@@ -47,16 +50,24 @@ const useTestModel = <T extends BaseObject & HasId>(schema: BaseSchema<T>, count
     return new ViewProjection(schema.jsonSchema, table.view.target);
   }, [schema, table]);
 
-  const model = useTableModel<TableRow>({ table, projection, rows: [] });
+  const features = useMemo<TableFeatures>(
+    () => ({ schemaEditable: false, dataEditable: true, selection: { enabled: false } }),
+    [],
+  );
+
+  const model = useTableModel<TableRow>({ table, projection, rows: [], features });
   useEffect(() => {
-    if (!model) {
+    if (!model || !space) {
       return;
     }
 
-    const objectGenerator = createGenerator(generator, schema, { optional: true });
-    const objects: Live<T>[] = Array.from({ length: count }).map(() => objectGenerator.createObject());
-    model.setRows(objects);
-  }, [model]);
+    const objectGenerator = createAsyncGenerator(generator, schema, { optional: true, db: space?.db });
+    void objectGenerator.createObjects(count).then((objects) => {
+      model.setRows(objects);
+    });
+  }, [model, space]);
+
+  console.log(projection?.getFieldProjections());
 
   const presentation = useMemo(() => {
     if (!model) {
@@ -71,21 +82,20 @@ const useTestModel = <T extends BaseObject & HasId>(schema: BaseSchema<T>, count
 
 const DefaultStory = () => {
   // TODO(burdon): Remove need for ImmutableSchema wrapper at API-level.
-  const orgSchema = useMemo(() => new ImmutableSchema(Testing.Org), []);
-  const { model: orgModel, presentation: orgPresentation } = useTestModel<Testing.Org>(orgSchema, 50);
+  const orgSchema = useMemo(() => new ImmutableSchema(DataType.Organization), []);
+  const { model: orgModel, presentation: orgPresentation } = useTestModel<DataType.Organization>(orgSchema, 50);
 
   // TODO(burdon): Generate links with references.
-  const contactSchema = useMemo(() => new ImmutableSchema(Testing.Contact), []);
-  const { model: contactModel, presentation: contactPresentation } = useTestModel<Testing.Contact>(contactSchema, 50);
+  const contactSchema = useMemo(() => new ImmutableSchema(DataType.Person), []);
+  const { model: contactModel, presentation: contactPresentation } = useTestModel<DataType.Person>(contactSchema, 50);
 
-  // TODO(burdon): Scrolling isn't working.
   return (
-    <div className='grow grid grid-cols-2 divide-x divide-separator'>
+    <div className='is-full bs-full grid grid-cols-2 divide-x divide-separator'>
       <Table.Root>
-        <Table.Main model={orgModel} presentation={orgPresentation} />
+        <Table.Main model={orgModel} presentation={orgPresentation} ignoreAttention />
       </Table.Root>
       <Table.Root>
-        <Table.Main model={contactModel} presentation={contactPresentation} />
+        <Table.Main model={contactModel} presentation={contactPresentation} ignoreAttention />
       </Table.Root>
     </div>
   );
@@ -97,7 +107,7 @@ const meta: Meta<typeof DefaultStory> = {
   parameters: { translations },
   decorators: [
     withClientProvider({
-      types: [TableType, ViewType, Testing.Org, Testing.Contact],
+      types: [TableType, ViewType, DataType.Organization, DataType.Person],
       createIdentity: true,
       createSpace: true,
     }),

package/src/components/testing.ts

@@ -2,9 +2,10 @@
 // Copyright 2024 DXOS.org
 //
 
+import { Schema } from 'effect';
 import { useEffect } from 'react';
 
-import { setValue, toJsonSchema, S, TypeEnum, TypedObject, FormatEnum } from '@dxos/echo-schema';
+import { setValue, toJsonSchema, TypeEnum, TypedObject, FormatEnum, ObjectId } from '@dxos/echo-schema';
 import { faker } from '@dxos/random';
 import { live, makeRef } from '@dxos/react-client/echo';
 import { createView, type ViewProjection } from '@dxos/schema';
@@ -12,11 +13,11 @@ import { createView, type ViewProjection } from '@dxos/schema';
 import { TableType } from '../types';
 
 export const TestSchema = TypedObject({ typename: 'example.com/type/Test', version: '0.1.0' })({
-  id: S.String,
-  name: S.optional(S.String),
-  age: S.optional(S.Number),
-  active: S.optional(S.Boolean),
-  netWorth: S.optional(S.Number),
+  id: ObjectId,
+  name: Schema.optional(Schema.String),
+  age: Schema.optional(Schema.Number),
+  active: Schema.optional(Schema.Boolean),
+  netWorth: Schema.optional(Schema.Number),
 });
 
 export const createTable = (schema = TestSchema) => {

package/src/model/table-model.test.ts

@@ -3,9 +3,10 @@
 //
 
 import { computed } from '@preact/signals-core';
+import { Schema } from 'effect';
 import { afterEach, beforeEach, describe, expect, it } from 'vitest';
 
-import { S, TypedObject } from '@dxos/echo-schema';
+import { TypedObject } from '@dxos/echo-schema';
 import { updateCounter } from '@dxos/echo-schema/testing';
 import { registerSignalsRuntime } from '@dxos/echo-signals';
 import { createEchoSchema } from '@dxos/live-object/testing';
@@ -99,8 +100,8 @@ describe('TableModel', () => {
 });
 
 class Test extends TypedObject({ typename: 'example.com/type/Test', version: '0.1.0' })({
-  title: S.String,
-  completed: S.Boolean,
+  title: Schema.String,
+  completed: Schema.Boolean,
 }) {}
 
 const createTableModel = (props: Partial<TableModelProps> = {}): TableModel => {

package/src/model/table-model.ts

@@ -21,6 +21,7 @@ import { type ViewType, type ViewProjection } from '@dxos/schema';
 import { type SelectionMode, SelectionModel } from './selection-model';
 import { TableSorting } from './table-sorting';
 import { touch } from '../util';
+import { extractTagIds } from '../util/tag';
 
 // TODO(burdon): Use schema types.
 export type TableRow = Record<JsonProp, any> & { id: string };
@@ -348,6 +349,22 @@ export class TableModel<T extends TableRow = TableRow> extends Resource {
         break;
       }
 
+      case FormatEnum.SingleSelect: {
+        const ids = extractTagIds(value);
+        if (ids && ids.length > 0) {
+          setValue(this._rows.value[rowIdx], field.path, ids[0]);
+        }
+        break;
+      }
+
+      case FormatEnum.MultiSelect: {
+        const ids = extractTagIds(value);
+        if (ids) {
+          setValue(this._rows.value[rowIdx], field.path, ids);
+        }
+        break;
+      }
+
       default: {
         setValue(
           this._rows.value[rowIdx],

package/src/model/table-presentation.test.ts

@@ -2,9 +2,10 @@
 // Copyright 2024 DXOS.org
 //
 
+import { Schema } from 'effect';
 import { describe, expect, it, beforeEach } from 'vitest';
 
-import { S, TypedObject } from '@dxos/echo-schema';
+import { TypedObject } from '@dxos/echo-schema';
 import { live, makeRef } from '@dxos/live-object';
 import { createEchoSchema } from '@dxos/live-object/testing';
 import { createView, ViewProjection } from '@dxos/schema';
@@ -89,8 +90,8 @@ describe('TablePresentation', () => {
 });
 
 class Test extends TypedObject({ typename: 'example.com/type/Test', version: '0.1.0' })({
-  title: S.String,
-  completed: S.Boolean,
+  title: Schema.String,
+  completed: Schema.Boolean,
 }) {}
 
 const createTableModel = (props: Partial<TableModelProps> = {}): TableModel => {

package/src/model/table-presentation.ts

@@ -4,7 +4,7 @@
 
 import { signal } from '@preact/signals-core';
 
-import { FormatEnum, getValue } from '@dxos/echo-schema';
+import { FormatEnum, getDXN, getValue } from '@dxos/echo-schema';
 import { cellClassesForFieldType, formatForDisplay } from '@dxos/react-ui-form';
 import {
   type DxGridPlane,
@@ -124,10 +124,8 @@ export class TablePresentation<T extends TableRow = TableRow> {
       if (props.format === FormatEnum.Ref && props.referenceSchema) {
         const targetObj = getValue(obj, field.path)?.target;
         if (targetObj) {
-          cell.accessoryHtml = tableButtons.referencedCell.render({
-            targetId: targetObj.id as any as string,
-            schemaId: props.referenceSchema,
-          });
+          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>`;
         }
       }
 

package/src/types/table.ts

@@ -2,20 +2,28 @@
 // Copyright 2024 DXOS.org
 //
 
-import { EchoObject, Expando, LabelAnnotationId, ObjectId, Ref, S } from '@dxos/echo-schema';
+import { Schema } from 'effect';
+
+import { Type } from '@dxos/echo';
 // import { ThreadType } from '@dxos/plugin-space/types';
+import { LabelAnnotationId } from '@dxos/echo-schema';
 import { ViewType } from '@dxos/schema';
 
-export const TableSchema = S.Struct({
-  id: ObjectId,
-  name: S.optional(S.String),
-  view: S.optional(Ref(ViewType)),
+export const TableSchema = Schema.Struct({
+  id: Type.ObjectId,
+  name: Schema.optional(Schema.String),
+  view: Schema.optional(Type.Ref(ViewType)),
   // TODO(burdon): Document why threads is included here?
-  threads: S.optional(S.Array(Ref(Expando /* ThreadType */))),
+  threads: Schema.optional(Schema.Array(Type.Ref(Type.Expando /* ThreadType */))),
 }).annotations({
   // TODO(burdon): Move annotation to property.
   [LabelAnnotationId]: 'name',
 });
 
-export const TableType = TableSchema.pipe(EchoObject({ typename: 'dxos.org/type/Table', version: '0.1.0' }));
-export interface TableType extends S.Schema.Type<typeof TableType> {}
+export const TableType = TableSchema.pipe(
+  Type.def({
+    typename: 'dxos.org/type/Table',
+    version: '0.1.0',
+  }),
+);
+export interface TableType extends Schema.Schema.Type<typeof TableType> {}

package/src/util/table-buttons.ts

@@ -15,7 +15,6 @@ export const BUTTON_IDENTIFIERS: { [K in TableButton]: string } = {
 type ButtonData =
   | { type: 'columnSettings'; fieldId: string }
   | { type: 'newColumn'; disabled?: boolean }
-  | { type: 'referencedCell'; schemaId: string; targetId: string }
   | { type: 'rowMenu'; rowIndex: number }
   | { type: 'sort'; fieldId: string; direction?: 'asc' | 'desc' };
 
@@ -76,27 +75,6 @@ const columnSettingsButton = {
   }),
 } as const;
 
-const referencedCellButton = {
-  attr: BUTTON_IDENTIFIERS.referencedCell,
-  icon: 'ph--link-simple-horizontal--regular',
-  render: ({ targetId, schemaId }: Omit<Extract<ButtonData, { type: 'referencedCell' }>, 'type'>) => {
-    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: HTMLElement): Extract<ButtonData, { type: 'referencedCell' }> => ({
-    type: 'referencedCell',
-    targetId: el.getAttribute('data-target-id')!,
-    schemaId: el.getAttribute('data-schema-id')!,
-  }),
-} as const;
-
 const rowMenuButton = {
   attr: BUTTON_IDENTIFIERS.rowMenu,
   icon: 'ph--dots-three--regular',
@@ -143,7 +121,6 @@ const sortButton = {
 export const tableButtons = {
   addColumn: addColumnButton,
   columnSettings: columnSettingsButton,
-  referencedCell: referencedCellButton,
   rowMenu: rowMenuButton,
   sort: sortButton,
 } as const;

package/src/util/table.ts

@@ -2,14 +2,14 @@
 // Copyright 2024 DXOS.org
 //
 
+import { Schema, SchemaAST } from 'effect';
+
 import {
-  AST,
   type EchoSchema,
   Format,
   FormatEnum,
   type JsonPath,
   type JsonProp,
-  S,
   TypedObject,
   TypeEnum,
 } from '@dxos/echo-schema';
@@ -34,18 +34,14 @@ export const initializeTable = async ({
   table,
   typename,
   initialRow = true,
-}: InitialiseTableProps): Promise<S.Schema.AnyNoContext> => {
+}: InitialiseTableProps): Promise<Schema.Schema.AnyNoContext> => {
   if (typename) {
     const schema = await space.db.graph.getSchemaByTypename(typename, space.db);
     if (!schema) {
       throw new Error(`Schema not found: ${typename}`);
     }
 
-    // We need to get the schema properties here.
-    // For now, only simple types and refs, not compound types are going to be supported.
-    const fields = getSchemaProperties(schema.ast)
-      .filter((prop) => prop.format !== FormatEnum.Ref)
-      .map((prop) => prop.name);
+    const fields = getSchemaProperties(schema.ast).map((prop) => prop.name);
 
     table.view = makeRef(
       createView({
@@ -86,10 +82,10 @@ const ContactSchema = TypedObject({
   typename: `example.com/type/${PublicKey.random().truncate()}`,
   version: '0.1.0',
 })({
-  name: S.optional(S.String).annotations({ [AST.TitleAnnotationId]: 'Name' }),
-  active: S.optional(S.Boolean),
-  email: S.optional(Format.Email),
-  salary: S.optional(Format.Currency()).annotations({ [AST.TitleAnnotationId]: 'Salary' }),
+  name: Schema.optional(Schema.String).annotations({ [SchemaAST.TitleAnnotationId]: 'Name' }),
+  active: Schema.optional(Schema.Boolean),
+  email: Schema.optional(Format.Email),
+  salary: Schema.optional(Format.Currency()).annotations({ [SchemaAST.TitleAnnotationId]: 'Salary' }),
 });
 
 const ContactFields = ['name', 'email', 'salary', 'active'];

package/src/util/tag.ts

@@ -0,0 +1,33 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+// TODO(ZaymonFC): Push this into the tag picker module.
+
+/**
+ * Regex pattern for matching tags in the format [Label](id)
+ */
+export const TAG_PATTERN_REGEX = /\[([^\]]+)\]\(([^)]+)\)/g;
+
+/**
+ * Extracts tag IDs from a string in the format [Label](id)
+ * @param value The string to extract IDs from
+ * @returns Array of extracted IDs or undefined if no matches or value is not a string
+ */
+export const extractTagIds = (value: unknown): string[] | undefined => {
+  if (typeof value !== 'string') {
+    return undefined;
+  }
+
+  const ids: string[] = [];
+  let match;
+
+  // Use the global regex to find all matches
+  while ((match = TAG_PATTERN_REGEX.exec(value)) !== null) {
+    if (match[2]) {
+      ids.push(match[2]);
+    }
+  }
+
+  return ids.length > 0 ? ids : undefined;
+};