@dxos/react-ui-table 0.8.4-main.937b3ca → 0.8.4-main.9be5663bfe

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/react-ui-table",
-  "version": "0.8.4-main.937b3ca",
+  "version": "0.8.4-main.9be5663bfe",
   "description": "A table component.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -60,66 +60,66 @@
     "@codemirror/autocomplete": "^6.19.0",
     "@codemirror/state": "^6.5.2",
     "@codemirror/view": "^6.38.4",
-    "@effect-atom/atom-react": "^0.4.6",
+    "@effect-atom/atom-react": "^0.5.0",
     "@fluentui/react-tabster": "9.26.11",
     "@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",
+    "date-fns": "^3.6.0",
     "lodash.orderby": "^4.6.0",
-    "@dxos/async": "0.8.4-main.937b3ca",
-    "@dxos/context": "0.8.4-main.937b3ca",
-    "@dxos/echo": "0.8.4-main.937b3ca",
-    "@dxos/debug": "0.8.4-main.937b3ca",
-    "@dxos/echo-atom": "0.8.4-main.937b3ca",
-    "@dxos/effect": "0.8.4-main.937b3ca",
-    "@dxos/invariant": "0.8.4-main.937b3ca",
-    "@dxos/lit-grid": "0.8.4-main.937b3ca",
-    "@dxos/log": "0.8.4-main.937b3ca",
-    "@dxos/keys": "0.8.4-main.937b3ca",
-    "@dxos/random": "0.8.4-main.937b3ca",
-    "@dxos/react-ui-attention": "0.8.4-main.937b3ca",
-    "@dxos/react-ui-components": "0.8.4-main.937b3ca",
-    "@dxos/react-client": "0.8.4-main.937b3ca",
-    "@dxos/react-ui-editor": "0.8.4-main.937b3ca",
-    "@dxos/react-ui-menu": "0.8.4-main.937b3ca",
-    "@dxos/react-ui-form": "0.8.4-main.937b3ca",
-    "@dxos/react-ui-searchlist": "0.8.4-main.937b3ca",
-    "@dxos/react-ui-stack": "0.8.4-main.937b3ca",
-    "@dxos/schema": "0.8.4-main.937b3ca",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.937b3ca",
-    "@dxos/types": "0.8.4-main.937b3ca",
-    "@dxos/util": "0.8.4-main.937b3ca",
-    "@dxos/ui-types": "0.8.4-main.937b3ca",
-    "@dxos/react-ui-grid": "0.8.4-main.937b3ca"
+    "@dxos/async": "0.8.4-main.9be5663bfe",
+    "@dxos/debug": "0.8.4-main.9be5663bfe",
+    "@dxos/context": "0.8.4-main.9be5663bfe",
+    "@dxos/effect": "0.8.4-main.9be5663bfe",
+    "@dxos/invariant": "0.8.4-main.9be5663bfe",
+    "@dxos/keys": "0.8.4-main.9be5663bfe",
+    "@dxos/echo-atom": "0.8.4-main.9be5663bfe",
+    "@dxos/lit-grid": "0.8.4-main.9be5663bfe",
+    "@dxos/log": "0.8.4-main.9be5663bfe",
+    "@dxos/random": "0.8.4-main.9be5663bfe",
+    "@dxos/react-ui-attention": "0.8.4-main.9be5663bfe",
+    "@dxos/react-ui-components": "0.8.4-main.9be5663bfe",
+    "@dxos/react-ui-form": "0.8.4-main.9be5663bfe",
+    "@dxos/react-client": "0.8.4-main.9be5663bfe",
+    "@dxos/react-ui-grid": "0.8.4-main.9be5663bfe",
+    "@dxos/react-ui-menu": "0.8.4-main.9be5663bfe",
+    "@dxos/react-ui-editor": "0.8.4-main.9be5663bfe",
+    "@dxos/react-ui-search": "0.8.4-main.9be5663bfe",
+    "@dxos/react-ui-stack": "0.8.4-main.9be5663bfe",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.9be5663bfe",
+    "@dxos/schema": "0.8.4-main.9be5663bfe",
+    "@dxos/types": "0.8.4-main.9be5663bfe",
+    "@dxos/util": "0.8.4-main.9be5663bfe",
+    "@dxos/ui-types": "0.8.4-main.9be5663bfe",
+    "@dxos/echo": "0.8.4-main.9be5663bfe"
   },
   "devDependencies": {
-    "@effect/platform": "0.93.6",
+    "@effect/platform": "0.94.4",
     "@types/lodash.orderby": "^4.6.9",
     "@types/react": "~19.2.7",
     "@types/react-dom": "~19.2.3",
-    "effect": "3.19.11",
+    "effect": "3.20.0",
     "fast-check": "^3.19.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "vite": "7.1.9",
-    "@dxos/lit-ui": "0.8.4-main.937b3ca",
-    "@dxos/random": "0.8.4-main.937b3ca",
-    "@dxos/react-ui": "0.8.4-main.937b3ca",
-    "@dxos/react-client": "0.8.4-main.937b3ca",
-    "@dxos/storybook-utils": "0.8.4-main.937b3ca",
-    "@dxos/ui-theme": "0.8.4-main.937b3ca",
-    "@dxos/test-utils": "0.8.4-main.937b3ca"
+    "vite": "^7.1.11",
+    "@dxos/lit-ui": "0.8.4-main.9be5663bfe",
+    "@dxos/random": "0.8.4-main.9be5663bfe",
+    "@dxos/react-client": "0.8.4-main.9be5663bfe",
+    "@dxos/test-utils": "0.8.4-main.9be5663bfe",
+    "@dxos/storybook-utils": "0.8.4-main.9be5663bfe",
+    "@dxos/react-ui": "0.8.4-main.9be5663bfe",
+    "@dxos/ui-theme": "0.8.4-main.9be5663bfe"
   },
   "peerDependencies": {
-    "@effect-atom/atom-react": "^0.4.6",
-    "@effect/platform": "0.93.6",
-    "effect": "3.19.11",
+    "@effect-atom/atom-react": "^0.5.0",
+    "@effect/platform": "0.94.4",
+    "effect": "3.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "@dxos/react-ui": "0.8.4-main.937b3ca",
-    "@dxos/ui-theme": "0.8.4-main.937b3ca"
+    "@dxos/react-ui": "0.8.4-main.9be5663bfe",
+    "@dxos/ui-theme": "0.8.4-main.9be5663bfe"
   },
   "publishConfig": {
     "access": "public"

package/src/components/Table/ColumnActionsMenu.tsx

@@ -36,7 +36,7 @@ export const ColumnActionsMenu = ({ model, modals }: ColumnActionsMenuProps) =>
                 data-testid='column-sort-descending'
                 onClick={() => model.setSort(state.fieldId, 'desc')}
               >
-                {t('column action sort descending')}
+                {t('column-action-sort-descending.menu')}
               </DropdownMenu.Item>
             )}
             {(!isCurrentColumnSorted || currentSort?.direction === 'desc') && (
@@ -44,22 +44,22 @@ export const ColumnActionsMenu = ({ model, modals }: ColumnActionsMenuProps) =>
                 data-testid='column-sort-ascending'
                 onClick={() => model.setSort(state.fieldId, 'asc')}
               >
-                {t('column action sort ascending')}
+                {t('column-action-sort-ascending.menu')}
               </DropdownMenu.Item>
             )}
             {isCurrentColumnSorted && (
               <DropdownMenu.Item data-testid='column-clear-sort' onClick={() => model.clearSort()}>
-                {t('column action clear sorting')}
+                {t('column-action-clear-sorting.menu')}
               </DropdownMenu.Item>
             )}
             {model.getColumnCount() > 1 && model.features.schemaEditable && (
               <DropdownMenu.Item data-testid='column-delete' onClick={() => model.deleteColumn(state.fieldId)}>
-                {t('column action delete')}
+                {t('column-action-delete.menu')}
               </DropdownMenu.Item>
             )}
             {model.features.schemaEditable && (
               <DropdownMenu.Item data-testid='column-settings' onClick={() => modals.openColumnSettings()}>
-                {t('column action settings')}
+                {t('column-action-settings.menu')}
               </DropdownMenu.Item>
             )}
           </DropdownMenu.Viewport>

package/src/components/Table/ColumnSettings.tsx

@@ -5,10 +5,9 @@
 import { useAtomValue } from '@effect-atom/atom-react';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 
-import { type SchemaRegistry } from '@dxos/echo';
+import { type SchemaRegistry, type View } from '@dxos/echo';
 import { Popover } from '@dxos/react-ui';
 import { FieldEditor } from '@dxos/react-ui-form';
-import { type FieldType } from '@dxos/schema';
 
 import { type ModalController, type TableModel } from '../../model';
 
@@ -20,7 +19,7 @@ type ColumnSettingsProps = {
 };
 
 export const ColumnSettings = ({ registry, model, modals, onNewColumn }: ColumnSettingsProps) => {
-  const [newField, setNewField] = useState<FieldType>();
+  const [newField, setNewField] = useState<View.FieldType>();
   const state = useAtomValue(modals.state);
 
   useEffect(() => {
@@ -64,7 +63,7 @@ export const ColumnSettings = ({ registry, model, modals, onNewColumn }: ColumnS
     <Popover.Root modal={false} open={state?.type === 'columnSettings'}>
       <Popover.VirtualTrigger virtualRef={modals.trigger} />
       <Popover.Portal>
-        <Popover.Content classNames='md:is-64'>
+        <Popover.Content classNames='md:w-64'>
           <Popover.Viewport>
             <FieldEditor
               projection={model.projection}

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

@@ -3,24 +3,24 @@
 //
 
 import { type Meta, type StoryObj } from '@storybook/react-vite';
+import type * as Types from 'effect/Types';
 import React, { useMemo, useState } from 'react';
 
-import { Obj } from '@dxos/echo';
-import { Format, type JsonSchemaType } from '@dxos/echo/internal';
-import { faker } from '@dxos/random';
+import { type JsonSchema, Obj } from '@dxos/echo';
+import { Format } from '@dxos/echo/internal';
+import { random } from '@dxos/random';
 import { Filter, useQuery, useSchema } from '@dxos/react-client/echo';
 import { useClientStory, withClientProvider } from '@dxos/react-client/testing';
-import { withTheme } from '@dxos/react-ui/testing';
+import { withLayout, withTheme } from '@dxos/react-ui/testing';
 import { type SchemaPropertyDefinition } from '@dxos/schema';
 import { TestSchema } from '@dxos/schema/testing';
 import { withRegistry } from '@dxos/storybook-utils';
 
 import { type TableFeatures } from '../../model';
 import { translations } from '../../translations';
-
 import { DynamicTable } from './DynamicTable';
 
-faker.seed(0);
+random.seed(0);
 
 const useTestPropertiesAndObjects = () => {
   const properties = useMemo<SchemaPropertyDefinition[]>(
@@ -33,9 +33,9 @@ const useTestPropertiesAndObjects = () => {
 
   const [rows] = useState<any[]>(
     Array.from({ length: 10 }, () => ({
-      id: faker.string.uuid(),
-      name: faker.person.fullName(),
-      age: faker.number.int({ min: 18, max: 80 }),
+      id: random.string.uuid(),
+      name: random.person.fullName(),
+      age: random.number.int({ min: 18, max: 80 }),
     })),
   );
 
@@ -58,7 +58,7 @@ const DynamicTableStory = () => {
 const meta = {
   title: 'ui/react-ui-table/DynamicTable',
   component: DynamicTable,
-  decorators: [withTheme, withRegistry],
+  decorators: [withTheme(), withLayout({ layout: 'fullscreen' }), withRegistry],
   parameters: {
     layout: 'fullscreen',
     translations,
@@ -101,7 +101,7 @@ export const WithClickToSelect: StoryObj = {
 
 export const WithJsonSchema: StoryObj = {
   render: () => {
-    const schema = useMemo<JsonSchemaType>(
+    const schema = useMemo<Types.DeepMutable<JsonSchema.JsonSchema>>(
       () => ({
         type: 'object',
         properties: {
@@ -117,10 +117,10 @@ export const WithJsonSchema: StoryObj = {
 
     const [rows] = useState<any[]>(
       Array.from({ length: 15 }, () => ({
-        name: faker.person.fullName(),
-        age: faker.number.int({ min: 18, max: 80 }),
-        email: faker.internet.email(),
-        active: faker.datatype.boolean(),
+        name: random.person.fullName(),
+        age: random.number.int({ min: 18, max: 80 }),
+        email: random.internet.email(),
+        active: random.datatype.boolean(),
       })),
     );
 
@@ -148,8 +148,8 @@ export const WithEchoSchema: StoryObj = {
         Array.from({ length: 10 }).forEach(() => {
           space.db.add(
             Obj.make(TestSchema.Person, {
-              name: faker.person.fullName(),
-              email: faker.internet.email(),
+              name: random.person.fullName(),
+              email: random.internet.email(),
             }),
           );
         });

package/src/components/Table/DynamicTable.tsx

@@ -3,10 +3,11 @@
 //
 
 import { RegistryContext } from '@effect-atom/atom-react';
+import type * as Types from 'effect/Types';
 import React, { useCallback, useContext, useEffect, useMemo, useRef, useState } from 'react';
 
 import { type Type } from '@dxos/echo';
-import { type JsonSchemaType } from '@dxos/echo/internal';
+import { type JsonSchema } from '@dxos/echo';
 import { type ThemedClassName, useDefaultValue } from '@dxos/react-ui';
 import { type ProjectionModel } from '@dxos/schema';
 import { mx } from '@dxos/ui-theme';
@@ -15,15 +16,14 @@ import { useTableModel } from '../../hooks';
 import { type TableFeatures, TablePresentation, type TableRowAction } from '../../model';
 import { type Table as TableType } from '../../types';
 import { type TablePropertyDefinition, getBaseSchema, makeDynamicTable } from '../../util';
-
 import { Table, type TableController } from './Table';
 
-export type DynamicTableProps<T extends Type.Entity.Any = Type.Entity.Any> = ThemedClassName<{
+export type DynamicTableProps<T extends Type.AnyEntity = Type.AnyEntity> = ThemedClassName<{
   schema?: T;
   name?: string; // TODO(burdon): Remove?
   rows: any[];
   properties?: TablePropertyDefinition[];
-  jsonSchema?: JsonSchemaType;
+  jsonSchema?: Types.DeepMutable<JsonSchema.JsonSchema>;
   features?: Partial<TableFeatures>;
   rowActions?: TableRowAction[];
   onRowClick?: (row: any) => void;
@@ -35,13 +35,13 @@ export type DynamicTableProps<T extends Type.Entity.Any = Type.Entity.Any> = The
  */
 // TODO(burdon): Instead of creating component variants, create helpers/hooks that normalize the props.
 // TODO(burdon): Warning: Cannot update a component (`DynamicTable`) while rendering a different component (`DynamicTable`).
-export const DynamicTable = <T extends Type.Entity.Any = Type.Entity.Any>({
+export const DynamicTable = <T extends Type.AnyEntity = Type.AnyEntity>({
   classNames,
   schema,
-  name = 'example.com/dynamic-table', // Rmove default or make random; this will lead to type collisions.
+  name = 'com.example.dynamic-table', // Remove default or make random; this will lead to type collisions.
   rows,
   properties,
-  jsonSchema: _jsonSchema,
+  jsonSchema: jsonSchemaProp,
   rowActions,
   onRowClick,
   onRowAction,
@@ -52,8 +52,8 @@ export const DynamicTable = <T extends Type.Entity.Any = Type.Entity.Any>({
 
   // TODO(burdon): Remove variance from the props (should be normalized externally; possibly via hooks).
   const { jsonSchema } = useMemo(
-    () => getBaseSchema({ typename: name, properties, jsonSchema: _jsonSchema, schema }),
-    [name, properties, _jsonSchema, schema],
+    () => getBaseSchema({ typename: name, properties, jsonSchema: jsonSchemaProp, schema }),
+    [name, properties, jsonSchemaProp, schema],
   );
 
   useEffect(() => {
@@ -95,18 +95,11 @@ export const DynamicTable = <T extends Type.Entity.Any = Type.Entity.Any>({
     }
   }, [registry, model]);
 
-  // TODO(burdon): Do we need the outer divs?
   return (
-    <div role='none' className={mx('is-full bs-full grow grid', classNames)}>
-      <div role='none' className='grid min-bs-0 overflow-hidden'>
-        <Table.Root>
-          <Table.Main
-            ref={tableRef}
-            model={model}
-            presentation={presentation}
-            ignoreAttention
-            onRowClick={onRowClick}
-          />
+    <div role='none' className={mx('dx-expander grid', classNames)}>
+      <div role='none' className='grid min-h-0 overflow-hidden'>
+        <Table.Root ref={tableRef}>
+          <Table.Content model={model} presentation={presentation} ignoreAttention onRowClick={onRowClick} />
         </Table.Root>
       </div>
     </div>

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

@@ -5,37 +5,37 @@
 import { RegistryContext } from '@effect-atom/atom-react';
 import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React, { useCallback, useContext, useEffect, useMemo, useState } from 'react';
-import { expect, userEvent, within } from 'storybook/test';
+import { expect, userEvent, waitFor, within } from 'storybook/test';
 
 import { Obj, Type } from '@dxos/echo';
+import { View } from '@dxos/echo';
 import { invariant } from '@dxos/invariant';
 import { type DxGrid } from '@dxos/lit-grid';
-import '@dxos/lit-ui/dx-tag-picker.pcss';
-import { faker } from '@dxos/random';
+import { random } from '@dxos/random';
 import { useClientStory, withClientProvider } from '@dxos/react-client/testing';
 import { useAsyncEffect } from '@dxos/react-ui';
-import { withLayout, withTheme } from '@dxos/react-ui/testing';
 import { translations as formTranslations } from '@dxos/react-ui-form';
-import { View } from '@dxos/schema';
+import { withLayout, withTheme } from '@dxos/react-ui/testing';
+import { ViewModel } from '@dxos/schema';
 import { type ValueGenerator, createAsyncGenerator } from '@dxos/schema/testing';
 import { withRegistry } from '@dxos/storybook-utils';
 import { Organization, Person } from '@dxos/types';
+import '@dxos/lit-ui/dx-tag-picker.pcss';
 
 import { useProjectionModel, 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;
+random.seed(1);
+const generator: ValueGenerator = random 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 useTestModel = <S extends Type.AnyObj>(schema: S, count: number) => {
   const registry = useContext(RegistryContext);
   const { space } = useClientStory();
   const [object, setObject] = useState<Table.Table>();
@@ -50,7 +50,7 @@ const useTestModel = <S extends Type.Obj.Any>(schema: S, count: number) => {
       return;
     }
 
-    const { view, jsonSchema } = await View.makeFromDatabase({ db: space.db, typename: Type.getTypename(schema) });
+    const { view, jsonSchema } = await ViewModel.makeFromDatabase({ db: space.db, typename: Type.getTypename(schema) });
     const object = Table.make({ view, jsonSchema });
     setObject(object);
     space.db.add(object);
@@ -87,7 +87,7 @@ const DefaultStory = () => {
   const { space } = useClientStory();
 
   const handleCreate = useCallback(
-    (schema: Type.Entity.Any, values: any) => {
+    (schema: Type.AnyEntity, values: any) => {
       invariant(Type.isObjectSchema(schema));
       invariant(space);
       return space.db.add(Obj.make(schema, values));
@@ -96,9 +96,9 @@ const DefaultStory = () => {
   );
 
   return (
-    <div className='is-full bs-full grid grid-cols-2 divide-x divide-separator'>
+    <div className='dx-expander grid grid-cols-2 divide-x divide-separator'>
       <TableComponent.Root>
-        <TableComponent.Main
+        <TableComponent.Content
           model={orgModel}
           schema={Organization.Organization}
           presentation={orgPresentation}
@@ -108,7 +108,7 @@ const DefaultStory = () => {
         />
       </TableComponent.Root>
       <TableComponent.Root>
-        <TableComponent.Main
+        <TableComponent.Content
           model={contactModel}
           schema={Person.Person}
           presentation={contactPresentation}
@@ -125,7 +125,7 @@ const meta = {
   title: 'ui/react-ui-table/Relations',
   render: DefaultStory,
   decorators: [
-    withTheme,
+    withTheme(),
     withRegistry,
     // TODO(thure): Shouldn't `layout: 'fullscreen'` below make this unnecessary?
     withLayout({ classNames: 'fixed inset-0' }),
@@ -147,7 +147,7 @@ export default meta;
 type Story = StoryObj<typeof meta>;
 
 export const Default: Story = {
-  play: async ({ canvasElement }: any) => {
+  play: async ({ canvasElement }) => {
     const canvas = within(canvasElement);
     const body = within(document.body);
 
@@ -195,8 +195,15 @@ export const Default: Story = {
     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));
+    // Verify the relation was set (cell should now contain the org name).
+    // Wait for the grid (Lit web component) to repaint after the reactive data update.
+    await waitFor(
+      async () => {
+        const updatedCell = within(secondGrid).getByTestId('grid.4.0');
+        await expect(updatedCell).toHaveTextContent(orgName.substring(0, 4));
+      },
+      { timeout: 5000 },
+    );
 
     // 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)
@@ -215,23 +222,24 @@ export const Default: Story = {
     const newSearchField = await body.findByPlaceholderText('Search…');
     await userEvent.click(newSearchField);
 
-    // Type a new object name (this will create a new object)
+    // Type a new object name (this will create a new object).
     const newOrgName = 'Salieri LLC';
     await userEvent.type(newSearchField, newOrgName);
 
-    // Wait for the create option to appear (debounce is 200ms, allow time for render)
-    const createOption = await body.findByRole('option', undefined, { timeout: 500 });
-    await expect(createOption).toBeVisible();
+    // Click the create option directly to open the create form.
+    const createOptionLabel = await body.findByText(/Create new object/, undefined, { timeout: 2000 });
+    await userEvent.click(createOptionLabel.closest('[role="option"]') as HTMLElement);
 
-    // Press Enter to select/create
-    await userEvent.keyboard('{Enter}');
-
-    // Look for and click save button
-    const createReferencedObjectForm = await body.findByTestId('create-referenced-object-form');
+    // Look for and click save button.
+    const createReferencedObjectForm = await body.findByTestId('create-referenced-object-form', undefined, {
+      timeout: 2000,
+    });
     const saveObjectButton = await within(createReferencedObjectForm).findByTestId('save-button');
+    await expect(saveObjectButton).not.toBeDisabled();
     await userEvent.click(saveObjectButton);
 
-    // Verify the new object was created and relation was set
-    await expect(newTargetCell).toHaveTextContent(newOrgName);
+    // Verify the relation was set by checking for the accessory link anchor in the cell.
+    const updatedNewCell = await within(secondGrid).findByTestId('grid.4.1', undefined, { timeout: 5000 });
+    await expect(updatedNewCell.querySelector('dx-anchor')).toBeTruthy();
   },
-} as any;
+};