@dxos/react-ui-graph 0.8.4-main.ae835ea → 0.8.4-main.bc2380dfbc

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 (102) hide show
  1. package/LICENSE +102 -5
  2. package/README.md +5 -7
  3. package/dist/lib/browser/chunk-EASNZZ7B.mjs +52 -0
  4. package/dist/lib/browser/chunk-EASNZZ7B.mjs.map +7 -0
  5. package/dist/lib/browser/index.mjs +1116 -291
  6. package/dist/lib/browser/index.mjs.map +4 -4
  7. package/dist/lib/browser/meta.json +1 -1
  8. package/dist/lib/browser/testing/index.mjs +16 -16
  9. package/dist/lib/browser/testing/index.mjs.map +3 -3
  10. package/dist/lib/node-esm/chunk-JSE2X4ML.mjs +54 -0
  11. package/dist/lib/node-esm/chunk-JSE2X4ML.mjs.map +7 -0
  12. package/dist/lib/node-esm/index.mjs +1116 -291
  13. package/dist/lib/node-esm/index.mjs.map +4 -4
  14. package/dist/lib/node-esm/meta.json +1 -1
  15. package/dist/lib/node-esm/testing/index.mjs +16 -16
  16. package/dist/lib/node-esm/testing/index.mjs.map +3 -3
  17. package/dist/types/src/components/Graph/Graph.d.ts +4 -5
  18. package/dist/types/src/components/Graph/Graph.d.ts.map +1 -1
  19. package/dist/types/src/components/Graph/Graph.stories.d.ts +6 -6
  20. package/dist/types/src/components/Graph/Graph.stories.d.ts.map +1 -1
  21. package/dist/types/src/components/Mesh/Mesh.d.ts.map +1 -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 +8 -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 +1 -1
  30. package/dist/types/src/components/SVG/Svg.stories.d.ts.map +1 -1
  31. package/dist/types/src/fx/fx.stories.d.ts +3 -3
  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 +6 -1
  51. package/dist/types/src/graph/renderer/renderer.d.ts.map +1 -1
  52. package/dist/types/src/graph/types.d.ts +1 -1
  53. package/dist/types/src/graph/types.d.ts.map +1 -1
  54. package/dist/types/src/hooks/useGrid.d.ts.map +1 -1
  55. package/dist/types/src/hooks/useStateRef.d.ts.map +1 -1
  56. package/dist/types/src/hooks/useSvgContext.d.ts.map +1 -1
  57. package/dist/types/src/hooks/useZoom.d.ts.map +1 -1
  58. package/dist/types/src/stories/hooks.stories.d.ts +4 -3
  59. package/dist/types/src/stories/hooks.stories.d.ts.map +1 -1
  60. package/dist/types/src/testing/data.d.ts +5 -5
  61. package/dist/types/src/testing/data.d.ts.map +1 -1
  62. package/dist/types/src/testing/hooks.d.ts +2 -16
  63. package/dist/types/src/testing/hooks.d.ts.map +1 -1
  64. package/dist/types/src/testing/model.d.ts +4 -8
  65. package/dist/types/src/testing/model.d.ts.map +1 -1
  66. package/dist/types/src/util/events.d.ts.map +1 -1
  67. package/dist/types/src/util/fraction.d.ts +1 -1
  68. package/dist/types/src/util/fraction.d.ts.map +1 -1
  69. package/dist/types/src/util/points.d.ts.map +1 -1
  70. package/dist/types/src/util/scale.d.ts.map +1 -1
  71. package/dist/types/src/util/screen.d.ts.map +1 -1
  72. package/dist/types/src/util/vector.d.ts.map +1 -1
  73. package/dist/types/tsconfig.tsbuildinfo +1 -1
  74. package/package.json +33 -35
  75. package/src/components/Graph/Graph.stories.tsx +53 -47
  76. package/src/components/Graph/Graph.tsx +23 -18
  77. package/src/components/Mesh/Mesh.stories.tsx +8 -7
  78. package/src/components/Mesh/Mesh.tsx +43 -35
  79. package/src/components/SVG/Grid.tsx +1 -1
  80. package/src/components/SVG/Root.tsx +41 -9
  81. package/src/components/SVG/SVG.tsx +10 -2
  82. package/src/components/SVG/Svg.stories.tsx +4 -5
  83. package/src/fx/fx.stories.tsx +7 -8
  84. package/src/graph/projector/graph-drag.ts +0 -1
  85. package/src/graph/projector/graph-force-projector.ts +1 -2
  86. package/src/graph/projector/graph-hierarchical-projector.ts +3 -4
  87. package/src/graph/projector/graph-projector.ts +2 -3
  88. package/src/graph/projector/graph-radial-projector.ts +1 -2
  89. package/src/graph/projector/graph-relational-projector.ts +3 -4
  90. package/src/graph/renderer/graph-renderer.ts +13 -5
  91. package/src/graph/renderer/renderer.ts +6 -4
  92. package/src/graph/types.ts +1 -1
  93. package/src/stories/hooks.stories.tsx +21 -10
  94. package/src/testing/data.ts +14 -14
  95. package/src/testing/hooks.ts +3 -4
  96. package/src/testing/model.ts +6 -6
  97. package/src/util/fraction.ts +1 -1
  98. package/styles/graph.css +292 -43
  99. package/dist/lib/browser/chunk-XWA2XJDX.mjs +0 -955
  100. package/dist/lib/browser/chunk-XWA2XJDX.mjs.map +0 -7
  101. package/dist/lib/node-esm/chunk-3RLSFEEV.mjs +0 -957
  102. package/dist/lib/node-esm/chunk-3RLSFEEV.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.ae835ea",
3
+ "version": "0.8.4-main.bc2380dfbc",
4
4
  "description": "GEM Graph.",
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": [
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.12.1",
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.ae835ea",
50
- "@dxos/echo-signals": "0.8.4-main.ae835ea",
51
- "@dxos/debug": "0.8.4-main.ae835ea",
52
- "@dxos/invariant": "0.8.4-main.ae835ea",
53
- "@dxos/log": "0.8.4-main.ae835ea",
54
- "@dxos/graph": "0.8.4-main.ae835ea",
55
- "@dxos/node-std": "0.8.4-main.ae835ea"
47
+ "@dxos/async": "0.8.4-main.bc2380dfbc",
48
+ "@dxos/debug": "0.8.4-main.bc2380dfbc",
49
+ "@dxos/graph": "0.8.4-main.bc2380dfbc",
50
+ "@dxos/node-std": "0.8.4-main.bc2380dfbc",
51
+ "@dxos/invariant": "0.8.4-main.bc2380dfbc",
52
+ "@dxos/log": "0.8.4-main.bc2380dfbc",
53
+ "@dxos/react-ui-mosaic": "0.8.4-main.bc2380dfbc"
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": "~19.2.2",
62
- "@types/react-dom": "~19.2.2",
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": "~19.2.0",
67
- "react-dom": "~19.2.0",
68
- "@dxos/react-ui-stack": "0.8.4-main.ae835ea",
69
- "@dxos/react-ui": "0.8.4-main.ae835ea",
70
- "@dxos/random": "0.8.4-main.ae835ea",
71
- "@dxos/react-ui-syntax-highlighter": "0.8.4-main.ae835ea",
72
- "@dxos/storybook-utils": "0.8.4-main.ae835ea",
73
- "@dxos/react-ui-theme": "0.8.4-main.ae835ea"
63
+ "postcss": "^8.5.12",
64
+ "react": "~19.2.3",
65
+ "react-dom": "~19.2.3",
66
+ "@dxos/random": "0.8.4-main.bc2380dfbc",
67
+ "@dxos/react-ui-stack": "0.8.4-main.bc2380dfbc",
68
+ "@dxos/react-ui": "0.8.4-main.bc2380dfbc",
69
+ "@dxos/storybook-utils": "0.8.4-main.bc2380dfbc",
70
+ "@dxos/react-ui-syntax-highlighter": "0.8.4-main.bc2380dfbc",
71
+ "@dxos/ui-theme": "0.8.4-main.bc2380dfbc"
74
72
  },
75
73
  "peerDependencies": {
76
- "react": "^19.0.0",
77
- "react-dom": "^19.0.0",
78
- "@dxos/react-ui": "0.8.4-main.ae835ea",
79
- "@dxos/react-ui-theme": "0.8.4-main.ae835ea"
74
+ "react": "~19.2.3",
75
+ "react-dom": "~19.2.3",
76
+ "@dxos/react-ui": "0.8.4-main.bc2380dfbc",
77
+ "@dxos/ui-theme": "0.8.4-main.bc2380dfbc"
80
78
  },
81
79
  "optionalDependencies": {
82
- "@dxos/random": "0.8.4-main.ae835ea"
80
+ "@dxos/random": "0.8.4-main.bc2380dfbc"
83
81
  },
84
82
  "publishConfig": {
85
83
  "access": "public"
@@ -2,17 +2,20 @@
2
2
  // Copyright 2022 DXOS.org
3
3
  //
4
4
 
5
- import { effect } from '@preact/signals-core';
5
+ import '../../../styles/graph.css';
6
+
7
+ import { RegistryContext } from '@effect-atom/atom-react';
6
8
  import { type Meta, type StoryObj } from '@storybook/react-vite';
7
9
  import { select } from 'd3';
8
- import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
10
+ import React, { useCallback, useContext, useEffect, useMemo, useRef, useState } from 'react';
9
11
 
10
- import { type Graph, type GraphModel, SelectionModel } from '@dxos/graph';
12
+ import { type Graph, type GraphModel, type SelectionMode, SelectionModel } from '@dxos/graph';
11
13
  import { IconButton, Popover, Toolbar } from '@dxos/react-ui';
12
- import { withTheme } from '@dxos/react-ui/testing';
13
- import { Card } from '@dxos/react-ui-stack';
14
- import { JsonFilter, SyntaxHighlighter } from '@dxos/react-ui-syntax-highlighter';
15
- import { getHashStyles, mx } from '@dxos/react-ui-theme';
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';
16
19
 
17
20
  import { Pulsar } from '../../fx';
18
21
  import {
@@ -31,11 +34,8 @@ import {
31
34
  import { type SVGContext } from '../../hooks';
32
35
  import { TestGraphModel, type TestNode, convertTreeToGraph, createGraph, createNode, createTree } from '../../testing';
33
36
  import { SVG, type SVGGridProps } from '../SVG';
34
-
35
37
  import { Graph as GraphComponent, type GraphController, type GraphProps } from './Graph';
36
38
 
37
- import '../../../styles/graph.css';
38
-
39
39
  type ProjectorType = 'force' | 'radial' | 'hierarchical' | 'relational';
40
40
 
41
41
  type Factory = {
@@ -49,12 +49,12 @@ const projectorTypes: Record<ProjectorType, Factory> = {
49
49
  relational: GraphRelationalProjector as Factory,
50
50
  };
51
51
 
52
- type StoryProps = GraphProps & {
52
+ type DefaultStoryProps = GraphProps & {
53
53
  debug?: boolean;
54
54
  grid?: boolean | SVGGridProps;
55
55
  inspect?: boolean;
56
- singleSelect?: boolean;
57
- graph: () => Graph;
56
+ graph: () => Graph.Any;
57
+ selectionMode?: SelectionMode;
58
58
  projectorType?: ProjectorType;
59
59
  projectorOptions?:
60
60
  | GraphForceProjectorOptions
@@ -67,18 +67,22 @@ const DefaultStory = ({
67
67
  debug,
68
68
  grid,
69
69
  inspect,
70
- singleSelect,
70
+ selectionMode,
71
71
  graph: _graph,
72
72
  projectorType: _projectorType = 'force',
73
73
  projectorOptions,
74
74
  ...props
75
- }: StoryProps) => {
75
+ }: DefaultStoryProps) => {
76
76
  const graphRef = useRef<GraphController | null>(null);
77
77
  const context = useRef<SVGContext>(null);
78
+ const registry = useContext(RegistryContext);
78
79
 
79
80
  // Models.
80
- const [model, setModel] = useState<GraphModel | undefined>(() => new TestGraphModel(_graph?.()));
81
- 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
+ });
82
86
 
83
87
  // Projector.
84
88
  const [projectorType, setProjectorType] = useState<ProjectorType>(_projectorType);
@@ -155,8 +159,9 @@ const DefaultStory = ({
155
159
  }, [model]);
156
160
 
157
161
  const handleRegenerate = useCallback(() => {
158
- setModel(new TestGraphModel(_graph?.()));
159
- }, [_graph]);
162
+ const graph = _graph?.();
163
+ setModel(graph ? new TestGraphModel(registry, graph) : undefined);
164
+ }, [_graph, registry]);
160
165
 
161
166
  const handleClear = useCallback(() => {
162
167
  setModel(undefined);
@@ -180,7 +185,7 @@ const DefaultStory = ({
180
185
 
181
186
  const active = useMemo(() => new SelectionModel(), []);
182
187
  const handlePing = useCallback(() => {
183
- for (const id of active.selected.value) {
188
+ for (const id of active.getSelectedIds()) {
184
189
  const node = graphRef.current?.findNode(id);
185
190
  if (node) {
186
191
  Pulsar.remove(select(node));
@@ -188,7 +193,7 @@ const DefaultStory = ({
188
193
  }
189
194
 
190
195
  active.clear();
191
- for (const id of selection.selected.value) {
196
+ for (const id of selection.getSelectedIds()) {
192
197
  const node = graphRef.current?.findNode(id);
193
198
  if (node) {
194
199
  active.add(id);
@@ -200,7 +205,7 @@ const DefaultStory = ({
200
205
 
201
206
  return (
202
207
  <Popover.Root open={!!popover} onOpenChange={(state) => !state && setPopover(undefined)}>
203
- <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]')}>
204
209
  <SVG.Root ref={context}>
205
210
  <SVG.Markers />
206
211
  {grid && <SVG.Grid {...(typeof grid === 'boolean' ? { axis: grid } : grid)} />}
@@ -254,13 +259,9 @@ const DefaultStory = ({
254
259
  <Popover.VirtualTrigger virtualRef={popoverAnchorRef} />
255
260
  <Popover.Content onOpenAutoFocus={(event) => event.preventDefault()}>
256
261
  <Popover.Viewport>
257
- <Card.SurfaceRoot role='card--popover'>
258
- <SyntaxHighlighter
259
- language='json'
260
- classNames='text-xs mlb-cardSpacingBlock pli-cardSpacingInline bg-transparent'
261
- code={JSON.stringify(popover, null, 2)}
262
- />
263
- </Card.SurfaceRoot>
262
+ <Card.Root>
263
+ <JsonHighlighter data={popover} classNames='text-xs my-form-padding px-form-padding bg-transparent' />
264
+ </Card.Root>
264
265
  </Popover.Viewport>
265
266
  <Popover.Arrow />
266
267
  </Popover.Content>
@@ -281,7 +282,7 @@ const Debug = ({
281
282
  onDelete,
282
283
  onPing,
283
284
  }: {
284
- model?: GraphModel;
285
+ model?: GraphModel.ReactiveGraphModel;
285
286
  selection: SelectionModel;
286
287
  projector: ProjectorType;
287
288
  onToggleProjector: () => void;
@@ -295,28 +296,33 @@ const Debug = ({
295
296
  }) => {
296
297
  const [data, setData] = useState({});
297
298
  useEffect(() => {
298
- effect(() => {
299
- setData({
300
- projector,
301
- selection: selection.toJSON(),
302
- model: model?.toJSON(),
303
- });
299
+ setData({
300
+ projector,
301
+ selection: selection.toJSON(),
302
+ model: model?.toJSON(),
304
303
  });
305
304
  }, [model, selection, projector]);
306
305
 
307
306
  return (
308
307
  <div className='flex flex-col overflow-hidden'>
309
308
  <Toolbar.Root>
310
- <IconButton onClick={onToggleProjector} size={5} label='Projector' icon='ph--graph--regular' iconOnly />
311
- <IconButton onClick={onRefresh} size={5} label='Refresh' icon='ph--arrow-clockwise--regular' iconOnly />
312
- <IconButton onClick={onRepaint} size={5} label='Repaint' icon='ph--paint-roller--regular' iconOnly />
313
- <IconButton onClick={onRegenerate} size={5} label='Regenerate' icon='ph--arrows-clockwise--regular' iconOnly />
314
- <IconButton onClick={onClear} size={5} label='Clear' icon='ph--trash--regular' iconOnly />
315
- <IconButton onClick={onAdd} size={5} label='Add' icon='ph--plus--regular' iconOnly />
316
- <IconButton onClick={onDelete} size={5} label='Delete' icon='ph--x--regular' iconOnly />
317
- <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 />
318
317
  </Toolbar.Root>
319
- <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>
320
326
  </div>
321
327
  );
322
328
  };
@@ -324,7 +330,7 @@ const Debug = ({
324
330
  const meta = {
325
331
  title: 'ui/react-ui-graph/Graph',
326
332
  render: DefaultStory,
327
- decorators: [withTheme],
333
+ decorators: [withRegistry, withTheme(), withLayout({ layout: 'fullscreen' })],
328
334
  parameters: {
329
335
  layout: 'fullscreen',
330
336
  controls: { disable: true },
@@ -353,7 +359,7 @@ export const Projector: Story = {
353
359
  debug: true,
354
360
  drag: true,
355
361
  arrows: true,
356
- singleSelect: true,
362
+ selectionMode: 'single',
357
363
  projectorType: 'hierarchical',
358
364
  projectorOptions: {
359
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,
@@ -57,25 +56,25 @@ export const GraphInner = <Node extends BaseGraphNode = any, Edge extends BaseGr
57
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;
@@ -5,10 +5,9 @@
5
5
  import { type Meta, type StoryObj } from '@storybook/react-vite';
6
6
  import React, { useEffect, useState } from 'react';
7
7
 
8
- import { withTheme } from '@dxos/react-ui/testing';
8
+ import { withLayout, withTheme } from '@dxos/react-ui/testing';
9
9
 
10
10
  import { SVG, type SVGRootProps } from '../SVG';
11
-
12
11
  import { Mesh } from './Mesh';
13
12
 
14
13
  // TODO(burdon): Create waves/game of life.
@@ -37,7 +36,7 @@ const DefaultStory = (props: SVGRootProps) => {
37
36
  const meta = {
38
37
  title: 'ui/react-ui-graph/Mesh',
39
38
  render: DefaultStory,
40
- decorators: [withTheme],
39
+ decorators: [withTheme(), withLayout({ layout: 'fullscreen' })],
41
40
  parameters: {
42
41
  layout: 'fullscreen',
43
42
  },
@@ -47,18 +46,20 @@ export default meta;
47
46
 
48
47
  type Story = StoryObj<typeof meta>;
49
48
 
49
+ // Selectors use the descendant combinator (`[&_X]`) — the mesh / hexagon / border elements
50
+ // live inside the SVG inside the div, so direct-child (`>`) selectors don't match.
50
51
  export const Default: Story = {
51
52
  args: {
52
53
  classNames: [
53
- '[&>.mesh]:fill-none',
54
- '[&>.hexagon>path.fill]:fill-blue-800 [&>.hexagon]:stroke-blue-700',
55
- '[&>.border]:fill-none [&>.border]:stroke-blue-500 [&>.border]:stroke-2',
54
+ '[&_.mesh]:fill-none',
55
+ '[&_.hexagon>path.fill]:fill-blue-800 [&_.hexagon]:stroke-blue-700',
56
+ '[&_.border]:fill-none [&_.border]:stroke-blue-500 [&_.border]:stroke-2',
56
57
  ],
57
58
  },
58
59
  };
59
60
 
60
61
  export const Outline: Story = {
61
62
  args: {
62
- classNames: ['[&>.mesh]:fill-none', '[&>.border]:fill-none [&>.border]:stroke-red-500 [&>.border]:stroke-2'],
63
+ classNames: ['[&_.mesh]:fill-none', '[&_.border]:fill-none [&_.border]:stroke-red-500 [&_.border]:stroke-2'],
63
64
  },
64
65
  };
@@ -20,43 +20,51 @@ export const Mesh = ({ radius = 16, value = 0.5 }: MeshProps) => {
20
20
  const { svg, size } = useSvgContext();
21
21
 
22
22
  useEffect(() => {
23
- if (size) {
24
- // TODO(burdon): Resize doesn't trigger.
25
- const topology = hexTopology(size, radius, value);
26
- const projection = hexProjection(radius);
27
- const path = geoPath().projection(projection);
28
-
29
- select(svg)
30
- .append('g')
31
- .attr('class', 'hexagon')
32
- .selectAll('path')
33
- .data(topology.objects.hexagons.geometries)
34
- .enter()
35
- .append('path')
36
- .attr('d', (d) => path(feature(topology, d)))
37
- .attr('class', (d) => ((d.properties as Custom)?.fill ? 'fill' : null));
38
- // .on('mousedown', mousedown)
39
- // .on('mousemove', mousemove)
40
- // .on('mouseup', mouseup);
41
-
42
- select(svg).append('path').datum(mesh(topology, topology.objects.hexagons)).attr('class', 'mesh').attr('d', path);
43
-
44
- const redraw = (border: any) => {
45
- border.attr(
46
- 'd',
47
- path(
48
- mesh(
49
- topology,
50
- topology.objects.hexagons,
51
- (a, b) => (a.properties as Custom).fill !== (b.properties as Custom).fill,
52
- ),
23
+ if (!size) {
24
+ return;
25
+ }
26
+
27
+ const topology = hexTopology(size, radius, value);
28
+ const projection = hexProjection(radius);
29
+ const path = geoPath().projection(projection);
30
+
31
+ // Replace the previous render: idempotent join on a single keyed root group, then
32
+ // recreate the inner layers. Without this the effect re-runs (e.g. animating `value`
33
+ // or on resize) appended new groups on top of the old ones instead of replacing them.
34
+ const root = select(svg)
35
+ .selectAll<SVGGElement, null>('g.dx-mesh-root')
36
+ .data([null])
37
+ .join('g')
38
+ .classed('dx-mesh-root', true);
39
+ root.selectAll('*').remove();
40
+
41
+ root
42
+ .append('g')
43
+ .attr('class', 'hexagon')
44
+ .selectAll('path')
45
+ .data(topology.objects.hexagons.geometries)
46
+ .enter()
47
+ .append('path')
48
+ .attr('d', (d) => path(feature(topology, d)))
49
+ .attr('class', (d) => ((d.properties as Custom)?.fill ? 'fill' : null));
50
+
51
+ root.append('path').datum(mesh(topology, topology.objects.hexagons)).attr('class', 'mesh').attr('d', path);
52
+
53
+ const redraw = (border: any) => {
54
+ border.attr(
55
+ 'd',
56
+ path(
57
+ mesh(
58
+ topology,
59
+ topology.objects.hexagons,
60
+ (a, b) => (a.properties as Custom).fill !== (b.properties as Custom).fill,
53
61
  ),
54
- );
55
- };
62
+ ),
63
+ );
64
+ };
56
65
 
57
- select(svg).append('path').attr('class', 'border').call(redraw);
58
- }
59
- }, [svg, size, value]);
66
+ root.append('path').attr('class', 'border').call(redraw);
67
+ }, [svg, size, value, radius]);
60
68
 
61
69
  return null;
62
70
  };
@@ -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
 
@@ -3,26 +3,58 @@
3
3
  //
4
4
 
5
5
  import { select } from 'd3';
6
- import React, { type PropsWithChildren, forwardRef, useEffect, useImperativeHandle, useMemo } from 'react';
7
- import { useResizeDetector } from 'react-resize-detector';
6
+ import React, {
7
+ type ComponentPropsWithoutRef,
8
+ type PropsWithChildren,
9
+ forwardRef,
10
+ useEffect,
11
+ useImperativeHandle,
12
+ useMemo,
13
+ useState,
14
+ } from 'react';
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.
26
+ *
27
+ * NOTE: Uses `ResizeObserver` directly rather than `react-resize-detector` — the latter's
28
+ * `useResizeDetector` was flaky in our Storybook environment (sometimes never fired its
29
+ * initial measurement), leaving the SVG stuck at `opacity-0` with no rendered content.
19
30
  */
20
- export const Root = forwardRef<SVGContext, RootProps>(({ classNames, children, ...props }, ref) => {
21
- const { ref: containerRef, width = 0, height = 0 } = useResizeDetector({ refreshRate: 200 });
31
+ export const Root = forwardRef<SVGContext, RootProps>(({ children, scale, centered, ...props }, ref) => {
32
+ const [container, setContainer] = useState<HTMLDivElement | null>(null);
33
+ const [size, setSize] = useState<{ width: number; height: number }>({ width: 0, height: 0 });
34
+
35
+ useEffect(() => {
36
+ if (!container) {
37
+ return;
38
+ }
39
+ const rect = container.getBoundingClientRect();
40
+ setSize({ width: rect.width, height: rect.height });
41
+ const observer = new ResizeObserver((entries) => {
42
+ const entry = entries[0];
43
+ if (!entry) {
44
+ return;
45
+ }
46
+ const { width, height } = entry.contentRect;
47
+ setSize((prev) => (prev.width === width && prev.height === height ? prev : { width, height }));
48
+ });
49
+ observer.observe(container);
50
+ return () => observer.disconnect();
51
+ }, [container]);
52
+
53
+ const { width, height } = size;
22
54
 
23
55
  const context = useMemo<SVGContext>(() => {
24
- return new SVGContext(props);
25
- }, [props.scale, props.centered]);
56
+ return new SVGContext({ scale, centered });
57
+ }, [scale, centered]);
26
58
 
27
59
  useImperativeHandle(ref, () => context, [context]);
28
60
 
@@ -41,7 +73,7 @@ export const Root = forwardRef<SVGContext, RootProps>(({ classNames, children, .
41
73
 
42
74
  return (
43
75
  <SVGContextProvider value={context}>
44
- <div ref={containerRef} className={mx('grid grow overflow-hidden', classNames)}>
76
+ <div {...composableProps(props, { classNames: 'dx-expander' })} ref={setContainer}>
45
77
  <svg
46
78
  xmlns='http://www.w3.org/2000/svg'
47
79
  ref={context.ref}