@dxos/react-ui-table 0.8.4-main.e8ec1fe → 0.8.4-main.effb148878

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.
Files changed (166) hide show
  1. package/LICENSE +102 -5
  2. package/dist/lib/browser/chunk-J5LGTIGS.mjs +10 -0
  3. package/dist/lib/browser/chunk-J5LGTIGS.mjs.map +7 -0
  4. package/dist/lib/browser/{chunk-GS2UNGJK.mjs → chunk-KC62K4WS.mjs} +643 -722
  5. package/dist/lib/browser/chunk-KC62K4WS.mjs.map +7 -0
  6. package/dist/lib/browser/chunk-VWQWF3CP.mjs +67 -0
  7. package/dist/lib/browser/chunk-VWQWF3CP.mjs.map +7 -0
  8. package/dist/lib/browser/index.mjs +1103 -1023
  9. package/dist/lib/browser/index.mjs.map +4 -4
  10. package/dist/lib/browser/meta.json +1 -1
  11. package/dist/lib/browser/testing/index.mjs +35 -46
  12. package/dist/lib/browser/testing/index.mjs.map +3 -3
  13. package/dist/lib/browser/translations.mjs +36 -0
  14. package/dist/lib/browser/translations.mjs.map +7 -0
  15. package/dist/lib/browser/types/index.mjs +4 -3
  16. package/dist/lib/node-esm/{chunk-TRR3C5NX.mjs → chunk-62FOU4M7.mjs} +643 -721
  17. package/dist/lib/node-esm/chunk-62FOU4M7.mjs.map +7 -0
  18. package/dist/lib/node-esm/chunk-HSLMI22Q.mjs +11 -0
  19. package/dist/lib/node-esm/chunk-HSLMI22Q.mjs.map +7 -0
  20. package/dist/lib/node-esm/chunk-UBXOF64L.mjs +68 -0
  21. package/dist/lib/node-esm/chunk-UBXOF64L.mjs.map +7 -0
  22. package/dist/lib/node-esm/index.mjs +1103 -1023
  23. package/dist/lib/node-esm/index.mjs.map +4 -4
  24. package/dist/lib/node-esm/meta.json +1 -1
  25. package/dist/lib/node-esm/testing/index.mjs +35 -46
  26. package/dist/lib/node-esm/testing/index.mjs.map +3 -3
  27. package/dist/lib/node-esm/translations.mjs +37 -0
  28. package/dist/lib/node-esm/translations.mjs.map +7 -0
  29. package/dist/lib/node-esm/types/index.mjs +4 -3
  30. package/dist/types/src/components/Table/ColumnActionsMenu.d.ts +1 -2
  31. package/dist/types/src/components/Table/ColumnActionsMenu.d.ts.map +1 -1
  32. package/dist/types/src/components/Table/ColumnSettings.d.ts +2 -2
  33. package/dist/types/src/components/Table/ColumnSettings.d.ts.map +1 -1
  34. package/dist/types/src/components/Table/DynamicTable.d.ts +6 -7
  35. package/dist/types/src/components/Table/DynamicTable.d.ts.map +1 -1
  36. package/dist/types/src/components/Table/DynamicTable.stories.d.ts +22 -37
  37. package/dist/types/src/components/Table/DynamicTable.stories.d.ts.map +1 -1
  38. package/dist/types/src/components/Table/Relations.stories.d.ts +85 -80
  39. package/dist/types/src/components/Table/Relations.stories.d.ts.map +1 -1
  40. package/dist/types/src/components/Table/RowActionsMenu.d.ts.map +1 -1
  41. package/dist/types/src/components/Table/Table.d.ts +20 -21
  42. package/dist/types/src/components/Table/Table.d.ts.map +1 -1
  43. package/dist/types/src/components/Table/Table.stories.d.ts +93 -26
  44. package/dist/types/src/components/Table/Table.stories.d.ts.map +1 -1
  45. package/dist/types/src/components/Table/TableContent.d.ts +18 -0
  46. package/dist/types/src/components/Table/TableContent.d.ts.map +1 -0
  47. package/dist/types/src/components/Table/TableToolbar.d.ts +21 -0
  48. package/dist/types/src/components/Table/TableToolbar.d.ts.map +1 -0
  49. package/dist/types/src/components/TableCellEditor/CellValidationMessage.d.ts +1 -1
  50. package/dist/types/src/components/TableCellEditor/CellValidationMessage.d.ts.map +1 -1
  51. package/dist/types/src/components/TableCellEditor/FormCellEditor.d.ts +10 -12
  52. package/dist/types/src/components/TableCellEditor/FormCellEditor.d.ts.map +1 -1
  53. package/dist/types/src/components/TableCellEditor/TableCellEditor.d.ts +5 -7
  54. package/dist/types/src/components/TableCellEditor/TableCellEditor.d.ts.map +1 -1
  55. package/dist/types/src/components/TableCellEditor/TableCellEditor.stories.d.ts +24 -26
  56. package/dist/types/src/components/TableCellEditor/TableCellEditor.stories.d.ts.map +1 -1
  57. package/dist/types/src/components/index.d.ts +0 -1
  58. package/dist/types/src/components/index.d.ts.map +1 -1
  59. package/dist/types/src/components/testing.d.ts +22 -15
  60. package/dist/types/src/components/testing.d.ts.map +1 -1
  61. package/dist/types/src/hooks/index.d.ts +2 -1
  62. package/dist/types/src/hooks/index.d.ts.map +1 -1
  63. package/dist/types/src/hooks/useAddRow.d.ts +5 -6
  64. package/dist/types/src/hooks/useAddRow.d.ts.map +1 -1
  65. package/dist/types/src/hooks/useProjectionModel.d.ts +6 -0
  66. package/dist/types/src/hooks/useProjectionModel.d.ts.map +1 -0
  67. package/dist/types/src/hooks/useTableModel.d.ts +9 -9
  68. package/dist/types/src/hooks/useTableModel.d.ts.map +1 -1
  69. package/dist/types/src/index.d.ts +0 -2
  70. package/dist/types/src/index.d.ts.map +1 -1
  71. package/dist/types/src/model/modal-controller.d.ts +5 -1
  72. package/dist/types/src/model/modal-controller.d.ts.map +1 -1
  73. package/dist/types/src/model/selection-model.d.ts +18 -9
  74. package/dist/types/src/model/selection-model.d.ts.map +1 -1
  75. package/dist/types/src/model/table-model.d.ts +103 -24
  76. package/dist/types/src/model/table-model.d.ts.map +1 -1
  77. package/dist/types/src/model/table-presentation.d.ts +3 -1
  78. package/dist/types/src/model/table-presentation.d.ts.map +1 -1
  79. package/dist/types/src/playwright/TableManager.d.ts +2 -1
  80. package/dist/types/src/playwright/TableManager.d.ts.map +1 -1
  81. package/dist/types/src/playwright/playwright.config.d.ts.map +1 -1
  82. package/dist/types/src/testing/useTestTableModel.d.ts +18 -15
  83. package/dist/types/src/testing/useTestTableModel.d.ts.map +1 -1
  84. package/dist/types/src/translations.d.ts +21 -23
  85. package/dist/types/src/translations.d.ts.map +1 -1
  86. package/dist/types/src/types/Table.d.ts +32 -0
  87. package/dist/types/src/types/Table.d.ts.map +1 -0
  88. package/dist/types/src/types/index.d.ts +1 -1
  89. package/dist/types/src/types/index.d.ts.map +1 -1
  90. package/dist/types/src/util/dynamic-table.d.ts +14 -11
  91. package/dist/types/src/util/dynamic-table.d.ts.map +1 -1
  92. package/dist/types/src/util/dynamic-table.test.d.ts +2 -0
  93. package/dist/types/src/util/dynamic-table.test.d.ts.map +1 -0
  94. package/dist/types/src/util/index.d.ts +2 -0
  95. package/dist/types/src/util/index.d.ts.map +1 -1
  96. package/dist/types/src/util/query-ast.d.ts +7 -0
  97. package/dist/types/src/util/query-ast.d.ts.map +1 -0
  98. package/dist/types/src/util/schema.d.ts.map +1 -1
  99. package/dist/types/src/util/signals.d.ts.map +1 -1
  100. package/dist/types/src/util/sort.d.ts +12 -0
  101. package/dist/types/src/util/sort.d.ts.map +1 -0
  102. package/dist/types/src/util/table-buttons.d.ts +20 -20
  103. package/dist/types/src/util/table-buttons.d.ts.map +1 -1
  104. package/dist/types/src/util/table-controls.d.ts +4 -4
  105. package/dist/types/src/util/table-controls.d.ts.map +1 -1
  106. package/dist/types/src/util/tag.d.ts.map +1 -1
  107. package/dist/types/tsconfig.tsbuildinfo +1 -1
  108. package/package.json +69 -79
  109. package/src/components/Table/ColumnActionsMenu.tsx +17 -12
  110. package/src/components/Table/ColumnSettings.tsx +8 -9
  111. package/src/components/Table/DynamicTable.stories.tsx +32 -32
  112. package/src/components/Table/DynamicTable.tsx +32 -33
  113. package/src/components/Table/Relations.stories.tsx +104 -64
  114. package/src/components/Table/RowActionsMenu.tsx +6 -4
  115. package/src/components/Table/Table.stories.tsx +125 -112
  116. package/src/components/Table/Table.tsx +43 -407
  117. package/src/components/Table/TableContent.tsx +426 -0
  118. package/src/components/{TableToolbar → Table}/TableToolbar.tsx +44 -45
  119. package/src/components/TableCellEditor/CellValidationMessage.tsx +5 -6
  120. package/src/components/TableCellEditor/FormCellEditor.tsx +120 -136
  121. package/src/components/TableCellEditor/TableCellEditor.stories.tsx +25 -19
  122. package/src/components/TableCellEditor/TableCellEditor.tsx +35 -33
  123. package/src/components/index.ts +0 -1
  124. package/src/components/testing.ts +38 -17
  125. package/src/hooks/index.ts +2 -1
  126. package/src/hooks/useAddRow.ts +8 -10
  127. package/src/hooks/useProjectionModel.ts +38 -0
  128. package/src/hooks/useTableModel.ts +36 -34
  129. package/src/index.ts +0 -4
  130. package/src/model/modal-controller.ts +23 -12
  131. package/src/model/selection-model.ts +75 -44
  132. package/src/model/table-model.test.ts +77 -55
  133. package/src/model/table-model.ts +431 -168
  134. package/src/model/table-presentation.test.ts +54 -50
  135. package/src/model/table-presentation.ts +44 -40
  136. package/src/playwright/TableManager.ts +13 -6
  137. package/src/playwright/playwright.config.ts +1 -1
  138. package/src/playwright/smoke.spec.ts +52 -8
  139. package/src/testing/useTestTableModel.ts +49 -43
  140. package/src/translations.ts +20 -22
  141. package/src/types/Table.ts +81 -0
  142. package/src/types/index.ts +1 -1
  143. package/src/util/dynamic-table.test.ts +63 -0
  144. package/src/util/dynamic-table.ts +48 -33
  145. package/src/util/index.ts +2 -0
  146. package/src/util/query-ast.ts +22 -0
  147. package/src/util/sort.ts +90 -0
  148. package/src/util/table-buttons.ts +1 -1
  149. package/src/util/table-controls.ts +2 -2
  150. package/dist/lib/browser/chunk-2PFAPQL4.mjs +0 -66
  151. package/dist/lib/browser/chunk-2PFAPQL4.mjs.map +0 -7
  152. package/dist/lib/browser/chunk-GS2UNGJK.mjs.map +0 -7
  153. package/dist/lib/node-esm/chunk-6POOFFYF.mjs +0 -67
  154. package/dist/lib/node-esm/chunk-6POOFFYF.mjs.map +0 -7
  155. package/dist/lib/node-esm/chunk-TRR3C5NX.mjs.map +0 -7
  156. package/dist/types/src/components/TableToolbar/TableToolbar.d.ts +0 -21
  157. package/dist/types/src/components/TableToolbar/TableToolbar.d.ts.map +0 -1
  158. package/dist/types/src/components/TableToolbar/index.d.ts +0 -2
  159. package/dist/types/src/components/TableToolbar/index.d.ts.map +0 -1
  160. package/dist/types/src/model/table-sorting.d.ts +0 -52
  161. package/dist/types/src/model/table-sorting.d.ts.map +0 -1
  162. package/dist/types/src/types/schema.d.ts +0 -28
  163. package/dist/types/src/types/schema.d.ts.map +0 -1
  164. package/src/components/TableToolbar/index.ts +0 -5
  165. package/src/model/table-sorting.ts +0 -225
  166. package/src/types/schema.ts +0 -73
package/package.json CHANGED
@@ -1,20 +1,21 @@
1
1
  {
2
2
  "name": "@dxos/react-ui-table",
3
- "version": "0.8.4-main.e8ec1fe",
3
+ "version": "0.8.4-main.effb148878",
4
4
  "description": "A table component.",
5
5
  "homepage": "https://dxos.org",
6
6
  "bugs": "https://github.com/dxos/dxos/issues",
7
- "license": "MIT",
7
+ "repository": {
8
+ "type": "git",
9
+ "url": "https://github.com/dxos/dxos"
10
+ },
11
+ "license": "FSL-1.1-Apache-2.0",
8
12
  "author": "DXOS.org",
9
- "sideEffects": true,
13
+ "sideEffects": false,
10
14
  "type": "module",
15
+ "imports": {
16
+ "#translations": "./src/translations.ts"
17
+ },
11
18
  "exports": {
12
- "./deprecated": {
13
- "source": "./src/deprecated/index.ts",
14
- "types": "./dist/types/src/deprecated/index.d.ts",
15
- "browser": "./dist/lib/browser/deprecated/index.mjs",
16
- "node": "./dist/lib/node-esm/deprecated/index.mjs"
17
- },
18
19
  ".": {
19
20
  "source": "./src/index.ts",
20
21
  "types": "./dist/types/src/index.d.ts",
@@ -27,6 +28,12 @@
27
28
  "browser": "./dist/lib/browser/testing/index.mjs",
28
29
  "node": "./dist/lib/node-esm/testing/index.mjs"
29
30
  },
31
+ "./translations": {
32
+ "source": "./src/translations.ts",
33
+ "types": "./dist/types/src/translations.d.ts",
34
+ "browser": "./dist/lib/browser/translations.mjs",
35
+ "node": "./dist/lib/node-esm/translations.mjs"
36
+ },
30
37
  "./types": {
31
38
  "source": "./src/types/index.ts",
32
39
  "types": "./dist/types/src/types/index.d.ts",
@@ -35,92 +42,75 @@
35
42
  }
36
43
  },
37
44
  "types": "dist/types/src/index.d.ts",
38
- "typesVersions": {
39
- "*": {
40
- "deprecated": [
41
- "dist/types/src/deprecated/index.d.ts"
42
- ],
43
- "testing": [
44
- "dist/types/src/testing/index.d.ts"
45
- ],
46
- "types": [
47
- "dist/types/src/types/index.d.ts"
48
- ]
49
- }
50
- },
51
45
  "files": [
52
46
  "dist",
53
47
  "src"
54
48
  ],
55
49
  "dependencies": {
56
- "@codemirror/autocomplete": "^6.19.0",
57
- "@codemirror/state": "^6.5.2",
58
- "@codemirror/view": "^6.38.4",
59
- "@fluentui/react-tabster": "^9.24.2",
60
- "@preact-signals/safe-react": "^0.9.0",
61
- "@preact/signals-core": "^1.12.1",
50
+ "@codemirror/autocomplete": "^6.20.2",
51
+ "@codemirror/state": "^6.6.0",
52
+ "@codemirror/view": "^6.43.0",
53
+ "@effect-atom/atom-react": "^0.5.0",
54
+ "@fluentui/react-tabster": "9.26.11",
62
55
  "@radix-ui/react-context": "1.1.1",
63
56
  "@radix-ui/react-primitive": "2.0.2",
64
57
  "@radix-ui/react-slot": "1.1.2",
65
58
  "@radix-ui/react-use-controllable-state": "1.1.0",
66
- "date-fns": "^3.3.1",
59
+ "date-fns": "^3.6.0",
67
60
  "lodash.orderby": "^4.6.0",
68
- "@dxos/async": "0.8.4-main.e8ec1fe",
69
- "@dxos/debug": "0.8.4-main.e8ec1fe",
70
- "@dxos/context": "0.8.4-main.e8ec1fe",
71
- "@dxos/echo": "0.8.4-main.e8ec1fe",
72
- "@dxos/echo-db": "0.8.4-main.e8ec1fe",
73
- "@dxos/invariant": "0.8.4-main.e8ec1fe",
74
- "@dxos/keys": "0.8.4-main.e8ec1fe",
75
- "@dxos/lit-grid": "0.8.4-main.e8ec1fe",
76
- "@dxos/live-object": "0.8.4-main.e8ec1fe",
77
- "@dxos/log": "0.8.4-main.e8ec1fe",
78
- "@dxos/plugin-search": "0.8.4-main.e8ec1fe",
79
- "@dxos/react-client": "0.8.4-main.e8ec1fe",
80
- "@dxos/random": "0.8.4-main.e8ec1fe",
81
- "@dxos/effect": "0.8.4-main.e8ec1fe",
82
- "@dxos/react-ui-attention": "0.8.4-main.e8ec1fe",
83
- "@dxos/react-ui-form": "0.8.4-main.e8ec1fe",
84
- "@dxos/react-ui-editor": "0.8.4-main.e8ec1fe",
85
- "@dxos/react-ui-grid": "0.8.4-main.e8ec1fe",
86
- "@dxos/react-ui-menu": "0.8.4-main.e8ec1fe",
87
- "@dxos/react-ui-components": "0.8.4-main.e8ec1fe",
88
- "@dxos/react-ui-searchlist": "0.8.4-main.e8ec1fe",
89
- "@dxos/react-ui-stack": "0.8.4-main.e8ec1fe",
90
- "@dxos/schema": "0.8.4-main.e8ec1fe",
91
- "@dxos/react-ui-types": "0.8.4-main.e8ec1fe",
92
- "@dxos/types": "0.8.4-main.e8ec1fe",
93
- "@dxos/util": "0.8.4-main.e8ec1fe",
94
- "@dxos/react-ui-syntax-highlighter": "0.8.4-main.e8ec1fe"
61
+ "@dxos/async": "0.8.4-main.effb148878",
62
+ "@dxos/debug": "0.8.4-main.effb148878",
63
+ "@dxos/echo-atom": "0.8.4-main.effb148878",
64
+ "@dxos/context": "0.8.4-main.effb148878",
65
+ "@dxos/effect": "0.8.4-main.effb148878",
66
+ "@dxos/keys": "0.8.4-main.effb148878",
67
+ "@dxos/invariant": "0.8.4-main.effb148878",
68
+ "@dxos/echo": "0.8.4-main.effb148878",
69
+ "@dxos/lit-grid": "0.8.4-main.effb148878",
70
+ "@dxos/log": "0.8.4-main.effb148878",
71
+ "@dxos/react-client": "0.8.4-main.effb148878",
72
+ "@dxos/random": "0.8.4-main.effb148878",
73
+ "@dxos/react-ui-attention": "0.8.4-main.effb148878",
74
+ "@dxos/react-ui-components": "0.8.4-main.effb148878",
75
+ "@dxos/react-ui-editor": "0.8.4-main.effb148878",
76
+ "@dxos/react-ui-form": "0.8.4-main.effb148878",
77
+ "@dxos/react-ui-grid": "0.8.4-main.effb148878",
78
+ "@dxos/react-ui-menu": "0.8.4-main.effb148878",
79
+ "@dxos/react-ui-list": "0.8.4-main.effb148878",
80
+ "@dxos/react-ui-syntax-highlighter": "0.8.4-main.effb148878",
81
+ "@dxos/react-ui-stack": "0.8.4-main.effb148878",
82
+ "@dxos/react-ui-search": "0.8.4-main.effb148878",
83
+ "@dxos/schema": "0.8.4-main.effb148878",
84
+ "@dxos/types": "0.8.4-main.effb148878",
85
+ "@dxos/ui-types": "0.8.4-main.effb148878",
86
+ "@dxos/util": "0.8.4-main.effb148878"
95
87
  },
96
88
  "devDependencies": {
97
- "@effect-atom/atom-react": "^0.3.4",
98
- "@effect/platform": "0.92.1",
89
+ "@effect/platform": "0.94.4",
99
90
  "@types/lodash.orderby": "^4.6.9",
100
- "@types/react": "~19.2.2",
101
- "@types/react-dom": "~19.2.2",
102
- "effect": "3.18.3",
91
+ "@types/react": "~19.2.7",
92
+ "@types/react-dom": "~19.2.3",
93
+ "effect": "3.20.0",
103
94
  "fast-check": "^3.19.0",
104
- "react": "~19.2.0",
105
- "react-dom": "~19.2.0",
106
- "vite": "7.1.9",
107
- "@dxos/lit-ui": "0.8.4-main.e8ec1fe",
108
- "@dxos/echo-signals": "0.8.4-main.e8ec1fe",
109
- "@dxos/random": "0.8.4-main.e8ec1fe",
110
- "@dxos/plugin-search": "0.8.4-main.e8ec1fe",
111
- "@dxos/react-ui": "0.8.4-main.e8ec1fe",
112
- "@dxos/react-ui-theme": "0.8.4-main.e8ec1fe",
113
- "@dxos/storybook-utils": "0.8.4-main.e8ec1fe",
114
- "@dxos/test-utils": "0.8.4-main.e8ec1fe"
95
+ "react": "~19.2.3",
96
+ "react-dom": "~19.2.3",
97
+ "vite": "^8.0.14",
98
+ "@dxos/lit-ui": "0.8.4-main.effb148878",
99
+ "@dxos/storybook-utils": "0.8.4-main.effb148878",
100
+ "@dxos/random": "0.8.4-main.effb148878",
101
+ "@dxos/react-client": "0.8.4-main.effb148878",
102
+ "@dxos/test-utils": "0.8.4-main.effb148878",
103
+ "@dxos/ui-theme": "0.8.4-main.effb148878",
104
+ "@dxos/react-ui": "0.8.4-main.effb148878"
115
105
  },
116
106
  "peerDependencies": {
117
- "@effect-atom/atom-react": "^0.3.4",
118
- "@effect/platform": "^0.80.12",
119
- "effect": "^3.13.3",
120
- "react": "^19.0.0",
121
- "react-dom": "^19.0.0",
122
- "@dxos/react-ui-theme": "0.8.4-main.e8ec1fe",
123
- "@dxos/react-ui": "0.8.4-main.e8ec1fe"
107
+ "@effect-atom/atom-react": "^0.5.0",
108
+ "@effect/platform": "0.94.4",
109
+ "effect": "3.20.0",
110
+ "react": "~19.2.3",
111
+ "react-dom": "~19.2.3",
112
+ "@dxos/react-ui": "0.8.4-main.effb148878",
113
+ "@dxos/ui-theme": "0.8.4-main.effb148878"
124
114
  },
125
115
  "publishConfig": {
126
116
  "access": "public"
@@ -2,23 +2,28 @@
2
2
  // Copyright 2024 DXOS.org
3
3
  //
4
4
 
5
+ import { useAtomValue } from '@effect-atom/atom-react';
5
6
  import React from 'react';
6
7
 
7
8
  import { DropdownMenu, useTranslation } from '@dxos/react-ui';
8
9
 
10
+ import { translationKey } from '#translations';
11
+
9
12
  import { type ModalController, type TableModel } from '../../model';
10
- import { translationKey } from '../../translations';
11
13
 
12
- type ColumnActionsMenuProps = { model: TableModel; modals: ModalController };
14
+ export type ColumnActionsMenuProps = {
15
+ model: TableModel;
16
+ modals: ModalController;
17
+ };
13
18
 
14
19
  export const ColumnActionsMenu = ({ model, modals }: ColumnActionsMenuProps) => {
15
20
  const { t } = useTranslation(translationKey);
16
- const state = modals.state.value;
21
+ const state = useAtomValue(modals.state);
17
22
  if (state?.type !== 'column') {
18
23
  return null;
19
24
  }
20
25
 
21
- const currentSort = model.sorting?.sorting;
26
+ const currentSort = model.getSorting();
22
27
  const isCurrentColumnSorted = currentSort?.fieldId === state.fieldId;
23
28
 
24
29
  return (
@@ -30,32 +35,32 @@ export const ColumnActionsMenu = ({ model, modals }: ColumnActionsMenuProps) =>
30
35
  {(!isCurrentColumnSorted || currentSort?.direction === 'asc') && (
31
36
  <DropdownMenu.Item
32
37
  data-testid='column-sort-descending'
33
- onClick={() => model.sorting?.setSort(state.fieldId, 'desc')}
38
+ onClick={() => model.setSort(state.fieldId, 'desc')}
34
39
  >
35
- {t('column action sort descending')}
40
+ {t('column-action-sort-descending.menu')}
36
41
  </DropdownMenu.Item>
37
42
  )}
38
43
  {(!isCurrentColumnSorted || currentSort?.direction === 'desc') && (
39
44
  <DropdownMenu.Item
40
45
  data-testid='column-sort-ascending'
41
- onClick={() => model.sorting?.setSort(state.fieldId, 'asc')}
46
+ onClick={() => model.setSort(state.fieldId, 'asc')}
42
47
  >
43
- {t('column action sort ascending')}
48
+ {t('column-action-sort-ascending.menu')}
44
49
  </DropdownMenu.Item>
45
50
  )}
46
51
  {isCurrentColumnSorted && (
47
- <DropdownMenu.Item data-testid='column-clear-sort' onClick={() => model.sorting?.clearSort()}>
48
- {t('column action clear sorting')}
52
+ <DropdownMenu.Item data-testid='column-clear-sort' onClick={() => model.clearSort()}>
53
+ {t('column-action-clear-sorting.menu')}
49
54
  </DropdownMenu.Item>
50
55
  )}
51
56
  {model.getColumnCount() > 1 && model.features.schemaEditable && (
52
57
  <DropdownMenu.Item data-testid='column-delete' onClick={() => model.deleteColumn(state.fieldId)}>
53
- {t('column action delete')}
58
+ {t('column-action-delete.menu')}
54
59
  </DropdownMenu.Item>
55
60
  )}
56
61
  {model.features.schemaEditable && (
57
62
  <DropdownMenu.Item data-testid='column-settings' onClick={() => modals.openColumnSettings()}>
58
- {t('column action settings')}
63
+ {t('column-action-settings.menu')}
59
64
  </DropdownMenu.Item>
60
65
  )}
61
66
  </DropdownMenu.Viewport>
@@ -2,26 +2,25 @@
2
2
  // Copyright 2024 DXOS.org
3
3
  //
4
4
 
5
+ import { useAtomValue } from '@effect-atom/atom-react';
5
6
  import React, { useCallback, useEffect, useMemo, useState } from 'react';
6
7
 
7
- // TODO(burdon): Remove dependency on echo-db.
8
- import { type SchemaRegistry } from '@dxos/echo-db';
8
+ import { type SchemaRegistry, type View } from '@dxos/echo';
9
9
  import { Popover } from '@dxos/react-ui';
10
10
  import { FieldEditor } from '@dxos/react-ui-form';
11
- import { type FieldType } from '@dxos/schema';
12
11
 
13
12
  import { type ModalController, type TableModel } from '../../model';
14
13
 
15
14
  type ColumnSettingsProps = {
16
- registry?: SchemaRegistry;
15
+ registry?: SchemaRegistry.SchemaRegistry;
17
16
  model?: TableModel;
18
17
  modals: ModalController;
19
18
  onNewColumn: () => void;
20
19
  };
21
20
 
22
21
  export const ColumnSettings = ({ registry, model, modals, onNewColumn }: ColumnSettingsProps) => {
23
- const [newField, setNewField] = useState<FieldType>();
24
- const state = modals.state.value;
22
+ const [newField, setNewField] = useState<View.FieldType>();
23
+ const state = useAtomValue(modals.state);
25
24
 
26
25
  useEffect(() => {
27
26
  if (state?.type === 'columnSettings' && state.mode.type === 'create' && model?.projection) {
@@ -38,11 +37,11 @@ export const ColumnSettings = ({ registry, model, modals, onNewColumn }: ColumnS
38
37
  if (state?.type === 'columnSettings') {
39
38
  const { mode } = state;
40
39
  if (mode.type === 'edit') {
41
- return model?.projection?.fields.find((f) => f.id === mode.fieldId);
40
+ return model?.projection?.getFields().find((f) => f.id === mode.fieldId);
42
41
  }
43
42
  }
44
43
  return undefined;
45
- }, [model?.projection?.fields, state]);
44
+ }, [model?.projection, state]);
46
45
 
47
46
  const field = existingField ?? newField;
48
47
 
@@ -64,7 +63,7 @@ export const ColumnSettings = ({ registry, model, modals, onNewColumn }: ColumnS
64
63
  <Popover.Root modal={false} open={state?.type === 'columnSettings'}>
65
64
  <Popover.VirtualTrigger virtualRef={modals.trigger} />
66
65
  <Popover.Portal>
67
- <Popover.Content classNames='md:is-64'>
66
+ <Popover.Content classNames='md:w-64'>
68
67
  <Popover.Viewport>
69
68
  <FieldEditor
70
69
  projection={model.projection}
@@ -3,39 +3,40 @@
3
3
  //
4
4
 
5
5
  import { type Meta, type StoryObj } from '@storybook/react-vite';
6
+ import type * as Types from 'effect/Types';
6
7
  import React, { useMemo, useState } from 'react';
7
8
 
8
- import { Obj } from '@dxos/echo';
9
- import { FormatEnum, type JsonSchemaType } from '@dxos/echo/internal';
10
- import { faker } from '@dxos/random';
11
- import { useClient } from '@dxos/react-client';
12
- import { Filter, useQuery, useSchema } from '@dxos/react-client/echo';
13
- import { useClientProvider, withClientProvider } from '@dxos/react-client/testing';
14
- import { withTheme } from '@dxos/react-ui/testing';
9
+ import { Filter, type JsonSchema, Obj, Type } from '@dxos/echo';
10
+ import { Format } from '@dxos/echo/internal';
11
+ import { random } from '@dxos/random';
12
+ import { useQuery, useType } from '@dxos/react-client/echo';
13
+ import { useClientStory, withClientProvider } from '@dxos/react-client/testing';
14
+ import { withLayout, withTheme } from '@dxos/react-ui/testing';
15
15
  import { type SchemaPropertyDefinition } from '@dxos/schema';
16
- import { Testing } from '@dxos/schema/testing';
16
+ import { TestSchema } from '@dxos/schema/testing';
17
+ import { withRegistry } from '@dxos/storybook-utils';
17
18
 
18
- import { type TableFeatures } from '../../model';
19
- import { translations } from '../../translations';
19
+ import { translations } from '#translations';
20
20
 
21
+ import { type TableFeatures } from '../../model';
21
22
  import { DynamicTable } from './DynamicTable';
22
23
 
23
- faker.seed(0);
24
+ random.seed(0);
24
25
 
25
26
  const useTestPropertiesAndObjects = () => {
26
27
  const properties = useMemo<SchemaPropertyDefinition[]>(
27
28
  () => [
28
- { name: 'name', format: FormatEnum.String },
29
- { name: 'age', format: FormatEnum.Number },
29
+ { name: 'name', format: Format.TypeFormat.String },
30
+ { name: 'age', format: Format.TypeFormat.Number },
30
31
  ],
31
32
  [],
32
33
  );
33
34
 
34
35
  const [rows] = useState<any[]>(
35
36
  Array.from({ length: 10 }, () => ({
36
- id: faker.string.uuid(),
37
- name: faker.person.fullName(),
38
- age: faker.number.int({ min: 18, max: 80 }),
37
+ id: random.string.uuid(),
38
+ name: random.person.fullName(),
39
+ age: random.number.int({ min: 18, max: 80 }),
39
40
  })),
40
41
  );
41
42
 
@@ -58,7 +59,7 @@ const DynamicTableStory = () => {
58
59
  const meta = {
59
60
  title: 'ui/react-ui-table/DynamicTable',
60
61
  component: DynamicTable,
61
- decorators: [withTheme],
62
+ decorators: [withTheme(), withLayout({ layout: 'fullscreen' }), withRegistry],
62
63
  parameters: {
63
64
  layout: 'fullscreen',
64
65
  translations,
@@ -101,7 +102,7 @@ export const WithClickToSelect: StoryObj = {
101
102
 
102
103
  export const WithJsonSchema: StoryObj = {
103
104
  render: () => {
104
- const schema = useMemo<JsonSchemaType>(
105
+ const schema = useMemo<Types.DeepMutable<JsonSchema.JsonSchema>>(
105
106
  () => ({
106
107
  type: 'object',
107
108
  properties: {
@@ -117,10 +118,10 @@ export const WithJsonSchema: StoryObj = {
117
118
 
118
119
  const [rows] = useState<any[]>(
119
120
  Array.from({ length: 15 }, () => ({
120
- name: faker.person.fullName(),
121
- age: faker.number.int({ min: 18, max: 80 }),
122
- email: faker.internet.email(),
123
- active: faker.datatype.boolean(),
121
+ name: random.person.fullName(),
122
+ age: random.number.int({ min: 18, max: 80 }),
123
+ email: random.internet.email(),
124
+ active: random.datatype.boolean(),
124
125
  })),
125
126
  );
126
127
 
@@ -130,27 +131,26 @@ export const WithJsonSchema: StoryObj = {
130
131
 
131
132
  export const WithEchoSchema: StoryObj = {
132
133
  render: () => {
133
- const client = useClient();
134
- const { space } = useClientProvider();
135
- const schema = useSchema(client, space, Testing.Person.typename);
136
- const objects = useQuery(space, schema ? Filter.type(schema) : Filter.nothing());
137
- if (!schema) {
134
+ const { space } = useClientStory();
135
+ const type = useType(space?.db, Type.getTypename(TestSchema.Person));
136
+ const objects = useQuery(space?.db, type ? Filter.type(type) : Filter.nothing());
137
+ if (!type) {
138
138
  return <div>Loading schema...</div>;
139
139
  }
140
140
 
141
- return <DynamicTable schema={schema} rows={objects} />;
141
+ return <DynamicTable type={type} rows={objects} />;
142
142
  },
143
143
  decorators: [
144
144
  withClientProvider({
145
- types: [Testing.Person],
145
+ types: [TestSchema.Person],
146
146
  createIdentity: true,
147
147
  createSpace: true,
148
148
  onCreateSpace: async ({ space }) => {
149
149
  Array.from({ length: 10 }).forEach(() => {
150
150
  space.db.add(
151
- Obj.make(Testing.Person, {
152
- name: faker.person.fullName(),
153
- email: faker.internet.email(),
151
+ Obj.make(TestSchema.Person, {
152
+ name: random.person.fullName(),
153
+ email: random.internet.email(),
154
154
  }),
155
155
  );
156
156
  });
@@ -2,25 +2,27 @@
2
2
  // Copyright 2025 DXOS.org
3
3
  //
4
4
 
5
- import type * as Schema from 'effect/Schema';
6
- import React, { useCallback, useMemo, useRef } from 'react';
5
+ import { RegistryContext } from '@effect-atom/atom-react';
6
+ import type * as Types from 'effect/Types';
7
+ import React, { useCallback, useContext, useEffect, useMemo, useRef, useState } from 'react';
7
8
 
8
- import { type JsonSchemaType } from '@dxos/echo/internal';
9
+ import { type JsonSchema, type Type } from '@dxos/echo';
9
10
  import { type ThemedClassName, useDefaultValue } from '@dxos/react-ui';
10
- import { mx } from '@dxos/react-ui-theme';
11
+ import { type ProjectionModel } from '@dxos/schema';
12
+ import { mx } from '@dxos/ui-theme';
11
13
 
12
14
  import { useTableModel } from '../../hooks';
13
15
  import { type TableFeatures, TablePresentation, type TableRowAction } from '../../model';
16
+ import { type Table as TableType } from '../../types';
14
17
  import { type TablePropertyDefinition, getBaseSchema, makeDynamicTable } from '../../util';
15
-
16
18
  import { Table, type TableController } from './Table';
17
19
 
18
- type DynamicTableProps = ThemedClassName<{
20
+ export type DynamicTableProps<T extends Type.AnyEntity = Type.AnyEntity> = ThemedClassName<{
21
+ type?: T;
19
22
  name?: string; // TODO(burdon): Remove?
20
23
  rows: any[];
21
24
  properties?: TablePropertyDefinition[];
22
- jsonSchema?: JsonSchemaType;
23
- schema?: Schema.Schema.AnyNoContext;
25
+ jsonSchema?: Types.DeepMutable<JsonSchema.JsonSchema>;
24
26
  features?: Partial<TableFeatures>;
25
27
  rowActions?: TableRowAction[];
26
28
  onRowClick?: (row: any) => void;
@@ -32,25 +34,30 @@ type DynamicTableProps = ThemedClassName<{
32
34
  */
33
35
  // TODO(burdon): Instead of creating component variants, create helpers/hooks that normalize the props.
34
36
  // TODO(burdon): Warning: Cannot update a component (`DynamicTable`) while rendering a different component (`DynamicTable`).
35
- export const DynamicTable = ({
37
+ export const DynamicTable = <T extends Type.AnyEntity = Type.AnyEntity>({
36
38
  classNames,
37
- name = 'example.com/dynamic-table', // Rmove default or make random; this will lead to type collisions.
39
+ type: typeProp,
40
+ name = 'com.example.dynamicTable', // Remove default or make random; this will lead to type collisions.
38
41
  rows,
39
42
  properties,
40
- jsonSchema: _jsonSchema,
41
- schema,
43
+ jsonSchema: jsonSchemaProp,
42
44
  rowActions,
43
45
  onRowClick,
44
46
  onRowAction,
45
47
  ...props
46
- }: DynamicTableProps) => {
48
+ }: DynamicTableProps<T>) => {
49
+ const registry = useContext(RegistryContext);
50
+ const [dynamicTable, setDynamicTable] = useState<{ object: TableType.Table; projection: ProjectionModel }>();
51
+
47
52
  // TODO(burdon): Remove variance from the props (should be normalized externally; possibly via hooks).
48
- const { jsonSchema } = useMemo(
49
- () => getBaseSchema({ typename: name, properties, jsonSchema: _jsonSchema, schema }),
50
- [name, properties, _jsonSchema, schema],
53
+ const { type } = useMemo(
54
+ () => getBaseSchema({ typename: name, properties, jsonSchema: jsonSchemaProp, type: typeProp }),
55
+ [name, properties, jsonSchemaProp, typeProp],
51
56
  );
52
57
 
53
- const { projection, view } = useMemo(() => makeDynamicTable({ jsonSchema, properties }), [jsonSchema, properties]);
58
+ useEffect(() => {
59
+ setDynamicTable(makeDynamicTable({ registry, type, properties }));
60
+ }, [registry, type, properties]);
54
61
 
55
62
  const tableRef = useRef<TableController>(null);
56
63
  const handleCellUpdate = useCallback((cell: any) => {
@@ -72,9 +79,8 @@ export const DynamicTable = ({
72
79
 
73
80
  const model = useTableModel({
74
81
  rows,
75
- view,
76
- schema: jsonSchema,
77
- projection,
82
+ object: dynamicTable?.object,
83
+ projection: dynamicTable?.projection,
78
84
  features,
79
85
  rowActions,
80
86
  onCellUpdate: handleCellUpdate,
@@ -84,22 +90,15 @@ export const DynamicTable = ({
84
90
 
85
91
  const presentation = useMemo(() => {
86
92
  if (model) {
87
- return new TablePresentation(model);
93
+ return new TablePresentation(registry, model);
88
94
  }
89
- }, [model]);
95
+ }, [registry, model]);
90
96
 
91
- // TODO(burdon): Do we need the outer divs?
92
97
  return (
93
- <div role='none' className={mx('is-full bs-full grow grid', classNames)}>
94
- <div role='none' className='grid min-bs-0 overflow-hidden'>
95
- <Table.Root>
96
- <Table.Main
97
- ref={tableRef}
98
- model={model}
99
- presentation={presentation}
100
- ignoreAttention
101
- onRowClick={onRowClick}
102
- />
98
+ <div className={mx('dx-expander grid', classNames)}>
99
+ <div className='grid min-h-0 overflow-hidden'>
100
+ <Table.Root ref={tableRef}>
101
+ <Table.Content model={model} presentation={presentation} ignoreAttention onRowClick={onRowClick} />
103
102
  </Table.Root>
104
103
  </div>
105
104
  </div>