@dxos/react-ui-table 0.8.4-main.c1de068 → 0.8.4-main.c4373fc

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/react-ui-table",
-  "version": "0.8.4-main.c1de068",
+  "version": "0.8.4-main.c4373fc",
   "description": "A table component.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -10,21 +10,25 @@
   "type": "module",
   "exports": {
     "./deprecated": {
+      "source": "./src/deprecated/index.ts",
       "types": "./dist/types/src/deprecated/index.d.ts",
       "browser": "./dist/lib/browser/deprecated/index.mjs",
       "node": "./dist/lib/node-esm/deprecated/index.mjs"
     },
     ".": {
+      "source": "./src/index.ts",
       "types": "./dist/types/src/index.d.ts",
       "browser": "./dist/lib/browser/index.mjs",
       "node": "./dist/lib/node-esm/index.mjs"
     },
     "./testing": {
+      "source": "./src/testing/index.ts",
       "types": "./dist/types/src/testing/index.d.ts",
       "browser": "./dist/lib/browser/testing/index.mjs",
       "node": "./dist/lib/node-esm/testing/index.mjs"
     },
     "./types": {
+      "source": "./src/types/index.ts",
       "types": "./dist/types/src/types/index.d.ts",
       "browser": "./dist/lib/browser/types/index.mjs",
       "node": "./dist/lib/node-esm/types/index.mjs"
@@ -49,72 +53,73 @@
     "src"
   ],
   "dependencies": {
-    "@codemirror/autocomplete": "^6.18.1",
-    "@codemirror/state": "^6.4.1",
-    "@codemirror/view": "^6.34.1",
+    "@codemirror/autocomplete": "^6.19.0",
+    "@codemirror/state": "^6.5.2",
+    "@codemirror/view": "^6.38.4",
     "@fluentui/react-tabster": "^9.24.2",
     "@preact-signals/safe-react": "^0.9.0",
-    "@preact/signals-core": "^1.9.0",
+    "@preact/signals-core": "^1.12.1",
     "@radix-ui/react-context": "1.1.1",
     "@radix-ui/react-primitive": "2.0.2",
     "@radix-ui/react-slot": "1.1.2",
     "@radix-ui/react-use-controllable-state": "1.1.0",
     "date-fns": "^3.3.1",
     "lodash.orderby": "^4.6.0",
-    "@dxos/context": "0.8.4-main.c1de068",
-    "@dxos/debug": "0.8.4-main.c1de068",
-    "@dxos/echo": "0.8.4-main.c1de068",
-    "@dxos/effect": "0.8.4-main.c1de068",
-    "@dxos/echo-schema": "0.8.4-main.c1de068",
-    "@dxos/echo-db": "0.8.4-main.c1de068",
-    "@dxos/invariant": "0.8.4-main.c1de068",
-    "@dxos/lit-grid": "0.8.4-main.c1de068",
-    "@dxos/keys": "0.8.4-main.c1de068",
-    "@dxos/live-object": "0.8.4-main.c1de068",
-    "@dxos/plugin-search": "0.8.4-main.c1de068",
-    "@dxos/log": "0.8.4-main.c1de068",
-    "@dxos/react-client": "0.8.4-main.c1de068",
-    "@dxos/react-ui-attention": "0.8.4-main.c1de068",
-    "@dxos/random": "0.8.4-main.c1de068",
-    "@dxos/react-ui-form": "0.8.4-main.c1de068",
-    "@dxos/react-ui-grid": "0.8.4-main.c1de068",
-    "@dxos/react-ui-editor": "0.8.4-main.c1de068",
-    "@dxos/react-ui-menu": "0.8.4-main.c1de068",
-    "@dxos/react-ui-searchlist": "0.8.4-main.c1de068",
-    "@dxos/react-ui-stack": "0.8.4-main.c1de068",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.c1de068",
-    "@dxos/react-ui-tag-picker": "0.8.4-main.c1de068",
-    "@dxos/react-ui-types": "0.8.4-main.c1de068",
-    "@dxos/schema": "0.8.4-main.c1de068",
-    "@dxos/util": "0.8.4-main.c1de068"
+    "@dxos/async": "0.8.4-main.c4373fc",
+    "@dxos/context": "0.8.4-main.c4373fc",
+    "@dxos/debug": "0.8.4-main.c4373fc",
+    "@dxos/echo-db": "0.8.4-main.c4373fc",
+    "@dxos/invariant": "0.8.4-main.c4373fc",
+    "@dxos/keys": "0.8.4-main.c4373fc",
+    "@dxos/effect": "0.8.4-main.c4373fc",
+    "@dxos/echo": "0.8.4-main.c4373fc",
+    "@dxos/lit-grid": "0.8.4-main.c4373fc",
+    "@dxos/live-object": "0.8.4-main.c4373fc",
+    "@dxos/plugin-search": "0.8.4-main.c4373fc",
+    "@dxos/log": "0.8.4-main.c4373fc",
+    "@dxos/random": "0.8.4-main.c4373fc",
+    "@dxos/react-ui-attention": "0.8.4-main.c4373fc",
+    "@dxos/react-ui-editor": "0.8.4-main.c4373fc",
+    "@dxos/react-ui-components": "0.8.4-main.c4373fc",
+    "@dxos/react-ui-form": "0.8.4-main.c4373fc",
+    "@dxos/react-client": "0.8.4-main.c4373fc",
+    "@dxos/react-ui-grid": "0.8.4-main.c4373fc",
+    "@dxos/react-ui-searchlist": "0.8.4-main.c4373fc",
+    "@dxos/react-ui-menu": "0.8.4-main.c4373fc",
+    "@dxos/react-ui-stack": "0.8.4-main.c4373fc",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.c4373fc",
+    "@dxos/react-ui-types": "0.8.4-main.c4373fc",
+    "@dxos/schema": "0.8.4-main.c4373fc",
+    "@dxos/util": "0.8.4-main.c4373fc"
   },
   "devDependencies": {
-    "@effect-rx/rx-react": "0.38.0",
-    "@effect/platform": "0.89.0",
+    "@effect-rx/rx-react": "0.42.4",
+    "@effect/platform": "0.92.1",
     "@types/lodash.orderby": "^4.6.9",
-    "@types/react": "~18.2.0",
-    "@types/react-dom": "~18.2.0",
-    "effect": "3.17.0",
+    "@types/react": "~19.2.2",
+    "@types/react-dom": "~19.2.1",
+    "effect": "3.18.3",
     "fast-check": "^3.19.0",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "vite": "5.4.7",
-    "@dxos/echo-signals": "0.8.4-main.c1de068",
-    "@dxos/plugin-search": "0.8.4-main.c1de068",
-    "@dxos/random": "0.8.4-main.c1de068",
-    "@dxos/react-ui": "0.8.4-main.c1de068",
-    "@dxos/react-ui-theme": "0.8.4-main.c1de068",
-    "@dxos/storybook-utils": "0.8.4-main.c1de068",
-    "@dxos/test-utils": "0.8.4-main.c1de068"
+    "react": "~19.2.0",
+    "react-dom": "~19.2.0",
+    "vite": "7.1.9",
+    "@dxos/lit-ui": "0.8.4-main.c4373fc",
+    "@dxos/plugin-search": "0.8.4-main.c4373fc",
+    "@dxos/random": "0.8.4-main.c4373fc",
+    "@dxos/react-ui": "0.8.4-main.c4373fc",
+    "@dxos/echo-signals": "0.8.4-main.c4373fc",
+    "@dxos/react-ui-theme": "0.8.4-main.c4373fc",
+    "@dxos/storybook-utils": "0.8.4-main.c4373fc",
+    "@dxos/test-utils": "0.8.4-main.c4373fc"
   },
   "peerDependencies": {
     "@effect-rx/rx-react": "^0.34.1",
     "@effect/platform": "^0.80.12",
     "effect": "^3.13.3",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.4-main.c1de068",
-    "@dxos/react-ui-theme": "0.8.4-main.c1de068"
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0",
+    "@dxos/react-ui": "0.8.4-main.c4373fc",
+    "@dxos/react-ui-theme": "0.8.4-main.c4373fc"
   },
   "publishConfig": {
     "access": "public"

package/src/components/Table/ColumnActionsMenu.tsx

@@ -6,7 +6,7 @@ import React from 'react';
 
 import { DropdownMenu, useTranslation } from '@dxos/react-ui';
 
-import { type TableModel, type ModalController } from '../../model';
+import { type ModalController, type TableModel } from '../../model';
 import { translationKey } from '../../translations';
 
 type ColumnActionsMenuProps = { model: TableModel; modals: ModalController };

package/src/components/Table/ColumnSettings.tsx

@@ -10,7 +10,7 @@ import { Popover } from '@dxos/react-ui';
 import { FieldEditor } from '@dxos/react-ui-form';
 import { type FieldType } from '@dxos/schema';
 
-import { type TableModel, type ModalController } from '../../model';
+import { type ModalController, type TableModel } from '../../model';
 
 type ColumnSettingsProps = {
   registry?: SchemaRegistry;

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

@@ -2,25 +2,24 @@
 // Copyright 2025 DXOS.org
 //
 
-import '@dxos-theme';
-
-import { type StoryObj, type Meta } from '@storybook/react-vite';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React, { useMemo, useState } from 'react';
 
 import { Obj } from '@dxos/echo';
-import { FormatEnum, type JsonSchemaType } from '@dxos/echo-schema';
+import { FormatEnum, type JsonSchemaType } from '@dxos/echo/internal';
 import { faker } from '@dxos/random';
 import { useClient } from '@dxos/react-client';
 import { Filter, useQuery, useSchema } from '@dxos/react-client/echo';
 import { useClientProvider, withClientProvider } from '@dxos/react-client/testing';
+import { withTheme } from '@dxos/react-ui/testing';
 import { type SchemaPropertyDefinition } from '@dxos/schema';
 import { Testing } from '@dxos/schema/testing';
-import { withLayout, withTheme } from '@dxos/storybook-utils';
 
-import { DynamicTable } from './DynamicTable';
 import { type TableFeatures } from '../../model';
 import { translations } from '../../translations';
 
+import { DynamicTable } from './DynamicTable';
+
 faker.seed(0);
 
 const useTestPropertiesAndObjects = () => {
@@ -56,15 +55,20 @@ const DynamicTableStory = () => {
 // Story definitions.
 //
 
-const meta: Meta = {
+const meta = {
   title: 'ui/react-ui-table/DynamicTable',
   component: DynamicTable,
-  parameters: { translations },
-  decorators: [withLayout({ fullscreen: true }), withTheme],
-};
+  decorators: [withTheme],
+  parameters: {
+    layout: 'fullscreen',
+    translations,
+  },
+} satisfies Meta<typeof DynamicTable>;
 
 export default meta;
 
+type Story = StoryObj<typeof meta>;
+
 export const Default: StoryObj = {
   render: DynamicTableStory,
 };
@@ -141,7 +145,7 @@ export const WithEchoSchema: StoryObj = {
       types: [Testing.Contact],
       createIdentity: true,
       createSpace: true,
-      onSpaceCreated: async ({ space }) => {
+      onCreateSpace: async ({ space }) => {
         Array.from({ length: 10 }).forEach(() => {
           space.db.add(
             Obj.make(Testing.Contact, {

package/src/components/Table/DynamicTable.tsx

@@ -2,17 +2,18 @@
 // Copyright 2025 DXOS.org
 //
 
-import { type Schema } from 'effect';
-import React, { useRef, useMemo, useCallback } from 'react';
+import type * as Schema from 'effect/Schema';
+import React, { useCallback, useMemo, useRef } from 'react';
 
-import { type JsonSchemaType } from '@dxos/echo-schema';
+import { type JsonSchemaType } from '@dxos/echo/internal';
 import { type ThemedClassName, useDefaultValue } from '@dxos/react-ui';
 import { mx } from '@dxos/react-ui-theme';
 
-import { Table, type TableController } from './Table';
 import { useTableModel } from '../../hooks';
 import { type TableFeatures, TablePresentation, type TableRowAction } from '../../model';
-import { getBaseSchema, makeDynamicTable, type TablePropertyDefinition } from '../../util';
+import { type TablePropertyDefinition, getBaseSchema, makeDynamicTable } from '../../util';
+
+import { Table, type TableController } from './Table';
 
 type DynamicTableProps = ThemedClassName<{
   name?: string; // TODO(burdon): Remove?
@@ -44,15 +45,12 @@ export const DynamicTable = ({
   ...props
 }: DynamicTableProps) => {
   // TODO(burdon): Remove variance from the props (should be normalized externally; possibly via hooks).
-  const { typename, jsonSchema } = useMemo(
+  const { jsonSchema } = useMemo(
     () => getBaseSchema({ typename: name, properties, jsonSchema: _jsonSchema, schema }),
     [name, properties, _jsonSchema, schema],
   );
 
-  const { projection, view } = useMemo(
-    () => makeDynamicTable({ typename, jsonSchema, properties }),
-    [typename, jsonSchema, properties],
-  );
+  const { projection, view } = useMemo(() => makeDynamicTable({ jsonSchema, properties }), [jsonSchema, properties]);
 
   const tableRef = useRef<TableController>(null);
   const handleCellUpdate = useCallback((cell: any) => {

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

@@ -0,0 +1,248 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import type * as Schema from 'effect/Schema';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import { expect, userEvent, within } from 'storybook/test';
+
+import { Obj, Type } from '@dxos/echo';
+import { type JsonSchemaType } from '@dxos/echo/internal';
+import { type DxGrid } from '@dxos/lit-grid';
+import '@dxos/lit-ui/dx-tag-picker.pcss';
+import { faker } from '@dxos/random';
+import { useClient } from '@dxos/react-client';
+import { useClientProvider, withClientProvider } from '@dxos/react-client/testing';
+import { useAsyncEffect } from '@dxos/react-ui';
+import { withTheme } from '@dxos/react-ui/testing';
+import { translations as formTranslations } from '@dxos/react-ui-form';
+import { DataType } from '@dxos/schema';
+import { type ValueGenerator, createAsyncGenerator } from '@dxos/schema/testing';
+
+import { useTableModel } from '../../hooks';
+import { type TableFeatures, TablePresentation, type TableRow } from '../../model';
+import { translations } from '../../translations';
+import { Table } from '../../types';
+
+import { Table as TableComponent } from './Table';
+
+faker.seed(1);
+const generator: ValueGenerator = faker as any;
+
+// TODO(burdon): Many-to-many relations.
+// TODO(burdon): Mutable and immutable views.
+// TODO(burdon): Reconcile schemas types and utils (see API PR).
+// TODO(burdon): Base type for T (with id); see ECHO API PR?
+const useTestModel = <S extends Type.Obj.Any>(schema: S, count: number) => {
+  const client = useClient();
+  const { space } = useClientProvider();
+  const [view, setView] = useState<DataType.View>();
+  const [jsonSchema, setJsonSchema] = useState<JsonSchemaType>();
+
+  const features = useMemo<TableFeatures>(
+    () => ({ schemaEditable: false, dataEditable: true, selection: { enabled: false } }),
+    [],
+  );
+
+  useAsyncEffect(async () => {
+    if (!space) {
+      return;
+    }
+
+    const {
+      jsonSchema,
+      schema: effectSchema,
+      view,
+    } = await Table.makeView({ client, space, typename: Type.getTypename(schema) });
+    setJsonSchema(jsonSchema);
+    setView(view);
+    space.db.add(view);
+    await space.db.schemaRegistry.register([effectSchema]);
+  }, [client, space, schema]);
+
+  const model = useTableModel<TableRow>({ view, schema: jsonSchema, rows: [], features });
+
+  useEffect(() => {
+    if (!model || !space) {
+      return;
+    }
+
+    const objectGenerator = createAsyncGenerator(generator, schema, { db: space?.db, force: true });
+    void objectGenerator.createObjects(count).then((objects) => {
+      model.setRows(objects);
+    });
+  }, [model, space]);
+
+  const presentation = useMemo(() => {
+    if (!model) {
+      return;
+    }
+
+    return new TablePresentation(model);
+  }, [model]);
+
+  return { model, presentation };
+};
+
+const DefaultStory = () => {
+  const client = useClient();
+  const { model: orgModel, presentation: orgPresentation } = useTestModel(DataType.Organization, 50);
+  const { model: contactModel, presentation: contactPresentation } = useTestModel(DataType.Person, 50);
+  const { space } = useClientProvider();
+
+  const handleCreate = useCallback(
+    (schema: Schema.Schema.AnyNoContext, values: any) => {
+      return client.spaces.default.db.add(Obj.make(schema, values));
+    },
+    [space],
+  );
+
+  return (
+    <div className='is-full bs-full grid grid-cols-2 divide-x divide-separator'>
+      <TableComponent.Root>
+        <TableComponent.Main
+          model={orgModel}
+          schema={DataType.Organization}
+          presentation={orgPresentation}
+          onCreate={handleCreate}
+          client={client}
+          ignoreAttention
+          testId='relations-0'
+        />
+      </TableComponent.Root>
+      <TableComponent.Root>
+        <TableComponent.Main
+          model={contactModel}
+          schema={DataType.Person}
+          presentation={contactPresentation}
+          onCreate={handleCreate}
+          client={client}
+          ignoreAttention
+          testId='relations-1'
+        />
+      </TableComponent.Root>
+    </div>
+  );
+};
+
+const meta = {
+  title: 'ui/react-ui-table/Relations',
+  render: DefaultStory,
+  decorators: [
+    withTheme,
+    withClientProvider({
+      types: [DataType.View, DataType.Organization, DataType.Person, Table.Table],
+      createIdentity: true,
+      createSpace: true,
+    }),
+  ],
+  parameters: {
+    layout: 'fullscreen',
+    controls: { disable: true },
+    translations: [...translations, ...formTranslations],
+  },
+} satisfies Meta<typeof DefaultStory>;
+
+export default meta;
+
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {
+  // TODO(wittjosiah): This test is flaky, especially in CI.
+  //   Most typical failure is `targetCell` returns `null`.
+  _play: async ({ canvasElement }: any) => {
+    const canvas = within(canvasElement);
+    const body = within(document.body);
+
+    // Get all dx-grid elements (should have 2 - one for each table)
+    const firstGrid = await canvas.findByTestId('relations-0', undefined, { timeout: 30_000 });
+    const secondGrid = await canvas.findByTestId('relations-1', undefined, { timeout: 30_000 });
+
+    // Focus on the second table (Person/contacts table)
+    await expect(secondGrid).toBeVisible();
+
+    // Scroll to the relations column (column 4) - this mimics the scrollToColumn call
+    (secondGrid.closest('dx-grid') as DxGrid).scrollToColumn(4);
+
+    // Wait for scroll to complete
+    await new Promise((resolve) => setTimeout(resolve, 1000));
+
+    // Find and click the target cell (first row, relations column)
+    const targetCell = secondGrid.querySelector('[data-dx-grid-plane="grid"] [aria-rowindex="0"][aria-colindex="4"]');
+    await expect(targetCell).toBeVisible();
+
+    // Click to focus the cell
+    await userEvent.click(targetCell as HTMLElement);
+    await expect(targetCell).toHaveFocus();
+    await userEvent.keyboard('{Enter}');
+
+    // Look for the combobox that should appear in edit mode
+    const combobox = await body.findByRole('combobox', undefined, { timeout: 5000 });
+    await userEvent.click(combobox);
+
+    const searchField = await body.findByPlaceholderText('Search…');
+    await userEvent.click(searchField);
+
+    // Get the first organization name from the first table to search for
+    const orgCell = firstGrid.querySelector(
+      '[data-dx-grid-plane="grid"] [aria-rowindex="0"][aria-colindex="0"] .dx-grid__cell__content',
+    ) as HTMLElement;
+
+    const orgName = orgCell.textContent;
+    // Type the first 4 characters to search
+    await userEvent.type(searchField, orgName.substring(0, 4));
+
+    // Look for an option to select
+    const option = await body.findAllByRole('option');
+    await expect(option[0]).toBeVisible();
+
+    // Press Enter to select
+    await userEvent.keyboard('{Enter}');
+
+    // Look for and click save button
+    const saveButton = await body.findByTestId('save-button');
+    await userEvent.click(saveButton);
+
+    // Verify the relation was set (cell should now contain the org name)
+    await expect(targetCell).toHaveTextContent(orgName.substring(0, 4));
+
+    // Test object creation (new relations) - equivalent to "new relations work as expected" test
+    // Find a different cell to test object creation (second row, relations column)
+    const newTargetCell = secondGrid.querySelector(
+      '[data-dx-grid-plane="grid"] [aria-rowindex="1"][aria-colindex="4"]',
+    );
+    await expect(newTargetCell).toBeTruthy();
+
+    // Click to focus the cell
+    await userEvent.click(newTargetCell as Element);
+
+    await userEvent.keyboard('{Enter}');
+
+    // Look for the combobox that should appear in edit mode
+    const newCombobox = await body.findByRole('combobox');
+    await userEvent.click(newCombobox);
+
+    const newSearchField = await body.findByPlaceholderText('Search…');
+    await userEvent.click(newSearchField);
+
+    // Type a new object name (this will create a new object)
+    const newOrgName = 'Salieri LLC';
+    await userEvent.type(newSearchField, newOrgName);
+
+    // Look for an option to select (should be the create new option)
+    const newOption = await body.findAllByRole('option');
+    await expect(newOption[0]).toBeVisible();
+
+    // Press Enter to select/create
+    await userEvent.keyboard('{Enter}');
+
+    // Look for and click save button
+    const createReferencedObjectForm = await body.findByTestId('create-referenced-object-form');
+    const saveObjectButton = await within(createReferencedObjectForm).findByTestId('save-button');
+    await userEvent.click(saveObjectButton);
+
+    // Verify the new object was created and relation was set
+    await expect(newTargetCell).toHaveTextContent(newOrgName);
+  },
+} as any;

package/src/components/Table/RowActionsMenu.tsx

@@ -4,9 +4,9 @@
 
 import React from 'react';
 
-import { DropdownMenu, useTranslation } from '@dxos/react-ui';
+import { DropdownMenu, toLocalizedString, useTranslation } from '@dxos/react-ui';
 
-import { type TableModel, type ModalController } from '../../model';
+import { type ModalController, type TableModel } from '../../model';
 import { translationKey } from '../../translations';
 
 type RowActionsMenuProps = { model: TableModel; modals: ModalController };
@@ -38,7 +38,7 @@ export const RowActionsMenu = ({ model, modals }: RowActionsMenuProps) => {
                 model.handleRowAction(action.id, state.rowIndex);
               }}
             >
-              {t(action.translationKey)}
+              {toLocalizedString(action.label, t)}
             </DropdownMenu.Item>
           ))}
         </DropdownMenu.Viewport>