@dxos/react-ui-graph 0.8.4-main.422d1c7879 → 0.8.4-main.4f23b4e393
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.
- package/dist/lib/browser/{chunk-LKC455GK.mjs → chunk-EASNZZ7B.mjs} +1 -1
- package/dist/lib/browser/{chunk-LKC455GK.mjs.map → chunk-EASNZZ7B.mjs.map} +2 -2
- package/dist/lib/browser/index.mjs +31 -97
- package/dist/lib/browser/index.mjs.map +3 -3
- package/dist/lib/browser/meta.json +1 -1
- package/dist/lib/browser/testing/index.mjs +1 -1
- package/dist/lib/browser/testing/index.mjs.map +2 -2
- package/dist/lib/node-esm/{chunk-JE4KZCUF.mjs → chunk-JSE2X4ML.mjs} +1 -1
- package/dist/lib/node-esm/{chunk-JE4KZCUF.mjs.map → chunk-JSE2X4ML.mjs.map} +2 -2
- package/dist/lib/node-esm/index.mjs +31 -97
- package/dist/lib/node-esm/index.mjs.map +3 -3
- package/dist/lib/node-esm/meta.json +1 -1
- package/dist/lib/node-esm/testing/index.mjs +1 -1
- package/dist/lib/node-esm/testing/index.mjs.map +2 -2
- package/dist/types/src/components/Graph/Graph.d.ts.map +1 -1
- package/dist/types/src/components/Graph/Graph.stories.d.ts +3 -3
- package/dist/types/src/components/Graph/Graph.stories.d.ts.map +1 -1
- package/dist/types/src/components/Mesh/Mesh.d.ts.map +1 -1
- package/dist/types/src/components/Mesh/Mesh.stories.d.ts.map +1 -1
- package/dist/types/src/components/SVG/Grid.d.ts.map +1 -1
- package/dist/types/src/components/SVG/Markers.d.ts.map +1 -1
- package/dist/types/src/components/SVG/Root.d.ts +1 -1
- package/dist/types/src/components/SVG/Svg.stories.d.ts.map +1 -1
- package/dist/types/src/fx/fx.stories.d.ts.map +1 -1
- package/dist/types/src/fx/pulsar.d.ts.map +1 -1
- package/dist/types/src/graph/markers.d.ts.map +1 -1
- package/dist/types/src/graph/projector/graph-drag.d.ts.map +1 -1
- package/dist/types/src/graph/projector/graph-force-projector.d.ts.map +1 -1
- package/dist/types/src/graph/projector/graph-forces.d.ts.map +1 -1
- package/dist/types/src/graph/projector/graph-hierarchical-projector.d.ts.map +1 -1
- package/dist/types/src/graph/projector/graph-projector.d.ts.map +1 -1
- package/dist/types/src/graph/projector/graph-radial-projector.d.ts.map +1 -1
- package/dist/types/src/graph/projector/graph-relational-projector.d.ts.map +1 -1
- package/dist/types/src/graph/projector/projector.d.ts.map +1 -1
- package/dist/types/src/graph/renderer/bullets.d.ts.map +1 -1
- package/dist/types/src/graph/renderer/graph-renderer.d.ts.map +1 -1
- package/dist/types/src/graph/renderer/renderer.d.ts.map +1 -1
- package/dist/types/src/hooks/useGrid.d.ts.map +1 -1
- package/dist/types/src/hooks/useStateRef.d.ts.map +1 -1
- package/dist/types/src/hooks/useSvgContext.d.ts.map +1 -1
- package/dist/types/src/hooks/useZoom.d.ts.map +1 -1
- package/dist/types/src/stories/hooks.stories.d.ts.map +1 -1
- package/dist/types/src/testing/data.d.ts +1 -1
- package/dist/types/src/testing/data.d.ts.map +1 -1
- package/dist/types/src/testing/hooks.d.ts.map +1 -1
- package/dist/types/src/testing/model.d.ts.map +1 -1
- package/dist/types/src/util/events.d.ts.map +1 -1
- package/dist/types/src/util/fraction.d.ts.map +1 -1
- package/dist/types/src/util/points.d.ts.map +1 -1
- package/dist/types/src/util/scale.d.ts.map +1 -1
- package/dist/types/src/util/screen.d.ts.map +1 -1
- package/dist/types/src/util/vector.d.ts.map +1 -1
- package/dist/types/tsconfig.tsbuildinfo +1 -1
- package/package.json +18 -18
- package/src/components/Graph/Graph.stories.tsx +5 -5
- package/src/components/Graph/Graph.tsx +10 -13
- package/src/graph/renderer/graph-renderer.ts +4 -4
- 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.
|
|
3
|
+
"version": "0.8.4-main.4f23b4e393",
|
|
4
4
|
"description": "GEM Graph.",
|
|
5
5
|
"homepage": "https://dxos.org",
|
|
6
6
|
"bugs": "https://github.com/dxos/dxos/issues",
|
|
@@ -44,13 +44,13 @@
|
|
|
44
44
|
"lodash.defaultsdeep": "^4.6.1",
|
|
45
45
|
"react-resize-detector": "^11.0.1",
|
|
46
46
|
"topojson-client": "^3.1.0",
|
|
47
|
-
"@dxos/
|
|
48
|
-
"@dxos/
|
|
49
|
-
"@dxos/
|
|
50
|
-
"@dxos/
|
|
51
|
-
"@dxos/
|
|
52
|
-
"@dxos/
|
|
53
|
-
"@dxos/
|
|
47
|
+
"@dxos/debug": "0.8.4-main.4f23b4e393",
|
|
48
|
+
"@dxos/async": "0.8.4-main.4f23b4e393",
|
|
49
|
+
"@dxos/node-std": "0.8.4-main.4f23b4e393",
|
|
50
|
+
"@dxos/log": "0.8.4-main.4f23b4e393",
|
|
51
|
+
"@dxos/invariant": "0.8.4-main.4f23b4e393",
|
|
52
|
+
"@dxos/react-ui-mosaic": "0.8.4-main.4f23b4e393",
|
|
53
|
+
"@dxos/graph": "0.8.4-main.4f23b4e393"
|
|
54
54
|
},
|
|
55
55
|
"devDependencies": {
|
|
56
56
|
"@babel/core": "^7.18.13",
|
|
@@ -60,24 +60,24 @@
|
|
|
60
60
|
"@types/react-dom": "~19.2.3",
|
|
61
61
|
"@types/topojson-client": "^3.1.4",
|
|
62
62
|
"@types/topojson-specification": "^1.0.5",
|
|
63
|
-
"postcss": "^8.
|
|
63
|
+
"postcss": "^8.5.12",
|
|
64
64
|
"react": "~19.2.3",
|
|
65
65
|
"react-dom": "~19.2.3",
|
|
66
|
-
"@dxos/random": "0.8.4-main.
|
|
67
|
-
"@dxos/react-ui": "0.8.4-main.
|
|
68
|
-
"@dxos/react-ui-
|
|
69
|
-
"@dxos/storybook-utils": "0.8.4-main.
|
|
70
|
-
"@dxos/ui-
|
|
71
|
-
"@dxos/
|
|
66
|
+
"@dxos/random": "0.8.4-main.4f23b4e393",
|
|
67
|
+
"@dxos/react-ui": "0.8.4-main.4f23b4e393",
|
|
68
|
+
"@dxos/react-ui-stack": "0.8.4-main.4f23b4e393",
|
|
69
|
+
"@dxos/storybook-utils": "0.8.4-main.4f23b4e393",
|
|
70
|
+
"@dxos/react-ui-syntax-highlighter": "0.8.4-main.4f23b4e393",
|
|
71
|
+
"@dxos/ui-theme": "0.8.4-main.4f23b4e393"
|
|
72
72
|
},
|
|
73
73
|
"peerDependencies": {
|
|
74
74
|
"react": "~19.2.3",
|
|
75
75
|
"react-dom": "~19.2.3",
|
|
76
|
-
"@dxos/react-ui": "0.8.4-main.
|
|
77
|
-
"@dxos/ui-theme": "0.8.4-main.
|
|
76
|
+
"@dxos/react-ui": "0.8.4-main.4f23b4e393",
|
|
77
|
+
"@dxos/ui-theme": "0.8.4-main.4f23b4e393"
|
|
78
78
|
},
|
|
79
79
|
"optionalDependencies": {
|
|
80
|
-
"@dxos/random": "0.8.4-main.
|
|
80
|
+
"@dxos/random": "0.8.4-main.4f23b4e393"
|
|
81
81
|
},
|
|
82
82
|
"publishConfig": {
|
|
83
83
|
"access": "public"
|
|
@@ -9,7 +9,7 @@ import { type Meta, type StoryObj } from '@storybook/react-vite';
|
|
|
9
9
|
import { select } from 'd3';
|
|
10
10
|
import React, { useCallback, useContext, useEffect, useMemo, useRef, useState } from 'react';
|
|
11
11
|
|
|
12
|
-
import { type Graph, type GraphModel, SelectionModel } from '@dxos/graph';
|
|
12
|
+
import { type Graph, type GraphModel, type SelectionMode, SelectionModel } from '@dxos/graph';
|
|
13
13
|
import { IconButton, Popover, Toolbar } from '@dxos/react-ui';
|
|
14
14
|
import { Card } from '@dxos/react-ui';
|
|
15
15
|
import { JsonHighlighter, Syntax } from '@dxos/react-ui-syntax-highlighter';
|
|
@@ -53,8 +53,8 @@ type DefaultStoryProps = GraphProps & {
|
|
|
53
53
|
debug?: boolean;
|
|
54
54
|
grid?: boolean | SVGGridProps;
|
|
55
55
|
inspect?: boolean;
|
|
56
|
-
singleSelect?: boolean;
|
|
57
56
|
graph: () => Graph.Any;
|
|
57
|
+
selectionMode?: SelectionMode;
|
|
58
58
|
projectorType?: ProjectorType;
|
|
59
59
|
projectorOptions?:
|
|
60
60
|
| GraphForceProjectorOptions
|
|
@@ -67,7 +67,7 @@ const DefaultStory = ({
|
|
|
67
67
|
debug,
|
|
68
68
|
grid,
|
|
69
69
|
inspect,
|
|
70
|
-
|
|
70
|
+
selectionMode,
|
|
71
71
|
graph: _graph,
|
|
72
72
|
projectorType: _projectorType = 'force',
|
|
73
73
|
projectorOptions,
|
|
@@ -78,11 +78,11 @@ const DefaultStory = ({
|
|
|
78
78
|
const registry = useContext(RegistryContext);
|
|
79
79
|
|
|
80
80
|
// Models.
|
|
81
|
+
const selection = useMemo(() => new SelectionModel({ mode: selectionMode }), [selectionMode]);
|
|
81
82
|
const [model, setModel] = useState<GraphModel.ReactiveGraphModel | undefined>(() => {
|
|
82
83
|
const graph = _graph?.();
|
|
83
84
|
return graph ? new TestGraphModel(registry, graph) : undefined;
|
|
84
85
|
});
|
|
85
|
-
const selection = useMemo(() => new SelectionModel(singleSelect), [singleSelect]);
|
|
86
86
|
|
|
87
87
|
// Projector.
|
|
88
88
|
const [projectorType, setProjectorType] = useState<ProjectorType>(_projectorType);
|
|
@@ -359,7 +359,7 @@ export const Projector: Story = {
|
|
|
359
359
|
debug: true,
|
|
360
360
|
drag: true,
|
|
361
361
|
arrows: true,
|
|
362
|
-
|
|
362
|
+
selectionMode: 'single',
|
|
363
363
|
projectorType: 'hierarchical',
|
|
364
364
|
projectorOptions: {
|
|
365
365
|
duration: 500,
|
|
@@ -54,8 +54,6 @@ 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);
|
|
59
57
|
|
|
60
58
|
const { projector, renderer } = useMemo(() => {
|
|
61
59
|
let projector = projectorProp;
|
|
@@ -70,8 +68,8 @@ const GraphInner = <Node extends Graph$.Node.Any = any, Edge extends Graph$.Edge
|
|
|
70
68
|
// TODO(burdon): Replace drag when projector is updated.
|
|
71
69
|
drag: drag ? createGraphDrag(context, projector) : undefined,
|
|
72
70
|
arrows: { end: arrows },
|
|
73
|
-
onNodeClick: onSelect
|
|
74
|
-
onNodePointerEnter: onInspect
|
|
71
|
+
onNodeClick: onSelect,
|
|
72
|
+
onNodePointerEnter: onInspect,
|
|
75
73
|
});
|
|
76
74
|
}
|
|
77
75
|
|
|
@@ -99,21 +97,20 @@ const GraphInner = <Node extends Graph$.Node.Any = any, Edge extends Graph$.Edge
|
|
|
99
97
|
useEffect(() => {
|
|
100
98
|
projector.updateData(model?.graph);
|
|
101
99
|
|
|
102
|
-
// Subscribe to model changes if reactive model.
|
|
103
|
-
const unsubscribeModel = model
|
|
104
|
-
? model.subscribe(() => {
|
|
105
|
-
projector.updateData(model?.graph);
|
|
106
|
-
})
|
|
107
|
-
: undefined;
|
|
108
|
-
|
|
109
100
|
return combine(
|
|
110
|
-
|
|
101
|
+
// Subscribe to model changes if reactive model.
|
|
102
|
+
model
|
|
103
|
+
? model.subscribe(() => {
|
|
104
|
+
projector.updateData(model?.graph);
|
|
105
|
+
})
|
|
106
|
+
: undefined,
|
|
107
|
+
|
|
111
108
|
projector.updated.on(({ layout }) => {
|
|
112
109
|
try {
|
|
113
110
|
renderer.render(layout);
|
|
114
111
|
} catch (error) {
|
|
115
|
-
void projector.stop();
|
|
116
112
|
log.catch(error);
|
|
113
|
+
void projector.stop();
|
|
117
114
|
}
|
|
118
115
|
}),
|
|
119
116
|
);
|
|
@@ -250,20 +250,20 @@ const createNode: D3Callable = <Data>(group: D3Selection, options: GraphRenderer
|
|
|
250
250
|
options.onNodePointerEnter(node, event);
|
|
251
251
|
});
|
|
252
252
|
|
|
253
|
-
group.attr('data-hover', 'handled');
|
|
253
|
+
group.attr('data-hover', 'handled');
|
|
254
254
|
} else if (options.highlight !== false) {
|
|
255
255
|
circle.on('pointerenter', function () {
|
|
256
256
|
select(this.closest('g.dx-node')).raise();
|
|
257
257
|
if (options.labels) {
|
|
258
|
-
select(this.parentElement).classed('dx-active', true).classed('dx-highlight', true);
|
|
258
|
+
select(this.parentElement).classed('dx-node-active', true).classed('dx-highlight', true);
|
|
259
259
|
}
|
|
260
260
|
});
|
|
261
261
|
|
|
262
262
|
group.on('pointerleave', function () {
|
|
263
263
|
if (options.labels) {
|
|
264
|
-
select(this).classed('dx-active', false);
|
|
264
|
+
select(this).classed('dx-node-active', false);
|
|
265
265
|
setTimeout(() => {
|
|
266
|
-
if (!select(this).classed('dx-active')) {
|
|
266
|
+
if (!select(this).classed('dx-node-active')) {
|
|
267
267
|
select(this).classed('dx-highlight', false);
|
|
268
268
|
}
|
|
269
269
|
}, 300);
|