@dxos/react-ui-graph 0.8.4-main.dedc0f3 → 0.8.4-main.dfabb4ec29

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 (101) hide show
  1. package/README.md +5 -7
  2. package/dist/lib/browser/chunk-EASNZZ7B.mjs +52 -0
  3. package/dist/lib/browser/chunk-EASNZZ7B.mjs.map +7 -0
  4. package/dist/lib/browser/index.mjs +1108 -391
  5. package/dist/lib/browser/index.mjs.map +4 -4
  6. package/dist/lib/browser/meta.json +1 -1
  7. package/dist/lib/browser/testing/index.mjs +16 -16
  8. package/dist/lib/browser/testing/index.mjs.map +3 -3
  9. package/dist/lib/node-esm/chunk-JSE2X4ML.mjs +54 -0
  10. package/dist/lib/node-esm/chunk-JSE2X4ML.mjs.map +7 -0
  11. package/dist/lib/node-esm/index.mjs +1108 -391
  12. package/dist/lib/node-esm/index.mjs.map +4 -4
  13. package/dist/lib/node-esm/meta.json +1 -1
  14. package/dist/lib/node-esm/testing/index.mjs +16 -16
  15. package/dist/lib/node-esm/testing/index.mjs.map +3 -3
  16. package/dist/types/src/components/Graph/Graph.d.ts +4 -5
  17. package/dist/types/src/components/Graph/Graph.d.ts.map +1 -1
  18. package/dist/types/src/components/Graph/Graph.stories.d.ts +7 -7
  19. package/dist/types/src/components/Graph/Graph.stories.d.ts.map +1 -1
  20. package/dist/types/src/components/Mesh/Mesh.d.ts.map +1 -1
  21. package/dist/types/src/components/Mesh/Mesh.stories.d.ts +3 -1
  22. package/dist/types/src/components/Mesh/Mesh.stories.d.ts.map +1 -1
  23. package/dist/types/src/components/SVG/Grid.d.ts.map +1 -1
  24. package/dist/types/src/components/SVG/Markers.d.ts.map +1 -1
  25. package/dist/types/src/components/SVG/Root.d.ts +4 -4
  26. package/dist/types/src/components/SVG/Root.d.ts.map +1 -1
  27. package/dist/types/src/components/SVG/SVG.d.ts +14 -17
  28. package/dist/types/src/components/SVG/SVG.d.ts.map +1 -1
  29. package/dist/types/src/components/SVG/Svg.stories.d.ts +4 -2
  30. package/dist/types/src/components/SVG/Svg.stories.d.ts.map +1 -1
  31. package/dist/types/src/fx/fx.stories.d.ts +6 -4
  32. package/dist/types/src/fx/fx.stories.d.ts.map +1 -1
  33. package/dist/types/src/fx/pulsar.d.ts.map +1 -1
  34. package/dist/types/src/graph/markers.d.ts.map +1 -1
  35. package/dist/types/src/graph/projector/graph-drag.d.ts.map +1 -1
  36. package/dist/types/src/graph/projector/graph-force-projector.d.ts +1 -1
  37. package/dist/types/src/graph/projector/graph-force-projector.d.ts.map +1 -1
  38. package/dist/types/src/graph/projector/graph-forces.d.ts.map +1 -1
  39. package/dist/types/src/graph/projector/graph-hierarchical-projector.d.ts +1 -1
  40. package/dist/types/src/graph/projector/graph-hierarchical-projector.d.ts.map +1 -1
  41. package/dist/types/src/graph/projector/graph-projector.d.ts +2 -2
  42. package/dist/types/src/graph/projector/graph-projector.d.ts.map +1 -1
  43. package/dist/types/src/graph/projector/graph-radial-projector.d.ts +1 -1
  44. package/dist/types/src/graph/projector/graph-radial-projector.d.ts.map +1 -1
  45. package/dist/types/src/graph/projector/graph-relational-projector.d.ts +1 -1
  46. package/dist/types/src/graph/projector/graph-relational-projector.d.ts.map +1 -1
  47. package/dist/types/src/graph/projector/projector.d.ts.map +1 -1
  48. package/dist/types/src/graph/renderer/bullets.d.ts.map +1 -1
  49. package/dist/types/src/graph/renderer/graph-renderer.d.ts.map +1 -1
  50. package/dist/types/src/graph/renderer/renderer.d.ts.map +1 -1
  51. package/dist/types/src/graph/types.d.ts +1 -1
  52. package/dist/types/src/graph/types.d.ts.map +1 -1
  53. package/dist/types/src/hooks/useGrid.d.ts.map +1 -1
  54. package/dist/types/src/hooks/useStateRef.d.ts.map +1 -1
  55. package/dist/types/src/hooks/useSvgContext.d.ts.map +1 -1
  56. package/dist/types/src/hooks/useZoom.d.ts.map +1 -1
  57. package/dist/types/src/stories/hooks.stories.d.ts +7 -4
  58. package/dist/types/src/stories/hooks.stories.d.ts.map +1 -1
  59. package/dist/types/src/testing/data.d.ts +5 -5
  60. package/dist/types/src/testing/data.d.ts.map +1 -1
  61. package/dist/types/src/testing/hooks.d.ts +2 -16
  62. package/dist/types/src/testing/hooks.d.ts.map +1 -1
  63. package/dist/types/src/testing/model.d.ts +4 -8
  64. package/dist/types/src/testing/model.d.ts.map +1 -1
  65. package/dist/types/src/util/events.d.ts.map +1 -1
  66. package/dist/types/src/util/fraction.d.ts +1 -1
  67. package/dist/types/src/util/fraction.d.ts.map +1 -1
  68. package/dist/types/src/util/points.d.ts.map +1 -1
  69. package/dist/types/src/util/scale.d.ts.map +1 -1
  70. package/dist/types/src/util/screen.d.ts.map +1 -1
  71. package/dist/types/src/util/vector.d.ts.map +1 -1
  72. package/dist/types/tsconfig.tsbuildinfo +1 -1
  73. package/package.json +32 -34
  74. package/src/components/Graph/Graph.stories.tsx +55 -50
  75. package/src/components/Graph/Graph.tsx +24 -19
  76. package/src/components/Mesh/Mesh.stories.tsx +5 -5
  77. package/src/components/SVG/Grid.tsx +1 -1
  78. package/src/components/SVG/Markers.tsx +1 -1
  79. package/src/components/SVG/Root.tsx +14 -7
  80. package/src/components/SVG/SVG.tsx +10 -2
  81. package/src/components/SVG/Svg.stories.tsx +6 -6
  82. package/src/fx/fx.stories.tsx +10 -10
  83. package/src/graph/projector/graph-drag.ts +0 -1
  84. package/src/graph/projector/graph-force-projector.ts +1 -2
  85. package/src/graph/projector/graph-hierarchical-projector.ts +3 -4
  86. package/src/graph/projector/graph-projector.ts +2 -3
  87. package/src/graph/projector/graph-radial-projector.ts +1 -2
  88. package/src/graph/projector/graph-relational-projector.ts +3 -4
  89. package/src/graph/renderer/graph-renderer.ts +4 -5
  90. package/src/graph/types.ts +1 -1
  91. package/src/hooks/useStateRef.ts +1 -1
  92. package/src/stories/hooks.stories.tsx +19 -12
  93. package/src/testing/data.ts +14 -14
  94. package/src/testing/hooks.ts +3 -4
  95. package/src/testing/model.ts +6 -6
  96. package/src/util/fraction.ts +1 -1
  97. package/styles/graph.css +292 -43
  98. package/dist/lib/browser/chunk-PDEA4KBO.mjs +0 -966
  99. package/dist/lib/browser/chunk-PDEA4KBO.mjs.map +0 -7
  100. package/dist/lib/node-esm/chunk-NJGJKPL7.mjs +0 -968
  101. package/dist/lib/node-esm/chunk-NJGJKPL7.mjs.map +0 -7
package/package.json CHANGED
@@ -1,12 +1,18 @@
1
1
  {
2
2
  "name": "@dxos/react-ui-graph",
3
- "version": "0.8.4-main.dedc0f3",
3
+ "version": "0.8.4-main.dfabb4ec29",
4
4
  "description": "GEM Graph.",
5
5
  "homepage": "https://dxos.org",
6
6
  "bugs": "https://github.com/dxos/dxos/issues",
7
+ "repository": {
8
+ "type": "git",
9
+ "url": "https://github.com/dxos/dxos"
10
+ },
7
11
  "license": "MIT",
8
12
  "author": "DXOS.org",
9
- "sideEffects": true,
13
+ "sideEffects": [
14
+ "*.css"
15
+ ],
10
16
  "type": "module",
11
17
  "exports": {
12
18
  ".": {
@@ -22,13 +28,6 @@
22
28
  "./styles/graph.css": "./styles/graph.css"
23
29
  },
24
30
  "types": "dist/types/src/index.d.ts",
25
- "typesVersions": {
26
- "*": {
27
- "testing": [
28
- "dist/types/src/testing/index.d.ts"
29
- ]
30
- }
31
- },
32
31
  "files": [
33
32
  "testing.d.ts",
34
33
  "testing.js",
@@ -37,8 +36,7 @@
37
36
  "styles"
38
37
  ],
39
38
  "dependencies": {
40
- "@preact-signals/safe-react": "^0.9.0",
41
- "@preact/signals-core": "^1.9.0",
39
+ "@effect-atom/atom-react": "^0.5.0",
42
40
  "d3": "^7.9.0",
43
41
  "d3-force": "~3.0.0",
44
42
  "immutability-helper": "^3.0.2",
@@ -46,40 +44,40 @@
46
44
  "lodash.defaultsdeep": "^4.6.1",
47
45
  "react-resize-detector": "^11.0.1",
48
46
  "topojson-client": "^3.1.0",
49
- "@dxos/async": "0.8.4-main.dedc0f3",
50
- "@dxos/debug": "0.8.4-main.dedc0f3",
51
- "@dxos/graph": "0.8.4-main.dedc0f3",
52
- "@dxos/echo-signals": "0.8.4-main.dedc0f3",
53
- "@dxos/log": "0.8.4-main.dedc0f3",
54
- "@dxos/node-std": "0.8.4-main.dedc0f3",
55
- "@dxos/invariant": "0.8.4-main.dedc0f3"
47
+ "@dxos/async": "0.8.4-main.dfabb4ec29",
48
+ "@dxos/debug": "0.8.4-main.dfabb4ec29",
49
+ "@dxos/graph": "0.8.4-main.dfabb4ec29",
50
+ "@dxos/log": "0.8.4-main.dfabb4ec29",
51
+ "@dxos/invariant": "0.8.4-main.dfabb4ec29",
52
+ "@dxos/react-ui-mosaic": "0.8.4-main.dfabb4ec29",
53
+ "@dxos/node-std": "0.8.4-main.dfabb4ec29"
56
54
  },
57
55
  "devDependencies": {
58
56
  "@babel/core": "^7.18.13",
59
57
  "@types/d3": "^7.4.3",
60
58
  "@types/lodash.defaultsdeep": "^4.6.6",
61
- "@types/react": "~18.2.0",
62
- "@types/react-dom": "~18.2.0",
59
+ "@types/react": "~19.2.7",
60
+ "@types/react-dom": "~19.2.3",
63
61
  "@types/topojson-client": "^3.1.4",
64
62
  "@types/topojson-specification": "^1.0.5",
65
- "postcss": "^8.4.41",
66
- "react": "~18.2.0",
67
- "react-dom": "~18.2.0",
68
- "@dxos/react-ui": "0.8.4-main.dedc0f3",
69
- "@dxos/random": "0.8.4-main.dedc0f3",
70
- "@dxos/react-ui-syntax-highlighter": "0.8.4-main.dedc0f3",
71
- "@dxos/storybook-utils": "0.8.4-main.dedc0f3",
72
- "@dxos/react-ui-stack": "0.8.4-main.dedc0f3",
73
- "@dxos/react-ui-theme": "0.8.4-main.dedc0f3"
63
+ "postcss": "^8.5.12",
64
+ "react": "~19.2.3",
65
+ "react-dom": "~19.2.3",
66
+ "@dxos/random": "0.8.4-main.dfabb4ec29",
67
+ "@dxos/react-ui-stack": "0.8.4-main.dfabb4ec29",
68
+ "@dxos/react-ui-syntax-highlighter": "0.8.4-main.dfabb4ec29",
69
+ "@dxos/react-ui": "0.8.4-main.dfabb4ec29",
70
+ "@dxos/storybook-utils": "0.8.4-main.dfabb4ec29",
71
+ "@dxos/ui-theme": "0.8.4-main.dfabb4ec29"
74
72
  },
75
73
  "peerDependencies": {
76
- "react": "~18.2.0",
77
- "react-dom": "~18.2.0",
78
- "@dxos/react-ui-theme": "0.8.4-main.dedc0f3",
79
- "@dxos/react-ui": "0.8.4-main.dedc0f3"
74
+ "react": "~19.2.3",
75
+ "react-dom": "~19.2.3",
76
+ "@dxos/ui-theme": "0.8.4-main.dfabb4ec29",
77
+ "@dxos/react-ui": "0.8.4-main.dfabb4ec29"
80
78
  },
81
79
  "optionalDependencies": {
82
- "@dxos/random": "0.8.4-main.dedc0f3"
80
+ "@dxos/random": "0.8.4-main.dfabb4ec29"
83
81
  },
84
82
  "publishConfig": {
85
83
  "access": "public"
@@ -2,19 +2,20 @@
2
2
  // Copyright 2022 DXOS.org
3
3
  //
4
4
 
5
- import '@dxos-theme';
5
+ import '../../../styles/graph.css';
6
6
 
7
- import { effect } from '@preact/signals-core';
7
+ import { RegistryContext } from '@effect-atom/atom-react';
8
8
  import { type Meta, type StoryObj } from '@storybook/react-vite';
9
9
  import { select } from 'd3';
10
- import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
10
+ import React, { useCallback, useContext, useEffect, useMemo, useRef, useState } from 'react';
11
11
 
12
- import { type Graph, type GraphModel, SelectionModel } from '@dxos/graph';
12
+ import { type Graph, type GraphModel, type SelectionMode, SelectionModel } from '@dxos/graph';
13
13
  import { IconButton, Popover, Toolbar } from '@dxos/react-ui';
14
- import { Card } from '@dxos/react-ui-stack';
15
- import { JsonFilter, SyntaxHighlighter } from '@dxos/react-ui-syntax-highlighter';
16
- import { getHashColor, mx } from '@dxos/react-ui-theme';
17
- import { withLayout, withTheme } from '@dxos/storybook-utils';
14
+ import { Card } from '@dxos/react-ui';
15
+ import { JsonHighlighter, Syntax } from '@dxos/react-ui-syntax-highlighter';
16
+ import { withLayout, withTheme } from '@dxos/react-ui/testing';
17
+ import { withRegistry } from '@dxos/storybook-utils';
18
+ import { getHashStyles, mx } from '@dxos/ui-theme';
18
19
 
19
20
  import { Pulsar } from '../../fx';
20
21
  import {
@@ -33,11 +34,8 @@ import {
33
34
  import { type SVGContext } from '../../hooks';
34
35
  import { TestGraphModel, type TestNode, convertTreeToGraph, createGraph, createNode, createTree } from '../../testing';
35
36
  import { SVG, type SVGGridProps } from '../SVG';
36
-
37
37
  import { Graph as GraphComponent, type GraphController, type GraphProps } from './Graph';
38
38
 
39
- import '../../../styles/graph.css';
40
-
41
39
  type ProjectorType = 'force' | 'radial' | 'hierarchical' | 'relational';
42
40
 
43
41
  type Factory = {
@@ -51,12 +49,12 @@ const projectorTypes: Record<ProjectorType, Factory> = {
51
49
  relational: GraphRelationalProjector as Factory,
52
50
  };
53
51
 
54
- type StoryProps = GraphProps & {
52
+ type DefaultStoryProps = GraphProps & {
55
53
  debug?: boolean;
56
54
  grid?: boolean | SVGGridProps;
57
55
  inspect?: boolean;
58
- singleSelect?: boolean;
59
- graph: () => Graph;
56
+ graph: () => Graph.Any;
57
+ selectionMode?: SelectionMode;
60
58
  projectorType?: ProjectorType;
61
59
  projectorOptions?:
62
60
  | GraphForceProjectorOptions
@@ -69,18 +67,22 @@ const DefaultStory = ({
69
67
  debug,
70
68
  grid,
71
69
  inspect,
72
- singleSelect,
70
+ selectionMode,
73
71
  graph: _graph,
74
72
  projectorType: _projectorType = 'force',
75
73
  projectorOptions,
76
74
  ...props
77
- }: StoryProps) => {
75
+ }: DefaultStoryProps) => {
78
76
  const graphRef = useRef<GraphController | null>(null);
79
77
  const context = useRef<SVGContext>(null);
78
+ const registry = useContext(RegistryContext);
80
79
 
81
80
  // Models.
82
- const [model, setModel] = useState<GraphModel | undefined>(() => new TestGraphModel(_graph?.()));
83
- const selection = useMemo(() => new SelectionModel(singleSelect), [singleSelect]);
81
+ const selection = useMemo(() => new SelectionModel({ mode: selectionMode }), [selectionMode]);
82
+ const [model, setModel] = useState<GraphModel.ReactiveGraphModel | undefined>(() => {
83
+ const graph = _graph?.();
84
+ return graph ? new TestGraphModel(registry, graph) : undefined;
85
+ });
84
86
 
85
87
  // Projector.
86
88
  const [projectorType, setProjectorType] = useState<ProjectorType>(_projectorType);
@@ -157,8 +159,9 @@ const DefaultStory = ({
157
159
  }, [model]);
158
160
 
159
161
  const handleRegenerate = useCallback(() => {
160
- setModel(new TestGraphModel(_graph?.()));
161
- }, [_graph]);
162
+ const graph = _graph?.();
163
+ setModel(graph ? new TestGraphModel(registry, graph) : undefined);
164
+ }, [_graph, registry]);
162
165
 
163
166
  const handleClear = useCallback(() => {
164
167
  setModel(undefined);
@@ -182,7 +185,7 @@ const DefaultStory = ({
182
185
 
183
186
  const active = useMemo(() => new SelectionModel(), []);
184
187
  const handlePing = useCallback(() => {
185
- for (const id of active.selected.value) {
188
+ for (const id of active.getSelectedIds()) {
186
189
  const node = graphRef.current?.findNode(id);
187
190
  if (node) {
188
191
  Pulsar.remove(select(node));
@@ -190,7 +193,7 @@ const DefaultStory = ({
190
193
  }
191
194
 
192
195
  active.clear();
193
- for (const id of selection.selected.value) {
196
+ for (const id of selection.getSelectedIds()) {
194
197
  const node = graphRef.current?.findNode(id);
195
198
  if (node) {
196
199
  active.add(id);
@@ -202,7 +205,7 @@ const DefaultStory = ({
202
205
 
203
206
  return (
204
207
  <Popover.Root open={!!popover} onOpenChange={(state) => !state && setPopover(undefined)}>
205
- <div className={mx('w-full grid divide-x divide-separator', debug && 'grid-cols-[1fr_30rem]')}>
208
+ <div className={mx('h-full w-full grid divide-x divide-separator', debug && 'grid-cols-[1fr_30rem]')}>
206
209
  <SVG.Root ref={context}>
207
210
  <SVG.Markers />
208
211
  {grid && <SVG.Grid {...(typeof grid === 'boolean' ? { axis: grid } : grid)} />}
@@ -217,7 +220,7 @@ const DefaultStory = ({
217
220
  attributes={{
218
221
  node: (node: GraphLayoutNode<TestNode>) => ({
219
222
  data: {
220
- color: getHashColor(node.data?.type ?? node.type)?.color,
223
+ color: getHashStyles(node.data?.type ?? node.type)?.hue,
221
224
  },
222
225
  classes: {
223
226
  'dx-selected': selection.contains(node.id),
@@ -225,7 +228,7 @@ const DefaultStory = ({
225
228
  }),
226
229
  edge: (edge: GraphLayoutEdge<TestNode>) => ({
227
230
  data: {
228
- color: getHashColor(edge.data?.type ?? edge.type)?.color,
231
+ color: getHashStyles(edge.data?.type ?? edge.type)?.hue,
229
232
  },
230
233
  }),
231
234
  }}
@@ -256,13 +259,9 @@ const DefaultStory = ({
256
259
  <Popover.VirtualTrigger virtualRef={popoverAnchorRef} />
257
260
  <Popover.Content onOpenAutoFocus={(event) => event.preventDefault()}>
258
261
  <Popover.Viewport>
259
- <Card.SurfaceRoot role='card--popover'>
260
- <SyntaxHighlighter
261
- language='json'
262
- classNames='text-xs mlb-cardSpacingBlock pli-cardSpacingInline bg-transparent'
263
- code={JSON.stringify(popover, null, 2)}
264
- />
265
- </Card.SurfaceRoot>
262
+ <Card.Root>
263
+ <JsonHighlighter data={popover} classNames='text-xs my-form-padding px-form-padding bg-transparent' />
264
+ </Card.Root>
266
265
  </Popover.Viewport>
267
266
  <Popover.Arrow />
268
267
  </Popover.Content>
@@ -283,7 +282,7 @@ const Debug = ({
283
282
  onDelete,
284
283
  onPing,
285
284
  }: {
286
- model?: GraphModel;
285
+ model?: GraphModel.ReactiveGraphModel;
287
286
  selection: SelectionModel;
288
287
  projector: ProjectorType;
289
288
  onToggleProjector: () => void;
@@ -297,28 +296,33 @@ const Debug = ({
297
296
  }) => {
298
297
  const [data, setData] = useState({});
299
298
  useEffect(() => {
300
- effect(() => {
301
- setData({
302
- projector,
303
- selection: selection.toJSON(),
304
- model: model?.toJSON(),
305
- });
299
+ setData({
300
+ projector,
301
+ selection: selection.toJSON(),
302
+ model: model?.toJSON(),
306
303
  });
307
304
  }, [model, selection, projector]);
308
305
 
309
306
  return (
310
307
  <div className='flex flex-col overflow-hidden'>
311
308
  <Toolbar.Root>
312
- <IconButton onClick={onToggleProjector} size={5} label='Projector' icon='ph--graph--regular' iconOnly />
313
- <IconButton onClick={onRefresh} size={5} label='Refresh' icon='ph--arrow-clockwise--regular' iconOnly />
314
- <IconButton onClick={onRepaint} size={5} label='Repaint' icon='ph--paint-roller--regular' iconOnly />
315
- <IconButton onClick={onRegenerate} size={5} label='Regenerate' icon='ph--arrows-clockwise--regular' iconOnly />
316
- <IconButton onClick={onClear} size={5} label='Clear' icon='ph--trash--regular' iconOnly />
317
- <IconButton onClick={onAdd} size={5} label='Add' icon='ph--plus--regular' iconOnly />
318
- <IconButton onClick={onDelete} size={5} label='Delete' icon='ph--x--regular' iconOnly />
319
- <IconButton onClick={onPing} size={5} label='Delete' icon='ph--crosshair-simple--regular' iconOnly />
309
+ <IconButton onClick={onToggleProjector} label='Projector' icon='ph--graph--regular' iconOnly />
310
+ <IconButton onClick={onRefresh} label='Refresh' icon='ph--arrow-clockwise--regular' iconOnly />
311
+ <IconButton onClick={onRepaint} label='Repaint' icon='ph--paint-roller--regular' iconOnly />
312
+ <IconButton onClick={onRegenerate} label='Regenerate' icon='ph--arrows-clockwise--regular' iconOnly />
313
+ <IconButton onClick={onClear} label='Clear' icon='ph--trash--regular' iconOnly />
314
+ <IconButton onClick={onAdd} label='Add' icon='ph--plus--regular' iconOnly />
315
+ <IconButton onClick={onDelete} label='Delete' icon='ph--x--regular' iconOnly />
316
+ <IconButton onClick={onPing} label='Delete' icon='ph--crosshair-simple--regular' iconOnly />
320
317
  </Toolbar.Root>
321
- <JsonFilter data={data} classNames='text-sm' />
318
+ <Syntax.Root data={data}>
319
+ <Syntax.Content>
320
+ <Syntax.Filter />
321
+ <Syntax.Viewport>
322
+ <Syntax.Code classNames='text-sm' />
323
+ </Syntax.Viewport>
324
+ </Syntax.Content>
325
+ </Syntax.Root>
322
326
  </div>
323
327
  );
324
328
  };
@@ -326,8 +330,9 @@ const Debug = ({
326
330
  const meta = {
327
331
  title: 'ui/react-ui-graph/Graph',
328
332
  render: DefaultStory,
329
- decorators: [withTheme, withLayout({ fullscreen: true })],
333
+ decorators: [withRegistry, withTheme(), withLayout({ layout: 'fullscreen' })],
330
334
  parameters: {
335
+ layout: 'fullscreen',
331
336
  controls: { disable: true },
332
337
  },
333
338
  } satisfies Meta<typeof DefaultStory>;
@@ -354,7 +359,7 @@ export const Projector: Story = {
354
359
  debug: true,
355
360
  drag: true,
356
361
  arrows: true,
357
- singleSelect: true,
362
+ selectionMode: 'single',
358
363
  projectorType: 'hierarchical',
359
364
  projectorOptions: {
360
365
  duration: 500,
@@ -2,14 +2,13 @@
2
2
  // Copyright 2022 DXOS.org
3
3
  //
4
4
 
5
- import { effect } from '@preact/signals-core';
6
5
  import React, { type JSX, type Ref, forwardRef, useEffect, useImperativeHandle, useMemo, useRef } from 'react';
7
6
 
8
7
  import { combine } from '@dxos/async';
9
- import { type BaseGraphEdge, type BaseGraphNode, type GraphModel } from '@dxos/graph';
8
+ import { GraphModel, type Graph as Graph$ } from '@dxos/graph';
10
9
  import { log } from '@dxos/log';
11
10
  import { type ThemedClassName } from '@dxos/react-ui';
12
- import { mx } from '@dxos/react-ui-theme';
11
+ import { mx } from '@dxos/ui-theme';
13
12
 
14
13
  import {
15
14
  GraphForceProjector,
@@ -27,9 +26,9 @@ export type GraphController = {
27
26
  findNode: (id: string) => SVGGElement | null;
28
27
  };
29
28
 
30
- export type GraphProps<Node extends BaseGraphNode = any, Edge extends BaseGraphEdge = any> = ThemedClassName<
29
+ export type GraphProps<Node extends Graph$.Node.Any = any, Edge extends Graph$.Edge.Any = any> = ThemedClassName<
31
30
  Pick<GraphRendererOptions<Node>, 'labels' | 'subgraphs' | 'attributes'> & {
32
- model?: GraphModel<Node, Edge>; // TODO(burdon): ReactiveGraphModel
31
+ model?: GraphModel.ReactiveGraphModel<Node, Edge>;
33
32
  projector?: GraphProjector<Node>;
34
33
  renderer?: GraphRenderer<Node>;
35
34
  drag?: boolean;
@@ -39,12 +38,12 @@ export type GraphProps<Node extends BaseGraphNode = any, Edge extends BaseGraphE
39
38
  }
40
39
  >;
41
40
 
42
- export const GraphInner = <Node extends BaseGraphNode = any, Edge extends BaseGraphEdge = any>(
41
+ const GraphInner = <Node extends Graph$.Node.Any = any, Edge extends Graph$.Edge.Any = any>(
43
42
  {
44
43
  classNames,
45
44
  model,
46
- projector: _projector,
47
- renderer: _renderer,
45
+ projector: projectorProp,
46
+ renderer: rendererProp,
48
47
  drag,
49
48
  arrows,
50
49
  onSelect,
@@ -54,28 +53,28 @@ export const GraphInner = <Node extends BaseGraphNode = any, Edge extends BaseGr
54
53
  forwardedRef: Ref<GraphController>,
55
54
  ) => {
56
55
  const context = useSvgContext();
57
- const graphRef = useRef<SVGGElement>();
56
+ const graphRef = useRef<SVGGElement>(null);
58
57
 
59
58
  const { projector, renderer } = useMemo(() => {
60
- let projector = _projector;
59
+ let projector = projectorProp;
61
60
  if (!projector) {
62
61
  projector = new GraphForceProjector<Node>(context);
63
62
  }
64
63
 
65
- let renderer = _renderer;
64
+ let renderer = rendererProp;
66
65
  if (!renderer) {
67
66
  renderer = new GraphRenderer<Node>(context, graphRef, {
68
67
  ...props,
69
68
  // TODO(burdon): Replace drag when projector is updated.
70
69
  drag: drag ? createGraphDrag(context, projector) : undefined,
71
70
  arrows: { end: arrows },
72
- onNodeClick: onSelect ? (node: GraphLayoutNode, event) => onSelect(node, event) : undefined,
73
- onNodePointerEnter: onInspect ? (node: GraphLayoutNode, event) => onInspect(node, event) : undefined,
71
+ onNodeClick: onSelect,
72
+ onNodePointerEnter: onInspect,
74
73
  });
75
74
  }
76
75
 
77
76
  return { projector, renderer };
78
- }, [context, _projector, _renderer, drag]);
77
+ }, [context, projectorProp, rendererProp, drag]);
79
78
 
80
79
  // External API.
81
80
  useImperativeHandle(
@@ -96,16 +95,22 @@ export const GraphInner = <Node extends BaseGraphNode = any, Edge extends BaseGr
96
95
 
97
96
  // Subscriptions.
98
97
  useEffect(() => {
98
+ projector.updateData(model?.graph);
99
+
99
100
  return combine(
100
- effect(() => {
101
- projector.updateData(model?.graph);
102
- }),
101
+ // Subscribe to model changes if reactive model.
102
+ model
103
+ ? model.subscribe(() => {
104
+ projector.updateData(model?.graph);
105
+ })
106
+ : undefined,
107
+
103
108
  projector.updated.on(({ layout }) => {
104
109
  try {
105
110
  renderer.render(layout);
106
111
  } catch (error) {
107
- void projector.stop();
108
112
  log.catch(error);
113
+ void projector.stop();
109
114
  }
110
115
  }),
111
116
  );
@@ -125,6 +130,6 @@ export const GraphInner = <Node extends BaseGraphNode = any, Edge extends BaseGr
125
130
  /**
126
131
  * SVG Graph.
127
132
  */
128
- export const Graph = forwardRef(GraphInner) as <Node extends BaseGraphNode = any, Edge extends BaseGraphEdge = any>(
133
+ export const Graph = forwardRef(GraphInner) as <Node extends Graph$.Node.Any = any, Edge extends Graph$.Edge.Any = any>(
129
134
  props: GraphProps<Node, Edge> & { ref?: Ref<GraphController> },
130
135
  ) => JSX.Element;
@@ -2,15 +2,12 @@
2
2
  // Copyright 2024 DXOS.org
3
3
  //
4
4
 
5
- import '@dxos-theme';
6
-
7
5
  import { type Meta, type StoryObj } from '@storybook/react-vite';
8
6
  import React, { useEffect, useState } from 'react';
9
7
 
10
- import { withLayout, withTheme } from '@dxos/storybook-utils';
8
+ import { withLayout, withTheme } from '@dxos/react-ui/testing';
11
9
 
12
10
  import { SVG, type SVGRootProps } from '../SVG';
13
-
14
11
  import { Mesh } from './Mesh';
15
12
 
16
13
  // TODO(burdon): Create waves/game of life.
@@ -39,7 +36,10 @@ const DefaultStory = (props: SVGRootProps) => {
39
36
  const meta = {
40
37
  title: 'ui/react-ui-graph/Mesh',
41
38
  render: DefaultStory,
42
- decorators: [withTheme, withLayout({ fullscreen: true })],
39
+ decorators: [withTheme(), withLayout({ layout: 'fullscreen' })],
40
+ parameters: {
41
+ layout: 'fullscreen',
42
+ },
43
43
  } satisfies Meta<typeof DefaultStory>;
44
44
 
45
45
  export default meta;
@@ -5,7 +5,7 @@
5
5
  import React from 'react';
6
6
 
7
7
  import { type ThemedClassName } from '@dxos/react-ui';
8
- import { mx } from '@dxos/react-ui-theme';
8
+ import { mx } from '@dxos/ui-theme';
9
9
 
10
10
  import { type GridOptions, useGrid } from '../../hooks';
11
11
 
@@ -16,7 +16,7 @@ export type MarkersProps = {
16
16
  * SVG markers wrapper.
17
17
  */
18
18
  export const Markers = ({ arrowSize, className }: MarkersProps) => {
19
- const ref = useRef();
19
+ const ref = useRef(null);
20
20
  useEffect(() => {
21
21
  select(ref.current).call(createMarkers({ arrowSize }));
22
22
  }, [ref]);
@@ -3,26 +3,33 @@
3
3
  //
4
4
 
5
5
  import { select } from 'd3';
6
- import React, { type PropsWithChildren, forwardRef, useEffect, useImperativeHandle, useMemo } from 'react';
6
+ import React, {
7
+ type ComponentPropsWithoutRef,
8
+ type PropsWithChildren,
9
+ forwardRef,
10
+ useEffect,
11
+ useImperativeHandle,
12
+ useMemo,
13
+ } from 'react';
7
14
  import { useResizeDetector } from 'react-resize-detector';
8
15
 
9
16
  import { type ThemedClassName } from '@dxos/react-ui';
10
- import { mx } from '@dxos/react-ui-theme';
17
+ import { composableProps, mx } from '@dxos/ui-theme';
11
18
 
12
19
  import { SVGContext, type SVGContextOptions, SVGContextProvider } from '../../hooks';
13
20
 
14
- export type RootProps = ThemedClassName<PropsWithChildren<SVGContextOptions>>;
21
+ export type RootProps = ThemedClassName<PropsWithChildren<SVGContextOptions & ComponentPropsWithoutRef<'div'>>>;
15
22
 
16
23
  /**
17
24
  * Makes the SVG context available to child nodes.
18
25
  * Automatically resizes the SVG element, which expands to fit the container.
19
26
  */
20
- export const Root = forwardRef<SVGContext, RootProps>(({ classNames, children, ...props }, ref) => {
27
+ export const Root = forwardRef<SVGContext, RootProps>(({ children, scale, centered, ...props }, ref) => {
21
28
  const { ref: containerRef, width = 0, height = 0 } = useResizeDetector({ refreshRate: 200 });
22
29
 
23
30
  const context = useMemo<SVGContext>(() => {
24
- return new SVGContext(props);
25
- }, [props.scale, props.centered]);
31
+ return new SVGContext({ scale, centered });
32
+ }, [scale, centered]);
26
33
 
27
34
  useImperativeHandle(ref, () => context, [context]);
28
35
 
@@ -41,7 +48,7 @@ export const Root = forwardRef<SVGContext, RootProps>(({ classNames, children, .
41
48
 
42
49
  return (
43
50
  <SVGContextProvider value={context}>
44
- <div ref={containerRef} className={mx('grid grow overflow-hidden', classNames)}>
51
+ <div {...composableProps(props, { classNames: 'dx-expander' })} ref={containerRef}>
45
52
  <svg
46
53
  xmlns='http://www.w3.org/2000/svg'
47
54
  ref={context.ref}
@@ -8,7 +8,6 @@ import { type ThemedClassName } from '@dxos/react-ui';
8
8
 
9
9
  import { Graph, type GraphProps as SVGGraphProps } from '../Graph';
10
10
  import { Mesh, type MeshProps as SVGMeshProps } from '../Mesh';
11
-
12
11
  import { Grid, type GridProps as SVGGridProps } from './Grid';
13
12
  import { Markers, type MarkersProps as SVGMarkersProps } from './Markers';
14
13
  import { Root, type RootProps as SVGRootProps } from './Root';
@@ -16,7 +15,16 @@ import { type ZoomProps as SVGZoomProps, Zoom } from './Zoom';
16
15
 
17
16
  export type SVGProps = PropsWithChildren<ThemedClassName>;
18
17
 
19
- export const SVG = {
18
+ type SVG = {
19
+ Root: typeof Root;
20
+ Grid: typeof Grid;
21
+ Markers: typeof Markers;
22
+ Mesh: typeof Mesh;
23
+ Zoom: typeof Zoom;
24
+ Graph: typeof Graph;
25
+ };
26
+
27
+ export const SVG: SVG = {
20
28
  Root,
21
29
  Grid,
22
30
  Markers,
@@ -2,19 +2,16 @@
2
2
  // Copyright 2022 DXOS.org
3
3
  //
4
4
 
5
- import '@dxos-theme';
5
+ import '../../../styles/graph.css';
6
6
 
7
7
  import { type Meta, type StoryObj } from '@storybook/react-vite';
8
8
  import React, { useRef } from 'react';
9
9
 
10
- import { withLayout, withTheme } from '@dxos/storybook-utils';
10
+ import { withLayout, withTheme } from '@dxos/react-ui/testing';
11
11
 
12
12
  import { type SVGContext, useGrid, useZoom } from '../../hooks';
13
-
14
13
  import { SVG } from './SVG';
15
14
 
16
- import '../../../styles/graph.css';
17
-
18
15
  type ComponentProps = {
19
16
  grid?: boolean;
20
17
  zoom?: boolean;
@@ -47,7 +44,10 @@ const DefaultStory = (props: ComponentProps) => {
47
44
  const meta = {
48
45
  title: 'ui/react-ui-graph/SVGRoot',
49
46
  render: DefaultStory,
50
- decorators: [withTheme, withLayout({ fullscreen: true })],
47
+ decorators: [withTheme(), withLayout({ layout: 'fullscreen' })],
48
+ parameters: {
49
+ layout: 'fullscreen',
50
+ },
51
51
  } satisfies Meta<typeof DefaultStory>;
52
52
 
53
53
  export default meta;