@dxos/react-ui-graph 0.8.4-main.4a85c3132b → 0.8.4-main.51f1e5ca51

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 (78) hide show
  1. package/dist/lib/browser/{chunk-LKC455GK.mjs → chunk-EASNZZ7B.mjs} +1 -1
  2. package/dist/lib/browser/{chunk-LKC455GK.mjs.map → chunk-EASNZZ7B.mjs.map} +2 -2
  3. package/dist/lib/browser/index.mjs +20 -88
  4. package/dist/lib/browser/index.mjs.map +3 -3
  5. package/dist/lib/browser/meta.json +1 -1
  6. package/dist/lib/browser/testing/index.mjs +14 -14
  7. package/dist/lib/browser/testing/index.mjs.map +3 -3
  8. package/dist/lib/node-esm/{chunk-JE4KZCUF.mjs → chunk-JSE2X4ML.mjs} +1 -1
  9. package/dist/lib/node-esm/{chunk-JE4KZCUF.mjs.map → chunk-JSE2X4ML.mjs.map} +2 -2
  10. package/dist/lib/node-esm/index.mjs +20 -88
  11. package/dist/lib/node-esm/index.mjs.map +3 -3
  12. package/dist/lib/node-esm/meta.json +1 -1
  13. package/dist/lib/node-esm/testing/index.mjs +14 -14
  14. package/dist/lib/node-esm/testing/index.mjs.map +3 -3
  15. package/dist/types/src/components/Graph/Graph.d.ts +2 -2
  16. package/dist/types/src/components/Graph/Graph.d.ts.map +1 -1
  17. package/dist/types/src/components/Graph/Graph.stories.d.ts +3 -3
  18. package/dist/types/src/components/Graph/Graph.stories.d.ts.map +1 -1
  19. package/dist/types/src/components/Mesh/Mesh.d.ts.map +1 -1
  20. package/dist/types/src/components/Mesh/Mesh.stories.d.ts.map +1 -1
  21. package/dist/types/src/components/SVG/Grid.d.ts.map +1 -1
  22. package/dist/types/src/components/SVG/Markers.d.ts.map +1 -1
  23. package/dist/types/src/components/SVG/Root.d.ts +1 -1
  24. package/dist/types/src/components/SVG/SVG.d.ts.map +1 -1
  25. package/dist/types/src/components/SVG/Svg.stories.d.ts +1 -1
  26. package/dist/types/src/components/SVG/Svg.stories.d.ts.map +1 -1
  27. package/dist/types/src/fx/fx.stories.d.ts +3 -3
  28. package/dist/types/src/fx/fx.stories.d.ts.map +1 -1
  29. package/dist/types/src/fx/pulsar.d.ts.map +1 -1
  30. package/dist/types/src/graph/markers.d.ts.map +1 -1
  31. package/dist/types/src/graph/projector/graph-drag.d.ts.map +1 -1
  32. package/dist/types/src/graph/projector/graph-force-projector.d.ts.map +1 -1
  33. package/dist/types/src/graph/projector/graph-forces.d.ts.map +1 -1
  34. package/dist/types/src/graph/projector/graph-hierarchical-projector.d.ts.map +1 -1
  35. package/dist/types/src/graph/projector/graph-projector.d.ts.map +1 -1
  36. package/dist/types/src/graph/projector/graph-radial-projector.d.ts.map +1 -1
  37. package/dist/types/src/graph/projector/graph-relational-projector.d.ts.map +1 -1
  38. package/dist/types/src/graph/projector/projector.d.ts.map +1 -1
  39. package/dist/types/src/graph/renderer/bullets.d.ts.map +1 -1
  40. package/dist/types/src/graph/renderer/graph-renderer.d.ts.map +1 -1
  41. package/dist/types/src/graph/renderer/renderer.d.ts.map +1 -1
  42. package/dist/types/src/hooks/useGrid.d.ts.map +1 -1
  43. package/dist/types/src/hooks/useStateRef.d.ts.map +1 -1
  44. package/dist/types/src/hooks/useSvgContext.d.ts.map +1 -1
  45. package/dist/types/src/hooks/useZoom.d.ts.map +1 -1
  46. package/dist/types/src/stories/hooks.stories.d.ts +1 -1
  47. package/dist/types/src/stories/hooks.stories.d.ts.map +1 -1
  48. package/dist/types/src/testing/data.d.ts +1 -1
  49. package/dist/types/src/testing/data.d.ts.map +1 -1
  50. package/dist/types/src/testing/hooks.d.ts.map +1 -1
  51. package/dist/types/src/testing/model.d.ts.map +1 -1
  52. package/dist/types/src/util/events.d.ts.map +1 -1
  53. package/dist/types/src/util/fraction.d.ts.map +1 -1
  54. package/dist/types/src/util/points.d.ts.map +1 -1
  55. package/dist/types/src/util/scale.d.ts.map +1 -1
  56. package/dist/types/src/util/screen.d.ts.map +1 -1
  57. package/dist/types/src/util/vector.d.ts.map +1 -1
  58. package/dist/types/tsconfig.tsbuildinfo +1 -1
  59. package/package.json +18 -25
  60. package/src/components/Graph/Graph.stories.tsx +16 -14
  61. package/src/components/Graph/Graph.tsx +9 -8
  62. package/src/components/Mesh/Mesh.stories.tsx +0 -1
  63. package/src/components/SVG/Root.tsx +3 -3
  64. package/src/components/SVG/SVG.tsx +0 -1
  65. package/src/components/SVG/Svg.stories.tsx +2 -3
  66. package/src/fx/fx.stories.tsx +5 -6
  67. package/src/graph/projector/graph-drag.ts +0 -1
  68. package/src/graph/projector/graph-force-projector.ts +0 -1
  69. package/src/graph/projector/graph-hierarchical-projector.ts +0 -1
  70. package/src/graph/projector/graph-projector.ts +0 -1
  71. package/src/graph/projector/graph-radial-projector.ts +0 -1
  72. package/src/graph/projector/graph-relational-projector.ts +0 -1
  73. package/src/graph/renderer/graph-renderer.ts +0 -1
  74. package/src/stories/hooks.stories.tsx +2 -2
  75. package/src/testing/data.ts +9 -9
  76. package/src/testing/hooks.ts +2 -3
  77. package/src/testing/model.ts +3 -3
  78. package/styles/graph.css +1 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@dxos/react-ui-graph",
3
- "version": "0.8.4-main.4a85c3132b",
3
+ "version": "0.8.4-main.51f1e5ca51",
4
4
  "description": "GEM Graph.",
5
5
  "homepage": "https://dxos.org",
6
6
  "bugs": "https://github.com/dxos/dxos/issues",
@@ -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/debug": "0.8.4-main.4a85c3132b",
55
- "@dxos/async": "0.8.4-main.4a85c3132b",
56
- "@dxos/graph": "0.8.4-main.4a85c3132b",
57
- "@dxos/invariant": "0.8.4-main.4a85c3132b",
58
- "@dxos/log": "0.8.4-main.4a85c3132b",
59
- "@dxos/node-std": "0.8.4-main.4a85c3132b",
60
- "@dxos/react-ui-mosaic": "0.8.4-main.4a85c3132b"
47
+ "@dxos/async": "0.8.4-main.51f1e5ca51",
48
+ "@dxos/graph": "0.8.4-main.51f1e5ca51",
49
+ "@dxos/debug": "0.8.4-main.51f1e5ca51",
50
+ "@dxos/log": "0.8.4-main.51f1e5ca51",
51
+ "@dxos/node-std": "0.8.4-main.51f1e5ca51",
52
+ "@dxos/react-ui-mosaic": "0.8.4-main.51f1e5ca51",
53
+ "@dxos/invariant": "0.8.4-main.51f1e5ca51"
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.4a85c3132b",
74
- "@dxos/react-ui": "0.8.4-main.4a85c3132b",
75
- "@dxos/react-ui-syntax-highlighter": "0.8.4-main.4a85c3132b",
76
- "@dxos/storybook-utils": "0.8.4-main.4a85c3132b",
77
- "@dxos/ui-theme": "0.8.4-main.4a85c3132b",
78
- "@dxos/react-ui-stack": "0.8.4-main.4a85c3132b"
66
+ "@dxos/react-ui": "0.8.4-main.51f1e5ca51",
67
+ "@dxos/random": "0.8.4-main.51f1e5ca51",
68
+ "@dxos/react-ui-stack": "0.8.4-main.51f1e5ca51",
69
+ "@dxos/react-ui-syntax-highlighter": "0.8.4-main.51f1e5ca51",
70
+ "@dxos/storybook-utils": "0.8.4-main.51f1e5ca51",
71
+ "@dxos/ui-theme": "0.8.4-main.51f1e5ca51"
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.4a85c3132b",
84
- "@dxos/ui-theme": "0.8.4-main.4a85c3132b"
76
+ "@dxos/react-ui": "0.8.4-main.51f1e5ca51",
77
+ "@dxos/ui-theme": "0.8.4-main.51f1e5ca51"
85
78
  },
86
79
  "optionalDependencies": {
87
- "@dxos/random": "0.8.4-main.4a85c3132b"
80
+ "@dxos/random": "0.8.4-main.51f1e5ca51"
88
81
  },
89
82
  "publishConfig": {
90
83
  "access": "public"
@@ -2,6 +2,8 @@
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';
@@ -10,8 +12,8 @@ import React, { useCallback, useContext, useEffect, useMemo, useRef, useState }
10
12
  import { type Graph, type GraphModel, 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,7 +49,7 @@ 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;
@@ -73,13 +72,13 @@ const DefaultStory = ({
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 [model, setModel] = useState<GraphModel.ReactiveGraphModel | undefined>(() => {
83
82
  const graph = _graph?.();
84
83
  return graph ? new TestGraphModel(registry, graph) : undefined;
85
84
  });
@@ -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
  };
@@ -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';
@@ -28,7 +28,7 @@ export type GraphController = {
28
28
 
29
29
  export type GraphProps<Node extends Graph$.Node.Any = any, Edge extends Graph$.Edge.Any = any> = ThemedClassName<
30
30
  Pick<GraphRendererOptions<Node>, 'labels' | 'subgraphs' | 'attributes'> & {
31
- model?: GraphModel.GraphModel<Node, Edge>; // TODO(burdon): ReactiveGraphModel
31
+ model?: GraphModel.ReactiveGraphModel<Node, Edge>;
32
32
  projector?: GraphProjector<Node>;
33
33
  renderer?: GraphRenderer<Node>;
34
34
  drag?: boolean;
@@ -54,6 +54,8 @@ const GraphInner = <Node extends Graph$.Node.Any = any, Edge extends Graph$.Edge
54
54
  ) => {
55
55
  const context = useSvgContext();
56
56
  const graphRef = useRef<SVGGElement>(null);
57
+ // TODO(wittjosiah): This doesn't work for some reason.
58
+ // const graph = useAtomValue(model?.graphAtom ?? EMPTY_ATOM);
57
59
 
58
60
  const { projector, renderer } = useMemo(() => {
59
61
  let projector = projectorProp;
@@ -98,12 +100,11 @@ const GraphInner = <Node extends Graph$.Node.Any = any, Edge extends Graph$.Edge
98
100
  projector.updateData(model?.graph);
99
101
 
100
102
  // Subscribe to model changes if reactive model.
101
- const unsubscribeModel =
102
- model && 'subscribe' in model
103
- ? (model as GraphModel.ReactiveGraphModel).subscribe(() => {
104
- projector.updateData(model?.graph);
105
- })
106
- : undefined;
103
+ const unsubscribeModel = model
104
+ ? model.subscribe(() => {
105
+ projector.updateData(model?.graph);
106
+ })
107
+ : undefined;
107
108
 
108
109
  return combine(
109
110
  unsubscribeModel,
@@ -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.
@@ -14,7 +14,7 @@ import React, {
14
14
  import { useResizeDetector } from 'react-resize-detector';
15
15
 
16
16
  import { type ThemedClassName } from '@dxos/react-ui';
17
- import { mx } from '@dxos/ui-theme';
17
+ import { composableProps, mx } from '@dxos/ui-theme';
18
18
 
19
19
  import { SVGContext, type SVGContextOptions, SVGContextProvider } from '../../hooks';
20
20
 
@@ -24,7 +24,7 @@ export type RootProps = ThemedClassName<PropsWithChildren<SVGContextOptions & Co
24
24
  * Makes the SVG context available to child nodes.
25
25
  * Automatically resizes the SVG element, which expands to fit the container.
26
26
  */
27
- export const Root = forwardRef<SVGContext, RootProps>(({ classNames, children, scale, centered, ...props }, ref) => {
27
+ export const Root = forwardRef<SVGContext, RootProps>(({ children, scale, centered, ...props }, ref) => {
28
28
  const { ref: containerRef, width = 0, height = 0 } = useResizeDetector({ refreshRate: 200 });
29
29
 
30
30
  const context = useMemo<SVGContext>(() => {
@@ -48,7 +48,7 @@ export const Root = forwardRef<SVGContext, RootProps>(({ classNames, children, s
48
48
 
49
49
  return (
50
50
  <SVGContextProvider value={context}>
51
- <div {...props} ref={containerRef} className={mx('grid grow overflow-hidden', classNames)}>
51
+ <div {...composableProps(props, { classNames: 'dx-expander' })} ref={containerRef}>
52
52
  <svg
53
53
  xmlns='http://www.w3.org/2000/svg'
54
54
  ref={context.ref}
@@ -8,7 +8,6 @@ import { type ThemedClassName } from '@dxos/react-ui';
8
8
 
9
9
  import { Graph, type GraphProps as SVGGraphProps } from '../Graph';
10
10
  import { Mesh, type MeshProps as SVGMeshProps } from '../Mesh';
11
-
12
11
  import { Grid, type GridProps as SVGGridProps } from './Grid';
13
12
  import { Markers, type MarkersProps as SVGMarkersProps } from './Markers';
14
13
  import { Root, type RootProps as SVGRootProps } from './Root';
@@ -2,17 +2,16 @@
2
2
  // Copyright 2022 DXOS.org
3
3
  //
4
4
 
5
+ import '../../../styles/graph.css';
6
+
5
7
  import { type Meta, type StoryObj } from '@storybook/react-vite';
6
8
  import React, { useRef } from 'react';
7
9
 
8
10
  import { withLayout, withTheme } from '@dxos/react-ui/testing';
9
11
 
10
12
  import { type SVGContext, useGrid, useZoom } from '../../hooks';
11
-
12
13
  import { SVG } from './SVG';
13
14
 
14
- import '../../../styles/graph.css';
15
-
16
15
  type ComponentProps = {
17
16
  grid?: boolean;
18
17
  zoom?: boolean;
@@ -2,6 +2,8 @@
2
2
  // Copyright 2025 DXOS.org
3
3
  //
4
4
 
5
+ import '../../styles/graph.css';
6
+
5
7
  import { type Meta, type StoryObj } from '@storybook/react-vite';
6
8
  import { select } from 'd3';
7
9
  import React, { type FC, useEffect, useMemo, useRef } from 'react';
@@ -11,22 +13,19 @@ import { withLayout, withTheme } from '@dxos/react-ui/testing';
11
13
  import { SVG } from '../components';
12
14
  import { useGrid, useZoom } from '../hooks';
13
15
  import { type D3Callable } from '../util';
14
-
15
16
  import { Pulsar } from './pulsar';
16
17
 
17
- import '../../styles/graph.css';
18
-
19
18
  type Datum = {
20
19
  x: number;
21
20
  y: number;
22
21
  r: number;
23
22
  };
24
23
 
25
- type StoryProps = {
24
+ type DefaultStoryProps = {
26
25
  count: number;
27
26
  } & Pulsar.Options;
28
27
 
29
- const DefaultStory = (props: StoryProps) => {
28
+ const DefaultStory = (props: DefaultStoryProps) => {
30
29
  return (
31
30
  <SVG.Root>
32
31
  <StoryComponent {...props} />
@@ -34,7 +33,7 @@ const DefaultStory = (props: StoryProps) => {
34
33
  );
35
34
  };
36
35
 
37
- const StoryComponent: FC<StoryProps> = ({ count = 1, ...options }) => {
36
+ const StoryComponent: FC<DefaultStoryProps> = ({ count = 1, ...options }) => {
38
37
  const items = useMemo<Datum[]>(
39
38
  () =>
40
39
  Array.from({ length: count }, () => {
@@ -7,7 +7,6 @@ import { drag, pointer, select } from 'd3';
7
7
  import { type SVGContext } from '../../hooks';
8
8
  import { type Point } from '../../util';
9
9
  import { type GraphLayoutNode } from '../types';
10
-
11
10
  import { type GraphProjector } from './graph-projector';
12
11
 
13
12
  enum Mode {
@@ -18,7 +18,6 @@ import { type Graph } from '@dxos/graph';
18
18
  import { log } from '@dxos/log';
19
19
 
20
20
  import { type GraphLayoutEdge, type GraphLayoutNode } from '../types';
21
-
22
21
  import { forcePoint } from './graph-forces';
23
22
  import { GraphProjector, type GraphProjectorOptions } from './graph-projector';
24
23
 
@@ -6,7 +6,6 @@ import { type Graph } from '@dxos/graph';
6
6
  import { log } from '@dxos/log';
7
7
 
8
8
  import { type GraphLayoutNode } from '../types';
9
-
10
9
  import { type GraphProjectorOptions } from './graph-projector';
11
10
  import { GraphRadialProjector, layoutRadial, updateNode } from './graph-radial-projector';
12
11
 
@@ -6,7 +6,6 @@ import { type Graph, type SelectionModel } from '@dxos/graph';
6
6
 
7
7
  import { type SVGContext } from '../../hooks';
8
8
  import { type GraphLayout, type GraphLayoutNode, emptyGraph } from '../types';
9
-
10
9
  import { Projector, type ProjectorOptions } from './projector';
11
10
 
12
11
  export type GraphProjectorOptions = ProjectorOptions & {};
@@ -9,7 +9,6 @@ import { log } from '@dxos/log';
9
9
 
10
10
  import { type Point } from '../../util';
11
11
  import { type GraphLayoutNode } from '../types';
12
-
13
12
  import { GraphProjector, type GraphProjectorOptions } from './graph-projector';
14
13
 
15
14
  export type GraphRadialProjectorOptions = GraphProjectorOptions & {
@@ -6,7 +6,6 @@ import { type Graph } from '@dxos/graph';
6
6
  import { log } from '@dxos/log';
7
7
 
8
8
  import { type GraphLayoutNode } from '../types';
9
-
10
9
  import { type GraphProjectorOptions } from './graph-projector';
11
10
  import { GraphRadialProjector, layoutHorizontal, layoutRadial, updateNode } from './graph-radial-projector';
12
11
 
@@ -9,7 +9,6 @@ import { log } from '@dxos/log';
9
9
 
10
10
  import { type D3Callable, type D3Selection, type Point, getCircumferencePoints } from '../../util';
11
11
  import { type GraphLayout, type GraphLayoutEdge, type GraphLayoutNode } from '../types';
12
-
13
12
  import { createBullets } from './bullets';
14
13
  import { Renderer, type RendererOptions } from './renderer';
15
14
 
@@ -2,6 +2,8 @@
2
2
  // Copyright 2020 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';
@@ -27,8 +29,6 @@ import {
27
29
  import { useGrid, useSvgContext, useZoom } from '../hooks';
28
30
  import { TestGraphModel, type TestNode, convertTreeToGraph, createTree } from '../testing';
29
31
 
30
- import '../../styles/graph.css';
31
-
32
32
  type ComponentProps = PropsWithChildren<{
33
33
  graph: () => Graph.Graph<TestNode, Graph.Edge.Any>;
34
34
  projectorOptions?: GraphForceProjectorOptions;
@@ -3,25 +3,25 @@
3
3
  //
4
4
 
5
5
  import { type Graph } from '@dxos/graph';
6
- import { faker } from '@dxos/random';
6
+ import { random } from '@dxos/random';
7
7
 
8
8
  import { type TestNode } from './model';
9
9
 
10
- // https://www.npmjs.com/package/faker#setting-a-randomness-seed
11
- export const seed = (seed: number) => faker.seed(seed);
10
+ // https://www.npmjs.com/package/random#setting-a-randomness-seed
11
+ export const seed = (seed: number) => random.seed(seed);
12
12
 
13
13
  //
14
14
  // Create data.
15
15
  //
16
16
 
17
17
  export const createNode = (type: string = undefined): TestNode => ({
18
- id: faker.string.uuid(),
18
+ id: random.string.uuid(),
19
19
  type,
20
- label: faker.lorem.words(3).replace(/ /g, '-'),
20
+ label: random.lorem.words(3).replace(/ /g, '-'),
21
21
  });
22
22
 
23
23
  export const createNodes = (n = 0, types?: string[]): TestNode[] =>
24
- Array.from({ length: n }, () => createNode(types ? faker.helpers.arrayElement(types) : undefined));
24
+ Array.from({ length: n }, () => createNode(types ? random.helpers.arrayElement(types) : undefined));
25
25
 
26
26
  export const createEdge = (source: TestNode, target: TestNode): Graph.Edge.Any => ({
27
27
  id: `${source.id}-${target.id}`,
@@ -38,7 +38,7 @@ export const createTree = ({ depth = 2, children = 3 } = {}): TestNode => {
38
38
  const createChildren = (root: TestNode, d = 0) => {
39
39
  if (d < depth) {
40
40
  const max = Math.round(Math.log(depth + 1 - d) * children);
41
- const num = faker.number.int({ min: 1, max });
41
+ const num = random.number.int({ min: 1, max });
42
42
  root.children = [...new Array(num)].map(() => {
43
43
  return createChildren(createNode(), d + 1);
44
44
  });
@@ -82,8 +82,8 @@ export const createGraph = (numNodes = 0, numEdges = 0, types?: string[]): Graph
82
82
  const edges = new Map();
83
83
  if (numEdges && nodes.length >= 2) {
84
84
  for (let i = 0; i < numEdges; i++) {
85
- const source = faker.helpers.arrayElement(nodes);
86
- const target = faker.helpers.arrayElement(nodes);
85
+ const source = random.helpers.arrayElement(nodes);
86
+ const target = random.helpers.arrayElement(nodes);
87
87
  if (source.id !== target.id) {
88
88
  const edge = createEdge(source, target);
89
89
  if (!edges.get(edge.id)) {
@@ -5,10 +5,9 @@
5
5
  import update from 'immutability-helper';
6
6
 
7
7
  import { type Graph } from '@dxos/graph';
8
- import { faker } from '@dxos/random';
8
+ import { random } from '@dxos/random';
9
9
 
10
10
  import { useStateRef } from '../hooks';
11
-
12
11
  import { createEdge, createNode } from './data';
13
12
  import { type TestNode } from './model';
14
13
 
@@ -53,7 +52,7 @@ export const useGraphGenerator = (options: { data?: Graph.Any } = {}) => {
53
52
  let interval;
54
53
 
55
54
  const mutator = () => {
56
- const parent = data.nodes.length ? faker.helpers.arrayElement(data.nodes) : undefined;
55
+ const parent = data.nodes.length ? random.helpers.arrayElement(data.nodes) : undefined;
57
56
  const node = createNode();
58
57
 
59
58
  updateData({
@@ -3,7 +3,7 @@
3
3
  //
4
4
 
5
5
  import { type Graph, GraphModel } from '@dxos/graph';
6
- import { faker } from '@dxos/random';
6
+ import { random } from '@dxos/random';
7
7
 
8
8
  import { createEdge, createNode } from './data';
9
9
 
@@ -14,13 +14,13 @@ export type TestNode = Graph.Node.Any & {
14
14
 
15
15
  export class TestGraphModel extends GraphModel.ReactiveGraphModel<TestNode> {
16
16
  getRandomNode() {
17
- return faker.helpers.arrayElement(this._graph.nodes);
17
+ return random.helpers.arrayElement(this._graph.nodes);
18
18
  }
19
19
 
20
20
  createNodes(node: TestNode = undefined, n = 1): void {
21
21
  Array.from({ length: n }).forEach(() => {
22
22
  const child = this.addNode(createNode());
23
- const parent = node || faker.helpers.arrayElement(this._graph.nodes);
23
+ const parent = node || random.helpers.arrayElement(this._graph.nodes);
24
24
  if (parent) {
25
25
  this.addEdge(createEdge(parent, child));
26
26
  }
package/styles/graph.css CHANGED
@@ -1,5 +1,5 @@
1
1
  /* TODO(burdon): Move into theme? */
2
- @reference "../../ui-theme/src/theme.css";
2
+ @reference "../../ui-theme/src/main.css";
3
3
 
4
4
  /**
5
5
  * Graph styles.