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

package/src/model/table-model.ts

@@ -8,7 +8,7 @@ import { type Space } from '@dxos/client/echo';
 import { Resource } from '@dxos/context';
 import { type FieldSortType, FormatEnum, getValue, setValue, type JsonProp } from '@dxos/echo-schema';
 import { invariant } from '@dxos/invariant';
-import { isReactiveObject, makeRef } from '@dxos/live-object';
+import { isLiveObject, makeRef } from '@dxos/live-object';
 import { formatForEditing, parseValue } from '@dxos/react-ui-form';
 import {
   type DxGridAxisMeta,
@@ -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 };
@@ -342,12 +343,28 @@ export class TableModel<T extends TableRow = TableRow> extends Resource {
       case FormatEnum.Ref: {
         // TODO(ZaymonFC): This get's called an additional time by the cell editor onBlur, but with the cell editors
         //   plain string value. Maybe onBlur should be called with the actual value?
-        if (isReactiveObject(value)) {
+        if (isLiveObject(value)) {
           setValue(this._rows.value[rowIdx], field.path, makeRef(value));
         }
         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,10 +2,11 @@
 // Copyright 2024 DXOS.org
 //
 
+import { Schema } from 'effect';
 import { describe, expect, it, beforeEach } from 'vitest';
 
-import { S, TypedObject } from '@dxos/echo-schema';
-import { create, makeRef } from '@dxos/live-object';
+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';
 
@@ -22,7 +23,7 @@ describe('TablePresentation', () => {
 
     beforeEach(async () => {
       updateCount = 0;
-      ({ data } = create({
+      ({ data } = live({
         data: [
           { col1: 'A', col2: 1, col3: true },
           { col1: 'B', col2: 2, col3: false },
@@ -89,14 +90,14 @@ 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 => {
   const schema = createEchoSchema(Test);
   const view = createView({ name: 'Test', typename: schema.typename, jsonSchema: schema.jsonSchema });
   const projection = new ViewProjection(schema.jsonSchema, view);
-  const table = create(TableType, { view: makeRef(view) });
+  const table = live(TableType, { view: makeRef(view) });
   return new TableModel({ id: table.id, view, projection, ...props });
 };

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/dynamic-table.ts

@@ -3,7 +3,7 @@
 //
 
 import type { BaseSchema, JsonSchemaType, SortDirectionType } from '@dxos/echo-schema';
-import { create, makeRef } from '@dxos/live-object';
+import { live, makeRef } from '@dxos/live-object';
 import {
   createView,
   getSchemaFromPropertyDefinitions,
@@ -66,7 +66,7 @@ export const makeDynamicTable = ({
     ...(properties && { fields: properties.map((property) => property.name) }),
   });
 
-  const table = create(TableType, { name: 'dynamic-table', view: makeRef(view) });
+  const table = live(TableType, { name: 'dynamic-table', view: makeRef(view) });
   const projection = new ViewProjection(jsonSchema, view);
   if (properties && view.fields) {
     setProperties(view, projection, properties);

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,19 +2,19 @@
 // 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';
 import { type Client, PublicKey } from '@dxos/react-client';
-import { create, makeRef, type Space } from '@dxos/react-client/echo';
+import { live, makeRef, type Space } from '@dxos/react-client/echo';
 import { createFieldId, createView, getSchemaProperties, ViewProjection, type ViewType } from '@dxos/schema';
 
 import { type TableType } from '../types';
@@ -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({
@@ -75,7 +71,7 @@ export const initializeTable = async ({
 
     if (initialRow) {
       // TODO(burdon): Last (first) row should not be in db and should be managed by the model.
-      space.db.add(create(schema, {}));
+      space.db.add(live(schema, {}));
     }
 
     return schema;
@@ -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;
+};

package/dist/lib/browser/chunk-YWNRUF4J.mjs

@@ -1,26 +0,0 @@
-// packages/ui/react-ui-table/src/types/table.ts
-import { EchoObject, Expando, LabelAnnotationId, ObjectId, Ref, S } from "@dxos/echo-schema";
-import { ViewType } from "@dxos/schema";
-var TableSchema = S.Struct({
-  id: ObjectId,
-  name: S.optional(S.String),
-  view: S.optional(Ref(ViewType)),
-  // TODO(burdon): Document why threads is included here?
-  threads: S.optional(S.Array(Ref(
-    Expando
-    /* ThreadType */
-  )))
-}).annotations({
-  // TODO(burdon): Move annotation to property.
-  [LabelAnnotationId]: "name"
-});
-var TableType = TableSchema.pipe(EchoObject({
-  typename: "dxos.org/type/Table",
-  version: "0.1.0"
-}));
-
-export {
-  TableSchema,
-  TableType
-};
-//# sourceMappingURL=chunk-YWNRUF4J.mjs.map

package/dist/lib/browser/chunk-YWNRUF4J.mjs.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../src/types/table.ts"],
-  "sourcesContent": ["//\n// Copyright 2024 DXOS.org\n//\n\nimport { EchoObject, Expando, LabelAnnotationId, ObjectId, Ref, S } from '@dxos/echo-schema';\n// import { ThreadType } from '@dxos/plugin-space/types';\nimport { ViewType } from '@dxos/schema';\n\nexport const TableSchema = S.Struct({\n  id: ObjectId,\n  name: S.optional(S.String),\n  view: S.optional(Ref(ViewType)),\n  // TODO(burdon): Document why threads is included here?\n  threads: S.optional(S.Array(Ref(Expando /* ThreadType */))),\n}).annotations({\n  // TODO(burdon): Move annotation to property.\n  [LabelAnnotationId]: 'name',\n});\n\nexport const TableType = TableSchema.pipe(EchoObject({ typename: 'dxos.org/type/Table', version: '0.1.0' }));\nexport interface TableType extends S.Schema.Type<typeof TableType> {}\n"],
-  "mappings": ";AAIA,SAASA,YAAYC,SAASC,mBAAmBC,UAAUC,KAAKC,SAAS;AAEzE,SAASC,gBAAgB;AAElB,IAAMC,cAAcC,EAAEC,OAAO;EAClCC,IAAIC;EACJC,MAAMJ,EAAEK,SAASL,EAAEM,MAAM;EACzBC,MAAMP,EAAEK,SAASG,IAAIC,QAAAA,CAAAA;;EAErBC,SAASV,EAAEK,SAASL,EAAEW,MAAMH;IAAII;;EAAsB,CAAA,CAAA;AACxD,CAAA,EAAGC,YAAY;;EAEb,CAACC,iBAAAA,GAAoB;AACvB,CAAA;AAEO,IAAMC,YAAYhB,YAAYiB,KAAKC,WAAW;EAAEC,UAAU;EAAuBC,SAAS;AAAQ,CAAA,CAAA;",
-  "names": ["EchoObject", "Expando", "LabelAnnotationId", "ObjectId", "Ref", "S", "ViewType", "TableSchema", "S", "Struct", "id", "ObjectId", "name", "optional", "String", "view", "Ref", "ViewType", "threads", "Array", "Expando", "annotations", "LabelAnnotationId", "TableType", "pipe", "EchoObject", "typename", "version"]
-}

package/dist/lib/node/chunk-TGG6OZ54.cjs.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../src/types/table.ts"],
-  "sourcesContent": ["//\n// Copyright 2024 DXOS.org\n//\n\nimport { EchoObject, Expando, LabelAnnotationId, ObjectId, Ref, S } from '@dxos/echo-schema';\n// import { ThreadType } from '@dxos/plugin-space/types';\nimport { ViewType } from '@dxos/schema';\n\nexport const TableSchema = S.Struct({\n  id: ObjectId,\n  name: S.optional(S.String),\n  view: S.optional(Ref(ViewType)),\n  // TODO(burdon): Document why threads is included here?\n  threads: S.optional(S.Array(Ref(Expando /* ThreadType */))),\n}).annotations({\n  // TODO(burdon): Move annotation to property.\n  [LabelAnnotationId]: 'name',\n});\n\nexport const TableType = TableSchema.pipe(EchoObject({ typename: 'dxos.org/type/Table', version: '0.1.0' }));\nexport interface TableType extends S.Schema.Type<typeof TableType> {}\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAIA,yBAAyE;AAEzE,oBAAyB;AAElB,IAAMA,cAAcC,qBAAEC,OAAO;EAClCC,IAAIC;EACJC,MAAMJ,qBAAEK,SAASL,qBAAEM,MAAM;EACzBC,MAAMP,qBAAEK,aAASG,wBAAIC,sBAAAA,CAAAA;;EAErBC,SAASV,qBAAEK,SAASL,qBAAEW,UAAMH;IAAII;;EAAsB,CAAA,CAAA;AACxD,CAAA,EAAGC,YAAY;;EAEb,CAACC,oCAAAA,GAAoB;AACvB,CAAA;AAEO,IAAMC,YAAYhB,YAAYiB,SAAKC,+BAAW;EAAEC,UAAU;EAAuBC,SAAS;AAAQ,CAAA,CAAA;",
-  "names": ["TableSchema", "S", "Struct", "id", "ObjectId", "name", "optional", "String", "view", "Ref", "ViewType", "threads", "Array", "Expando", "annotations", "LabelAnnotationId", "TableType", "pipe", "EchoObject", "typename", "version"]
-}

package/dist/lib/node-esm/chunk-KKLP54L3.mjs.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../src/types/table.ts"],
-  "sourcesContent": ["//\n// Copyright 2024 DXOS.org\n//\n\nimport { EchoObject, Expando, LabelAnnotationId, ObjectId, Ref, S } from '@dxos/echo-schema';\n// import { ThreadType } from '@dxos/plugin-space/types';\nimport { ViewType } from '@dxos/schema';\n\nexport const TableSchema = S.Struct({\n  id: ObjectId,\n  name: S.optional(S.String),\n  view: S.optional(Ref(ViewType)),\n  // TODO(burdon): Document why threads is included here?\n  threads: S.optional(S.Array(Ref(Expando /* ThreadType */))),\n}).annotations({\n  // TODO(burdon): Move annotation to property.\n  [LabelAnnotationId]: 'name',\n});\n\nexport const TableType = TableSchema.pipe(EchoObject({ typename: 'dxos.org/type/Table', version: '0.1.0' }));\nexport interface TableType extends S.Schema.Type<typeof TableType> {}\n"],
-  "mappings": ";;;AAIA,SAASA,YAAYC,SAASC,mBAAmBC,UAAUC,KAAKC,SAAS;AAEzE,SAASC,gBAAgB;AAElB,IAAMC,cAAcC,EAAEC,OAAO;EAClCC,IAAIC;EACJC,MAAMJ,EAAEK,SAASL,EAAEM,MAAM;EACzBC,MAAMP,EAAEK,SAASG,IAAIC,QAAAA,CAAAA;;EAErBC,SAASV,EAAEK,SAASL,EAAEW,MAAMH;IAAII;;EAAsB,CAAA,CAAA;AACxD,CAAA,EAAGC,YAAY;;EAEb,CAACC,iBAAAA,GAAoB;AACvB,CAAA;AAEO,IAAMC,YAAYhB,YAAYiB,KAAKC,WAAW;EAAEC,UAAU;EAAuBC,SAAS;AAAQ,CAAA,CAAA;",
-  "names": ["EchoObject", "Expando", "LabelAnnotationId", "ObjectId", "Ref", "S", "ViewType", "TableSchema", "S", "Struct", "id", "ObjectId", "name", "optional", "String", "view", "Ref", "ViewType", "threads", "Array", "Expando", "annotations", "LabelAnnotationId", "TableType", "pipe", "EchoObject", "typename", "version"]
-}

package/dist/types/src/components/Table/RefPanel.d.ts

@@ -1,9 +0,0 @@
-import React from 'react';
-import { type TableModel, type ModalController } from '../../model';
-type RefPanelProps = {
-    model: TableModel;
-    modals: ModalController;
-};
-export declare const RefPanel: ({ model, modals }: RefPanelProps) => React.JSX.Element | null;
-export {};
-//# sourceMappingURL=RefPanel.d.ts.map

package/dist/types/src/components/Table/RefPanel.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"RefPanel.d.ts","sourceRoot":"","sources":["../../../../../src/components/Table/RefPanel.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,OAAO,CAAC;AAM1B,OAAO,EAAE,KAAK,UAAU,EAAE,KAAK,eAAe,EAAE,MAAM,aAAa,CAAC;AAEpE,KAAK,aAAa,GAAG;IAAE,KAAK,EAAE,UAAU,CAAC;IAAC,MAAM,EAAE,eAAe,CAAA;CAAE,CAAC;AAUpE,eAAO,MAAM,QAAQ,sBAAuB,aAAa,6BA6BxD,CAAC"}

package/src/components/Table/RefPanel.tsx

@@ -1,52 +0,0 @@
-//
-// Copyright 2024 DXOS.org
-//
-
-import React from 'react';
-
-import { type Space } from '@dxos/react-client/echo';
-import { Popover } from '@dxos/react-ui';
-import { Form } from '@dxos/react-ui-form';
-
-import { type TableModel, type ModalController } from '../../model';
-
-type RefPanelProps = { model: TableModel; modals: ModalController };
-
-const getRefTargetObj = (space?: Space, id?: string) => {
-  if (space && id) {
-    return space?.db.getObjectById(id);
-  } else {
-    return undefined;
-  }
-};
-
-export const RefPanel = ({ model, modals }: RefPanelProps) => {
-  const state = modals.state.value;
-  const space = model?.space;
-  const targetObj = getRefTargetObj(space, state?.type === 'refPanel' ? state.targetId : undefined);
-  const schema = space && state?.type === 'refPanel' ? space.db.schemaRegistry.getSchema(state.typename) : undefined;
-
-  if (!model.view || !model.projection) {
-    return null;
-  }
-
-  return (
-    <Popover.Root
-      modal={false}
-      open={state?.type === 'refPanel' && !!targetObj && !!schema}
-      onOpenChange={(nextOpen) => {
-        if (!nextOpen) {
-          return modals.close();
-        }
-      }}
-    >
-      <Popover.VirtualTrigger virtualRef={modals.trigger} />
-      <Popover.Portal>
-        <Popover.Content classNames='md:is-64'>
-          {targetObj && schema && <Form readonly values={targetObj} schema={schema} />}
-          <Popover.Arrow />
-        </Popover.Content>
-      </Popover.Portal>
-    </Popover.Root>
-  );
-};