@dxos/react-ui-graph 0.8.3 → 0.8.4-main.28f8d3d
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-2YMRPQU7.mjs → chunk-HLAKLUDC.mjs} +362 -383
- package/dist/lib/browser/{chunk-2YMRPQU7.mjs.map → chunk-HLAKLUDC.mjs.map} +3 -3
- package/dist/lib/browser/index.mjs +57 -50
- package/dist/lib/browser/index.mjs.map +3 -3
- package/dist/lib/browser/meta.json +1 -1
- package/dist/lib/browser/testing/index.mjs +4 -4
- package/dist/lib/browser/testing/index.mjs.map +2 -2
- package/dist/lib/node-esm/{chunk-ITHTKQOY.mjs → chunk-O6GWCXDC.mjs} +362 -383
- package/dist/lib/node-esm/{chunk-ITHTKQOY.mjs.map → chunk-O6GWCXDC.mjs.map} +3 -3
- package/dist/lib/node-esm/index.mjs +57 -50
- 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 +4 -4
- 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 +2 -2
- package/dist/types/src/components/Graph/Graph.stories.d.ts.map +1 -1
- package/dist/types/src/components/Mesh/Mesh.stories.d.ts +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/Root.d.ts.map +1 -1
- package/dist/types/src/components/SVG/SVG.d.ts +2 -2
- package/dist/types/src/components/SVG/SVG.d.ts.map +1 -1
- package/dist/types/src/components/SVG/Svg.stories.d.ts.map +1 -1
- package/dist/types/src/components/SVG/Zoom.d.ts.map +1 -1
- package/dist/types/src/fx/fx.stories.d.ts +1 -1
- package/dist/types/src/fx/fx.stories.d.ts.map +1 -1
- package/dist/types/src/graph/projector/graph-drag.d.ts +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 +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 +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 +2 -2
- package/dist/types/src/graph/projector/graph-projector.d.ts.map +1 -1
- package/dist/types/src/graph/projector/graph-radial-projector.d.ts +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 +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 +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/useZoom.d.ts.map +1 -1
- package/dist/types/src/stories/hooks.stories.d.ts +1 -1
- package/dist/types/src/stories/hooks.stories.d.ts.map +1 -1
- package/dist/types/src/testing/hooks.d.ts.map +1 -1
- package/dist/types/src/util/index.d.ts +2 -2
- package/dist/types/src/util/index.d.ts.map +1 -1
- package/dist/types/src/util/screen.d.ts +1 -1
- package/dist/types/src/util/screen.d.ts.map +1 -1
- package/dist/types/src/util/vector.d.ts +1 -1
- package/dist/types/src/util/vector.d.ts.map +1 -1
- package/dist/types/tsconfig.tsbuildinfo +1 -1
- package/package.json +17 -17
- package/src/components/Graph/Graph.stories.tsx +10 -9
- package/src/components/Graph/Graph.tsx +1 -1
- package/src/components/Mesh/Mesh.stories.tsx +3 -2
- package/src/components/Mesh/Mesh.tsx +1 -1
- package/src/components/SVG/Grid.tsx +1 -1
- package/src/components/SVG/Root.tsx +1 -1
- package/src/components/SVG/SVG.tsx +4 -3
- package/src/components/SVG/Svg.stories.tsx +2 -1
- package/src/components/SVG/Zoom.tsx +1 -1
- package/src/fx/fx.stories.tsx +3 -2
- package/src/graph/projector/graph-drag.ts +2 -1
- package/src/graph/projector/graph-force-projector.ts +3 -2
- package/src/graph/projector/graph-forces.ts +1 -1
- package/src/graph/projector/graph-hierarchical-projector.ts +2 -1
- package/src/graph/projector/graph-projector.ts +4 -3
- package/src/graph/projector/graph-radial-projector.ts +3 -2
- package/src/graph/projector/graph-relational-projector.ts +2 -1
- package/src/graph/projector/projector.ts +1 -1
- package/src/graph/renderer/bullets.ts +1 -1
- package/src/graph/renderer/graph-renderer.ts +4 -3
- package/src/graph/renderer/renderer.ts +1 -1
- package/src/hooks/useZoom.ts +1 -1
- package/src/stories/hooks.stories.tsx +6 -6
- package/src/testing/hooks.ts +3 -2
- package/src/util/index.ts +2 -2
- package/src/util/screen.test.ts +1 -1
- package/src/util/screen.ts +1 -1
- package/src/util/vector.ts +1 -1
- package/dist/lib/node/chunk-WFHWEMPB.cjs +0 -919
- package/dist/lib/node/chunk-WFHWEMPB.cjs.map +0 -7
- package/dist/lib/node/index.cjs +0 -1547
- package/dist/lib/node/index.cjs.map +0 -7
- package/dist/lib/node/meta.json +0 -1
- package/dist/lib/node/testing/index.cjs +0 -214
- package/dist/lib/node/testing/index.cjs.map +0 -7
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dxos/react-ui-graph",
|
|
3
|
-
"version": "0.8.
|
|
3
|
+
"version": "0.8.4-main.28f8d3d",
|
|
4
4
|
"description": "GEM Graph.",
|
|
5
5
|
"homepage": "https://dxos.org",
|
|
6
6
|
"bugs": "https://github.com/dxos/dxos/issues",
|
|
@@ -46,13 +46,13 @@
|
|
|
46
46
|
"lodash.defaultsdeep": "^4.6.1",
|
|
47
47
|
"react-resize-detector": "^11.0.1",
|
|
48
48
|
"topojson-client": "^3.1.0",
|
|
49
|
-
"@dxos/
|
|
50
|
-
"@dxos/
|
|
51
|
-
"@dxos/echo-signals": "0.8.
|
|
52
|
-
"@dxos/graph": "0.8.
|
|
53
|
-
"@dxos/
|
|
54
|
-
"@dxos/
|
|
55
|
-
"@dxos/
|
|
49
|
+
"@dxos/async": "0.8.4-main.28f8d3d",
|
|
50
|
+
"@dxos/debug": "0.8.4-main.28f8d3d",
|
|
51
|
+
"@dxos/echo-signals": "0.8.4-main.28f8d3d",
|
|
52
|
+
"@dxos/graph": "0.8.4-main.28f8d3d",
|
|
53
|
+
"@dxos/node-std": "0.8.4-main.28f8d3d",
|
|
54
|
+
"@dxos/invariant": "0.8.4-main.28f8d3d",
|
|
55
|
+
"@dxos/log": "0.8.4-main.28f8d3d"
|
|
56
56
|
},
|
|
57
57
|
"devDependencies": {
|
|
58
58
|
"@babel/core": "^7.18.13",
|
|
@@ -65,21 +65,21 @@
|
|
|
65
65
|
"postcss": "^8.4.41",
|
|
66
66
|
"react": "~18.2.0",
|
|
67
67
|
"react-dom": "~18.2.0",
|
|
68
|
-
"@dxos/random": "0.8.
|
|
69
|
-
"@dxos/react-ui": "0.8.
|
|
70
|
-
"@dxos/react-ui-stack": "0.8.
|
|
71
|
-
"@dxos/react-ui-
|
|
72
|
-
"@dxos/
|
|
73
|
-
"@dxos/
|
|
68
|
+
"@dxos/random": "0.8.4-main.28f8d3d",
|
|
69
|
+
"@dxos/react-ui": "0.8.4-main.28f8d3d",
|
|
70
|
+
"@dxos/react-ui-stack": "0.8.4-main.28f8d3d",
|
|
71
|
+
"@dxos/react-ui-syntax-highlighter": "0.8.4-main.28f8d3d",
|
|
72
|
+
"@dxos/storybook-utils": "0.8.4-main.28f8d3d",
|
|
73
|
+
"@dxos/react-ui-theme": "0.8.4-main.28f8d3d"
|
|
74
74
|
},
|
|
75
75
|
"peerDependencies": {
|
|
76
76
|
"react": "~18.2.0",
|
|
77
77
|
"react-dom": "~18.2.0",
|
|
78
|
-
"@dxos/react-ui": "0.8.
|
|
79
|
-
"@dxos/react-ui-theme": "0.8.
|
|
78
|
+
"@dxos/react-ui": "0.8.4-main.28f8d3d",
|
|
79
|
+
"@dxos/react-ui-theme": "0.8.4-main.28f8d3d"
|
|
80
80
|
},
|
|
81
81
|
"optionalDependencies": {
|
|
82
|
-
"@dxos/random": "0.8.
|
|
82
|
+
"@dxos/random": "0.8.4-main.28f8d3d"
|
|
83
83
|
},
|
|
84
84
|
"publishConfig": {
|
|
85
85
|
"access": "public"
|
|
@@ -5,36 +5,37 @@
|
|
|
5
5
|
import '@dxos-theme';
|
|
6
6
|
|
|
7
7
|
import { effect } from '@preact/signals-core';
|
|
8
|
-
import { type StoryObj } from '@storybook/react';
|
|
8
|
+
import { type StoryObj } from '@storybook/react-vite';
|
|
9
9
|
import { select } from 'd3';
|
|
10
10
|
import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
|
|
11
11
|
|
|
12
|
-
import { type GraphModel, SelectionModel
|
|
12
|
+
import { type Graph, type GraphModel, SelectionModel } from '@dxos/graph';
|
|
13
13
|
import { IconButton, Popover, Toolbar } from '@dxos/react-ui';
|
|
14
14
|
import { Card } from '@dxos/react-ui-stack';
|
|
15
15
|
import { JsonFilter, SyntaxHighlighter } from '@dxos/react-ui-syntax-highlighter';
|
|
16
16
|
import { getHashColor, mx } from '@dxos/react-ui-theme';
|
|
17
17
|
import { type Meta, withLayout, withTheme } from '@dxos/storybook-utils';
|
|
18
18
|
|
|
19
|
-
import { Graph as GraphComponent, type GraphController, type GraphProps } from './Graph';
|
|
20
19
|
import { Pulsar } from '../../fx';
|
|
21
20
|
import {
|
|
22
21
|
GraphForceProjector,
|
|
23
22
|
type GraphForceProjectorOptions,
|
|
24
23
|
GraphHierarchicalProjector,
|
|
25
24
|
type GraphHierarchicalProjectorOptions,
|
|
25
|
+
type GraphLayoutEdge,
|
|
26
|
+
type GraphLayoutNode,
|
|
27
|
+
type GraphProjector,
|
|
26
28
|
GraphRadialProjector,
|
|
27
29
|
type GraphRadialProjectorOptions,
|
|
28
30
|
GraphRelationalProjector,
|
|
29
31
|
type GraphRelationalProjectorOptions,
|
|
30
|
-
type GraphLayoutEdge,
|
|
31
|
-
type GraphLayoutNode,
|
|
32
|
-
type GraphProjector,
|
|
33
32
|
} from '../../graph';
|
|
34
33
|
import { type SVGContext } from '../../hooks';
|
|
35
|
-
import { convertTreeToGraph, createGraph, createNode, createTree
|
|
34
|
+
import { TestGraphModel, type TestNode, convertTreeToGraph, createGraph, createNode, createTree } from '../../testing';
|
|
36
35
|
import { SVG, type SVGGridProps } from '../SVG';
|
|
37
36
|
|
|
37
|
+
import { Graph as GraphComponent, type GraphController, type GraphProps } from './Graph';
|
|
38
|
+
|
|
38
39
|
import '../../../styles/graph.css';
|
|
39
40
|
|
|
40
41
|
type ProjectorType = 'force' | 'radial' | 'hierarchical' | 'relational';
|
|
@@ -255,13 +256,13 @@ const DefaultStory = ({
|
|
|
255
256
|
<Popover.VirtualTrigger virtualRef={popoverAnchorRef} />
|
|
256
257
|
<Popover.Content onOpenAutoFocus={(event) => event.preventDefault()}>
|
|
257
258
|
<Popover.Viewport>
|
|
258
|
-
<Card.
|
|
259
|
+
<Card.SurfaceRoot role='card--popover'>
|
|
259
260
|
<SyntaxHighlighter
|
|
260
261
|
classNames='bg-transparent text-xs !mlb-cardSpacingBlock !pli-cardSpacingInline !overflow-visible'
|
|
261
262
|
language='json'
|
|
262
263
|
code={JSON.stringify(popover, null, 2)}
|
|
263
264
|
/>
|
|
264
|
-
</Card.
|
|
265
|
+
</Card.SurfaceRoot>
|
|
265
266
|
</Popover.Viewport>
|
|
266
267
|
<Popover.Arrow />
|
|
267
268
|
</Popover.Content>
|
|
@@ -12,12 +12,12 @@ import { type ThemedClassName } from '@dxos/react-ui';
|
|
|
12
12
|
import { mx } from '@dxos/react-ui-theme';
|
|
13
13
|
|
|
14
14
|
import {
|
|
15
|
-
createGraphDrag,
|
|
16
15
|
GraphForceProjector,
|
|
17
16
|
type GraphLayoutNode,
|
|
18
17
|
type GraphProjector,
|
|
19
18
|
GraphRenderer,
|
|
20
19
|
type GraphRendererOptions,
|
|
20
|
+
createGraphDrag,
|
|
21
21
|
} from '../../graph';
|
|
22
22
|
import { useSvgContext } from '../../hooks';
|
|
23
23
|
|
|
@@ -4,14 +4,15 @@
|
|
|
4
4
|
|
|
5
5
|
import '@dxos-theme';
|
|
6
6
|
|
|
7
|
-
import { type StoryObj } from '@storybook/react';
|
|
7
|
+
import { type StoryObj } from '@storybook/react-vite';
|
|
8
8
|
import React, { useEffect, useState } from 'react';
|
|
9
9
|
|
|
10
10
|
import { type Meta, withLayout, withTheme } from '@dxos/storybook-utils';
|
|
11
11
|
|
|
12
|
-
import { Mesh } from './Mesh';
|
|
13
12
|
import { SVG, type SVGRootProps } from '../SVG';
|
|
14
13
|
|
|
14
|
+
import { Mesh } from './Mesh';
|
|
15
|
+
|
|
15
16
|
// TODO(burdon): Create waves/game of life.
|
|
16
17
|
const DefaultStory = (props: SVGRootProps) => {
|
|
17
18
|
const [value, setValue] = useState(1);
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
// Copyright 2024 DXOS.org
|
|
3
3
|
//
|
|
4
4
|
|
|
5
|
-
import { geoPath, select
|
|
5
|
+
import { type GeoStream, geoPath, select } from 'd3';
|
|
6
6
|
import { useEffect } from 'react';
|
|
7
7
|
import { feature, mesh } from 'topojson-client';
|
|
8
8
|
import { type GeometryCollection, type GeometryObject, type Objects, type Topology } from 'topojson-specification';
|
|
@@ -7,7 +7,7 @@ import React from 'react';
|
|
|
7
7
|
import { type ThemedClassName } from '@dxos/react-ui';
|
|
8
8
|
import { mx } from '@dxos/react-ui-theme';
|
|
9
9
|
|
|
10
|
-
import {
|
|
10
|
+
import { type GridOptions, useGrid } from '../../hooks';
|
|
11
11
|
|
|
12
12
|
export type GridProps = ThemedClassName<GridOptions>;
|
|
13
13
|
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
//
|
|
4
4
|
|
|
5
5
|
import { select } from 'd3';
|
|
6
|
-
import React, {
|
|
6
|
+
import React, { type PropsWithChildren, forwardRef, useEffect, useImperativeHandle, useMemo } from 'react';
|
|
7
7
|
import { useResizeDetector } from 'react-resize-detector';
|
|
8
8
|
|
|
9
9
|
import { type ThemedClassName } from '@dxos/react-ui';
|
|
@@ -6,12 +6,13 @@ import { type PropsWithChildren } from 'react';
|
|
|
6
6
|
|
|
7
7
|
import { type ThemedClassName } from '@dxos/react-ui';
|
|
8
8
|
|
|
9
|
+
import { Graph, type GraphProps as SVGGraphProps } from '../Graph';
|
|
10
|
+
import { Mesh, type MeshProps as SVGMeshProps } from '../Mesh';
|
|
11
|
+
|
|
9
12
|
import { Grid, type GridProps as SVGGridProps } from './Grid';
|
|
10
13
|
import { Markers, type MarkersProps as SVGMarkersProps } from './Markers';
|
|
11
14
|
import { Root, type RootProps as SVGRootProps } from './Root';
|
|
12
|
-
import {
|
|
13
|
-
import { Graph, type GraphProps as SVGGraphProps } from '../Graph';
|
|
14
|
-
import { Mesh, type MeshProps as SVGMeshProps } from '../Mesh';
|
|
15
|
+
import { type ZoomProps as SVGZoomProps, Zoom } from './Zoom';
|
|
15
16
|
|
|
16
17
|
export type SVGProps = PropsWithChildren<ThemedClassName>;
|
|
17
18
|
|
|
@@ -8,8 +8,9 @@ import React, { useRef } from 'react';
|
|
|
8
8
|
|
|
9
9
|
import { type Meta, withLayout, withTheme } from '@dxos/storybook-utils';
|
|
10
10
|
|
|
11
|
+
import { type SVGContext, useGrid, useZoom } from '../../hooks';
|
|
12
|
+
|
|
11
13
|
import { SVG } from './SVG';
|
|
12
|
-
import { useGrid, useZoom, type SVGContext } from '../../hooks';
|
|
13
14
|
|
|
14
15
|
import '../../../styles/graph.css';
|
|
15
16
|
|
package/src/fx/fx.stories.tsx
CHANGED
|
@@ -4,17 +4,18 @@
|
|
|
4
4
|
|
|
5
5
|
import '@dxos-theme';
|
|
6
6
|
|
|
7
|
-
import { type Meta } from '@storybook/react';
|
|
7
|
+
import { type Meta } from '@storybook/react-vite';
|
|
8
8
|
import { select } from 'd3';
|
|
9
9
|
import React, { type FC, useEffect, useMemo, useRef } from 'react';
|
|
10
10
|
|
|
11
11
|
import { withLayout, withTheme } from '@dxos/storybook-utils';
|
|
12
12
|
|
|
13
|
-
import { Pulsar } from './pulsar';
|
|
14
13
|
import { SVG } from '../components';
|
|
15
14
|
import { useGrid, useZoom } from '../hooks';
|
|
16
15
|
import { type D3Callable } from '../util';
|
|
17
16
|
|
|
17
|
+
import { Pulsar } from './pulsar';
|
|
18
|
+
|
|
18
19
|
import '../../styles/graph.css';
|
|
19
20
|
|
|
20
21
|
type Datum = {
|
|
@@ -4,11 +4,12 @@
|
|
|
4
4
|
|
|
5
5
|
import { drag, pointer, select } from 'd3';
|
|
6
6
|
|
|
7
|
-
import { type GraphProjector } from './graph-projector';
|
|
8
7
|
import { type SVGContext } from '../../hooks';
|
|
9
8
|
import { type Point } from '../../util';
|
|
10
9
|
import { type GraphLayoutNode } from '../types';
|
|
11
10
|
|
|
11
|
+
import { type GraphProjector } from './graph-projector';
|
|
12
|
+
|
|
12
13
|
enum Mode {
|
|
13
14
|
MOVE = 0,
|
|
14
15
|
LINK = 1,
|
|
@@ -17,9 +17,10 @@ import {
|
|
|
17
17
|
import { type Graph } from '@dxos/graph';
|
|
18
18
|
import { log } from '@dxos/log';
|
|
19
19
|
|
|
20
|
+
import { type GraphLayoutEdge, type GraphLayoutNode } from '../types';
|
|
21
|
+
|
|
20
22
|
import { forcePoint } from './graph-forces';
|
|
21
23
|
import { GraphProjector, type GraphProjectorOptions } from './graph-projector';
|
|
22
|
-
import { type GraphLayoutEdge, type GraphLayoutNode } from '../types';
|
|
23
24
|
|
|
24
25
|
/**
|
|
25
26
|
* Return value or invoke function.
|
|
@@ -50,7 +51,7 @@ const maybeForce = <Config>(
|
|
|
50
51
|
cb: (config: Config) => Force<any, any>,
|
|
51
52
|
defaultValue = undefined,
|
|
52
53
|
) => {
|
|
53
|
-
const value = typeof options === 'boolean' ? (options ? {} : undefined) : options ?? defaultValue;
|
|
54
|
+
const value = typeof options === 'boolean' ? (options ? {} : undefined) : (options ?? defaultValue);
|
|
54
55
|
if (value) {
|
|
55
56
|
return cb(value);
|
|
56
57
|
}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
// Copyright 2025 DXOS.org
|
|
3
3
|
//
|
|
4
4
|
|
|
5
|
-
import { type Force,
|
|
5
|
+
import { type Force, type SimulationLinkDatum, type SimulationNodeDatum, forceX, forceY } from 'd3';
|
|
6
6
|
|
|
7
7
|
export type ForcePointOptions = {
|
|
8
8
|
x?: number;
|
|
@@ -5,9 +5,10 @@
|
|
|
5
5
|
import { type Graph } from '@dxos/graph';
|
|
6
6
|
import { log } from '@dxos/log';
|
|
7
7
|
|
|
8
|
+
import { type GraphLayoutNode } from '../types';
|
|
9
|
+
|
|
8
10
|
import { type GraphProjectorOptions } from './graph-projector';
|
|
9
11
|
import { GraphRadialProjector, layoutRadial, updateNode } from './graph-radial-projector';
|
|
10
|
-
import { type GraphLayoutNode } from '../types';
|
|
11
12
|
|
|
12
13
|
export type GraphHierarchicalProjectorOptions = GraphProjectorOptions & {
|
|
13
14
|
radius?: number;
|
|
@@ -2,11 +2,12 @@
|
|
|
2
2
|
// Copyright 2025 DXOS.org
|
|
3
3
|
//
|
|
4
4
|
|
|
5
|
-
import { type
|
|
5
|
+
import { type Graph, type SelectionModel } from '@dxos/graph';
|
|
6
6
|
|
|
7
|
-
import { Projector, type ProjectorOptions } from './projector';
|
|
8
7
|
import { type SVGContext } from '../../hooks';
|
|
9
|
-
import {
|
|
8
|
+
import { type GraphLayout, type GraphLayoutNode, emptyGraph } from '../types';
|
|
9
|
+
|
|
10
|
+
import { Projector, type ProjectorOptions } from './projector';
|
|
10
11
|
|
|
11
12
|
export type GraphProjectorOptions = ProjectorOptions & {};
|
|
12
13
|
|
|
@@ -2,15 +2,16 @@
|
|
|
2
2
|
// Copyright 2025 DXOS.org
|
|
3
3
|
//
|
|
4
4
|
|
|
5
|
-
import { easeCubic, timer
|
|
5
|
+
import { type Timer, easeCubic, timer } from 'd3';
|
|
6
6
|
|
|
7
7
|
import { type Graph } from '@dxos/graph';
|
|
8
8
|
import { log } from '@dxos/log';
|
|
9
9
|
|
|
10
|
-
import { GraphProjector, type GraphProjectorOptions } from './graph-projector';
|
|
11
10
|
import { type Point } from '../../util';
|
|
12
11
|
import { type GraphLayoutNode } from '../types';
|
|
13
12
|
|
|
13
|
+
import { GraphProjector, type GraphProjectorOptions } from './graph-projector';
|
|
14
|
+
|
|
14
15
|
export type GraphRadialProjectorOptions = GraphProjectorOptions & {
|
|
15
16
|
radius?: number;
|
|
16
17
|
margin?: number;
|
|
@@ -5,9 +5,10 @@
|
|
|
5
5
|
import { type Graph } from '@dxos/graph';
|
|
6
6
|
import { log } from '@dxos/log';
|
|
7
7
|
|
|
8
|
+
import { type GraphLayoutNode } from '../types';
|
|
9
|
+
|
|
8
10
|
import { type GraphProjectorOptions } from './graph-projector';
|
|
9
11
|
import { GraphRadialProjector, layoutHorizontal, layoutRadial, updateNode } from './graph-radial-projector';
|
|
10
|
-
import { type GraphLayoutNode } from '../types';
|
|
11
12
|
|
|
12
13
|
export type GraphRelationalProjectorOptions = GraphProjectorOptions & {
|
|
13
14
|
radius?: number;
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
|
|
5
5
|
import { type SVGContext } from '../../hooks';
|
|
6
6
|
import { EventEmitter } from '../../util';
|
|
7
|
-
import {
|
|
7
|
+
import { type IdAccessor, defaultIdAccessor } from '../types';
|
|
8
8
|
|
|
9
9
|
export type ProjectorOptions = {
|
|
10
10
|
idAccessor?: IdAccessor;
|
|
@@ -2,15 +2,16 @@
|
|
|
2
2
|
// Copyright 2021 DXOS.org
|
|
3
3
|
//
|
|
4
4
|
|
|
5
|
-
import {
|
|
5
|
+
import { easeCubicOut, line, polygonHull, select } from 'd3';
|
|
6
6
|
import * as Clipper from 'js-clipper';
|
|
7
7
|
|
|
8
8
|
import { log } from '@dxos/log';
|
|
9
9
|
|
|
10
|
+
import { type D3Callable, type D3Selection, type Point, getCircumferencePoints } from '../../util';
|
|
11
|
+
import { type GraphLayout, type GraphLayoutEdge, type GraphLayoutNode } from '../types';
|
|
12
|
+
|
|
10
13
|
import { createBullets } from './bullets';
|
|
11
14
|
import { Renderer, type RendererOptions } from './renderer';
|
|
12
|
-
import { getCircumferencePoints, type D3Selection, type D3Callable, type Point } from '../../util';
|
|
13
|
-
import { type GraphLayout, type GraphLayoutEdge, type GraphLayoutNode } from '../types';
|
|
14
15
|
|
|
15
16
|
const createLine = line<Point>();
|
|
16
17
|
|
|
@@ -7,7 +7,7 @@ import { type RefObject } from 'react';
|
|
|
7
7
|
import { invariant } from '@dxos/invariant';
|
|
8
8
|
|
|
9
9
|
import { type SVGContext } from '../../hooks';
|
|
10
|
-
import {
|
|
10
|
+
import { type IdAccessor, defaultIdAccessor } from '../types';
|
|
11
11
|
|
|
12
12
|
export type RendererOptions<T = any> = {
|
|
13
13
|
idAccessor: IdAccessor;
|
package/src/hooks/useZoom.ts
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
// Copyright 2022 DXOS.org
|
|
3
3
|
//
|
|
4
4
|
|
|
5
|
-
import {
|
|
5
|
+
import { type ZoomBehavior, type ZoomTransform, select, zoom, zoomIdentity } from 'd3';
|
|
6
6
|
import defaultsDeep from 'lodash.defaultsdeep';
|
|
7
7
|
import { type RefObject, useEffect, useMemo, useRef } from 'react';
|
|
8
8
|
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
|
|
5
5
|
import '@dxos-theme';
|
|
6
6
|
|
|
7
|
-
import { type StoryObj } from '@storybook/react';
|
|
7
|
+
import { type StoryObj } from '@storybook/react-vite';
|
|
8
8
|
import { select } from 'd3';
|
|
9
9
|
import React, { type PropsWithChildren, useEffect, useMemo, useRef } from 'react';
|
|
10
10
|
|
|
@@ -15,16 +15,16 @@ import { type Meta, withLayout, withTheme } from '@dxos/storybook-utils';
|
|
|
15
15
|
import { SVG } from '../components';
|
|
16
16
|
import {
|
|
17
17
|
GraphForceProjector,
|
|
18
|
-
type
|
|
18
|
+
type GraphForceProjectorOptions,
|
|
19
19
|
type GraphLayoutEdge,
|
|
20
|
+
type GraphLayoutNode,
|
|
20
21
|
GraphRenderer,
|
|
21
|
-
type GraphForceProjectorOptions,
|
|
22
|
-
createMarkers,
|
|
23
22
|
createGraphDrag,
|
|
23
|
+
createMarkers,
|
|
24
24
|
linkerRenderer,
|
|
25
25
|
} from '../graph';
|
|
26
|
-
import { useSvgContext, useZoom
|
|
27
|
-
import {
|
|
26
|
+
import { useGrid, useSvgContext, useZoom } from '../hooks';
|
|
27
|
+
import { TestGraphModel, type TestNode, convertTreeToGraph, createTree } from '../testing';
|
|
28
28
|
|
|
29
29
|
import '../../styles/graph.css';
|
|
30
30
|
|
package/src/testing/hooks.ts
CHANGED
|
@@ -7,10 +7,11 @@ import update from 'immutability-helper';
|
|
|
7
7
|
import { type Graph } from '@dxos/graph';
|
|
8
8
|
import { faker } from '@dxos/random';
|
|
9
9
|
|
|
10
|
-
import { createNode, createEdge } from './data';
|
|
11
|
-
import { type TestNode } from './model';
|
|
12
10
|
import { useStateRef } from '../hooks';
|
|
13
11
|
|
|
12
|
+
import { createEdge, createNode } from './data';
|
|
13
|
+
import { type TestNode } from './model';
|
|
14
|
+
|
|
14
15
|
export type ObjectMutator<T> = [
|
|
15
16
|
T, // Current value.
|
|
16
17
|
(data: T) => void, // Set value.
|
package/src/util/index.ts
CHANGED
|
@@ -2,11 +2,11 @@
|
|
|
2
2
|
// Copyright 2021 DXOS.org
|
|
3
3
|
//
|
|
4
4
|
|
|
5
|
-
export * from './d3-types';
|
|
5
|
+
export type * from './d3-types';
|
|
6
6
|
export * from './events';
|
|
7
7
|
export * from './fraction';
|
|
8
8
|
export * from './points';
|
|
9
9
|
export * from './scale';
|
|
10
10
|
export * from './screen';
|
|
11
|
-
export * from './types';
|
|
11
|
+
export type * from './types';
|
|
12
12
|
export * from './vector';
|
package/src/util/screen.test.ts
CHANGED
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
import { expect, test } from 'vitest';
|
|
6
6
|
|
|
7
7
|
import { Screen } from './screen';
|
|
8
|
-
import { type
|
|
8
|
+
import { type Point, type Rect } from './types';
|
|
9
9
|
|
|
10
10
|
test('createBounds', () => {
|
|
11
11
|
const tests: { p1: Point; p2: Point; bounds: Rect }[] = [
|
package/src/util/screen.ts
CHANGED