@dxos/react-ui-graph 0.8.4-main.84f28bd → 0.8.4-main.8baae0fced

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 (134) 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 +1965 -560
  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 +1965 -560
  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 +9 -6
  18. package/dist/types/src/components/Graph/Graph.d.ts.map +1 -1
  19. package/dist/types/src/components/Graph/Graph.stories.d.ts +20 -11
  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 +9 -5
  23. package/dist/types/src/components/Mesh/Mesh.stories.d.ts.map +1 -1
  24. package/dist/types/src/components/SVG/Grid.d.ts.map +1 -1
  25. package/dist/types/src/components/SVG/Markers.d.ts.map +1 -1
  26. package/dist/types/src/components/SVG/Root.d.ts +8 -4
  27. package/dist/types/src/components/SVG/Root.d.ts.map +1 -1
  28. package/dist/types/src/components/SVG/SVG.d.ts +14 -17
  29. package/dist/types/src/components/SVG/SVG.d.ts.map +1 -1
  30. package/dist/types/src/components/SVG/Svg.stories.d.ts +11 -9
  31. package/dist/types/src/components/SVG/Svg.stories.d.ts.map +1 -1
  32. package/dist/types/src/components/SVG/Zoom.d.ts.map +1 -1
  33. package/dist/types/src/fx/fx.stories.d.ts +16 -15
  34. package/dist/types/src/fx/fx.stories.d.ts.map +1 -1
  35. package/dist/types/src/fx/pulsar.d.ts.map +1 -1
  36. package/dist/types/src/graph/markers.d.ts.map +1 -1
  37. package/dist/types/src/graph/projector/graph-bundle-projector.d.ts +47 -0
  38. package/dist/types/src/graph/projector/graph-bundle-projector.d.ts.map +1 -0
  39. package/dist/types/src/graph/projector/graph-cluster-projector.d.ts +60 -0
  40. package/dist/types/src/graph/projector/graph-cluster-projector.d.ts.map +1 -0
  41. package/dist/types/src/graph/projector/graph-drag.d.ts +1 -1
  42. package/dist/types/src/graph/projector/graph-drag.d.ts.map +1 -1
  43. package/dist/types/src/graph/projector/graph-force-projector.d.ts +2 -2
  44. package/dist/types/src/graph/projector/graph-force-projector.d.ts.map +1 -1
  45. package/dist/types/src/graph/projector/graph-forces.d.ts.map +1 -1
  46. package/dist/types/src/graph/projector/graph-hierarchical-projector.d.ts +2 -2
  47. package/dist/types/src/graph/projector/graph-hierarchical-projector.d.ts.map +1 -1
  48. package/dist/types/src/graph/projector/graph-lattice-projector.d.ts +23 -0
  49. package/dist/types/src/graph/projector/graph-lattice-projector.d.ts.map +1 -0
  50. package/dist/types/src/graph/projector/graph-projector.d.ts +4 -4
  51. package/dist/types/src/graph/projector/graph-projector.d.ts.map +1 -1
  52. package/dist/types/src/graph/projector/graph-radial-projector.d.ts +8 -2
  53. package/dist/types/src/graph/projector/graph-radial-projector.d.ts.map +1 -1
  54. package/dist/types/src/graph/projector/graph-relational-projector.d.ts +2 -2
  55. package/dist/types/src/graph/projector/graph-relational-projector.d.ts.map +1 -1
  56. package/dist/types/src/graph/projector/index.d.ts +3 -0
  57. package/dist/types/src/graph/projector/index.d.ts.map +1 -1
  58. package/dist/types/src/graph/projector/projector.d.ts +10 -1
  59. package/dist/types/src/graph/projector/projector.d.ts.map +1 -1
  60. package/dist/types/src/graph/renderer/bullets.d.ts.map +1 -1
  61. package/dist/types/src/graph/renderer/graph-renderer.d.ts +22 -2
  62. package/dist/types/src/graph/renderer/graph-renderer.d.ts.map +1 -1
  63. package/dist/types/src/graph/renderer/renderer.d.ts +12 -1
  64. package/dist/types/src/graph/renderer/renderer.d.ts.map +1 -1
  65. package/dist/types/src/graph/types.d.ts +15 -1
  66. package/dist/types/src/graph/types.d.ts.map +1 -1
  67. package/dist/types/src/hooks/useGrid.d.ts.map +1 -1
  68. package/dist/types/src/hooks/useStateRef.d.ts.map +1 -1
  69. package/dist/types/src/hooks/useSvgContext.d.ts.map +1 -1
  70. package/dist/types/src/hooks/useZoom.d.ts.map +1 -1
  71. package/dist/types/src/stories/hooks.stories.d.ts +14 -9
  72. package/dist/types/src/stories/hooks.stories.d.ts.map +1 -1
  73. package/dist/types/src/testing/data.d.ts +5 -5
  74. package/dist/types/src/testing/data.d.ts.map +1 -1
  75. package/dist/types/src/testing/hooks.d.ts +2 -16
  76. package/dist/types/src/testing/hooks.d.ts.map +1 -1
  77. package/dist/types/src/testing/model.d.ts +4 -8
  78. package/dist/types/src/testing/model.d.ts.map +1 -1
  79. package/dist/types/src/util/events.d.ts.map +1 -1
  80. package/dist/types/src/util/fraction.d.ts +1 -1
  81. package/dist/types/src/util/fraction.d.ts.map +1 -1
  82. package/dist/types/src/util/index.d.ts +2 -2
  83. package/dist/types/src/util/index.d.ts.map +1 -1
  84. package/dist/types/src/util/points.d.ts.map +1 -1
  85. package/dist/types/src/util/scale.d.ts.map +1 -1
  86. package/dist/types/src/util/screen.d.ts +1 -1
  87. package/dist/types/src/util/screen.d.ts.map +1 -1
  88. package/dist/types/src/util/vector.d.ts +1 -1
  89. package/dist/types/src/util/vector.d.ts.map +1 -1
  90. package/dist/types/tsconfig.tsbuildinfo +1 -1
  91. package/package.json +33 -35
  92. package/src/components/Graph/Graph.stories.tsx +73 -69
  93. package/src/components/Graph/Graph.tsx +60 -25
  94. package/src/components/Mesh/Mesh.stories.tsx +16 -13
  95. package/src/components/Mesh/Mesh.tsx +44 -36
  96. package/src/components/SVG/Grid.tsx +2 -2
  97. package/src/components/SVG/Markers.tsx +1 -1
  98. package/src/components/SVG/Root.tsx +41 -9
  99. package/src/components/SVG/SVG.tsx +13 -4
  100. package/src/components/SVG/Svg.stories.tsx +23 -19
  101. package/src/components/SVG/Zoom.tsx +1 -1
  102. package/src/fx/fx.stories.tsx +18 -15
  103. package/src/graph/projector/graph-bundle-projector.ts +210 -0
  104. package/src/graph/projector/graph-cluster-projector.ts +325 -0
  105. package/src/graph/projector/graph-drag.ts +1 -1
  106. package/src/graph/projector/graph-force-projector.ts +8 -4
  107. package/src/graph/projector/graph-forces.ts +1 -1
  108. package/src/graph/projector/graph-hierarchical-projector.ts +5 -4
  109. package/src/graph/projector/graph-lattice-projector.ts +86 -0
  110. package/src/graph/projector/graph-projector.ts +12 -5
  111. package/src/graph/projector/graph-radial-projector.ts +33 -5
  112. package/src/graph/projector/graph-relational-projector.ts +5 -4
  113. package/src/graph/projector/index.ts +3 -0
  114. package/src/graph/projector/projector.ts +13 -4
  115. package/src/graph/renderer/bullets.ts +1 -1
  116. package/src/graph/renderer/graph-renderer.ts +178 -32
  117. package/src/graph/renderer/renderer.ts +16 -5
  118. package/src/graph/types.ts +15 -1
  119. package/src/hooks/useStateRef.ts +1 -1
  120. package/src/hooks/useZoom.ts +1 -1
  121. package/src/stories/hooks.stories.tsx +49 -37
  122. package/src/testing/data.ts +14 -14
  123. package/src/testing/hooks.ts +5 -5
  124. package/src/testing/model.ts +6 -6
  125. package/src/util/fraction.ts +1 -1
  126. package/src/util/index.ts +2 -2
  127. package/src/util/screen.test.ts +1 -1
  128. package/src/util/screen.ts +1 -1
  129. package/src/util/vector.ts +1 -1
  130. package/styles/graph.css +341 -43
  131. package/dist/lib/browser/chunk-4C5Z5DAE.mjs +0 -979
  132. package/dist/lib/browser/chunk-4C5Z5DAE.mjs.map +0 -7
  133. package/dist/lib/node-esm/chunk-AK6HNA4R.mjs +0 -981
  134. package/dist/lib/node-esm/chunk-AK6HNA4R.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.84f28bd",
3
+ "version": "0.8.4-main.8baae0fced",
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.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.84f28bd",
50
- "@dxos/debug": "0.8.4-main.84f28bd",
51
- "@dxos/echo-signals": "0.8.4-main.84f28bd",
52
- "@dxos/log": "0.8.4-main.84f28bd",
53
- "@dxos/graph": "0.8.4-main.84f28bd",
54
- "@dxos/node-std": "0.8.4-main.84f28bd",
55
- "@dxos/invariant": "0.8.4-main.84f28bd"
47
+ "@dxos/debug": "0.8.4-main.8baae0fced",
48
+ "@dxos/graph": "0.8.4-main.8baae0fced",
49
+ "@dxos/async": "0.8.4-main.8baae0fced",
50
+ "@dxos/log": "0.8.4-main.8baae0fced",
51
+ "@dxos/node-std": "0.8.4-main.8baae0fced",
52
+ "@dxos/invariant": "0.8.4-main.8baae0fced",
53
+ "@dxos/react-ui-mosaic": "0.8.4-main.8baae0fced"
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/random": "0.8.4-main.84f28bd",
69
- "@dxos/react-ui": "0.8.4-main.84f28bd",
70
- "@dxos/react-ui-syntax-highlighter": "0.8.4-main.84f28bd",
71
- "@dxos/react-ui-theme": "0.8.4-main.84f28bd",
72
- "@dxos/storybook-utils": "0.8.4-main.84f28bd",
73
- "@dxos/react-ui-stack": "0.8.4-main.84f28bd"
63
+ "postcss": "^8.5.12",
64
+ "react": "~19.2.3",
65
+ "react-dom": "~19.2.3",
66
+ "@dxos/random": "0.8.4-main.8baae0fced",
67
+ "@dxos/react-ui": "0.8.4-main.8baae0fced",
68
+ "@dxos/react-ui-stack": "0.8.4-main.8baae0fced",
69
+ "@dxos/storybook-utils": "0.8.4-main.8baae0fced",
70
+ "@dxos/react-ui-syntax-highlighter": "0.8.4-main.8baae0fced",
71
+ "@dxos/ui-theme": "0.8.4-main.8baae0fced"
74
72
  },
75
73
  "peerDependencies": {
76
- "react": "~18.2.0",
77
- "react-dom": "~18.2.0",
78
- "@dxos/react-ui": "0.8.4-main.84f28bd",
79
- "@dxos/react-ui-theme": "0.8.4-main.84f28bd"
74
+ "react": "~19.2.3",
75
+ "react-dom": "~19.2.3",
76
+ "@dxos/react-ui": "0.8.4-main.8baae0fced",
77
+ "@dxos/ui-theme": "0.8.4-main.8baae0fced"
80
78
  },
81
79
  "optionalDependencies": {
82
- "@dxos/random": "0.8.4-main.84f28bd"
80
+ "@dxos/random": "0.8.4-main.8baae0fced"
83
81
  },
84
82
  "publishConfig": {
85
83
  "access": "public"
@@ -2,40 +2,39 @@
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';
8
- import { type StoryObj } from '@storybook/react-vite';
7
+ import { RegistryContext } from '@effect-atom/atom-react';
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 GraphModel, SelectionModel, type Graph } 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 { type Meta, 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
- import { Graph as GraphComponent, type GraphController, type GraphProps } from './Graph';
20
20
  import { Pulsar } from '../../fx';
21
21
  import {
22
22
  GraphForceProjector,
23
23
  type GraphForceProjectorOptions,
24
24
  GraphHierarchicalProjector,
25
25
  type GraphHierarchicalProjectorOptions,
26
+ type GraphLayoutEdge,
27
+ type GraphLayoutNode,
28
+ type GraphProjector,
26
29
  GraphRadialProjector,
27
30
  type GraphRadialProjectorOptions,
28
31
  GraphRelationalProjector,
29
32
  type GraphRelationalProjectorOptions,
30
- type GraphLayoutEdge,
31
- type GraphLayoutNode,
32
- type GraphProjector,
33
33
  } from '../../graph';
34
34
  import { type SVGContext } from '../../hooks';
35
- import { convertTreeToGraph, createGraph, createNode, createTree, TestGraphModel, type TestNode } from '../../testing';
35
+ import { TestGraphModel, type TestNode, convertTreeToGraph, createGraph, createNode, createTree } from '../../testing';
36
36
  import { SVG, type SVGGridProps } from '../SVG';
37
-
38
- import '../../../styles/graph.css';
37
+ import { Graph as GraphComponent, type GraphController, type GraphProps } from './Graph';
39
38
 
40
39
  type ProjectorType = 'force' | 'radial' | 'hierarchical' | 'relational';
41
40
 
@@ -50,12 +49,12 @@ const projectorTypes: Record<ProjectorType, Factory> = {
50
49
  relational: GraphRelationalProjector as Factory,
51
50
  };
52
51
 
53
- type StoryProps = GraphProps & {
52
+ type DefaultStoryProps = GraphProps & {
54
53
  debug?: boolean;
55
54
  grid?: boolean | SVGGridProps;
56
55
  inspect?: boolean;
57
- singleSelect?: boolean;
58
- graph: () => Graph;
56
+ graph: () => Graph.Any;
57
+ selectionMode?: SelectionMode;
59
58
  projectorType?: ProjectorType;
60
59
  projectorOptions?:
61
60
  | GraphForceProjectorOptions
@@ -68,18 +67,22 @@ const DefaultStory = ({
68
67
  debug,
69
68
  grid,
70
69
  inspect,
71
- singleSelect,
70
+ selectionMode,
72
71
  graph: _graph,
73
72
  projectorType: _projectorType = 'force',
74
73
  projectorOptions,
75
74
  ...props
76
- }: StoryProps) => {
75
+ }: DefaultStoryProps) => {
77
76
  const graphRef = useRef<GraphController | null>(null);
78
77
  const context = useRef<SVGContext>(null);
78
+ const registry = useContext(RegistryContext);
79
79
 
80
80
  // Models.
81
- const [model, setModel] = useState<GraphModel | undefined>(() => new TestGraphModel(_graph?.()));
82
- 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
+ });
83
86
 
84
87
  // Projector.
85
88
  const [projectorType, setProjectorType] = useState<ProjectorType>(_projectorType);
@@ -156,8 +159,9 @@ const DefaultStory = ({
156
159
  }, [model]);
157
160
 
158
161
  const handleRegenerate = useCallback(() => {
159
- setModel(new TestGraphModel(_graph?.()));
160
- }, [_graph]);
162
+ const graph = _graph?.();
163
+ setModel(graph ? new TestGraphModel(registry, graph) : undefined);
164
+ }, [_graph, registry]);
161
165
 
162
166
  const handleClear = useCallback(() => {
163
167
  setModel(undefined);
@@ -181,7 +185,7 @@ const DefaultStory = ({
181
185
 
182
186
  const active = useMemo(() => new SelectionModel(), []);
183
187
  const handlePing = useCallback(() => {
184
- for (const id of active.selected.value) {
188
+ for (const id of active.getSelectedIds()) {
185
189
  const node = graphRef.current?.findNode(id);
186
190
  if (node) {
187
191
  Pulsar.remove(select(node));
@@ -189,7 +193,7 @@ const DefaultStory = ({
189
193
  }
190
194
 
191
195
  active.clear();
192
- for (const id of selection.selected.value) {
196
+ for (const id of selection.getSelectedIds()) {
193
197
  const node = graphRef.current?.findNode(id);
194
198
  if (node) {
195
199
  active.add(id);
@@ -201,7 +205,7 @@ const DefaultStory = ({
201
205
 
202
206
  return (
203
207
  <Popover.Root open={!!popover} onOpenChange={(state) => !state && setPopover(undefined)}>
204
- <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]')}>
205
209
  <SVG.Root ref={context}>
206
210
  <SVG.Markers />
207
211
  {grid && <SVG.Grid {...(typeof grid === 'boolean' ? { axis: grid } : grid)} />}
@@ -216,7 +220,7 @@ const DefaultStory = ({
216
220
  attributes={{
217
221
  node: (node: GraphLayoutNode<TestNode>) => ({
218
222
  data: {
219
- color: getHashColor(node.data?.type ?? node.type)?.color,
223
+ color: getHashStyles(node.data?.type ?? node.type)?.hue,
220
224
  },
221
225
  classes: {
222
226
  'dx-selected': selection.contains(node.id),
@@ -224,7 +228,7 @@ const DefaultStory = ({
224
228
  }),
225
229
  edge: (edge: GraphLayoutEdge<TestNode>) => ({
226
230
  data: {
227
- color: getHashColor(edge.data?.type ?? edge.type)?.color,
231
+ color: getHashStyles(edge.data?.type ?? edge.type)?.hue,
228
232
  },
229
233
  }),
230
234
  }}
@@ -255,13 +259,9 @@ const DefaultStory = ({
255
259
  <Popover.VirtualTrigger virtualRef={popoverAnchorRef} />
256
260
  <Popover.Content onOpenAutoFocus={(event) => event.preventDefault()}>
257
261
  <Popover.Viewport>
258
- <Card.SurfaceRoot role='popover'>
259
- <SyntaxHighlighter
260
- classNames='bg-transparent text-xs !mlb-cardSpacingBlock !pli-cardSpacingInline !overflow-visible'
261
- language='json'
262
- code={JSON.stringify(popover, null, 2)}
263
- />
264
- </Card.SurfaceRoot>
262
+ <Card.Root>
263
+ <JsonHighlighter data={popover} classNames='text-xs my-form-padding px-form-padding bg-transparent' />
264
+ </Card.Root>
265
265
  </Popover.Viewport>
266
266
  <Popover.Arrow />
267
267
  </Popover.Content>
@@ -282,7 +282,7 @@ const Debug = ({
282
282
  onDelete,
283
283
  onPing,
284
284
  }: {
285
- model?: GraphModel;
285
+ model?: GraphModel.ReactiveGraphModel;
286
286
  selection: SelectionModel;
287
287
  projector: ProjectorType;
288
288
  onToggleProjector: () => void;
@@ -296,44 +296,50 @@ const Debug = ({
296
296
  }) => {
297
297
  const [data, setData] = useState({});
298
298
  useEffect(() => {
299
- effect(() => {
300
- setData({
301
- projector,
302
- selection: selection.toJSON(),
303
- model: model?.toJSON(),
304
- });
299
+ setData({
300
+ projector,
301
+ selection: selection.toJSON(),
302
+ model: model?.toJSON(),
305
303
  });
306
304
  }, [model, selection, projector]);
307
305
 
308
306
  return (
309
307
  <div className='flex flex-col overflow-hidden'>
310
308
  <Toolbar.Root>
311
- <IconButton onClick={onToggleProjector} size={5} label='Projector' icon='ph--graph--regular' iconOnly />
312
- <IconButton onClick={onRefresh} size={5} label='Refresh' icon='ph--arrow-clockwise--regular' iconOnly />
313
- <IconButton onClick={onRepaint} size={5} label='Repaint' icon='ph--paint-roller--regular' iconOnly />
314
- <IconButton onClick={onRegenerate} size={5} label='Regenerate' icon='ph--arrows-clockwise--regular' iconOnly />
315
- <IconButton onClick={onClear} size={5} label='Clear' icon='ph--trash--regular' iconOnly />
316
- <IconButton onClick={onAdd} size={5} label='Add' icon='ph--plus--regular' iconOnly />
317
- <IconButton onClick={onDelete} size={5} label='Delete' icon='ph--x--regular' iconOnly />
318
- <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 />
319
317
  </Toolbar.Root>
320
- <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>
321
326
  </div>
322
327
  );
323
328
  };
324
329
 
325
- const meta: Meta<StoryProps> = {
330
+ const meta = {
326
331
  title: 'ui/react-ui-graph/Graph',
327
332
  render: DefaultStory,
328
- decorators: [withTheme, withLayout({ fullscreen: true })],
333
+ decorators: [withRegistry, withTheme(), withLayout({ layout: 'fullscreen' })],
329
334
  parameters: {
335
+ layout: 'fullscreen',
330
336
  controls: { disable: true },
331
337
  },
332
- };
338
+ } satisfies Meta<typeof DefaultStory>;
333
339
 
334
340
  export default meta;
335
341
 
336
- type Story = StoryObj<StoryProps>;
342
+ type Story = StoryObj<typeof meta>;
337
343
 
338
344
  export const Default: Story = {
339
345
  args: {
@@ -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,
@@ -449,14 +455,12 @@ export const WithPopover: Story = {
449
455
  },
450
456
  };
451
457
 
452
- export const Empty: Story = {
453
- render: () => (
454
- <SVG.Root>
455
- <SVG.Markers />
456
- <SVG.Grid axis />
457
- <SVG.Zoom extent={[1 / 4, 4]}>
458
- <GraphComponent />
459
- </SVG.Zoom>
460
- </SVG.Root>
461
- ),
462
- };
458
+ export const Empty = () => (
459
+ <SVG.Root>
460
+ <SVG.Markers />
461
+ <SVG.Grid axis />
462
+ <SVG.Zoom extent={[1 / 4, 4]}>
463
+ <GraphComponent />
464
+ </SVG.Zoom>
465
+ </SVG.Root>
466
+ );
@@ -2,22 +2,21 @@
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
- createGraphDrag,
16
14
  GraphForceProjector,
17
15
  type GraphLayoutNode,
18
16
  type GraphProjector,
19
17
  GraphRenderer,
20
18
  type GraphRendererOptions,
19
+ createGraphDrag,
21
20
  } from '../../graph';
22
21
  import { useSvgContext } from '../../hooks';
23
22
 
@@ -27,24 +26,28 @@ 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<
31
- Pick<GraphRendererOptions<Node>, 'labels' | 'subgraphs' | 'attributes'> & {
32
- model?: GraphModel<Node, Edge>; // TODO(burdon): ReactiveGraphModel
29
+ export type GraphProps<Node extends Graph$.Node.Any = any, Edge extends Graph$.Edge.Any = any> = ThemedClassName<
30
+ Pick<GraphRendererOptions<Node>, 'labels' | 'subgraphs' | 'attributes' | 'renderNode'> & {
31
+ model?: GraphModel.ReactiveGraphModel<Node, Edge>;
33
32
  projector?: GraphProjector<Node>;
34
33
  renderer?: GraphRenderer<Node>;
35
34
  drag?: boolean;
36
35
  arrows?: boolean;
37
36
  onSelect?: (node: GraphLayoutNode<Node>, event: MouseEvent) => void;
38
- onInspect?: (node: GraphLayoutNode<Node>, event: MouseEvent) => void;
37
+ /**
38
+ * Fires on pointerenter with the hovered node, and on pointerleave with `null`.
39
+ * Use the `null` signal to clear hover-driven previews / highlights.
40
+ */
41
+ onInspect?: (node: GraphLayoutNode<Node> | null, event: MouseEvent) => void;
39
42
  }
40
43
  >;
41
44
 
42
- export const GraphInner = <Node extends BaseGraphNode = any, Edge extends BaseGraphEdge = any>(
45
+ const GraphInner = <Node extends Graph$.Node.Any = any, Edge extends Graph$.Edge.Any = any>(
43
46
  {
44
47
  classNames,
45
48
  model,
46
- projector: _projector,
47
- renderer: _renderer,
49
+ projector: projectorProp,
50
+ renderer: rendererProp,
48
51
  drag,
49
52
  arrows,
50
53
  onSelect,
@@ -54,28 +57,45 @@ export const GraphInner = <Node extends BaseGraphNode = any, Edge extends BaseGr
54
57
  forwardedRef: Ref<GraphController>,
55
58
  ) => {
56
59
  const context = useSvgContext();
57
- const graphRef = useRef<SVGGElement>();
60
+ const graphRef = useRef<SVGGElement>(null);
58
61
 
59
62
  const { projector, renderer } = useMemo(() => {
60
- let projector = _projector;
63
+ let projector = projectorProp;
61
64
  if (!projector) {
62
65
  projector = new GraphForceProjector<Node>(context);
63
66
  }
64
67
 
65
- let renderer = _renderer;
68
+ let renderer = rendererProp;
66
69
  if (!renderer) {
67
70
  renderer = new GraphRenderer<Node>(context, graphRef, {
68
71
  ...props,
69
72
  // TODO(burdon): Replace drag when projector is updated.
70
73
  drag: drag ? createGraphDrag(context, projector) : undefined,
71
74
  arrows: { end: arrows },
72
- onNodeClick: onSelect ? (node: GraphLayoutNode, event) => onSelect(node, event) : undefined,
73
- onNodePointerEnter: onInspect ? (node: GraphLayoutNode, event) => onInspect(node, event) : undefined,
75
+ onNodeClick: onSelect,
76
+ onNodePointerEnter: onInspect ? (node, event) => onInspect(node, event) : undefined,
77
+ // Pair pointerenter with leave so consumers can clear hover-driven previews.
78
+ // The callback receives `null` on leave (event still carries the source).
79
+ onNodePointerLeave: onInspect ? (_node, event) => onInspect(null, event) : undefined,
74
80
  });
75
81
  }
76
82
 
77
83
  return { projector, renderer };
78
- }, [context, _projector, _renderer, drag]);
84
+ // Renderer options are baked into the instance — re-memo when any of them change
85
+ // so a swapped `renderNode` / handler is actually applied.
86
+ }, [
87
+ context,
88
+ projectorProp,
89
+ rendererProp,
90
+ drag,
91
+ arrows,
92
+ onSelect,
93
+ onInspect,
94
+ props.labels,
95
+ props.subgraphs,
96
+ props.attributes,
97
+ props.renderNode,
98
+ ]);
79
99
 
80
100
  // External API.
81
101
  useImperativeHandle(
@@ -96,19 +116,34 @@ export const GraphInner = <Node extends BaseGraphNode = any, Edge extends BaseGr
96
116
 
97
117
  // Subscriptions.
98
118
  useEffect(() => {
99
- return combine(
100
- effect(() => {
101
- projector.updateData(model?.graph);
102
- }),
103
- projector.updated.on(({ layout }) => {
119
+ // Wire the renderer listener BEFORE calling updateData so the synchronous
120
+ // 'topology' emit (fired from inside onUpdate) reaches the renderer.
121
+ const cleanup = combine(
122
+ // Subscribe to model changes if reactive model.
123
+ model
124
+ ? model.subscribe(() => {
125
+ projector.updateData(model?.graph);
126
+ })
127
+ : undefined,
128
+
129
+ projector.updated.on(({ layout, kind }) => {
104
130
  try {
105
- renderer.render(layout);
131
+ // 'positions' is the per-tick fast path; 'topology' (and unset, for back-compat) is the full render.
132
+ if (kind === 'positions') {
133
+ renderer.applyPositions(layout);
134
+ } else {
135
+ renderer.render(layout);
136
+ }
106
137
  } catch (error) {
107
- void projector.stop();
108
138
  log.catch(error);
139
+ void projector.stop();
109
140
  }
110
141
  }),
111
142
  );
143
+
144
+ projector.updateData(model?.graph);
145
+
146
+ return cleanup;
112
147
  }, [model, projector, renderer]);
113
148
 
114
149
  // Start.
@@ -125,6 +160,6 @@ export const GraphInner = <Node extends BaseGraphNode = any, Edge extends BaseGr
125
160
  /**
126
161
  * SVG Graph.
127
162
  */
128
- export const Graph = forwardRef(GraphInner) as <Node extends BaseGraphNode = any, Edge extends BaseGraphEdge = any>(
163
+ export const Graph = forwardRef(GraphInner) as <Node extends Graph$.Node.Any = any, Edge extends Graph$.Edge.Any = any>(
129
164
  props: GraphProps<Node, Edge> & { ref?: Ref<GraphController> },
130
165
  ) => JSX.Element;
@@ -2,15 +2,13 @@
2
2
  // Copyright 2024 DXOS.org
3
3
  //
4
4
 
5
- import '@dxos-theme';
6
-
7
- import { type StoryObj } from '@storybook/react-vite';
5
+ import { type Meta, type StoryObj } from '@storybook/react-vite';
8
6
  import React, { useEffect, useState } from 'react';
9
7
 
10
- import { type Meta, withLayout, withTheme } from '@dxos/storybook-utils';
8
+ import { withLayout, withTheme } from '@dxos/react-ui/testing';
11
9
 
12
- import { Mesh } from './Mesh';
13
10
  import { SVG, type SVGRootProps } from '../SVG';
11
+ import { Mesh } from './Mesh';
14
12
 
15
13
  // TODO(burdon): Create waves/game of life.
16
14
  const DefaultStory = (props: SVGRootProps) => {
@@ -35,28 +33,33 @@ const DefaultStory = (props: SVGRootProps) => {
35
33
  );
36
34
  };
37
35
 
38
- const meta: Meta<typeof DefaultStory> = {
36
+ const meta = {
39
37
  title: 'ui/react-ui-graph/Mesh',
40
38
  render: DefaultStory,
41
- decorators: [withTheme, withLayout({ fullscreen: true })],
42
- };
39
+ decorators: [withTheme(), withLayout({ layout: 'fullscreen' })],
40
+ parameters: {
41
+ layout: 'fullscreen',
42
+ },
43
+ } satisfies Meta<typeof DefaultStory>;
43
44
 
44
45
  export default meta;
45
46
 
46
- type Story = StoryObj<typeof DefaultStory>;
47
+ type Story = StoryObj<typeof meta>;
47
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.
48
51
  export const Default: Story = {
49
52
  args: {
50
53
  classNames: [
51
- '[&>.mesh]:fill-none',
52
- '[&>.hexagon>path.fill]:fill-blue-800 [&>.hexagon]:stroke-blue-700',
53
- '[&>.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',
54
57
  ],
55
58
  },
56
59
  };
57
60
 
58
61
  export const Outline: Story = {
59
62
  args: {
60
- 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'],
61
64
  },
62
65
  };