@dxos/react-ui-graph 0.8.4-main.a4bbb77 → 0.8.4-main.abd8ff62ef

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 (98) hide show
  1. package/README.md +5 -7
  2. package/dist/lib/browser/chunk-EASNZZ7B.mjs +52 -0
  3. package/dist/lib/browser/chunk-EASNZZ7B.mjs.map +7 -0
  4. package/dist/lib/browser/index.mjs +1110 -396
  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 +16 -16
  8. package/dist/lib/browser/testing/index.mjs.map +3 -3
  9. package/dist/lib/node-esm/chunk-JSE2X4ML.mjs +54 -0
  10. package/dist/lib/node-esm/chunk-JSE2X4ML.mjs.map +7 -0
  11. package/dist/lib/node-esm/index.mjs +1110 -396
  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 +16 -16
  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 +4 -4
  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/Grid.d.ts.map +1 -1
  23. package/dist/types/src/components/SVG/Markers.d.ts.map +1 -1
  24. package/dist/types/src/components/SVG/Root.d.ts +4 -4
  25. package/dist/types/src/components/SVG/Root.d.ts.map +1 -1
  26. package/dist/types/src/components/SVG/SVG.d.ts +14 -17
  27. package/dist/types/src/components/SVG/SVG.d.ts.map +1 -1
  28. package/dist/types/src/components/SVG/Svg.stories.d.ts +1 -1
  29. package/dist/types/src/components/SVG/Svg.stories.d.ts.map +1 -1
  30. package/dist/types/src/fx/fx.stories.d.ts +3 -3
  31. package/dist/types/src/fx/fx.stories.d.ts.map +1 -1
  32. package/dist/types/src/fx/pulsar.d.ts.map +1 -1
  33. package/dist/types/src/graph/markers.d.ts.map +1 -1
  34. package/dist/types/src/graph/projector/graph-drag.d.ts.map +1 -1
  35. package/dist/types/src/graph/projector/graph-force-projector.d.ts +1 -1
  36. package/dist/types/src/graph/projector/graph-force-projector.d.ts.map +1 -1
  37. package/dist/types/src/graph/projector/graph-forces.d.ts.map +1 -1
  38. package/dist/types/src/graph/projector/graph-hierarchical-projector.d.ts +1 -1
  39. package/dist/types/src/graph/projector/graph-hierarchical-projector.d.ts.map +1 -1
  40. package/dist/types/src/graph/projector/graph-projector.d.ts +2 -2
  41. package/dist/types/src/graph/projector/graph-projector.d.ts.map +1 -1
  42. package/dist/types/src/graph/projector/graph-radial-projector.d.ts +1 -1
  43. package/dist/types/src/graph/projector/graph-radial-projector.d.ts.map +1 -1
  44. package/dist/types/src/graph/projector/graph-relational-projector.d.ts +1 -1
  45. package/dist/types/src/graph/projector/graph-relational-projector.d.ts.map +1 -1
  46. package/dist/types/src/graph/projector/projector.d.ts.map +1 -1
  47. package/dist/types/src/graph/renderer/bullets.d.ts.map +1 -1
  48. package/dist/types/src/graph/renderer/graph-renderer.d.ts.map +1 -1
  49. package/dist/types/src/graph/renderer/renderer.d.ts.map +1 -1
  50. package/dist/types/src/graph/types.d.ts +1 -1
  51. package/dist/types/src/graph/types.d.ts.map +1 -1
  52. package/dist/types/src/hooks/useGrid.d.ts.map +1 -1
  53. package/dist/types/src/hooks/useStateRef.d.ts.map +1 -1
  54. package/dist/types/src/hooks/useSvgContext.d.ts.map +1 -1
  55. package/dist/types/src/hooks/useZoom.d.ts.map +1 -1
  56. package/dist/types/src/stories/hooks.stories.d.ts +4 -3
  57. package/dist/types/src/stories/hooks.stories.d.ts.map +1 -1
  58. package/dist/types/src/testing/data.d.ts +5 -5
  59. package/dist/types/src/testing/data.d.ts.map +1 -1
  60. package/dist/types/src/testing/hooks.d.ts +2 -16
  61. package/dist/types/src/testing/hooks.d.ts.map +1 -1
  62. package/dist/types/src/testing/model.d.ts +4 -8
  63. package/dist/types/src/testing/model.d.ts.map +1 -1
  64. package/dist/types/src/util/events.d.ts.map +1 -1
  65. package/dist/types/src/util/fraction.d.ts +1 -1
  66. package/dist/types/src/util/fraction.d.ts.map +1 -1
  67. package/dist/types/src/util/points.d.ts.map +1 -1
  68. package/dist/types/src/util/scale.d.ts.map +1 -1
  69. package/dist/types/src/util/screen.d.ts.map +1 -1
  70. package/dist/types/src/util/vector.d.ts.map +1 -1
  71. package/dist/types/tsconfig.tsbuildinfo +1 -1
  72. package/package.json +32 -34
  73. package/src/components/Graph/Graph.stories.tsx +50 -44
  74. package/src/components/Graph/Graph.tsx +23 -15
  75. package/src/components/Mesh/Mesh.stories.tsx +2 -3
  76. package/src/components/SVG/Grid.tsx +1 -1
  77. package/src/components/SVG/Root.tsx +14 -7
  78. package/src/components/SVG/SVG.tsx +10 -2
  79. package/src/components/SVG/Svg.stories.tsx +4 -5
  80. package/src/fx/fx.stories.tsx +7 -8
  81. package/src/graph/projector/graph-drag.ts +0 -1
  82. package/src/graph/projector/graph-force-projector.ts +1 -2
  83. package/src/graph/projector/graph-hierarchical-projector.ts +3 -4
  84. package/src/graph/projector/graph-projector.ts +2 -3
  85. package/src/graph/projector/graph-radial-projector.ts +1 -2
  86. package/src/graph/projector/graph-relational-projector.ts +3 -4
  87. package/src/graph/renderer/graph-renderer.ts +9 -4
  88. package/src/graph/types.ts +1 -1
  89. package/src/stories/hooks.stories.tsx +15 -9
  90. package/src/testing/data.ts +14 -14
  91. package/src/testing/hooks.ts +3 -4
  92. package/src/testing/model.ts +6 -6
  93. package/src/util/fraction.ts +1 -1
  94. package/styles/graph.css +292 -43
  95. package/dist/lib/browser/chunk-EX2Q43O6.mjs +0 -966
  96. package/dist/lib/browser/chunk-EX2Q43O6.mjs.map +0 -7
  97. package/dist/lib/node-esm/chunk-SWA6OT3W.mjs +0 -968
  98. package/dist/lib/node-esm/chunk-SWA6OT3W.mjs.map +0 -7
@@ -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 & {};
@@ -15,7 +14,7 @@ export type GraphProjectorOptions = ProjectorOptions & {};
15
14
  * Base class for graph projectors.
16
15
  */
17
16
  export abstract class GraphProjector<NodeData = any, Options extends GraphProjectorOptions = any> extends Projector<
18
- Graph,
17
+ Graph.Any,
19
18
  GraphLayout<NodeData>,
20
19
  Options
21
20
  > {
@@ -60,7 +59,7 @@ export abstract class GraphProjector<NodeData = any, Options extends GraphProjec
60
59
  * Merge external data with internal representation (e.g., so force properties like position are preserved).
61
60
  * @param data
62
61
  */
63
- protected mergeData(data: Graph = emptyGraph) {
62
+ protected mergeData(data: Graph.Any = emptyGraph) {
64
63
  // Merge nodes.
65
64
  const nodes: GraphLayoutNode[] = data.nodes.map((node) => {
66
65
  let current: GraphLayoutNode = this._layout.graph.nodes.find((n) => n.id === this.options.idAccessor(node));
@@ -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 & {
@@ -28,7 +27,7 @@ export class GraphRadialProjector<
28
27
  return undefined;
29
28
  }
30
29
 
31
- protected override onUpdate(graph?: Graph) {
30
+ protected override onUpdate(graph?: Graph.Any) {
32
31
  log('onUpdate', { graph: { nodes: graph?.nodes.length, edges: graph?.edges.length } });
33
32
  this.mergeData(graph);
34
33
  this.doRadialLayout();
@@ -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
 
@@ -20,14 +19,14 @@ export class GraphRelationalProjector<
20
19
  NodeData = any,
21
20
  Options extends GraphRelationalProjectorOptions = any,
22
21
  > extends GraphRadialProjector<NodeData, Options> {
23
- protected override onUpdate(graph?: Graph) {
22
+ protected override onUpdate(graph?: Graph.Any) {
24
23
  log('onUpdate', {
25
24
  graph: { nodes: graph?.nodes.length, edges: graph?.edges.length },
26
- selection: this.selection?.selected.value,
25
+ selection: this.selection?.getSelectedIds(),
27
26
  });
28
27
 
29
28
  this.mergeData(graph);
30
- const selected = this.selection?.selected.value?.[0];
29
+ const selected = this.selection?.getSelectedIds()[0];
31
30
  if (selected) {
32
31
  const node = this.layout.graph.nodes.find((node) => node.id === selected);
33
32
  if (node) {
@@ -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
 
@@ -253,18 +252,24 @@ const createNode: D3Callable = <Data>(group: D3Selection, options: GraphRenderer
253
252
 
254
253
  group.attr('data-hover', 'handled'); // TODO(burdon): ???
255
254
  } else if (options.highlight !== false) {
255
+ // `dx-node-active` is a graph-renderer-private state flag — used as a
256
+ // mutable boolean on the DOM element across event handlers, not as a
257
+ // Tailwind utility. Renamed from `dx-active` (which had no CSS rule
258
+ // and collided with the global `dx-*` utility namespace; the canonical
259
+ // selection utilities are `dx-selected` / `dx-current` — see
260
+ // `ui-theme/src/css/components/selected.md`).
256
261
  circle.on('pointerenter', function () {
257
262
  select(this.closest('g.dx-node')).raise();
258
263
  if (options.labels) {
259
- select(this.parentElement).classed('dx-active', true).classed('dx-highlight', true);
264
+ select(this.parentElement).classed('dx-node-active', true).classed('dx-highlight', true);
260
265
  }
261
266
  });
262
267
 
263
268
  group.on('pointerleave', function () {
264
269
  if (options.labels) {
265
- select(this).classed('dx-active', false);
270
+ select(this).classed('dx-node-active', false);
266
271
  setTimeout(() => {
267
- if (!select(this).classed('dx-active')) {
272
+ if (!select(this).classed('dx-node-active')) {
268
273
  select(this).classed('dx-highlight', false);
269
274
  }
270
275
  }, 300);
@@ -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,18 @@
2
2
  // Copyright 2020 DXOS.org
3
3
  //
4
4
 
5
+ import '../../styles/graph.css';
6
+
7
+ import { RegistryContext } from '@effect-atom/atom-react';
5
8
  import { type Meta, type StoryObj } from '@storybook/react-vite';
6
9
  import { select } from 'd3';
7
- import React, { type PropsWithChildren, useEffect, useMemo, useRef } from 'react';
10
+ import React, { type PropsWithChildren, useContext, useEffect, useMemo, useRef } from 'react';
8
11
 
9
12
  import { combine } from '@dxos/async';
13
+ import { type Graph } from '@dxos/graph';
10
14
  import { log } from '@dxos/log';
11
- import { withTheme } from '@dxos/react-ui/testing';
15
+ import { withLayout, withTheme } from '@dxos/react-ui/testing';
16
+ import { withRegistry } from '@dxos/storybook-utils';
12
17
 
13
18
  import { SVG } from '../components';
14
19
  import {
@@ -24,10 +29,8 @@ import {
24
29
  import { useGrid, useSvgContext, useZoom } from '../hooks';
25
30
  import { TestGraphModel, type TestNode, convertTreeToGraph, createTree } from '../testing';
26
31
 
27
- import '../../styles/graph.css';
28
-
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,
@@ -2,28 +2,28 @@
2
2
  // Copyright 2020 DXOS.org
3
3
  //
4
4
 
5
- import { type BaseGraphEdge, type Graph } from '@dxos/graph';
6
- import { faker } from '@dxos/random';
5
+ import { type Graph } from '@dxos/graph';
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
- export const createEdge = (source: TestNode, target: TestNode): BaseGraphEdge => ({
26
+ export const createEdge = (source: TestNode, target: TestNode): Graph.Edge.Any => ({
27
27
  id: `${source.id}-${target.id}`,
28
28
  source: source.id,
29
29
  target: 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
  });
@@ -54,8 +54,8 @@ export const createTree = ({ depth = 2, children = 3 } = {}): TestNode => {
54
54
  * Converts a tree into a graph.
55
55
  * @param root
56
56
  */
57
- export const convertTreeToGraph = (root: TestNode): Graph => {
58
- const traverse = (node: TestNode, graph: Graph) => {
57
+ export const convertTreeToGraph = (root: TestNode): Graph.Any => {
58
+ const traverse = (node: TestNode, graph: Graph.Any) => {
59
59
  graph.nodes.push(node);
60
60
  node.children?.forEach((child) => {
61
61
  graph.edges.push(createEdge(node, child));
@@ -76,14 +76,14 @@ export const convertTreeToGraph = (root: TestNode): Graph => {
76
76
  * @param numNodes
77
77
  * @param numEdges
78
78
  */
79
- export const createGraph = (numNodes = 0, numEdges = 0, types?: string[]): Graph => {
79
+ export const createGraph = (numNodes = 0, numEdges = 0, types?: string[]): Graph.Any => {
80
80
  const nodes = createNodes(numNodes, types);
81
81
 
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
 
@@ -47,13 +46,13 @@ export const useObjectMutator = <T>(initalValue: T): ObjectMutator<T> => {
47
46
  /**
48
47
  * Test data set generator and mutator.
49
48
  */
50
- export const useGraphGenerator = (options: { data?: Graph } = {}) => {
49
+ export const useGraphGenerator = (options: { data?: Graph.Any } = {}) => {
51
50
  const [data, setData, updateData] = useObjectMutator(options.data || { nodes: [], edges: [] });
52
51
 
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({
@@ -2,25 +2,25 @@
2
2
  // Copyright 2022 DXOS.org
3
3
  //
4
4
 
5
- import { type BaseGraphNode, ReactiveGraphModel } from '@dxos/graph';
6
- import { faker } from '@dxos/random';
5
+ import { type Graph, GraphModel } from '@dxos/graph';
6
+ import { random } from '@dxos/random';
7
7
 
8
8
  import { createEdge, createNode } from './data';
9
9
 
10
- export type TestNode = BaseGraphNode & {
10
+ export type TestNode = Graph.Node.Any & {
11
11
  label?: string;
12
12
  children?: TestNode[];
13
13
  };
14
14
 
15
- export class TestGraphModel extends ReactiveGraphModel<TestNode> {
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
  }
@@ -30,7 +30,7 @@ export class FractionUtil {
30
30
 
31
31
  /**
32
32
  * @param {Fraction}
33
- * Convert to rounded number.
33
+ * Convert to rounded-sm number.
34
34
  */
35
35
  static toNumber = ([n, d]: Fraction): number => {
36
36
  FractionUtil.validate([n, d]);