@dxos/react-ui-graph 0.8.4-main.72ec0f3 → 0.8.4-main.7996785055

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 (72) hide show
  1. package/README.md +5 -7
  2. package/dist/lib/browser/chunk-LKC455GK.mjs +52 -0
  3. package/dist/lib/browser/chunk-LKC455GK.mjs.map +7 -0
  4. package/dist/lib/browser/index.mjs +1080 -230
  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 +3 -3
  8. package/dist/lib/browser/testing/index.mjs.map +3 -3
  9. package/dist/lib/node-esm/chunk-JE4KZCUF.mjs +54 -0
  10. package/dist/lib/node-esm/chunk-JE4KZCUF.mjs.map +7 -0
  11. package/dist/lib/node-esm/index.mjs +1080 -230
  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 +3 -3
  15. package/dist/lib/node-esm/testing/index.mjs.map +3 -3
  16. package/dist/types/src/components/Graph/Graph.d.ts +4 -5
  17. package/dist/types/src/components/Graph/Graph.d.ts.map +1 -1
  18. package/dist/types/src/components/Graph/Graph.stories.d.ts +3 -3
  19. package/dist/types/src/components/Graph/Graph.stories.d.ts.map +1 -1
  20. package/dist/types/src/components/SVG/Root.d.ts +4 -4
  21. package/dist/types/src/components/SVG/Root.d.ts.map +1 -1
  22. package/dist/types/src/components/SVG/SVG.d.ts +14 -17
  23. package/dist/types/src/components/SVG/SVG.d.ts.map +1 -1
  24. package/dist/types/src/fx/fx.stories.d.ts +2 -2
  25. package/dist/types/src/fx/fx.stories.d.ts.map +1 -1
  26. package/dist/types/src/graph/projector/graph-force-projector.d.ts +1 -1
  27. package/dist/types/src/graph/projector/graph-force-projector.d.ts.map +1 -1
  28. package/dist/types/src/graph/projector/graph-hierarchical-projector.d.ts +1 -1
  29. package/dist/types/src/graph/projector/graph-hierarchical-projector.d.ts.map +1 -1
  30. package/dist/types/src/graph/projector/graph-projector.d.ts +2 -2
  31. package/dist/types/src/graph/projector/graph-projector.d.ts.map +1 -1
  32. package/dist/types/src/graph/projector/graph-radial-projector.d.ts +1 -1
  33. package/dist/types/src/graph/projector/graph-radial-projector.d.ts.map +1 -1
  34. package/dist/types/src/graph/projector/graph-relational-projector.d.ts +1 -1
  35. package/dist/types/src/graph/projector/graph-relational-projector.d.ts.map +1 -1
  36. package/dist/types/src/graph/types.d.ts +1 -1
  37. package/dist/types/src/graph/types.d.ts.map +1 -1
  38. package/dist/types/src/stories/hooks.stories.d.ts +3 -2
  39. package/dist/types/src/stories/hooks.stories.d.ts.map +1 -1
  40. package/dist/types/src/testing/data.d.ts +4 -4
  41. package/dist/types/src/testing/data.d.ts.map +1 -1
  42. package/dist/types/src/testing/hooks.d.ts +2 -16
  43. package/dist/types/src/testing/hooks.d.ts.map +1 -1
  44. package/dist/types/src/testing/model.d.ts +4 -8
  45. package/dist/types/src/testing/model.d.ts.map +1 -1
  46. package/dist/types/src/util/fraction.d.ts +1 -1
  47. package/dist/types/tsconfig.tsbuildinfo +1 -1
  48. package/package.json +31 -26
  49. package/src/components/Graph/Graph.stories.tsx +29 -25
  50. package/src/components/Graph/Graph.tsx +23 -15
  51. package/src/components/Mesh/Mesh.stories.tsx +2 -2
  52. package/src/components/SVG/Grid.tsx +1 -1
  53. package/src/components/SVG/Root.tsx +14 -7
  54. package/src/components/SVG/SVG.tsx +10 -1
  55. package/src/components/SVG/Svg.stories.tsx +2 -2
  56. package/src/fx/fx.stories.tsx +5 -5
  57. package/src/graph/projector/graph-force-projector.ts +1 -1
  58. package/src/graph/projector/graph-hierarchical-projector.ts +3 -3
  59. package/src/graph/projector/graph-projector.ts +2 -2
  60. package/src/graph/projector/graph-radial-projector.ts +1 -1
  61. package/src/graph/projector/graph-relational-projector.ts +3 -3
  62. package/src/graph/types.ts +1 -1
  63. package/src/stories/hooks.stories.tsx +13 -7
  64. package/src/testing/data.ts +5 -5
  65. package/src/testing/hooks.ts +1 -1
  66. package/src/testing/model.ts +3 -3
  67. package/src/util/fraction.ts +1 -1
  68. package/styles/graph.css +292 -43
  69. package/dist/lib/browser/chunk-XWA2XJDX.mjs +0 -955
  70. package/dist/lib/browser/chunk-XWA2XJDX.mjs.map +0 -7
  71. package/dist/lib/node-esm/chunk-3RLSFEEV.mjs +0 -957
  72. 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.72ec0f3",
3
+ "version": "0.8.4-main.7996785055",
4
4
  "description": "GEM Graph.",
5
5
  "homepage": "https://dxos.org",
6
6
  "bugs": "https://github.com/dxos/dxos/issues",
7
+ "repository": {
8
+ "type": "git",
9
+ "url": "https://github.com/dxos/dxos"
10
+ },
7
11
  "license": "MIT",
8
12
  "author": "DXOS.org",
9
- "sideEffects": true,
13
+ "sideEffects": [
14
+ "*.css"
15
+ ],
10
16
  "type": "module",
11
17
  "exports": {
12
18
  ".": {
@@ -37,8 +43,7 @@
37
43
  "styles"
38
44
  ],
39
45
  "dependencies": {
40
- "@preact-signals/safe-react": "^0.9.0",
41
- "@preact/signals-core": "^1.12.1",
46
+ "@effect-atom/atom-react": "^0.5.0",
42
47
  "d3": "^7.9.0",
43
48
  "d3-force": "~3.0.0",
44
49
  "immutability-helper": "^3.0.2",
@@ -46,40 +51,40 @@
46
51
  "lodash.defaultsdeep": "^4.6.1",
47
52
  "react-resize-detector": "^11.0.1",
48
53
  "topojson-client": "^3.1.0",
49
- "@dxos/async": "0.8.4-main.72ec0f3",
50
- "@dxos/debug": "0.8.4-main.72ec0f3",
51
- "@dxos/echo-signals": "0.8.4-main.72ec0f3",
52
- "@dxos/graph": "0.8.4-main.72ec0f3",
53
- "@dxos/invariant": "0.8.4-main.72ec0f3",
54
- "@dxos/log": "0.8.4-main.72ec0f3",
55
- "@dxos/node-std": "0.8.4-main.72ec0f3"
54
+ "@dxos/async": "0.8.4-main.7996785055",
55
+ "@dxos/debug": "0.8.4-main.7996785055",
56
+ "@dxos/graph": "0.8.4-main.7996785055",
57
+ "@dxos/log": "0.8.4-main.7996785055",
58
+ "@dxos/invariant": "0.8.4-main.7996785055",
59
+ "@dxos/react-ui-mosaic": "0.8.4-main.7996785055",
60
+ "@dxos/node-std": "0.8.4-main.7996785055"
56
61
  },
57
62
  "devDependencies": {
58
63
  "@babel/core": "^7.18.13",
59
64
  "@types/d3": "^7.4.3",
60
65
  "@types/lodash.defaultsdeep": "^4.6.6",
61
- "@types/react": "~19.2.2",
62
- "@types/react-dom": "~19.2.2",
66
+ "@types/react": "~19.2.7",
67
+ "@types/react-dom": "~19.2.3",
63
68
  "@types/topojson-client": "^3.1.4",
64
69
  "@types/topojson-specification": "^1.0.5",
65
70
  "postcss": "^8.4.41",
66
- "react": "~19.2.0",
67
- "react-dom": "~19.2.0",
68
- "@dxos/react-ui": "0.8.4-main.72ec0f3",
69
- "@dxos/react-ui-stack": "0.8.4-main.72ec0f3",
70
- "@dxos/random": "0.8.4-main.72ec0f3",
71
- "@dxos/react-ui-syntax-highlighter": "0.8.4-main.72ec0f3",
72
- "@dxos/react-ui-theme": "0.8.4-main.72ec0f3",
73
- "@dxos/storybook-utils": "0.8.4-main.72ec0f3"
71
+ "react": "~19.2.3",
72
+ "react-dom": "~19.2.3",
73
+ "@dxos/random": "0.8.4-main.7996785055",
74
+ "@dxos/react-ui": "0.8.4-main.7996785055",
75
+ "@dxos/storybook-utils": "0.8.4-main.7996785055",
76
+ "@dxos/ui-theme": "0.8.4-main.7996785055",
77
+ "@dxos/react-ui-syntax-highlighter": "0.8.4-main.7996785055",
78
+ "@dxos/react-ui-stack": "0.8.4-main.7996785055"
74
79
  },
75
80
  "peerDependencies": {
76
- "react": "^19.0.0",
77
- "react-dom": "^19.0.0",
78
- "@dxos/react-ui-theme": "0.8.4-main.72ec0f3",
79
- "@dxos/react-ui": "0.8.4-main.72ec0f3"
81
+ "react": "~19.2.3",
82
+ "react-dom": "~19.2.3",
83
+ "@dxos/react-ui": "0.8.4-main.7996785055",
84
+ "@dxos/ui-theme": "0.8.4-main.7996785055"
80
85
  },
81
86
  "optionalDependencies": {
82
- "@dxos/random": "0.8.4-main.72ec0f3"
87
+ "@dxos/random": "0.8.4-main.7996785055"
83
88
  },
84
89
  "publishConfig": {
85
90
  "access": "public"
@@ -2,17 +2,18 @@
2
2
  // Copyright 2022 DXOS.org
3
3
  //
4
4
 
5
- import { effect } from '@preact/signals-core';
5
+ import { RegistryContext } from '@effect-atom/atom-react';
6
6
  import { type Meta, type StoryObj } from '@storybook/react-vite';
7
7
  import { select } from 'd3';
8
- import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
8
+ import React, { useCallback, useContext, useEffect, useMemo, useRef, useState } from 'react';
9
9
 
10
10
  import { type Graph, type GraphModel, SelectionModel } from '@dxos/graph';
11
11
  import { IconButton, Popover, Toolbar } from '@dxos/react-ui';
12
- import { withTheme } from '@dxos/react-ui/testing';
13
- import { Card } from '@dxos/react-ui-stack';
12
+ import { Card } from '@dxos/react-ui';
13
+ import { withLayout, withTheme } from '@dxos/react-ui/testing';
14
14
  import { JsonFilter, SyntaxHighlighter } from '@dxos/react-ui-syntax-highlighter';
15
- import { getHashStyles, mx } from '@dxos/react-ui-theme';
15
+ import { withRegistry } from '@dxos/storybook-utils';
16
+ import { getHashStyles, mx } from '@dxos/ui-theme';
16
17
 
17
18
  import { Pulsar } from '../../fx';
18
19
  import {
@@ -49,12 +50,12 @@ const projectorTypes: Record<ProjectorType, Factory> = {
49
50
  relational: GraphRelationalProjector as Factory,
50
51
  };
51
52
 
52
- type StoryProps = GraphProps & {
53
+ type DefaultStoryProps = GraphProps & {
53
54
  debug?: boolean;
54
55
  grid?: boolean | SVGGridProps;
55
56
  inspect?: boolean;
56
57
  singleSelect?: boolean;
57
- graph: () => Graph;
58
+ graph: () => Graph.Any;
58
59
  projectorType?: ProjectorType;
59
60
  projectorOptions?:
60
61
  | GraphForceProjectorOptions
@@ -72,12 +73,16 @@ const DefaultStory = ({
72
73
  projectorType: _projectorType = 'force',
73
74
  projectorOptions,
74
75
  ...props
75
- }: StoryProps) => {
76
+ }: DefaultStoryProps) => {
76
77
  const graphRef = useRef<GraphController | null>(null);
77
78
  const context = useRef<SVGContext>(null);
79
+ const registry = useContext(RegistryContext);
78
80
 
79
81
  // Models.
80
- const [model, setModel] = useState<GraphModel | undefined>(() => new TestGraphModel(_graph?.()));
82
+ const [model, setModel] = useState<GraphModel.ReactiveGraphModel | undefined>(() => {
83
+ const graph = _graph?.();
84
+ return graph ? new TestGraphModel(registry, graph) : undefined;
85
+ });
81
86
  const selection = useMemo(() => new SelectionModel(singleSelect), [singleSelect]);
82
87
 
83
88
  // Projector.
@@ -155,8 +160,9 @@ const DefaultStory = ({
155
160
  }, [model]);
156
161
 
157
162
  const handleRegenerate = useCallback(() => {
158
- setModel(new TestGraphModel(_graph?.()));
159
- }, [_graph]);
163
+ const graph = _graph?.();
164
+ setModel(graph ? new TestGraphModel(registry, graph) : undefined);
165
+ }, [_graph, registry]);
160
166
 
161
167
  const handleClear = useCallback(() => {
162
168
  setModel(undefined);
@@ -180,7 +186,7 @@ const DefaultStory = ({
180
186
 
181
187
  const active = useMemo(() => new SelectionModel(), []);
182
188
  const handlePing = useCallback(() => {
183
- for (const id of active.selected.value) {
189
+ for (const id of active.getSelectedIds()) {
184
190
  const node = graphRef.current?.findNode(id);
185
191
  if (node) {
186
192
  Pulsar.remove(select(node));
@@ -188,7 +194,7 @@ const DefaultStory = ({
188
194
  }
189
195
 
190
196
  active.clear();
191
- for (const id of selection.selected.value) {
197
+ for (const id of selection.getSelectedIds()) {
192
198
  const node = graphRef.current?.findNode(id);
193
199
  if (node) {
194
200
  active.add(id);
@@ -200,7 +206,7 @@ const DefaultStory = ({
200
206
 
201
207
  return (
202
208
  <Popover.Root open={!!popover} onOpenChange={(state) => !state && setPopover(undefined)}>
203
- <div className={mx('is-full grid divide-x divide-separator', debug && 'grid-cols-[1fr_30rem]')}>
209
+ <div className={mx('h-full w-full grid divide-x divide-separator', debug && 'grid-cols-[1fr_30rem]')}>
204
210
  <SVG.Root ref={context}>
205
211
  <SVG.Markers />
206
212
  {grid && <SVG.Grid {...(typeof grid === 'boolean' ? { axis: grid } : grid)} />}
@@ -254,13 +260,13 @@ const DefaultStory = ({
254
260
  <Popover.VirtualTrigger virtualRef={popoverAnchorRef} />
255
261
  <Popover.Content onOpenAutoFocus={(event) => event.preventDefault()}>
256
262
  <Popover.Viewport>
257
- <Card.SurfaceRoot role='card--popover'>
263
+ <Card.Root>
258
264
  <SyntaxHighlighter
259
265
  language='json'
260
- classNames='text-xs mlb-cardSpacingBlock pli-cardSpacingInline bg-transparent'
266
+ classNames='text-xs my-form-padding px-form-padding bg-transparent'
261
267
  code={JSON.stringify(popover, null, 2)}
262
268
  />
263
- </Card.SurfaceRoot>
269
+ </Card.Root>
264
270
  </Popover.Viewport>
265
271
  <Popover.Arrow />
266
272
  </Popover.Content>
@@ -281,7 +287,7 @@ const Debug = ({
281
287
  onDelete,
282
288
  onPing,
283
289
  }: {
284
- model?: GraphModel;
290
+ model?: GraphModel.ReactiveGraphModel;
285
291
  selection: SelectionModel;
286
292
  projector: ProjectorType;
287
293
  onToggleProjector: () => void;
@@ -295,12 +301,10 @@ const Debug = ({
295
301
  }) => {
296
302
  const [data, setData] = useState({});
297
303
  useEffect(() => {
298
- effect(() => {
299
- setData({
300
- projector,
301
- selection: selection.toJSON(),
302
- model: model?.toJSON(),
303
- });
304
+ setData({
305
+ projector,
306
+ selection: selection.toJSON(),
307
+ model: model?.toJSON(),
304
308
  });
305
309
  }, [model, selection, projector]);
306
310
 
@@ -324,7 +328,7 @@ const Debug = ({
324
328
  const meta = {
325
329
  title: 'ui/react-ui-graph/Graph',
326
330
  render: DefaultStory,
327
- decorators: [withTheme],
331
+ decorators: [withRegistry, withTheme(), withLayout({ layout: 'fullscreen' })],
328
332
  parameters: {
329
333
  layout: 'fullscreen',
330
334
  controls: { disable: true },
@@ -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,
@@ -55,14 +54,16 @@ export const GraphInner = <Node extends BaseGraphNode = any, Edge extends BaseGr
55
54
  ) => {
56
55
  const context = useSvgContext();
57
56
  const graphRef = useRef<SVGGElement>(null);
57
+ // TODO(wittjosiah): This doesn't work for some reason.
58
+ // const graph = useAtomValue(model?.graphAtom ?? EMPTY_ATOM);
58
59
 
59
60
  const { projector, renderer } = useMemo(() => {
60
- let projector = _projector;
61
+ let projector = projectorProp;
61
62
  if (!projector) {
62
63
  projector = new GraphForceProjector<Node>(context);
63
64
  }
64
65
 
65
- let renderer = _renderer;
66
+ let renderer = rendererProp;
66
67
  if (!renderer) {
67
68
  renderer = new GraphRenderer<Node>(context, graphRef, {
68
69
  ...props,
@@ -75,7 +76,7 @@ export const GraphInner = <Node extends BaseGraphNode = any, Edge extends BaseGr
75
76
  }
76
77
 
77
78
  return { projector, renderer };
78
- }, [context, _projector, _renderer, drag]);
79
+ }, [context, projectorProp, rendererProp, drag]);
79
80
 
80
81
  // External API.
81
82
  useImperativeHandle(
@@ -96,10 +97,17 @@ export const GraphInner = <Node extends BaseGraphNode = any, Edge extends BaseGr
96
97
 
97
98
  // Subscriptions.
98
99
  useEffect(() => {
100
+ projector.updateData(model?.graph);
101
+
102
+ // Subscribe to model changes if reactive model.
103
+ const unsubscribeModel = model
104
+ ? model.subscribe(() => {
105
+ projector.updateData(model?.graph);
106
+ })
107
+ : undefined;
108
+
99
109
  return combine(
100
- effect(() => {
101
- projector.updateData(model?.graph);
102
- }),
110
+ unsubscribeModel,
103
111
  projector.updated.on(({ layout }) => {
104
112
  try {
105
113
  renderer.render(layout);
@@ -125,6 +133,6 @@ export const GraphInner = <Node extends BaseGraphNode = any, Edge extends BaseGr
125
133
  /**
126
134
  * SVG Graph.
127
135
  */
128
- export const Graph = forwardRef(GraphInner) as <Node extends BaseGraphNode = any, Edge extends BaseGraphEdge = any>(
136
+ export const Graph = forwardRef(GraphInner) as <Node extends Graph$.Node.Any = any, Edge extends Graph$.Edge.Any = any>(
129
137
  props: GraphProps<Node, Edge> & { ref?: Ref<GraphController> },
130
138
  ) => JSX.Element;
@@ -5,7 +5,7 @@
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
11
 
@@ -37,7 +37,7 @@ const DefaultStory = (props: SVGRootProps) => {
37
37
  const meta = {
38
38
  title: 'ui/react-ui-graph/Mesh',
39
39
  render: DefaultStory,
40
- decorators: [withTheme],
40
+ decorators: [withTheme(), withLayout({ layout: 'fullscreen' })],
41
41
  parameters: {
42
42
  layout: 'fullscreen',
43
43
  },
@@ -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,33 @@
3
3
  //
4
4
 
5
5
  import { select } from 'd3';
6
- import React, { type PropsWithChildren, forwardRef, useEffect, useImperativeHandle, useMemo } from 'react';
6
+ import React, {
7
+ type ComponentPropsWithoutRef,
8
+ type PropsWithChildren,
9
+ forwardRef,
10
+ useEffect,
11
+ useImperativeHandle,
12
+ useMemo,
13
+ } from 'react';
7
14
  import { useResizeDetector } from 'react-resize-detector';
8
15
 
9
16
  import { type ThemedClassName } from '@dxos/react-ui';
10
- import { mx } from '@dxos/react-ui-theme';
17
+ import { composableProps, mx } from '@dxos/ui-theme';
11
18
 
12
19
  import { SVGContext, type SVGContextOptions, SVGContextProvider } from '../../hooks';
13
20
 
14
- export type RootProps = ThemedClassName<PropsWithChildren<SVGContextOptions>>;
21
+ export type RootProps = ThemedClassName<PropsWithChildren<SVGContextOptions & ComponentPropsWithoutRef<'div'>>>;
15
22
 
16
23
  /**
17
24
  * Makes the SVG context available to child nodes.
18
25
  * Automatically resizes the SVG element, which expands to fit the container.
19
26
  */
20
- export const Root = forwardRef<SVGContext, RootProps>(({ classNames, children, ...props }, ref) => {
27
+ export const Root = forwardRef<SVGContext, RootProps>(({ children, scale, centered, ...props }, ref) => {
21
28
  const { ref: containerRef, width = 0, height = 0 } = useResizeDetector({ refreshRate: 200 });
22
29
 
23
30
  const context = useMemo<SVGContext>(() => {
24
- return new SVGContext(props);
25
- }, [props.scale, props.centered]);
31
+ return new SVGContext({ scale, centered });
32
+ }, [scale, centered]);
26
33
 
27
34
  useImperativeHandle(ref, () => context, [context]);
28
35
 
@@ -41,7 +48,7 @@ export const Root = forwardRef<SVGContext, RootProps>(({ classNames, children, .
41
48
 
42
49
  return (
43
50
  <SVGContextProvider value={context}>
44
- <div ref={containerRef} className={mx('grid grow overflow-hidden', classNames)}>
51
+ <div {...composableProps(props, { classNames: 'dx-expander' })} ref={containerRef}>
45
52
  <svg
46
53
  xmlns='http://www.w3.org/2000/svg'
47
54
  ref={context.ref}
@@ -16,7 +16,16 @@ import { type ZoomProps as SVGZoomProps, Zoom } from './Zoom';
16
16
 
17
17
  export type SVGProps = PropsWithChildren<ThemedClassName>;
18
18
 
19
- export const SVG = {
19
+ type SVG = {
20
+ Root: typeof Root;
21
+ Grid: typeof Grid;
22
+ Markers: typeof Markers;
23
+ Mesh: typeof Mesh;
24
+ Zoom: typeof Zoom;
25
+ Graph: typeof Graph;
26
+ };
27
+
28
+ export const SVG: SVG = {
20
29
  Root,
21
30
  Grid,
22
31
  Markers,
@@ -5,7 +5,7 @@
5
5
  import { type Meta, type StoryObj } from '@storybook/react-vite';
6
6
  import React, { useRef } 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 { type SVGContext, useGrid, useZoom } from '../../hooks';
11
11
 
@@ -45,7 +45,7 @@ const DefaultStory = (props: ComponentProps) => {
45
45
  const meta = {
46
46
  title: 'ui/react-ui-graph/SVGRoot',
47
47
  render: DefaultStory,
48
- decorators: [withTheme],
48
+ decorators: [withTheme(), withLayout({ layout: 'fullscreen' })],
49
49
  parameters: {
50
50
  layout: 'fullscreen',
51
51
  },
@@ -6,7 +6,7 @@ import { type Meta, type StoryObj } from '@storybook/react-vite';
6
6
  import { select } from 'd3';
7
7
  import React, { type FC, useEffect, useMemo, useRef } from 'react';
8
8
 
9
- import { withTheme } from '@dxos/react-ui/testing';
9
+ import { withLayout, withTheme } from '@dxos/react-ui/testing';
10
10
 
11
11
  import { SVG } from '../components';
12
12
  import { useGrid, useZoom } from '../hooks';
@@ -22,11 +22,11 @@ type Datum = {
22
22
  r: number;
23
23
  };
24
24
 
25
- type StoryProps = {
25
+ type DefaultStoryProps = {
26
26
  count: number;
27
27
  } & Pulsar.Options;
28
28
 
29
- const DefaultStory = (props: StoryProps) => {
29
+ const DefaultStory = (props: DefaultStoryProps) => {
30
30
  return (
31
31
  <SVG.Root>
32
32
  <StoryComponent {...props} />
@@ -34,7 +34,7 @@ const DefaultStory = (props: StoryProps) => {
34
34
  );
35
35
  };
36
36
 
37
- const StoryComponent: FC<StoryProps> = ({ count = 1, ...options }) => {
37
+ const StoryComponent: FC<DefaultStoryProps> = ({ count = 1, ...options }) => {
38
38
  const items = useMemo<Datum[]>(
39
39
  () =>
40
40
  Array.from({ length: count }, () => {
@@ -94,7 +94,7 @@ const createNode: D3Callable<SVGGElement, Datum> = (group, classNames, options)
94
94
  const meta = {
95
95
  title: 'ui/react-ui-graph/fx',
96
96
  render: DefaultStory,
97
- decorators: [withTheme],
97
+ decorators: [withTheme(), withLayout({ layout: 'fullscreen' })],
98
98
  parameters: {
99
99
  layout: 'fullscreen',
100
100
  },
@@ -223,7 +223,7 @@ export class GraphForceProjector<NodeData = any> extends GraphProjector<NodeData
223
223
  this.restart();
224
224
  }
225
225
 
226
- override onUpdate(graph?: Graph): void {
226
+ override onUpdate(graph?: Graph.Any): void {
227
227
  log('onUpdate', { graph: { nodes: graph?.nodes.length, edges: graph?.edges.length } });
228
228
  this._simulation.stop();
229
229
  this.mergeData(graph);
@@ -20,14 +20,14 @@ export class GraphHierarchicalProjector<
20
20
  NodeData = any,
21
21
  Options extends GraphHierarchicalProjectorOptions = any,
22
22
  > extends GraphRadialProjector<NodeData, Options> {
23
- protected override onUpdate(graph?: Graph) {
23
+ protected override onUpdate(graph?: Graph.Any) {
24
24
  log('onUpdate', {
25
25
  graph: { nodes: graph?.nodes.length, edges: graph?.edges.length },
26
- selection: this.selection?.selected.value,
26
+ selection: this.selection?.getSelectedIds(),
27
27
  });
28
28
 
29
29
  this.mergeData(graph);
30
- const selected = this.selection?.selected.value?.[0];
30
+ const selected = this.selection?.getSelectedIds()[0];
31
31
  if (selected) {
32
32
  const node = this.layout.graph.nodes.find((node) => node.id === selected);
33
33
  if (node) {
@@ -15,7 +15,7 @@ export type GraphProjectorOptions = ProjectorOptions & {};
15
15
  * Base class for graph projectors.
16
16
  */
17
17
  export abstract class GraphProjector<NodeData = any, Options extends GraphProjectorOptions = any> extends Projector<
18
- Graph,
18
+ Graph.Any,
19
19
  GraphLayout<NodeData>,
20
20
  Options
21
21
  > {
@@ -60,7 +60,7 @@ export abstract class GraphProjector<NodeData = any, Options extends GraphProjec
60
60
  * Merge external data with internal representation (e.g., so force properties like position are preserved).
61
61
  * @param data
62
62
  */
63
- protected mergeData(data: Graph = emptyGraph) {
63
+ protected mergeData(data: Graph.Any = emptyGraph) {
64
64
  // Merge nodes.
65
65
  const nodes: GraphLayoutNode[] = data.nodes.map((node) => {
66
66
  let current: GraphLayoutNode = this._layout.graph.nodes.find((n) => n.id === this.options.idAccessor(node));
@@ -28,7 +28,7 @@ export class GraphRadialProjector<
28
28
  return undefined;
29
29
  }
30
30
 
31
- protected override onUpdate(graph?: Graph) {
31
+ protected override onUpdate(graph?: Graph.Any) {
32
32
  log('onUpdate', { graph: { nodes: graph?.nodes.length, edges: graph?.edges.length } });
33
33
  this.mergeData(graph);
34
34
  this.doRadialLayout();
@@ -20,14 +20,14 @@ export class GraphRelationalProjector<
20
20
  NodeData = any,
21
21
  Options extends GraphRelationalProjectorOptions = any,
22
22
  > extends GraphRadialProjector<NodeData, Options> {
23
- protected override onUpdate(graph?: Graph) {
23
+ protected override onUpdate(graph?: Graph.Any) {
24
24
  log('onUpdate', {
25
25
  graph: { nodes: graph?.nodes.length, edges: graph?.edges.length },
26
- selection: this.selection?.selected.value,
26
+ selection: this.selection?.getSelectedIds(),
27
27
  });
28
28
 
29
29
  this.mergeData(graph);
30
- const selected = this.selection?.selected.value?.[0];
30
+ const selected = this.selection?.getSelectedIds()[0];
31
31
  if (selected) {
32
32
  const node = this.layout.graph.nodes.find((node) => node.id === selected);
33
33
  if (node) {
@@ -19,7 +19,7 @@ export const defaultIdAccessor: IdAccessor = (node: any) => {
19
19
  return node.id;
20
20
  };
21
21
 
22
- export const emptyGraph: Graph = {
22
+ export const emptyGraph: Graph.Any = {
23
23
  nodes: [],
24
24
  edges: [],
25
25
  };
@@ -2,13 +2,16 @@
2
2
  // Copyright 2020 DXOS.org
3
3
  //
4
4
 
5
+ import { RegistryContext } from '@effect-atom/atom-react';
5
6
  import { type Meta, type StoryObj } from '@storybook/react-vite';
6
7
  import { select } from 'd3';
7
- import React, { type PropsWithChildren, useEffect, useMemo, useRef } from 'react';
8
+ import React, { type PropsWithChildren, useContext, useEffect, useMemo, useRef } from 'react';
8
9
 
9
10
  import { combine } from '@dxos/async';
11
+ import { type Graph } from '@dxos/graph';
10
12
  import { log } from '@dxos/log';
11
- import { withTheme } from '@dxos/react-ui/testing';
13
+ import { withLayout, withTheme } from '@dxos/react-ui/testing';
14
+ import { withRegistry } from '@dxos/storybook-utils';
12
15
 
13
16
  import { SVG } from '../components';
14
17
  import {
@@ -27,7 +30,7 @@ import { TestGraphModel, type TestNode, convertTreeToGraph, createTree } from '.
27
30
  import '../../styles/graph.css';
28
31
 
29
32
  type ComponentProps = PropsWithChildren<{
30
- model: TestGraphModel;
33
+ graph: () => Graph.Graph<TestNode, Graph.Edge.Any>;
31
34
  projectorOptions?: GraphForceProjectorOptions;
32
35
  count?: number;
33
36
  interval?: number;
@@ -36,13 +39,16 @@ type ComponentProps = PropsWithChildren<{
36
39
  }>;
37
40
 
38
41
  const Component = ({
39
- model,
42
+ graph: graphFactory,
40
43
  projectorOptions,
41
44
  count = 0,
42
45
  interval = 200,
43
46
  link = false,
44
47
  grid: showGrid = false,
45
48
  }: ComponentProps) => {
49
+ const registry = useContext(RegistryContext);
50
+ const model = useMemo(() => new TestGraphModel(registry, graphFactory()), [registry, graphFactory]);
51
+
46
52
  const context = useSvgContext();
47
53
  const graphRef = useRef<SVGGElement>(null);
48
54
  const markersRef = useRef<SVGGElement>(null);
@@ -152,7 +158,7 @@ const DefaultStory = ({ children, ...props }: ComponentProps) => {
152
158
  const meta = {
153
159
  title: 'ui/react-ui-graph/hooks',
154
160
  render: DefaultStory,
155
- decorators: [withTheme],
161
+ decorators: [withRegistry, withTheme(), withLayout({ layout: 'fullscreen' })],
156
162
  parameters: {
157
163
  layout: 'fullscreen',
158
164
  },
@@ -164,7 +170,7 @@ type Story = StoryObj<typeof meta>;
164
170
 
165
171
  export const Default: Story = {
166
172
  args: {
167
- model: new TestGraphModel(convertTreeToGraph(createTree({ depth: 3 }))),
173
+ graph: () => convertTreeToGraph(createTree({ depth: 3 })),
168
174
  grid: true,
169
175
  count: 300,
170
176
  interval: 20,
@@ -189,7 +195,7 @@ export const Default: Story = {
189
195
 
190
196
  export const Bullets: Story = {
191
197
  args: {
192
- model: new TestGraphModel(convertTreeToGraph(createTree({ depth: 4 }))),
198
+ graph: () => convertTreeToGraph(createTree({ depth: 4 })),
193
199
  children: <span>⌘-DRAG to edge or create node; ⌘-CLICK to delete edge.</span>,
194
200
  link: true,
195
201
  grid: false,