@dxos/react-ui-table 0.8.4-main.f9ba587 → 0.8.4-main.fcc0d83b33

package/package.json

@@ -1,110 +1,121 @@
 {
   "name": "@dxos/react-ui-table",
-  "version": "0.8.4-main.f9ba587",
+  "version": "0.8.4-main.fcc0d83b33",
   "description": "A table component.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/dxos/dxos"
+  },
   "license": "MIT",
   "author": "DXOS.org",
-  "sideEffects": true,
+  "sideEffects": false,
   "type": "module",
+  "imports": {
+    "#translations": "./src/translations.ts"
+  },
   "exports": {
+    ".": {
+      "source": "./src/index.ts",
+      "types": "./dist/types/src/index.d.ts",
+      "browser": "./dist/lib/browser/index.mjs",
+      "node": "./dist/lib/node-esm/index.mjs"
+    },
     "./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"
     },
-    ".": {
-      "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"
+    },
+    "./translations": {
+      "source": "./src/translations.ts",
+      "types": "./dist/types/src/translations.d.ts",
+      "browser": "./dist/lib/browser/translations.mjs",
+      "node": "./dist/lib/node-esm/translations.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"
     }
   },
   "types": "dist/types/src/index.d.ts",
-  "typesVersions": {
-    "*": {
-      "deprecated": [
-        "dist/types/src/deprecated/index.d.ts"
-      ],
-      "types": [
-        "dist/types/src/types/index.d.ts"
-      ]
-    }
-  },
   "files": [
     "dist",
     "src"
   ],
   "dependencies": {
-    "@codemirror/autocomplete": "^6.18.1",
-    "@codemirror/state": "^6.4.1",
-    "@codemirror/view": "^6.34.1",
-    "@fluentui/react-tabster": "^9.24.2",
-    "@preact-signals/safe-react": "^0.9.0",
-    "@preact/signals-core": "^1.9.0",
+    "@codemirror/autocomplete": "^6.19.0",
+    "@codemirror/state": "^6.5.2",
+    "@codemirror/view": "^6.38.4",
+    "@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/context": "0.8.4-main.f9ba587",
-    "@dxos/debug": "0.8.4-main.f9ba587",
-    "@dxos/echo": "0.8.4-main.f9ba587",
-    "@dxos/echo-schema": "0.8.4-main.f9ba587",
-    "@dxos/effect": "0.8.4-main.f9ba587",
-    "@dxos/invariant": "0.8.4-main.f9ba587",
-    "@dxos/keys": "0.8.4-main.f9ba587",
-    "@dxos/lit-grid": "0.8.4-main.f9ba587",
-    "@dxos/log": "0.8.4-main.f9ba587",
-    "@dxos/live-object": "0.8.4-main.f9ba587",
-    "@dxos/plugin-search": "0.8.4-main.f9ba587",
-    "@dxos/plugin-space": "0.8.4-main.f9ba587",
-    "@dxos/react-client": "0.8.4-main.f9ba587",
-    "@dxos/react-ui-attention": "0.8.4-main.f9ba587",
-    "@dxos/react-ui-editor": "0.8.4-main.f9ba587",
-    "@dxos/react-ui-form": "0.8.4-main.f9ba587",
-    "@dxos/react-ui-grid": "0.8.4-main.f9ba587",
-    "@dxos/react-ui-menu": "0.8.4-main.f9ba587",
-    "@dxos/react-ui-searchlist": "0.8.4-main.f9ba587",
-    "@dxos/react-ui-stack": "0.8.4-main.f9ba587",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.f9ba587",
-    "@dxos/react-ui-tag-picker": "0.8.4-main.f9ba587",
-    "@dxos/react-ui-types": "0.8.4-main.f9ba587",
-    "@dxos/schema": "0.8.4-main.f9ba587",
-    "@dxos/util": "0.8.4-main.f9ba587"
+    "@dxos/async": "0.8.4-main.fcc0d83b33",
+    "@dxos/context": "0.8.4-main.fcc0d83b33",
+    "@dxos/debug": "0.8.4-main.fcc0d83b33",
+    "@dxos/echo": "0.8.4-main.fcc0d83b33",
+    "@dxos/invariant": "0.8.4-main.fcc0d83b33",
+    "@dxos/keys": "0.8.4-main.fcc0d83b33",
+    "@dxos/effect": "0.8.4-main.fcc0d83b33",
+    "@dxos/lit-grid": "0.8.4-main.fcc0d83b33",
+    "@dxos/echo-atom": "0.8.4-main.fcc0d83b33",
+    "@dxos/random": "0.8.4-main.fcc0d83b33",
+    "@dxos/log": "0.8.4-main.fcc0d83b33",
+    "@dxos/react-client": "0.8.4-main.fcc0d83b33",
+    "@dxos/react-ui-attention": "0.8.4-main.fcc0d83b33",
+    "@dxos/react-ui-editor": "0.8.4-main.fcc0d83b33",
+    "@dxos/react-ui-form": "0.8.4-main.fcc0d83b33",
+    "@dxos/react-ui-grid": "0.8.4-main.fcc0d83b33",
+    "@dxos/react-ui-menu": "0.8.4-main.fcc0d83b33",
+    "@dxos/react-ui-components": "0.8.4-main.fcc0d83b33",
+    "@dxos/react-ui-stack": "0.8.4-main.fcc0d83b33",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.fcc0d83b33",
+    "@dxos/react-ui-search": "0.8.4-main.fcc0d83b33",
+    "@dxos/schema": "0.8.4-main.fcc0d83b33",
+    "@dxos/ui-types": "0.8.4-main.fcc0d83b33",
+    "@dxos/types": "0.8.4-main.fcc0d83b33",
+    "@dxos/util": "0.8.4-main.fcc0d83b33"
   },
   "devDependencies": {
-    "@effect-rx/rx-react": "0.38.0",
-    "@effect/platform": "0.88.0",
+    "@effect/platform": "0.94.4",
     "@types/lodash.orderby": "^4.6.9",
-    "@types/react": "~18.2.0",
-    "@types/react-dom": "~18.2.0",
-    "effect": "3.16.13",
+    "@types/react": "~19.2.7",
+    "@types/react-dom": "~19.2.3",
+    "effect": "3.20.0",
     "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.f9ba587",
-    "@dxos/random": "0.8.4-main.f9ba587",
-    "@dxos/react-ui": "0.8.4-main.f9ba587",
-    "@dxos/react-ui-theme": "0.8.4-main.f9ba587",
-    "@dxos/storybook-utils": "0.8.4-main.f9ba587",
-    "@dxos/test-utils": "0.8.4-main.f9ba587"
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
+    "vite": "^8.0.10",
+    "@dxos/lit-ui": "0.8.4-main.fcc0d83b33",
+    "@dxos/random": "0.8.4-main.fcc0d83b33",
+    "@dxos/storybook-utils": "0.8.4-main.fcc0d83b33",
+    "@dxos/react-client": "0.8.4-main.fcc0d83b33",
+    "@dxos/test-utils": "0.8.4-main.fcc0d83b33",
+    "@dxos/react-ui": "0.8.4-main.fcc0d83b33",
+    "@dxos/ui-theme": "0.8.4-main.fcc0d83b33"
   },
   "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.f9ba587",
-    "@dxos/react-ui-theme": "0.8.4-main.f9ba587"
+    "@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/ui-theme": "0.8.4-main.fcc0d83b33",
+    "@dxos/react-ui": "0.8.4-main.fcc0d83b33"
   },
   "publishConfig": {
     "access": "public"

package/src/components/Table/ColumnActionsMenu.tsx

@@ -2,23 +2,28 @@
 // Copyright 2024 DXOS.org
 //
 
+import { useAtomValue } from '@effect-atom/atom-react';
 import React from 'react';
 
 import { DropdownMenu, useTranslation } from '@dxos/react-ui';
 
-import { type TableModel, type ModalController } from '../../model';
-import { translationKey } from '../../translations';
+import { translationKey } from '#translations';
 
-type ColumnActionsMenuProps = { model: TableModel; modals: ModalController };
+import { type ModalController, type TableModel } from '../../model';
+
+export type ColumnActionsMenuProps = {
+  model: TableModel;
+  modals: ModalController;
+};
 
 export const ColumnActionsMenu = ({ model, modals }: ColumnActionsMenuProps) => {
   const { t } = useTranslation(translationKey);
-  const state = modals.state.value;
+  const state = useAtomValue(modals.state);
   if (state?.type !== 'column') {
     return null;
   }
 
-  const currentSort = model.sorting?.sorting;
+  const currentSort = model.getSorting();
   const isCurrentColumnSorted = currentSort?.fieldId === state.fieldId;
 
   return (
@@ -30,32 +35,32 @@ export const ColumnActionsMenu = ({ model, modals }: ColumnActionsMenuProps) =>
             {(!isCurrentColumnSorted || currentSort?.direction === 'asc') && (
               <DropdownMenu.Item
                 data-testid='column-sort-descending'
-                onClick={() => model.sorting?.setSort(state.fieldId, 'desc')}
+                onClick={() => model.setSort(state.fieldId, 'desc')}
               >
-                {t('column action sort descending')}
+                {t('column-action-sort-descending.menu')}
               </DropdownMenu.Item>
             )}
             {(!isCurrentColumnSorted || currentSort?.direction === 'desc') && (
               <DropdownMenu.Item
                 data-testid='column-sort-ascending'
-                onClick={() => model.sorting?.setSort(state.fieldId, 'asc')}
+                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.sorting?.clearSort()}>
-                {t('column action clear sorting')}
+              <DropdownMenu.Item data-testid='column-clear-sort' onClick={() => model.clearSort()}>
+                {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

@@ -2,21 +2,25 @@
 // Copyright 2024 DXOS.org
 //
 
+import { useAtomValue } from '@effect-atom/atom-react';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 
+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 TableModel, type ModalController } from '../../model';
+import { type ModalController, type TableModel } from '../../model';
 
-type ColumnSettingsProps = { model?: TableModel; modals: ModalController; onNewColumn: () => void };
-
-export const ColumnSettings = ({ model, modals, onNewColumn }: ColumnSettingsProps) => {
-  const [newField, setNewField] = useState<FieldType>();
-  const state = modals.state.value;
+type ColumnSettingsProps = {
+  registry?: SchemaRegistry.SchemaRegistry;
+  model?: TableModel;
+  modals: ModalController;
+  onNewColumn: () => void;
+};
 
-  const space = model?.space;
+export const ColumnSettings = ({ registry, model, modals, onNewColumn }: ColumnSettingsProps) => {
+  const [newField, setNewField] = useState<View.FieldType>();
+  const state = useAtomValue(modals.state);
 
   useEffect(() => {
     if (state?.type === 'columnSettings' && state.mode.type === 'create' && model?.projection) {
@@ -33,11 +37,11 @@ export const ColumnSettings = ({ model, modals, onNewColumn }: ColumnSettingsPro
     if (state?.type === 'columnSettings') {
       const { mode } = state;
       if (mode.type === 'edit') {
-        return model?.view?.fields.find((f) => f.id === mode.fieldId);
+        return model?.projection?.getFields().find((f) => f.id === mode.fieldId);
       }
     }
     return undefined;
-  }, [model?.view?.fields, state]);
+  }, [model?.projection, state]);
 
   const field = existingField ?? newField;
 
@@ -47,11 +51,11 @@ export const ColumnSettings = ({ model, modals, onNewColumn }: ColumnSettingsPro
 
   const handleCancel = useCallback(() => {
     if (state?.type === 'columnSettings' && state.mode.type === 'create' && newField) {
-      model?.projection?.deleteFieldProjection(newField.id);
+      model?.projection.deleteFieldProjection(newField.id);
     }
   }, [model?.projection, state, newField]);
 
-  if (!model?.view || !model.projection || !field) {
+  if (!model?.projection || !field) {
     return null;
   }
 
@@ -59,13 +63,12 @@ export const ColumnSettings = ({ model, modals, onNewColumn }: ColumnSettingsPro
     <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
-              view={model.view!}
               projection={model.projection}
               field={field}
-              registry={space?.db.schemaRegistry}
+              registry={registry}
               onSave={handleSave}
               onCancel={handleCancel}
             />

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

@@ -2,41 +2,41 @@
 // 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 type * as Types from 'effect/Types';
 import React, { useMemo, useState } from 'react';
 
-import { Obj } from '@dxos/echo';
-import { FormatEnum, type JsonSchemaType } from '@dxos/echo-schema';
-import { faker } from '@dxos/random';
-import { useClient } from '@dxos/react-client';
+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 { useClientProvider, withClientProvider } from '@dxos/react-client/testing';
+import { useClientStory, withClientProvider } from '@dxos/react-client/testing';
+import { withLayout, 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 { TestSchema } from '@dxos/schema/testing';
+import { withRegistry } from '@dxos/storybook-utils';
+
+import { translations } from '#translations';
 
-import { DynamicTable } from './DynamicTable';
 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[]>(
     () => [
-      { name: 'name', format: FormatEnum.String },
-      { name: 'age', format: FormatEnum.Number },
+      { name: 'name', format: Format.TypeFormat.String },
+      { name: 'age', format: Format.TypeFormat.Number },
     ],
     [],
   );
 
   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 }),
     })),
   );
 
@@ -56,15 +56,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(), withLayout({ layout: 'fullscreen' }), withRegistry],
+  parameters: {
+    layout: 'fullscreen',
+    translations,
+  },
+} satisfies Meta<typeof DynamicTable>;
 
 export default meta;
 
+type Story = StoryObj<typeof meta>;
+
 export const Default: StoryObj = {
   render: DynamicTableStory,
 };
@@ -97,7 +102,7 @@ export const WithClickToSelect: StoryObj = {
 
 export const WithJsonSchema: StoryObj = {
   render: () => {
-    const schema = useMemo<JsonSchemaType>(
+    const schema = useMemo<Types.DeepMutable<JsonSchema.JsonSchema>>(
       () => ({
         type: 'object',
         properties: {
@@ -113,10 +118,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(),
       })),
     );
 
@@ -126,10 +131,9 @@ export const WithJsonSchema: StoryObj = {
 
 export const WithEchoSchema: StoryObj = {
   render: () => {
-    const client = useClient();
-    const { space } = useClientProvider();
-    const schema = useSchema(client, space, Testing.Contact.typename);
-    const objects = useQuery(space, schema ? Filter.type(schema) : Filter.nothing());
+    const { space } = useClientStory();
+    const schema = useSchema(space?.db, TestSchema.Person.typename);
+    const objects = useQuery(space?.db, schema ? Filter.type(schema) : Filter.nothing());
     if (!schema) {
       return <div>Loading schema...</div>;
     }
@@ -138,15 +142,15 @@ export const WithEchoSchema: StoryObj = {
   },
   decorators: [
     withClientProvider({
-      types: [Testing.Contact],
+      types: [TestSchema.Person],
       createIdentity: true,
       createSpace: true,
-      onSpaceCreated: async ({ space }) => {
+      onCreateSpace: async ({ space }) => {
         Array.from({ length: 10 }).forEach(() => {
           space.db.add(
-            Obj.make(Testing.Contact, {
-              name: faker.person.fullName(),
-              email: faker.internet.email(),
+            Obj.make(TestSchema.Person, {
+              name: random.person.fullName(),
+              email: random.internet.email(),
             }),
           );
         });

package/src/components/Table/DynamicTable.tsx

@@ -2,24 +2,28 @@
 // Copyright 2025 DXOS.org
 //
 
-import { type Schema } from 'effect';
-import React, { useRef, useMemo, useCallback } from 'react';
+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 JsonSchemaType } from '@dxos/echo-schema';
+import { type Type } from '@dxos/echo';
+import { type JsonSchema } from '@dxos/echo';
 import { type ThemedClassName, useDefaultValue } from '@dxos/react-ui';
-import { mx } from '@dxos/react-ui-theme';
+import { type ProjectionModel } from '@dxos/schema';
+import { mx } from '@dxos/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 Table as TableType } from '../../types';
+import { type TablePropertyDefinition, getBaseSchema, makeDynamicTable } from '../../util';
+import { Table, type TableController } from './Table';
 
-type DynamicTableProps = ThemedClassName<{
+export type DynamicTableProps<T extends Type.AnyEntity = Type.AnyEntity> = ThemedClassName<{
+  schema?: T;
   name?: string; // TODO(burdon): Remove?
   rows: any[];
   properties?: TablePropertyDefinition[];
-  jsonSchema?: JsonSchemaType;
-  schema?: Schema.Schema.AnyNoContext;
+  jsonSchema?: Types.DeepMutable<JsonSchema.JsonSchema>;
   features?: Partial<TableFeatures>;
   rowActions?: TableRowAction[];
   onRowClick?: (row: any) => void;
@@ -31,23 +35,30 @@ type DynamicTableProps = ThemedClassName<{
  */
 // 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 = ({
+export const DynamicTable = <T extends Type.AnyEntity = Type.AnyEntity>({
   classNames,
-  name = 'example.com/dynamic-table', // Rmove default or make random; this will lead to type collisions.
+  schema,
+  name = 'com.example.dynamicTable', // Remove default or make random; this will lead to type collisions.
   rows,
   properties,
-  jsonSchema,
-  schema,
+  jsonSchema: jsonSchemaProp,
   rowActions,
   onRowClick,
   onRowAction,
   ...props
-}: DynamicTableProps) => {
-  const { table, projection } = useMemo(() => {
-    // TODO(burdon): Remove variance from the props (should be normalized externally; possibly via hooks).
-    const props = getBaseSchema({ typename: name, properties, jsonSchema, schema });
-    return makeDynamicTable({ ...props, properties });
-  }, [name, properties, schema, jsonSchema]);
+}: DynamicTableProps<T>) => {
+  const registry = useContext(RegistryContext);
+  const [dynamicTable, setDynamicTable] = useState<{ object: TableType.Table; projection: ProjectionModel }>();
+
+  // TODO(burdon): Remove variance from the props (should be normalized externally; possibly via hooks).
+  const { jsonSchema } = useMemo(
+    () => getBaseSchema({ typename: name, properties, jsonSchema: jsonSchemaProp, schema }),
+    [name, properties, jsonSchemaProp, schema],
+  );
+
+  useEffect(() => {
+    setDynamicTable(makeDynamicTable({ registry, jsonSchema, properties }));
+  }, [registry, jsonSchema, properties]);
 
   const tableRef = useRef<TableController>(null);
   const handleCellUpdate = useCallback((cell: any) => {
@@ -68,9 +79,9 @@ export const DynamicTable = ({
   );
 
   const model = useTableModel({
-    table,
     rows,
-    projection,
+    object: dynamicTable?.object,
+    projection: dynamicTable?.projection,
     features,
     rowActions,
     onCellUpdate: handleCellUpdate,
@@ -80,22 +91,15 @@ export const DynamicTable = ({
 
   const presentation = useMemo(() => {
     if (model) {
-      return new TablePresentation(model);
+      return new TablePresentation(registry, model);
     }
-  }, [model]);
+  }, [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>