@dxos/react-ui-graph 0.8.4-main.d05673bc65 → 0.8.4-main.d9fc60f731

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 (125) hide show
  1. package/LICENSE +102 -5
  2. package/dist/lib/browser/{chunk-LKC455GK.mjs → chunk-EASNZZ7B.mjs} +1 -1
  3. package/dist/lib/browser/{chunk-LKC455GK.mjs.map → chunk-EASNZZ7B.mjs.map} +2 -2
  4. package/dist/lib/browser/index.mjs +1787 -499
  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 +14 -14
  8. package/dist/lib/browser/testing/index.mjs.map +3 -3
  9. package/dist/lib/node-esm/{chunk-JE4KZCUF.mjs → chunk-JSE2X4ML.mjs} +1 -1
  10. package/dist/lib/node-esm/{chunk-JE4KZCUF.mjs.map → chunk-JSE2X4ML.mjs.map} +2 -2
  11. package/dist/lib/node-esm/index.mjs +1787 -499
  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 +14 -14
  15. package/dist/lib/node-esm/testing/index.mjs.map +3 -3
  16. package/dist/types/src/components/Graph/Graph.d.ts +22 -4
  17. package/dist/types/src/components/Graph/Graph.d.ts.map +1 -1
  18. package/dist/types/src/components/Graph/Graph.stories.d.ts +5 -5
  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.map +1 -1
  22. package/dist/types/src/components/SVG/FPS.d.ts +20 -0
  23. package/dist/types/src/components/SVG/FPS.d.ts.map +1 -0
  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 +5 -1
  27. package/dist/types/src/components/SVG/Root.d.ts.map +1 -1
  28. package/dist/types/src/components/SVG/SVG.d.ts +3 -1
  29. package/dist/types/src/components/SVG/SVG.d.ts.map +1 -1
  30. package/dist/types/src/components/SVG/Svg.stories.d.ts +1 -1
  31. package/dist/types/src/components/SVG/Svg.stories.d.ts.map +1 -1
  32. package/dist/types/src/fx/fx.stories.d.ts +3 -3
  33. package/dist/types/src/fx/fx.stories.d.ts.map +1 -1
  34. package/dist/types/src/fx/pulsar.d.ts.map +1 -1
  35. package/dist/types/src/graph/markers.d.ts.map +1 -1
  36. package/dist/types/src/graph/projector/graph-bundle-projector.d.ts +47 -0
  37. package/dist/types/src/graph/projector/graph-bundle-projector.d.ts.map +1 -0
  38. package/dist/types/src/graph/projector/graph-cluster-projector.d.ts +65 -0
  39. package/dist/types/src/graph/projector/graph-cluster-projector.d.ts.map +1 -0
  40. package/dist/types/src/graph/projector/graph-drag.d.ts.map +1 -1
  41. package/dist/types/src/graph/projector/graph-force-projector.d.ts.map +1 -1
  42. package/dist/types/src/graph/projector/graph-forces.d.ts.map +1 -1
  43. package/dist/types/src/graph/projector/graph-hierarchical-projector.d.ts.map +1 -1
  44. package/dist/types/src/graph/projector/graph-lattice-projector.d.ts +23 -0
  45. package/dist/types/src/graph/projector/graph-lattice-projector.d.ts.map +1 -0
  46. package/dist/types/src/graph/projector/graph-plexus-projector.d.ts +67 -0
  47. package/dist/types/src/graph/projector/graph-plexus-projector.d.ts.map +1 -0
  48. package/dist/types/src/graph/projector/graph-plexus-projector.test.d.ts +2 -0
  49. package/dist/types/src/graph/projector/graph-plexus-projector.test.d.ts.map +1 -0
  50. package/dist/types/src/graph/projector/graph-projector.d.ts +8 -0
  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 +6 -0
  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.map +1 -1
  55. package/dist/types/src/graph/projector/graph-swarm-projector.d.ts +72 -0
  56. package/dist/types/src/graph/projector/graph-swarm-projector.d.ts.map +1 -0
  57. package/dist/types/src/graph/projector/index.d.ts +5 -0
  58. package/dist/types/src/graph/projector/index.d.ts.map +1 -1
  59. package/dist/types/src/graph/projector/projector.d.ts +10 -1
  60. package/dist/types/src/graph/projector/projector.d.ts.map +1 -1
  61. package/dist/types/src/graph/renderer/bullets.d.ts.map +1 -1
  62. package/dist/types/src/graph/renderer/graph-renderer.d.ts +41 -1
  63. package/dist/types/src/graph/renderer/graph-renderer.d.ts.map +1 -1
  64. package/dist/types/src/graph/renderer/index.d.ts +1 -0
  65. package/dist/types/src/graph/renderer/index.d.ts.map +1 -1
  66. package/dist/types/src/graph/renderer/labels.d.ts +33 -0
  67. package/dist/types/src/graph/renderer/labels.d.ts.map +1 -0
  68. package/dist/types/src/graph/renderer/renderer.d.ts +12 -1
  69. package/dist/types/src/graph/renderer/renderer.d.ts.map +1 -1
  70. package/dist/types/src/graph/types.d.ts +14 -0
  71. package/dist/types/src/graph/types.d.ts.map +1 -1
  72. package/dist/types/src/hooks/useGrid.d.ts.map +1 -1
  73. package/dist/types/src/hooks/useStateRef.d.ts.map +1 -1
  74. package/dist/types/src/hooks/useSvgContext.d.ts.map +1 -1
  75. package/dist/types/src/hooks/useZoom.d.ts.map +1 -1
  76. package/dist/types/src/stories/experimental.stories.d.ts +7 -0
  77. package/dist/types/src/stories/experimental.stories.d.ts.map +1 -0
  78. package/dist/types/src/stories/hooks.stories.d.ts +1 -1
  79. package/dist/types/src/stories/hooks.stories.d.ts.map +1 -1
  80. package/dist/types/src/testing/data.d.ts +1 -1
  81. package/dist/types/src/testing/data.d.ts.map +1 -1
  82. package/dist/types/src/testing/hooks.d.ts.map +1 -1
  83. package/dist/types/src/testing/model.d.ts.map +1 -1
  84. package/dist/types/src/util/events.d.ts.map +1 -1
  85. package/dist/types/src/util/fraction.d.ts.map +1 -1
  86. package/dist/types/src/util/points.d.ts.map +1 -1
  87. package/dist/types/src/util/scale.d.ts.map +1 -1
  88. package/dist/types/src/util/screen.d.ts.map +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 +19 -26
  92. package/src/components/Graph/Graph.stories.tsx +21 -19
  93. package/src/components/Graph/Graph.tsx +115 -19
  94. package/src/components/Mesh/Mesh.stories.tsx +6 -5
  95. package/src/components/Mesh/Mesh.tsx +43 -35
  96. package/src/components/SVG/FPS.tsx +91 -0
  97. package/src/components/SVG/Root.tsx +30 -4
  98. package/src/components/SVG/SVG.tsx +4 -2
  99. package/src/components/SVG/Svg.stories.tsx +2 -3
  100. package/src/fx/fx.stories.tsx +5 -6
  101. package/src/graph/projector/graph-bundle-projector.ts +210 -0
  102. package/src/graph/projector/graph-cluster-projector.ts +337 -0
  103. package/src/graph/projector/graph-drag.ts +0 -1
  104. package/src/graph/projector/graph-force-projector.ts +6 -2
  105. package/src/graph/projector/graph-hierarchical-projector.ts +1 -1
  106. package/src/graph/projector/graph-lattice-projector.ts +86 -0
  107. package/src/graph/projector/graph-plexus-projector.test.ts +102 -0
  108. package/src/graph/projector/graph-plexus-projector.ts +309 -0
  109. package/src/graph/projector/graph-projector.ts +22 -2
  110. package/src/graph/projector/graph-radial-projector.ts +30 -3
  111. package/src/graph/projector/graph-relational-projector.ts +1 -1
  112. package/src/graph/projector/graph-swarm-projector.ts +373 -0
  113. package/src/graph/projector/index.ts +5 -0
  114. package/src/graph/projector/projector.ts +12 -3
  115. package/src/graph/renderer/graph-renderer.ts +289 -31
  116. package/src/graph/renderer/index.ts +1 -0
  117. package/src/graph/renderer/labels.ts +138 -0
  118. package/src/graph/renderer/renderer.ts +15 -4
  119. package/src/graph/types.ts +14 -0
  120. package/src/stories/experimental.stories.tsx +446 -0
  121. package/src/stories/hooks.stories.tsx +8 -3
  122. package/src/testing/data.ts +9 -9
  123. package/src/testing/hooks.ts +2 -3
  124. package/src/testing/model.ts +3 -3
  125. package/styles/graph.css +52 -3
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@dxos/react-ui-graph",
3
- "version": "0.8.4-main.d05673bc65",
3
+ "version": "0.8.4-main.d9fc60f731",
4
4
  "description": "GEM Graph.",
5
5
  "homepage": "https://dxos.org",
6
6
  "bugs": "https://github.com/dxos/dxos/issues",
@@ -8,7 +8,7 @@
8
8
  "type": "git",
9
9
  "url": "https://github.com/dxos/dxos"
10
10
  },
11
- "license": "MIT",
11
+ "license": "FSL-1.1-Apache-2.0",
12
12
  "author": "DXOS.org",
13
13
  "sideEffects": [
14
14
  "*.css"
@@ -28,13 +28,6 @@
28
28
  "./styles/graph.css": "./styles/graph.css"
29
29
  },
30
30
  "types": "dist/types/src/index.d.ts",
31
- "typesVersions": {
32
- "*": {
33
- "testing": [
34
- "dist/types/src/testing/index.d.ts"
35
- ]
36
- }
37
- },
38
31
  "files": [
39
32
  "testing.d.ts",
40
33
  "testing.js",
@@ -51,13 +44,13 @@
51
44
  "lodash.defaultsdeep": "^4.6.1",
52
45
  "react-resize-detector": "^11.0.1",
53
46
  "topojson-client": "^3.1.0",
54
- "@dxos/async": "0.8.4-main.d05673bc65",
55
- "@dxos/invariant": "0.8.4-main.d05673bc65",
56
- "@dxos/debug": "0.8.4-main.d05673bc65",
57
- "@dxos/node-std": "0.8.4-main.d05673bc65",
58
- "@dxos/react-ui-mosaic": "0.8.4-main.d05673bc65",
59
- "@dxos/log": "0.8.4-main.d05673bc65",
60
- "@dxos/graph": "0.8.4-main.d05673bc65"
47
+ "@dxos/async": "0.8.4-main.d9fc60f731",
48
+ "@dxos/debug": "0.8.4-main.d9fc60f731",
49
+ "@dxos/graph": "0.8.4-main.d9fc60f731",
50
+ "@dxos/invariant": "0.8.4-main.d9fc60f731",
51
+ "@dxos/node-std": "0.8.4-main.d9fc60f731",
52
+ "@dxos/react-ui-mosaic": "0.8.4-main.d9fc60f731",
53
+ "@dxos/log": "0.8.4-main.d9fc60f731"
61
54
  },
62
55
  "devDependencies": {
63
56
  "@babel/core": "^7.18.13",
@@ -67,24 +60,24 @@
67
60
  "@types/react-dom": "~19.2.3",
68
61
  "@types/topojson-client": "^3.1.4",
69
62
  "@types/topojson-specification": "^1.0.5",
70
- "postcss": "^8.4.41",
63
+ "postcss": "^8.5.12",
71
64
  "react": "~19.2.3",
72
65
  "react-dom": "~19.2.3",
73
- "@dxos/random": "0.8.4-main.d05673bc65",
74
- "@dxos/react-ui": "0.8.4-main.d05673bc65",
75
- "@dxos/react-ui-syntax-highlighter": "0.8.4-main.d05673bc65",
76
- "@dxos/react-ui-stack": "0.8.4-main.d05673bc65",
77
- "@dxos/ui-theme": "0.8.4-main.d05673bc65",
78
- "@dxos/storybook-utils": "0.8.4-main.d05673bc65"
66
+ "@dxos/react-ui-stack": "0.8.4-main.d9fc60f731",
67
+ "@dxos/storybook-utils": "0.8.4-main.d9fc60f731",
68
+ "@dxos/react-ui-syntax-highlighter": "0.8.4-main.d9fc60f731",
69
+ "@dxos/ui-theme": "0.8.4-main.d9fc60f731",
70
+ "@dxos/react-ui": "0.8.4-main.d9fc60f731",
71
+ "@dxos/random": "0.8.4-main.d9fc60f731"
79
72
  },
80
73
  "peerDependencies": {
81
74
  "react": "~19.2.3",
82
75
  "react-dom": "~19.2.3",
83
- "@dxos/react-ui": "0.8.4-main.d05673bc65",
84
- "@dxos/ui-theme": "0.8.4-main.d05673bc65"
76
+ "@dxos/react-ui": "0.8.4-main.d9fc60f731",
77
+ "@dxos/ui-theme": "0.8.4-main.d9fc60f731"
85
78
  },
86
79
  "optionalDependencies": {
87
- "@dxos/random": "0.8.4-main.d05673bc65"
80
+ "@dxos/random": "0.8.4-main.d9fc60f731"
88
81
  },
89
82
  "publishConfig": {
90
83
  "access": "public"
@@ -2,16 +2,18 @@
2
2
  // Copyright 2022 DXOS.org
3
3
  //
4
4
 
5
+ import '../../../styles/graph.css';
6
+
5
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
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
14
  import { Card } from '@dxos/react-ui';
15
+ import { JsonHighlighter, Syntax } from '@dxos/react-ui-syntax-highlighter';
13
16
  import { withLayout, withTheme } from '@dxos/react-ui/testing';
14
- import { JsonFilter, SyntaxHighlighter } from '@dxos/react-ui-syntax-highlighter';
15
17
  import { withRegistry } from '@dxos/storybook-utils';
16
18
  import { getHashStyles, mx } from '@dxos/ui-theme';
17
19
 
@@ -32,11 +34,8 @@ import {
32
34
  import { type SVGContext } from '../../hooks';
33
35
  import { TestGraphModel, type TestNode, convertTreeToGraph, createGraph, createNode, createTree } from '../../testing';
34
36
  import { SVG, type SVGGridProps } from '../SVG';
35
-
36
37
  import { Graph as GraphComponent, type GraphController, type GraphProps } from './Graph';
37
38
 
38
- import '../../../styles/graph.css';
39
-
40
39
  type ProjectorType = 'force' | 'radial' | 'hierarchical' | 'relational';
41
40
 
42
41
  type Factory = {
@@ -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
56
  graph: () => Graph.Any;
57
+ selectionMode?: SelectionMode;
59
58
  projectorType?: ProjectorType;
60
59
  projectorOptions?:
61
60
  | GraphForceProjectorOptions
@@ -68,22 +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);
79
78
  const registry = useContext(RegistryContext);
80
79
 
81
80
  // Models.
82
- const [model, setModel] = useState<GraphModel.GraphModel | undefined>(() => {
81
+ const selection = useMemo(() => new SelectionModel({ mode: selectionMode }), [selectionMode]);
82
+ const [model, setModel] = useState<GraphModel.ReactiveGraphModel | undefined>(() => {
83
83
  const graph = _graph?.();
84
84
  return graph ? new TestGraphModel(registry, graph) : undefined;
85
85
  });
86
- const selection = useMemo(() => new SelectionModel(singleSelect), [singleSelect]);
87
86
 
88
87
  // Projector.
89
88
  const [projectorType, setProjectorType] = useState<ProjectorType>(_projectorType);
@@ -261,11 +260,7 @@ const DefaultStory = ({
261
260
  <Popover.Content onOpenAutoFocus={(event) => event.preventDefault()}>
262
261
  <Popover.Viewport>
263
262
  <Card.Root>
264
- <SyntaxHighlighter
265
- language='json'
266
- classNames='text-xs my-form-padding px-form-padding bg-transparent'
267
- code={JSON.stringify(popover, null, 2)}
268
- />
263
+ <JsonHighlighter data={popover} classNames='text-xs my-form-padding px-form-padding bg-transparent' />
269
264
  </Card.Root>
270
265
  </Popover.Viewport>
271
266
  <Popover.Arrow />
@@ -287,7 +282,7 @@ const Debug = ({
287
282
  onDelete,
288
283
  onPing,
289
284
  }: {
290
- model?: GraphModel.GraphModel;
285
+ model?: GraphModel.ReactiveGraphModel;
291
286
  selection: SelectionModel;
292
287
  projector: ProjectorType;
293
288
  onToggleProjector: () => void;
@@ -320,7 +315,14 @@ const Debug = ({
320
315
  <IconButton onClick={onDelete} label='Delete' icon='ph--x--regular' iconOnly />
321
316
  <IconButton onClick={onPing} label='Delete' icon='ph--crosshair-simple--regular' iconOnly />
322
317
  </Toolbar.Root>
323
- <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>
324
326
  </div>
325
327
  );
326
328
  };
@@ -357,7 +359,7 @@ export const Projector: Story = {
357
359
  debug: true,
358
360
  drag: true,
359
361
  arrows: true,
360
- singleSelect: true,
362
+ selectionMode: 'single',
361
363
  projectorType: 'hierarchical',
362
364
  projectorOptions: {
363
365
  duration: 500,
@@ -5,7 +5,7 @@
5
5
  import React, { type JSX, type Ref, forwardRef, useEffect, useImperativeHandle, useMemo, useRef } from 'react';
6
6
 
7
7
  import { combine } from '@dxos/async';
8
- import { type Graph as Graph$, type GraphModel } from '@dxos/graph';
8
+ import { GraphModel, type Graph as Graph$ } from '@dxos/graph';
9
9
  import { log } from '@dxos/log';
10
10
  import { type ThemedClassName } from '@dxos/react-ui';
11
11
  import { mx } from '@dxos/ui-theme';
@@ -26,15 +26,34 @@ export type GraphController = {
26
26
  findNode: (id: string) => SVGGElement | null;
27
27
  };
28
28
 
29
+ /** Cursor position expressed in the same SVG model coordinates that node `x/y` live in (centered origin, post-zoom). */
30
+ export type ModelPoint = { x: number; y: number };
31
+
29
32
  export type GraphProps<Node extends Graph$.Node.Any = any, Edge extends Graph$.Edge.Any = any> = ThemedClassName<
30
- Pick<GraphRendererOptions<Node>, 'labels' | 'subgraphs' | 'attributes'> & {
31
- model?: GraphModel.GraphModel<Node, Edge>; // TODO(burdon): ReactiveGraphModel
33
+ Pick<
34
+ GraphRendererOptions<Node>,
35
+ 'labels' | 'subgraphs' | 'attributes' | 'renderNode' | 'highlightOnHover' | 'applyNode' | 'edgeOpacity'
36
+ > & {
37
+ model?: GraphModel.ReactiveGraphModel<Node, Edge>;
32
38
  projector?: GraphProjector<Node>;
33
39
  renderer?: GraphRenderer<Node>;
34
40
  drag?: boolean;
35
41
  arrows?: boolean;
36
42
  onSelect?: (node: GraphLayoutNode<Node>, event: MouseEvent) => void;
37
- onInspect?: (node: GraphLayoutNode<Node>, event: MouseEvent) => void;
43
+ /**
44
+ * Fires on pointerenter with the hovered node, and on pointerleave with `null`.
45
+ * Use the `null` signal to clear hover-driven previews / highlights.
46
+ */
47
+ onInspect?: (node: GraphLayoutNode<Node> | null, event: MouseEvent) => void;
48
+ /**
49
+ * Pointer-move in SVG model coordinates (the same space `node.x/y` live in — centered
50
+ * origin, post-zoom). The CTM lookup is done against the dx-graph group, so zoom + viewBox
51
+ * are both undone in one step. Pair with `onPointerLeave` to clear cursor-driven state.
52
+ * When either handler is set the renderer's `<svg>` is given `pointer-events: all` so
53
+ * events fire across empty canvas, not just over painted nodes.
54
+ */
55
+ onPointerMove?: (point: ModelPoint, event: PointerEvent) => void;
56
+ onPointerLeave?: (event: PointerEvent) => void;
38
57
  }
39
58
  >;
40
59
 
@@ -48,6 +67,8 @@ const GraphInner = <Node extends Graph$.Node.Any = any, Edge extends Graph$.Edge
48
67
  arrows,
49
68
  onSelect,
50
69
  onInspect,
70
+ onPointerMove,
71
+ onPointerLeave,
51
72
  ...props
52
73
  }: GraphProps<Node, Edge>,
53
74
  forwardedRef: Ref<GraphController>,
@@ -68,13 +89,40 @@ const GraphInner = <Node extends Graph$.Node.Any = any, Edge extends Graph$.Edge
68
89
  // TODO(burdon): Replace drag when projector is updated.
69
90
  drag: drag ? createGraphDrag(context, projector) : undefined,
70
91
  arrows: { end: arrows },
71
- onNodeClick: onSelect ? (node: GraphLayoutNode, event) => onSelect(node, event) : undefined,
72
- onNodePointerEnter: onInspect ? (node: GraphLayoutNode, event) => onInspect(node, event) : undefined,
92
+ // Projector intercept first so built-in interactions (e.g. cluster collapse) can
93
+ // run without consumers wiring them. Returning true suppresses the user handler.
94
+ onNodeClick: (node, event) => {
95
+ if (projector.handleNodeClick(node, event)) {
96
+ return;
97
+ }
98
+ onSelect?.(node, event);
99
+ },
100
+ onNodePointerEnter: onInspect ? (node, event) => onInspect(node, event) : undefined,
101
+ // Pair pointerenter with leave so consumers can clear hover-driven previews.
102
+ // The callback receives `null` on leave (event still carries the source).
103
+ onNodePointerLeave: onInspect ? (_node, event) => onInspect(null, event) : undefined,
73
104
  });
74
105
  }
75
106
 
76
107
  return { projector, renderer };
77
- }, [context, projectorProp, rendererProp, drag]);
108
+ // Renderer options are baked into the instance — re-memo when any of them change
109
+ // so a swapped `renderNode` / handler is actually applied.
110
+ }, [
111
+ context,
112
+ projectorProp,
113
+ rendererProp,
114
+ drag,
115
+ arrows,
116
+ onSelect,
117
+ onInspect,
118
+ props.labels,
119
+ props.subgraphs,
120
+ props.attributes,
121
+ props.renderNode,
122
+ props.highlightOnHover,
123
+ props.applyNode,
124
+ props.edgeOpacity,
125
+ ]);
78
126
 
79
127
  // External API.
80
128
  useImperativeHandle(
@@ -95,27 +143,34 @@ const GraphInner = <Node extends Graph$.Node.Any = any, Edge extends Graph$.Edge
95
143
 
96
144
  // Subscriptions.
97
145
  useEffect(() => {
98
- projector.updateData(model?.graph);
99
-
100
- // Subscribe to model changes if reactive model.
101
- const unsubscribeModel =
102
- model && 'subscribe' in model
103
- ? (model as GraphModel.ReactiveGraphModel).subscribe(() => {
146
+ // Wire the renderer listener BEFORE calling updateData so the synchronous
147
+ // 'topology' emit (fired from inside onUpdate) reaches the renderer.
148
+ const cleanup = combine(
149
+ // Subscribe to model changes if reactive model.
150
+ model
151
+ ? model.subscribe(() => {
104
152
  projector.updateData(model?.graph);
105
153
  })
106
- : undefined;
154
+ : undefined,
107
155
 
108
- return combine(
109
- unsubscribeModel,
110
- projector.updated.on(({ layout }) => {
156
+ projector.updated.on(({ layout, kind }) => {
111
157
  try {
112
- renderer.render(layout);
158
+ // 'positions' is the per-tick fast path; 'topology' (and unset, for back-compat) is the full render.
159
+ if (kind === 'positions') {
160
+ renderer.applyPositions(layout);
161
+ } else {
162
+ renderer.render(layout);
163
+ }
113
164
  } catch (error) {
114
- void projector.stop();
115
165
  log.catch(error);
166
+ void projector.stop();
116
167
  }
117
168
  }),
118
169
  );
170
+
171
+ projector.updateData(model?.graph);
172
+
173
+ return cleanup;
119
174
  }, [model, projector, renderer]);
120
175
 
121
176
  // Start.
@@ -126,6 +181,47 @@ const GraphInner = <Node extends Graph$.Node.Any = any, Edge extends Graph$.Edge
126
181
  };
127
182
  }, [projector]);
128
183
 
184
+ // Model-space pointer events. Attached to the SVG element so they fire across the entire
185
+ // canvas (with pointer-events: all), not just over painted nodes. The dx-graph group's CTM
186
+ // undoes both the centered viewBox and any active zoom in one step, landing the cursor in
187
+ // the same coordinate space the projector reads.
188
+ useEffect(() => {
189
+ if (!onPointerMove && !onPointerLeave) {
190
+ return;
191
+ }
192
+ const svg = context.svg;
193
+ if (!svg) {
194
+ return;
195
+ }
196
+ const previousPointerEvents = svg.style.pointerEvents;
197
+ svg.style.pointerEvents = 'all';
198
+ const handleMove = (event: PointerEvent) => {
199
+ if (!onPointerMove) {
200
+ return;
201
+ }
202
+ const target = graphRef.current;
203
+ const ctm = target?.getScreenCTM();
204
+ if (!target || !ctm) {
205
+ return;
206
+ }
207
+ const point = svg.createSVGPoint();
208
+ point.x = event.clientX;
209
+ point.y = event.clientY;
210
+ const modelPoint = point.matrixTransform(ctm.inverse());
211
+ onPointerMove({ x: modelPoint.x, y: modelPoint.y }, event);
212
+ };
213
+ const handleLeave = (event: PointerEvent) => {
214
+ onPointerLeave?.(event);
215
+ };
216
+ svg.addEventListener('pointermove', handleMove);
217
+ svg.addEventListener('pointerleave', handleLeave);
218
+ return () => {
219
+ svg.removeEventListener('pointermove', handleMove);
220
+ svg.removeEventListener('pointerleave', handleLeave);
221
+ svg.style.pointerEvents = previousPointerEvents;
222
+ };
223
+ }, [context, onPointerMove, onPointerLeave]);
224
+
129
225
  return <g ref={graphRef} className={mx('dx-graph', classNames)} />;
130
226
  };
131
227
 
@@ -8,7 +8,6 @@ import React, { useEffect, useState } from 'react';
8
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.
@@ -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
  };
@@ -0,0 +1,91 @@
1
+ //
2
+ // Copyright 2026 DXOS.org
3
+ //
4
+
5
+ import React, { useEffect, useState } from 'react';
6
+
7
+ import { type ThemedClassName } from '@dxos/react-ui';
8
+ import { mx } from '@dxos/ui-theme';
9
+
10
+ import { useSvgContext } from '../../hooks';
11
+
12
+ export type FPSCorner = 'top-left' | 'top-right' | 'bottom-left' | 'bottom-right';
13
+
14
+ export type FPSProps = ThemedClassName<{
15
+ /** Which corner of the SVG viewport to anchor the readout to. */
16
+ corner?: FPSCorner;
17
+ /** Pixels of padding from the chosen corner. */
18
+ margin?: number;
19
+ }>;
20
+
21
+ const PADDING = 8;
22
+
23
+ /**
24
+ * Frame-rate readout — drops into an `<SVG.Root>` alongside `<SVG.Graph>` to display a
25
+ * rolling 1-second average of the browser's repaint rate. Self-contained: runs its own
26
+ * `requestAnimationFrame` loop, so the number reflects actual render rate independent of
27
+ * whichever projector is driving the graph.
28
+ *
29
+ * Anchored to a corner of the SVG viewBox via the `<text>`'s `text-anchor` and `dy`
30
+ * attributes — re-renders on `context.resized` so the position tracks container resizes.
31
+ */
32
+ export const FPS = ({ classNames, corner = 'top-right', margin = PADDING }: FPSProps) => {
33
+ const context = useSvgContext();
34
+ const [size, setSize] = useState(context.size);
35
+ const [fps, setFps] = useState<number | null>(null);
36
+
37
+ // Keep `size` in sync with the SVG context so the corner anchor follows container resizes.
38
+ useEffect(() => {
39
+ setSize(context.size);
40
+ return context.resized.on((ctx) => setSize(ctx.size));
41
+ }, [context]);
42
+
43
+ // Independent rAF loop — measures the browser's actual repaint rate, not any specific
44
+ // projector's tick rate. Rolling 1-second window so the number is responsive but stable.
45
+ useEffect(() => {
46
+ let frames = 0;
47
+ let windowStart = performance.now();
48
+ let rafId = 0;
49
+ const loop = (now: number) => {
50
+ frames++;
51
+ const elapsed = now - windowStart;
52
+ if (elapsed >= 1000) {
53
+ setFps((frames * 1000) / elapsed);
54
+ frames = 0;
55
+ windowStart = now;
56
+ }
57
+ rafId = requestAnimationFrame(loop);
58
+ };
59
+ rafId = requestAnimationFrame(loop);
60
+ return () => cancelAnimationFrame(rafId);
61
+ }, []);
62
+
63
+ if (!size) {
64
+ return null;
65
+ }
66
+
67
+ // The SVG.Root viewBox is centered ([-w/2, w/2] × [-h/2, h/2]); offset from the chosen
68
+ // corner inward by `margin` and pick the corresponding text-anchor / dominant-baseline.
69
+ const halfW = size.width / 2;
70
+ const halfH = size.height / 2;
71
+ const left = corner === 'top-left' || corner === 'bottom-left';
72
+ const top = corner === 'top-left' || corner === 'top-right';
73
+ const x = left ? -halfW + margin : halfW - margin;
74
+ const y = top ? -halfH + margin : halfH - margin;
75
+ const textAnchor = left ? 'start' : 'end';
76
+ const dominantBaseline = top ? 'hanging' : 'alphabetic';
77
+
78
+ return (
79
+ <g className='dx-fps' style={{ pointerEvents: 'none' }}>
80
+ <text
81
+ x={x}
82
+ y={y}
83
+ textAnchor={textAnchor}
84
+ dominantBaseline={dominantBaseline}
85
+ className={mx('font-mono text-xs fill-neutral-500 tabular-nums', classNames)}
86
+ >
87
+ {fps == null ? '— fps' : `${fps.toFixed(0)} fps`}
88
+ </text>
89
+ </g>
90
+ );
91
+ };
@@ -10,10 +10,11 @@ import React, {
10
10
  useEffect,
11
11
  useImperativeHandle,
12
12
  useMemo,
13
+ useState,
13
14
  } from 'react';
14
- import { useResizeDetector } from 'react-resize-detector';
15
15
 
16
16
  import { type ThemedClassName } from '@dxos/react-ui';
17
+ import { composableProps } from '@dxos/react-ui';
17
18
  import { mx } from '@dxos/ui-theme';
18
19
 
19
20
  import { SVGContext, type SVGContextOptions, SVGContextProvider } from '../../hooks';
@@ -23,9 +24,34 @@ export type RootProps = ThemedClassName<PropsWithChildren<SVGContextOptions & Co
23
24
  /**
24
25
  * Makes the SVG context available to child nodes.
25
26
  * Automatically resizes the SVG element, which expands to fit the container.
27
+ *
28
+ * NOTE: Uses `ResizeObserver` directly rather than `react-resize-detector` — the latter's
29
+ * `useResizeDetector` was flaky in our Storybook environment (sometimes never fired its
30
+ * initial measurement), leaving the SVG stuck at `opacity-0` with no rendered content.
26
31
  */
27
- export const Root = forwardRef<SVGContext, RootProps>(({ classNames, children, scale, centered, ...props }, ref) => {
28
- const { ref: containerRef, width = 0, height = 0 } = useResizeDetector({ refreshRate: 200 });
32
+ export const Root = forwardRef<SVGContext, RootProps>(({ children, scale, centered, ...props }, ref) => {
33
+ const [container, setContainer] = useState<HTMLDivElement | null>(null);
34
+ const [size, setSize] = useState<{ width: number; height: number }>({ width: 0, height: 0 });
35
+
36
+ useEffect(() => {
37
+ if (!container) {
38
+ return;
39
+ }
40
+ const rect = container.getBoundingClientRect();
41
+ setSize({ width: rect.width, height: rect.height });
42
+ const observer = new ResizeObserver((entries) => {
43
+ const entry = entries[0];
44
+ if (!entry) {
45
+ return;
46
+ }
47
+ const { width, height } = entry.contentRect;
48
+ setSize((prev) => (prev.width === width && prev.height === height ? prev : { width, height }));
49
+ });
50
+ observer.observe(container);
51
+ return () => observer.disconnect();
52
+ }, [container]);
53
+
54
+ const { width, height } = size;
29
55
 
30
56
  const context = useMemo<SVGContext>(() => {
31
57
  return new SVGContext({ scale, centered });
@@ -48,7 +74,7 @@ export const Root = forwardRef<SVGContext, RootProps>(({ classNames, children, s
48
74
 
49
75
  return (
50
76
  <SVGContextProvider value={context}>
51
- <div {...props} ref={containerRef} className={mx('grid grow overflow-hidden', classNames)}>
77
+ <div {...composableProps(props, { classNames: 'dx-expander' })} ref={setContainer}>
52
78
  <svg
53
79
  xmlns='http://www.w3.org/2000/svg'
54
80
  ref={context.ref}