@dxos/react-ui-table 0.8.4-main.2e9d522 → 0.8.4-main.548089c
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/lib/browser/chunk-2PFAPQL4.mjs +66 -0
- package/dist/lib/browser/chunk-2PFAPQL4.mjs.map +7 -0
- package/dist/lib/browser/{chunk-5XLSHLOG.mjs → chunk-GS2UNGJK.mjs} +493 -469
- package/dist/lib/browser/chunk-GS2UNGJK.mjs.map +7 -0
- package/dist/lib/browser/index.mjs +614 -696
- package/dist/lib/browser/index.mjs.map +4 -4
- package/dist/lib/browser/meta.json +1 -1
- package/dist/lib/browser/testing/index.mjs +14 -9
- package/dist/lib/browser/testing/index.mjs.map +3 -3
- package/dist/lib/browser/types/index.mjs +3 -3
- package/dist/lib/node-esm/chunk-6POOFFYF.mjs +67 -0
- package/dist/lib/node-esm/chunk-6POOFFYF.mjs.map +7 -0
- package/dist/lib/node-esm/{chunk-Y66YLSTC.mjs → chunk-TRR3C5NX.mjs} +493 -469
- package/dist/lib/node-esm/chunk-TRR3C5NX.mjs.map +7 -0
- package/dist/lib/node-esm/index.mjs +614 -696
- package/dist/lib/node-esm/index.mjs.map +4 -4
- package/dist/lib/node-esm/meta.json +1 -1
- package/dist/lib/node-esm/testing/index.mjs +14 -9
- package/dist/lib/node-esm/testing/index.mjs.map +3 -3
- package/dist/lib/node-esm/types/index.mjs +3 -3
- package/dist/types/src/components/Table/ColumnActionsMenu.d.ts +1 -1
- package/dist/types/src/components/Table/ColumnActionsMenu.d.ts.map +1 -1
- package/dist/types/src/components/Table/ColumnSettings.d.ts +1 -1
- package/dist/types/src/components/Table/ColumnSettings.d.ts.map +1 -1
- package/dist/types/src/components/Table/DynamicTable.d.ts +2 -2
- package/dist/types/src/components/Table/DynamicTable.d.ts.map +1 -1
- package/dist/types/src/components/Table/DynamicTable.stories.d.ts +51 -3
- package/dist/types/src/components/Table/DynamicTable.stories.d.ts.map +1 -1
- package/dist/types/src/components/Table/Relations.stories.d.ts +107 -0
- package/dist/types/src/components/Table/Relations.stories.d.ts.map +1 -0
- package/dist/types/src/components/Table/RowActionsMenu.d.ts +1 -1
- package/dist/types/src/components/Table/RowActionsMenu.d.ts.map +1 -1
- package/dist/types/src/components/Table/Table.d.ts +8 -4
- package/dist/types/src/components/Table/Table.d.ts.map +1 -1
- package/dist/types/src/components/Table/Table.stories.d.ts +42 -4
- package/dist/types/src/components/Table/Table.stories.d.ts.map +1 -1
- package/dist/types/src/components/TableCellEditor/CellValidationMessage.d.ts.map +1 -1
- package/dist/types/src/components/TableCellEditor/FormCellEditor.d.ts +12 -6
- package/dist/types/src/components/TableCellEditor/FormCellEditor.d.ts.map +1 -1
- package/dist/types/src/components/TableCellEditor/TableCellEditor.d.ts +12 -17
- package/dist/types/src/components/TableCellEditor/TableCellEditor.d.ts.map +1 -1
- package/dist/types/src/components/TableCellEditor/TableCellEditor.stories.d.ts +39 -4
- package/dist/types/src/components/TableCellEditor/TableCellEditor.stories.d.ts.map +1 -1
- package/dist/types/src/components/TableCellEditor/index.d.ts +1 -0
- package/dist/types/src/components/TableCellEditor/index.d.ts.map +1 -1
- package/dist/types/src/components/TableToolbar/TableToolbar.d.ts +2 -2
- package/dist/types/src/components/TableToolbar/TableToolbar.d.ts.map +1 -1
- package/dist/types/src/components/testing.d.ts +3 -3
- package/dist/types/src/components/testing.d.ts.map +1 -1
- package/dist/types/src/hooks/useAddRow.d.ts +3 -2
- package/dist/types/src/hooks/useAddRow.d.ts.map +1 -1
- package/dist/types/src/hooks/useTableModel.d.ts +4 -4
- package/dist/types/src/hooks/useTableModel.d.ts.map +1 -1
- package/dist/types/src/model/modal-controller.d.ts +0 -7
- package/dist/types/src/model/modal-controller.d.ts.map +1 -1
- package/dist/types/src/model/selection-model.d.ts.map +1 -1
- package/dist/types/src/model/table-model.d.ts +11 -9
- package/dist/types/src/model/table-model.d.ts.map +1 -1
- package/dist/types/src/model/table-presentation.d.ts +2 -1
- package/dist/types/src/model/table-presentation.d.ts.map +1 -1
- package/dist/types/src/model/table-sorting.d.ts +3 -4
- package/dist/types/src/model/table-sorting.d.ts.map +1 -1
- package/dist/types/src/testing/useTestTableModel.d.ts +3 -22
- package/dist/types/src/testing/useTestTableModel.d.ts.map +1 -1
- package/dist/types/src/translations.d.ts +2 -2
- package/dist/types/src/types/index.d.ts +1 -1
- package/dist/types/src/types/index.d.ts.map +1 -1
- package/dist/types/src/types/schema.d.ts +25 -5
- package/dist/types/src/types/schema.d.ts.map +1 -1
- package/dist/types/src/util/dynamic-table.d.ts +5 -6
- package/dist/types/src/util/dynamic-table.d.ts.map +1 -1
- package/dist/types/src/util/index.d.ts +0 -1
- package/dist/types/src/util/index.d.ts.map +1 -1
- package/dist/types/src/util/schema.d.ts +1 -1
- package/dist/types/src/util/schema.d.ts.map +1 -1
- package/dist/types/src/util/table-buttons.d.ts.map +1 -1
- package/dist/types/src/util/table-controls.d.ts.map +1 -1
- package/dist/types/tsconfig.tsbuildinfo +1 -1
- package/package.json +57 -51
- package/src/components/Table/ColumnActionsMenu.tsx +1 -1
- package/src/components/Table/ColumnSettings.tsx +1 -1
- package/src/components/Table/DynamicTable.stories.tsx +18 -14
- package/src/components/Table/DynamicTable.tsx +8 -10
- package/src/components/Table/Relations.stories.tsx +242 -0
- package/src/components/Table/RowActionsMenu.tsx +23 -15
- package/src/components/Table/Table.stories.tsx +72 -60
- package/src/components/Table/Table.tsx +147 -117
- package/src/components/TableCellEditor/CellValidationMessage.tsx +1 -1
- package/src/components/TableCellEditor/FormCellEditor.tsx +153 -42
- package/src/components/TableCellEditor/TableCellEditor.stories.tsx +25 -64
- package/src/components/TableCellEditor/TableCellEditor.tsx +74 -224
- package/src/components/TableCellEditor/index.ts +1 -0
- package/src/components/TableToolbar/TableToolbar.tsx +33 -23
- package/src/components/testing.ts +2 -2
- package/src/hooks/useAddRow.ts +7 -5
- package/src/hooks/useTableModel.ts +6 -6
- package/src/model/modal-controller.ts +1 -29
- package/src/model/selection-model.ts +3 -2
- package/src/model/table-model.test.ts +20 -11
- package/src/model/table-model.ts +46 -31
- package/src/model/table-presentation.test.ts +24 -22
- package/src/model/table-presentation.ts +74 -33
- package/src/model/table-sorting.ts +17 -8
- package/src/playwright/TableManager.ts +1 -1
- package/src/playwright/smoke.spec.ts +131 -37
- package/src/testing/useTestTableModel.ts +12 -8
- package/src/translations.ts +2 -2
- package/src/types/index.ts +1 -1
- package/src/types/schema.ts +63 -6
- package/src/util/dynamic-table.ts +16 -17
- package/src/util/index.ts +0 -1
- package/src/util/schema.ts +4 -4
- package/src/util/table-buttons.ts +4 -3
- package/src/util/table-controls.ts +4 -1
- package/dist/lib/browser/chunk-5XLSHLOG.mjs.map +0 -7
- package/dist/lib/browser/chunk-L2LSB6KV.mjs +0 -18
- package/dist/lib/browser/chunk-L2LSB6KV.mjs.map +0 -7
- package/dist/lib/node-esm/chunk-NXZ4CJYX.mjs +0 -20
- package/dist/lib/node-esm/chunk-NXZ4CJYX.mjs.map +0 -7
- package/dist/lib/node-esm/chunk-Y66YLSTC.mjs.map +0 -7
- package/dist/types/src/components/Table/CreateRefPanel.d.ts +0 -9
- package/dist/types/src/components/Table/CreateRefPanel.d.ts.map +0 -1
- package/dist/types/src/components/Table/relations.stories.d.ts +0 -9
- package/dist/types/src/components/Table/relations.stories.d.ts.map +0 -1
- package/dist/types/src/components/TableCellEditor/extension.d.ts +0 -13
- package/dist/types/src/components/TableCellEditor/extension.d.ts.map +0 -1
- package/dist/types/src/util/table.d.ts +0 -11
- package/dist/types/src/util/table.d.ts.map +0 -1
- package/src/components/Table/CreateRefPanel.tsx +0 -86
- package/src/components/Table/relations.stories.tsx +0 -116
- package/src/components/TableCellEditor/extension.ts +0 -61
- package/src/util/table.ts +0 -49
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dxos/react-ui-table",
|
|
3
|
-
"version": "0.8.4-main.
|
|
3
|
+
"version": "0.8.4-main.548089c",
|
|
4
4
|
"description": "A table component.",
|
|
5
5
|
"homepage": "https://dxos.org",
|
|
6
6
|
"bugs": "https://github.com/dxos/dxos/issues",
|
|
@@ -10,21 +10,25 @@
|
|
|
10
10
|
"type": "module",
|
|
11
11
|
"exports": {
|
|
12
12
|
"./deprecated": {
|
|
13
|
+
"source": "./src/deprecated/index.ts",
|
|
13
14
|
"types": "./dist/types/src/deprecated/index.d.ts",
|
|
14
15
|
"browser": "./dist/lib/browser/deprecated/index.mjs",
|
|
15
16
|
"node": "./dist/lib/node-esm/deprecated/index.mjs"
|
|
16
17
|
},
|
|
17
18
|
".": {
|
|
19
|
+
"source": "./src/index.ts",
|
|
18
20
|
"types": "./dist/types/src/index.d.ts",
|
|
19
21
|
"browser": "./dist/lib/browser/index.mjs",
|
|
20
22
|
"node": "./dist/lib/node-esm/index.mjs"
|
|
21
23
|
},
|
|
22
24
|
"./testing": {
|
|
25
|
+
"source": "./src/testing/index.ts",
|
|
23
26
|
"types": "./dist/types/src/testing/index.d.ts",
|
|
24
27
|
"browser": "./dist/lib/browser/testing/index.mjs",
|
|
25
28
|
"node": "./dist/lib/node-esm/testing/index.mjs"
|
|
26
29
|
},
|
|
27
30
|
"./types": {
|
|
31
|
+
"source": "./src/types/index.ts",
|
|
28
32
|
"types": "./dist/types/src/types/index.d.ts",
|
|
29
33
|
"browser": "./dist/lib/browser/types/index.mjs",
|
|
30
34
|
"node": "./dist/lib/node-esm/types/index.mjs"
|
|
@@ -49,72 +53,74 @@
|
|
|
49
53
|
"src"
|
|
50
54
|
],
|
|
51
55
|
"dependencies": {
|
|
52
|
-
"@codemirror/autocomplete": "^6.
|
|
53
|
-
"@codemirror/state": "^6.
|
|
54
|
-
"@codemirror/view": "^6.
|
|
56
|
+
"@codemirror/autocomplete": "^6.19.0",
|
|
57
|
+
"@codemirror/state": "^6.5.2",
|
|
58
|
+
"@codemirror/view": "^6.38.4",
|
|
55
59
|
"@fluentui/react-tabster": "^9.24.2",
|
|
56
60
|
"@preact-signals/safe-react": "^0.9.0",
|
|
57
|
-
"@preact/signals-core": "^1.
|
|
61
|
+
"@preact/signals-core": "^1.12.1",
|
|
58
62
|
"@radix-ui/react-context": "1.1.1",
|
|
59
63
|
"@radix-ui/react-primitive": "2.0.2",
|
|
60
64
|
"@radix-ui/react-slot": "1.1.2",
|
|
61
65
|
"@radix-ui/react-use-controllable-state": "1.1.0",
|
|
62
66
|
"date-fns": "^3.3.1",
|
|
63
67
|
"lodash.orderby": "^4.6.0",
|
|
64
|
-
"@dxos/context": "0.8.4-main.
|
|
65
|
-
"@dxos/
|
|
66
|
-
"@dxos/debug": "0.8.4-main.
|
|
67
|
-
"@dxos/echo
|
|
68
|
-
"@dxos/
|
|
69
|
-
"@dxos/
|
|
70
|
-
"@dxos/
|
|
71
|
-
"@dxos/lit-grid": "0.8.4-main.
|
|
72
|
-
"@dxos/
|
|
73
|
-
"@dxos/
|
|
74
|
-
"@dxos/
|
|
75
|
-
"@dxos/
|
|
76
|
-
"@dxos/
|
|
77
|
-
"@dxos/
|
|
78
|
-
"@dxos/react-ui-attention": "0.8.4-main.
|
|
79
|
-
"@dxos/react-ui-editor": "0.8.4-main.
|
|
80
|
-
"@dxos/react-ui-
|
|
81
|
-
"@dxos/react-ui-
|
|
82
|
-
"@dxos/react-ui-
|
|
83
|
-
"@dxos/react-ui-
|
|
84
|
-
"@dxos/react-ui-
|
|
85
|
-
"@dxos/react-ui-
|
|
86
|
-
"@dxos/
|
|
87
|
-
"@dxos/react-ui-types": "0.8.4-main.
|
|
88
|
-
"@dxos/
|
|
89
|
-
"@dxos/
|
|
68
|
+
"@dxos/context": "0.8.4-main.548089c",
|
|
69
|
+
"@dxos/async": "0.8.4-main.548089c",
|
|
70
|
+
"@dxos/debug": "0.8.4-main.548089c",
|
|
71
|
+
"@dxos/echo": "0.8.4-main.548089c",
|
|
72
|
+
"@dxos/invariant": "0.8.4-main.548089c",
|
|
73
|
+
"@dxos/effect": "0.8.4-main.548089c",
|
|
74
|
+
"@dxos/keys": "0.8.4-main.548089c",
|
|
75
|
+
"@dxos/lit-grid": "0.8.4-main.548089c",
|
|
76
|
+
"@dxos/echo-db": "0.8.4-main.548089c",
|
|
77
|
+
"@dxos/live-object": "0.8.4-main.548089c",
|
|
78
|
+
"@dxos/log": "0.8.4-main.548089c",
|
|
79
|
+
"@dxos/random": "0.8.4-main.548089c",
|
|
80
|
+
"@dxos/react-client": "0.8.4-main.548089c",
|
|
81
|
+
"@dxos/plugin-search": "0.8.4-main.548089c",
|
|
82
|
+
"@dxos/react-ui-attention": "0.8.4-main.548089c",
|
|
83
|
+
"@dxos/react-ui-editor": "0.8.4-main.548089c",
|
|
84
|
+
"@dxos/react-ui-components": "0.8.4-main.548089c",
|
|
85
|
+
"@dxos/react-ui-form": "0.8.4-main.548089c",
|
|
86
|
+
"@dxos/react-ui-grid": "0.8.4-main.548089c",
|
|
87
|
+
"@dxos/react-ui-menu": "0.8.4-main.548089c",
|
|
88
|
+
"@dxos/react-ui-searchlist": "0.8.4-main.548089c",
|
|
89
|
+
"@dxos/react-ui-syntax-highlighter": "0.8.4-main.548089c",
|
|
90
|
+
"@dxos/types": "0.8.4-main.548089c",
|
|
91
|
+
"@dxos/react-ui-types": "0.8.4-main.548089c",
|
|
92
|
+
"@dxos/util": "0.8.4-main.548089c",
|
|
93
|
+
"@dxos/react-ui-stack": "0.8.4-main.548089c",
|
|
94
|
+
"@dxos/schema": "0.8.4-main.548089c"
|
|
90
95
|
},
|
|
91
96
|
"devDependencies": {
|
|
92
|
-
"@effect-
|
|
93
|
-
"@effect/platform": "0.
|
|
97
|
+
"@effect-atom/atom-react": "^0.3.4",
|
|
98
|
+
"@effect/platform": "0.92.1",
|
|
94
99
|
"@types/lodash.orderby": "^4.6.9",
|
|
95
|
-
"@types/react": "~
|
|
96
|
-
"@types/react-dom": "~
|
|
97
|
-
"effect": "3.
|
|
100
|
+
"@types/react": "~19.2.2",
|
|
101
|
+
"@types/react-dom": "~19.2.2",
|
|
102
|
+
"effect": "3.18.3",
|
|
98
103
|
"fast-check": "^3.19.0",
|
|
99
|
-
"react": "~
|
|
100
|
-
"react-dom": "~
|
|
101
|
-
"vite": "
|
|
102
|
-
"@dxos/
|
|
103
|
-
"@dxos/plugin-search": "0.8.4-main.
|
|
104
|
-
"@dxos/
|
|
105
|
-
"@dxos/
|
|
106
|
-
"@dxos/react-ui
|
|
107
|
-
"@dxos/
|
|
108
|
-
"@dxos/
|
|
104
|
+
"react": "~19.2.0",
|
|
105
|
+
"react-dom": "~19.2.0",
|
|
106
|
+
"vite": "7.1.9",
|
|
107
|
+
"@dxos/lit-ui": "0.8.4-main.548089c",
|
|
108
|
+
"@dxos/plugin-search": "0.8.4-main.548089c",
|
|
109
|
+
"@dxos/echo-signals": "0.8.4-main.548089c",
|
|
110
|
+
"@dxos/random": "0.8.4-main.548089c",
|
|
111
|
+
"@dxos/react-ui": "0.8.4-main.548089c",
|
|
112
|
+
"@dxos/react-ui-theme": "0.8.4-main.548089c",
|
|
113
|
+
"@dxos/storybook-utils": "0.8.4-main.548089c",
|
|
114
|
+
"@dxos/test-utils": "0.8.4-main.548089c"
|
|
109
115
|
},
|
|
110
116
|
"peerDependencies": {
|
|
111
|
-
"@effect-
|
|
117
|
+
"@effect-atom/atom-react": "^0.3.4",
|
|
112
118
|
"@effect/platform": "^0.80.12",
|
|
113
119
|
"effect": "^3.13.3",
|
|
114
|
-
"react": "
|
|
115
|
-
"react-dom": "
|
|
116
|
-
"@dxos/react-ui": "0.8.4-main.
|
|
117
|
-
"@dxos/react-ui-theme": "0.8.4-main.
|
|
120
|
+
"react": "^19.0.0",
|
|
121
|
+
"react-dom": "^19.0.0",
|
|
122
|
+
"@dxos/react-ui": "0.8.4-main.548089c",
|
|
123
|
+
"@dxos/react-ui-theme": "0.8.4-main.548089c"
|
|
118
124
|
},
|
|
119
125
|
"publishConfig": {
|
|
120
126
|
"access": "public"
|
|
@@ -6,7 +6,7 @@ import React from 'react';
|
|
|
6
6
|
|
|
7
7
|
import { DropdownMenu, useTranslation } from '@dxos/react-ui';
|
|
8
8
|
|
|
9
|
-
import { type
|
|
9
|
+
import { type ModalController, type TableModel } from '../../model';
|
|
10
10
|
import { translationKey } from '../../translations';
|
|
11
11
|
|
|
12
12
|
type ColumnActionsMenuProps = { model: TableModel; modals: ModalController };
|
|
@@ -10,7 +10,7 @@ import { Popover } from '@dxos/react-ui';
|
|
|
10
10
|
import { FieldEditor } from '@dxos/react-ui-form';
|
|
11
11
|
import { type FieldType } from '@dxos/schema';
|
|
12
12
|
|
|
13
|
-
import { type
|
|
13
|
+
import { type ModalController, type TableModel } from '../../model';
|
|
14
14
|
|
|
15
15
|
type ColumnSettingsProps = {
|
|
16
16
|
registry?: SchemaRegistry;
|
|
@@ -2,25 +2,24 @@
|
|
|
2
2
|
// Copyright 2025 DXOS.org
|
|
3
3
|
//
|
|
4
4
|
|
|
5
|
-
import '@
|
|
6
|
-
|
|
7
|
-
import { type StoryObj, type Meta } from '@storybook/react-vite';
|
|
5
|
+
import { type Meta, type StoryObj } from '@storybook/react-vite';
|
|
8
6
|
import React, { useMemo, useState } from 'react';
|
|
9
7
|
|
|
10
8
|
import { Obj } from '@dxos/echo';
|
|
11
|
-
import { FormatEnum, type JsonSchemaType } from '@dxos/echo
|
|
9
|
+
import { FormatEnum, type JsonSchemaType } from '@dxos/echo/internal';
|
|
12
10
|
import { faker } from '@dxos/random';
|
|
13
11
|
import { useClient } from '@dxos/react-client';
|
|
14
12
|
import { Filter, useQuery, useSchema } from '@dxos/react-client/echo';
|
|
15
13
|
import { useClientProvider, withClientProvider } from '@dxos/react-client/testing';
|
|
14
|
+
import { withTheme } from '@dxos/react-ui/testing';
|
|
16
15
|
import { type SchemaPropertyDefinition } from '@dxos/schema';
|
|
17
16
|
import { Testing } from '@dxos/schema/testing';
|
|
18
|
-
import { withLayout, withTheme } from '@dxos/storybook-utils';
|
|
19
17
|
|
|
20
|
-
import { DynamicTable } from './DynamicTable';
|
|
21
18
|
import { type TableFeatures } from '../../model';
|
|
22
19
|
import { translations } from '../../translations';
|
|
23
20
|
|
|
21
|
+
import { DynamicTable } from './DynamicTable';
|
|
22
|
+
|
|
24
23
|
faker.seed(0);
|
|
25
24
|
|
|
26
25
|
const useTestPropertiesAndObjects = () => {
|
|
@@ -56,15 +55,20 @@ const DynamicTableStory = () => {
|
|
|
56
55
|
// Story definitions.
|
|
57
56
|
//
|
|
58
57
|
|
|
59
|
-
const meta
|
|
58
|
+
const meta = {
|
|
60
59
|
title: 'ui/react-ui-table/DynamicTable',
|
|
61
60
|
component: DynamicTable,
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
61
|
+
decorators: [withTheme],
|
|
62
|
+
parameters: {
|
|
63
|
+
layout: 'fullscreen',
|
|
64
|
+
translations,
|
|
65
|
+
},
|
|
66
|
+
} satisfies Meta<typeof DynamicTable>;
|
|
65
67
|
|
|
66
68
|
export default meta;
|
|
67
69
|
|
|
70
|
+
type Story = StoryObj<typeof meta>;
|
|
71
|
+
|
|
68
72
|
export const Default: StoryObj = {
|
|
69
73
|
render: DynamicTableStory,
|
|
70
74
|
};
|
|
@@ -128,7 +132,7 @@ export const WithEchoSchema: StoryObj = {
|
|
|
128
132
|
render: () => {
|
|
129
133
|
const client = useClient();
|
|
130
134
|
const { space } = useClientProvider();
|
|
131
|
-
const schema = useSchema(client, space, Testing.
|
|
135
|
+
const schema = useSchema(client, space, Testing.Person.typename);
|
|
132
136
|
const objects = useQuery(space, schema ? Filter.type(schema) : Filter.nothing());
|
|
133
137
|
if (!schema) {
|
|
134
138
|
return <div>Loading schema...</div>;
|
|
@@ -138,13 +142,13 @@ export const WithEchoSchema: StoryObj = {
|
|
|
138
142
|
},
|
|
139
143
|
decorators: [
|
|
140
144
|
withClientProvider({
|
|
141
|
-
types: [Testing.
|
|
145
|
+
types: [Testing.Person],
|
|
142
146
|
createIdentity: true,
|
|
143
147
|
createSpace: true,
|
|
144
|
-
|
|
148
|
+
onCreateSpace: async ({ space }) => {
|
|
145
149
|
Array.from({ length: 10 }).forEach(() => {
|
|
146
150
|
space.db.add(
|
|
147
|
-
Obj.make(Testing.
|
|
151
|
+
Obj.make(Testing.Person, {
|
|
148
152
|
name: faker.person.fullName(),
|
|
149
153
|
email: faker.internet.email(),
|
|
150
154
|
}),
|
|
@@ -2,17 +2,18 @@
|
|
|
2
2
|
// Copyright 2025 DXOS.org
|
|
3
3
|
//
|
|
4
4
|
|
|
5
|
-
import
|
|
6
|
-
import React, {
|
|
5
|
+
import type * as Schema from 'effect/Schema';
|
|
6
|
+
import React, { useCallback, useMemo, useRef } from 'react';
|
|
7
7
|
|
|
8
|
-
import { type JsonSchemaType } from '@dxos/echo
|
|
8
|
+
import { type JsonSchemaType } from '@dxos/echo/internal';
|
|
9
9
|
import { type ThemedClassName, useDefaultValue } from '@dxos/react-ui';
|
|
10
10
|
import { mx } from '@dxos/react-ui-theme';
|
|
11
11
|
|
|
12
|
-
import { Table, type TableController } from './Table';
|
|
13
12
|
import { useTableModel } from '../../hooks';
|
|
14
13
|
import { type TableFeatures, TablePresentation, type TableRowAction } from '../../model';
|
|
15
|
-
import { getBaseSchema, makeDynamicTable
|
|
14
|
+
import { type TablePropertyDefinition, getBaseSchema, makeDynamicTable } from '../../util';
|
|
15
|
+
|
|
16
|
+
import { Table, type TableController } from './Table';
|
|
16
17
|
|
|
17
18
|
type DynamicTableProps = ThemedClassName<{
|
|
18
19
|
name?: string; // TODO(burdon): Remove?
|
|
@@ -44,15 +45,12 @@ export const DynamicTable = ({
|
|
|
44
45
|
...props
|
|
45
46
|
}: DynamicTableProps) => {
|
|
46
47
|
// TODO(burdon): Remove variance from the props (should be normalized externally; possibly via hooks).
|
|
47
|
-
const {
|
|
48
|
+
const { jsonSchema } = useMemo(
|
|
48
49
|
() => getBaseSchema({ typename: name, properties, jsonSchema: _jsonSchema, schema }),
|
|
49
50
|
[name, properties, _jsonSchema, schema],
|
|
50
51
|
);
|
|
51
52
|
|
|
52
|
-
const { projection, view } = useMemo(
|
|
53
|
-
() => makeDynamicTable({ typename, jsonSchema, properties }),
|
|
54
|
-
[typename, jsonSchema, properties],
|
|
55
|
-
);
|
|
53
|
+
const { projection, view } = useMemo(() => makeDynamicTable({ jsonSchema, properties }), [jsonSchema, properties]);
|
|
56
54
|
|
|
57
55
|
const tableRef = useRef<TableController>(null);
|
|
58
56
|
const handleCellUpdate = useCallback((cell: any) => {
|
|
@@ -0,0 +1,242 @@
|
|
|
1
|
+
//
|
|
2
|
+
// Copyright 2025 DXOS.org
|
|
3
|
+
//
|
|
4
|
+
|
|
5
|
+
import { type Meta, type StoryObj } from '@storybook/react-vite';
|
|
6
|
+
import type * as Schema from 'effect/Schema';
|
|
7
|
+
import React, { useCallback, useEffect, useMemo, useState } from 'react';
|
|
8
|
+
import { expect, userEvent, within } from 'storybook/test';
|
|
9
|
+
|
|
10
|
+
import { Obj, Type } from '@dxos/echo';
|
|
11
|
+
import { type JsonSchemaType } from '@dxos/echo/internal';
|
|
12
|
+
import { type DxGrid } from '@dxos/lit-grid';
|
|
13
|
+
import '@dxos/lit-ui/dx-tag-picker.pcss';
|
|
14
|
+
import { faker } from '@dxos/random';
|
|
15
|
+
import { useClient } from '@dxos/react-client';
|
|
16
|
+
import { useClientProvider, withClientProvider } from '@dxos/react-client/testing';
|
|
17
|
+
import { useAsyncEffect } from '@dxos/react-ui';
|
|
18
|
+
import { withLayout, withTheme } from '@dxos/react-ui/testing';
|
|
19
|
+
import { translations as formTranslations } from '@dxos/react-ui-form';
|
|
20
|
+
import { View } from '@dxos/schema';
|
|
21
|
+
import { type ValueGenerator, createAsyncGenerator } from '@dxos/schema/testing';
|
|
22
|
+
import { Organization, Person } from '@dxos/types';
|
|
23
|
+
|
|
24
|
+
import { useTableModel } from '../../hooks';
|
|
25
|
+
import { type TableFeatures, TablePresentation, type TableRow } from '../../model';
|
|
26
|
+
import { translations } from '../../translations';
|
|
27
|
+
import { Table } from '../../types';
|
|
28
|
+
|
|
29
|
+
import { Table as TableComponent } from './Table';
|
|
30
|
+
|
|
31
|
+
faker.seed(1);
|
|
32
|
+
const generator: ValueGenerator = faker as any;
|
|
33
|
+
|
|
34
|
+
// TODO(burdon): Many-to-many relations.
|
|
35
|
+
// TODO(burdon): Mutable and immutable views.
|
|
36
|
+
// TODO(burdon): Reconcile schemas types and utils (see API PR).
|
|
37
|
+
// TODO(burdon): Base type for T (with id); see ECHO API PR?
|
|
38
|
+
const useTestModel = <S extends Type.Obj.Any>(schema: S, count: number) => {
|
|
39
|
+
const client = useClient();
|
|
40
|
+
const { space } = useClientProvider();
|
|
41
|
+
const [view, setView] = useState<View.View>();
|
|
42
|
+
const [jsonSchema, setJsonSchema] = useState<JsonSchemaType>();
|
|
43
|
+
|
|
44
|
+
const features = useMemo<TableFeatures>(
|
|
45
|
+
() => ({ schemaEditable: false, dataEditable: true, selection: { enabled: false } }),
|
|
46
|
+
[],
|
|
47
|
+
);
|
|
48
|
+
|
|
49
|
+
useAsyncEffect(async () => {
|
|
50
|
+
if (!space) {
|
|
51
|
+
return;
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
const {
|
|
55
|
+
jsonSchema,
|
|
56
|
+
schema: effectSchema,
|
|
57
|
+
view,
|
|
58
|
+
} = await Table.makeView({ client, space, typename: Type.getTypename(schema) });
|
|
59
|
+
setJsonSchema(jsonSchema);
|
|
60
|
+
setView(view);
|
|
61
|
+
space.db.add(view);
|
|
62
|
+
await space.db.schemaRegistry.register([effectSchema]);
|
|
63
|
+
}, [client, space, schema]);
|
|
64
|
+
|
|
65
|
+
const model = useTableModel<TableRow>({ view, schema: jsonSchema, rows: [], features });
|
|
66
|
+
|
|
67
|
+
useEffect(() => {
|
|
68
|
+
if (!model || !space) {
|
|
69
|
+
return;
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
const objectGenerator = createAsyncGenerator(generator, schema, { db: space?.db, force: true });
|
|
73
|
+
void objectGenerator.createObjects(count).then((objects) => {
|
|
74
|
+
model.setRows(objects);
|
|
75
|
+
});
|
|
76
|
+
}, [model, space]);
|
|
77
|
+
|
|
78
|
+
const presentation = useMemo(() => {
|
|
79
|
+
if (!model) {
|
|
80
|
+
return;
|
|
81
|
+
}
|
|
82
|
+
|
|
83
|
+
return new TablePresentation(model);
|
|
84
|
+
}, [model]);
|
|
85
|
+
|
|
86
|
+
return { model, presentation };
|
|
87
|
+
};
|
|
88
|
+
|
|
89
|
+
const DefaultStory = () => {
|
|
90
|
+
const client = useClient();
|
|
91
|
+
const { model: orgModel, presentation: orgPresentation } = useTestModel(Organization.Organization, 50);
|
|
92
|
+
const { model: contactModel, presentation: contactPresentation } = useTestModel(Person.Person, 50);
|
|
93
|
+
const { space } = useClientProvider();
|
|
94
|
+
|
|
95
|
+
const handleCreate = useCallback(
|
|
96
|
+
(schema: Schema.Schema.AnyNoContext, values: any) => {
|
|
97
|
+
return client.spaces.default.db.add(Obj.make(schema, values));
|
|
98
|
+
},
|
|
99
|
+
[space],
|
|
100
|
+
);
|
|
101
|
+
|
|
102
|
+
return (
|
|
103
|
+
<div className='is-full bs-full grid grid-cols-2 divide-x divide-separator'>
|
|
104
|
+
<TableComponent.Root>
|
|
105
|
+
<TableComponent.Main
|
|
106
|
+
model={orgModel}
|
|
107
|
+
schema={Organization.Organization}
|
|
108
|
+
presentation={orgPresentation}
|
|
109
|
+
onCreate={handleCreate}
|
|
110
|
+
client={client}
|
|
111
|
+
ignoreAttention
|
|
112
|
+
testId='relations-0'
|
|
113
|
+
/>
|
|
114
|
+
</TableComponent.Root>
|
|
115
|
+
<TableComponent.Root>
|
|
116
|
+
<TableComponent.Main
|
|
117
|
+
model={contactModel}
|
|
118
|
+
schema={Person.Person}
|
|
119
|
+
presentation={contactPresentation}
|
|
120
|
+
onCreate={handleCreate}
|
|
121
|
+
client={client}
|
|
122
|
+
ignoreAttention
|
|
123
|
+
testId='relations-1'
|
|
124
|
+
/>
|
|
125
|
+
</TableComponent.Root>
|
|
126
|
+
</div>
|
|
127
|
+
);
|
|
128
|
+
};
|
|
129
|
+
|
|
130
|
+
const meta = {
|
|
131
|
+
title: 'ui/react-ui-table/Relations',
|
|
132
|
+
render: DefaultStory,
|
|
133
|
+
decorators: [
|
|
134
|
+
withTheme,
|
|
135
|
+
// TODO(thure): Shouldn’t `layout: 'fullscreen'` below make this unnecessary?
|
|
136
|
+
withLayout({ classNames: 'fixed inset-0' }),
|
|
137
|
+
withClientProvider({
|
|
138
|
+
types: [View.View, Organization.Organization, Person.Person, Table.Table],
|
|
139
|
+
createIdentity: true,
|
|
140
|
+
createSpace: true,
|
|
141
|
+
}),
|
|
142
|
+
],
|
|
143
|
+
parameters: {
|
|
144
|
+
layout: 'fullscreen',
|
|
145
|
+
controls: { disable: true },
|
|
146
|
+
translations: [...translations, ...formTranslations],
|
|
147
|
+
},
|
|
148
|
+
} satisfies Meta<typeof DefaultStory>;
|
|
149
|
+
|
|
150
|
+
export default meta;
|
|
151
|
+
|
|
152
|
+
type Story = StoryObj<typeof meta>;
|
|
153
|
+
|
|
154
|
+
export const Default: Story = {
|
|
155
|
+
play: async ({ canvasElement }: any) => {
|
|
156
|
+
const canvas = within(canvasElement);
|
|
157
|
+
const body = within(document.body);
|
|
158
|
+
|
|
159
|
+
// Get all dx-grid elements (should have 2 - one for each table)
|
|
160
|
+
const firstGrid = await canvas.findByTestId('relations-0', undefined, { timeout: 30_000 });
|
|
161
|
+
const secondGrid = await canvas.findByTestId('relations-1', undefined, { timeout: 30_000 });
|
|
162
|
+
|
|
163
|
+
// Focus on the second table (Person/contacts table)
|
|
164
|
+
await expect(secondGrid).toBeVisible();
|
|
165
|
+
|
|
166
|
+
// Scroll to the relations column (column 4) - this mimics the scrollToColumn call
|
|
167
|
+
(secondGrid.closest('dx-grid') as DxGrid).scrollToColumn(4);
|
|
168
|
+
|
|
169
|
+
// Find and click the target cell (first row, relations column)
|
|
170
|
+
const targetCell = await within(secondGrid).findByTestId('grid.4.0', undefined, { timeout: 10_000 });
|
|
171
|
+
await expect(targetCell).toBeVisible();
|
|
172
|
+
|
|
173
|
+
// Click to focus the cell
|
|
174
|
+
await userEvent.click(targetCell as HTMLElement);
|
|
175
|
+
await expect(targetCell).toHaveFocus();
|
|
176
|
+
await userEvent.keyboard('{Enter}');
|
|
177
|
+
|
|
178
|
+
// Look for the combobox that should appear in edit mode
|
|
179
|
+
const combobox = await body.findByRole('combobox', undefined, { timeout: 5000 });
|
|
180
|
+
await userEvent.click(combobox);
|
|
181
|
+
|
|
182
|
+
const searchField = await body.findByPlaceholderText('Search…');
|
|
183
|
+
await userEvent.click(searchField);
|
|
184
|
+
|
|
185
|
+
// Get the first organization name from the first table to search for
|
|
186
|
+
const orgCell = await within(firstGrid).findByTestId('grid.0.0', undefined, { timeout: 10_000 });
|
|
187
|
+
|
|
188
|
+
const orgName = (orgCell.querySelector('.dx-grid__cell__content') as HTMLElement).textContent;
|
|
189
|
+
// Type the first 4 characters to search
|
|
190
|
+
await userEvent.type(searchField, orgName.substring(0, 4));
|
|
191
|
+
|
|
192
|
+
// Look for an option to select
|
|
193
|
+
const option = await body.findAllByRole('option');
|
|
194
|
+
await expect(option[0]).toBeVisible();
|
|
195
|
+
|
|
196
|
+
// Press Enter to select
|
|
197
|
+
await userEvent.keyboard('{Enter}');
|
|
198
|
+
|
|
199
|
+
// Look for and click save button
|
|
200
|
+
const saveButton = await body.findByTestId('save-button');
|
|
201
|
+
await userEvent.click(saveButton);
|
|
202
|
+
|
|
203
|
+
// Verify the relation was set (cell should now contain the org name)
|
|
204
|
+
await expect(targetCell).toHaveTextContent(orgName.substring(0, 4));
|
|
205
|
+
|
|
206
|
+
// Test object creation (new relations) - equivalent to "new relations work as expected" test
|
|
207
|
+
// Find a different cell to test object creation (second row, relations column)
|
|
208
|
+
const newTargetCell = await within(secondGrid).findByTestId('grid.4.1', undefined, { timeout: 10_000 });
|
|
209
|
+
await expect(newTargetCell).toBeTruthy();
|
|
210
|
+
|
|
211
|
+
// Click to focus the cell
|
|
212
|
+
await userEvent.click(newTargetCell as Element);
|
|
213
|
+
|
|
214
|
+
await userEvent.keyboard('{Enter}');
|
|
215
|
+
|
|
216
|
+
// Look for the combobox that should appear in edit mode
|
|
217
|
+
const newCombobox = await body.findByRole('combobox');
|
|
218
|
+
await userEvent.click(newCombobox);
|
|
219
|
+
|
|
220
|
+
const newSearchField = await body.findByPlaceholderText('Search…');
|
|
221
|
+
await userEvent.click(newSearchField);
|
|
222
|
+
|
|
223
|
+
// Type a new object name (this will create a new object)
|
|
224
|
+
const newOrgName = 'Salieri LLC';
|
|
225
|
+
await userEvent.type(newSearchField, newOrgName);
|
|
226
|
+
|
|
227
|
+
// Look for an option to select (should be the create new option)
|
|
228
|
+
const newOption = await body.findAllByRole('option');
|
|
229
|
+
await expect(newOption[0]).toBeVisible();
|
|
230
|
+
|
|
231
|
+
// Press Enter to select/create
|
|
232
|
+
await userEvent.keyboard('{Enter}');
|
|
233
|
+
|
|
234
|
+
// Look for and click save button
|
|
235
|
+
const createReferencedObjectForm = await body.findByTestId('create-referenced-object-form');
|
|
236
|
+
const saveObjectButton = await within(createReferencedObjectForm).findByTestId('save-button');
|
|
237
|
+
await userEvent.click(saveObjectButton);
|
|
238
|
+
|
|
239
|
+
// Verify the new object was created and relation was set
|
|
240
|
+
await expect(newTargetCell).toHaveTextContent(newOrgName);
|
|
241
|
+
},
|
|
242
|
+
} as any;
|
|
@@ -4,9 +4,9 @@
|
|
|
4
4
|
|
|
5
5
|
import React from 'react';
|
|
6
6
|
|
|
7
|
-
import { DropdownMenu, useTranslation } from '@dxos/react-ui';
|
|
7
|
+
import { DropdownMenu, toLocalizedString, useTranslation } from '@dxos/react-ui';
|
|
8
8
|
|
|
9
|
-
import { type
|
|
9
|
+
import { type ModalController, type TableModel } from '../../model';
|
|
10
10
|
import { translationKey } from '../../translations';
|
|
11
11
|
|
|
12
12
|
type RowActionsMenuProps = { model: TableModel; modals: ModalController };
|
|
@@ -23,24 +23,32 @@ export const RowActionsMenu = ({ model, modals }: RowActionsMenuProps) => {
|
|
|
23
23
|
<DropdownMenu.VirtualTrigger virtualRef={modals.trigger} />
|
|
24
24
|
<DropdownMenu.Content>
|
|
25
25
|
<DropdownMenu.Viewport>
|
|
26
|
+
{/* Custom actions */}
|
|
27
|
+
{model.rowActions?.length > 0 && (
|
|
28
|
+
<>
|
|
29
|
+
<DropdownMenu.Group>
|
|
30
|
+
{model.rowActions?.map((action) => (
|
|
31
|
+
<DropdownMenu.Item
|
|
32
|
+
key={action.id}
|
|
33
|
+
data-testid={`row-action-${action.id}`}
|
|
34
|
+
onClick={() => {
|
|
35
|
+
modals.close();
|
|
36
|
+
model.handleRowAction(action.id, state.rowIndex);
|
|
37
|
+
}}
|
|
38
|
+
>
|
|
39
|
+
{toLocalizedString(action.label, t)}
|
|
40
|
+
</DropdownMenu.Item>
|
|
41
|
+
))}
|
|
42
|
+
</DropdownMenu.Group>
|
|
43
|
+
<DropdownMenu.Separator />
|
|
44
|
+
</>
|
|
45
|
+
)}
|
|
46
|
+
{/* Default actions */}
|
|
26
47
|
{model.features.dataEditable !== false && (
|
|
27
48
|
<DropdownMenu.Item data-testid='row-menu-delete' onClick={() => model.deleteRow(state.rowIndex)}>
|
|
28
49
|
{t(hasSelection ? 'bulk delete row label' : 'delete row label')}
|
|
29
50
|
</DropdownMenu.Item>
|
|
30
51
|
)}
|
|
31
|
-
{/* Custom actions */}
|
|
32
|
-
{model.rowActions?.map((action) => (
|
|
33
|
-
<DropdownMenu.Item
|
|
34
|
-
key={action.id}
|
|
35
|
-
data-testid={`row-action-${action.id}`}
|
|
36
|
-
onClick={() => {
|
|
37
|
-
modals.close();
|
|
38
|
-
model.handleRowAction(action.id, state.rowIndex);
|
|
39
|
-
}}
|
|
40
|
-
>
|
|
41
|
-
{t(action.translationKey)}
|
|
42
|
-
</DropdownMenu.Item>
|
|
43
|
-
))}
|
|
44
52
|
</DropdownMenu.Viewport>
|
|
45
53
|
<DropdownMenu.Arrow />
|
|
46
54
|
</DropdownMenu.Content>
|