From 810f9827191b8a4ee4a50862ad30e7d7bfaa5c51 Mon Sep 17 00:00:00 2001 From: Yuxin <55794321+yvonneyx@users.noreply.github.com> Date: Fri, 15 Mar 2024 19:36:27 +0800 Subject: [PATCH] feat: refine theme and add support background (#5538) * refactor: support setting background * docs: add theme demo * test: update snapshots * feat: palette field support callback * test: update tests and snapshots * fix: wordwrap set false * fix: fix cr issues * fix: animation field * test: update test case and snapshots --- .vscode/settings.json | 1 + .../g6/__tests__/dataset/dagre-combo.json | 35 + .../animation/controller-element-state.ts | 8 +- .../demo/animation/controller-element.ts | 6 +- .../demo/case/element-change-type.ts | 2 +- .../g6/__tests__/demo/case/element-state.ts | 4 +- packages/g6/__tests__/demo/case/index.ts | 1 + .../demo/case/layout-circular-basic.ts | 10 +- ...layout-circular-configuration-translate.ts | 24 +- .../demo/case/layout-circular-degree.ts | 22 +- .../demo/case/layout-circular-division.ts | 31 +- .../demo/case/layout-circular-spiral.ts | 32 +- .../__tests__/demo/case/layout-concentric.ts | 17 +- .../demo/case/layout-dagre-flow-combo.ts | 27 +- .../__tests__/demo/case/layout-dagre-flow.ts | 11 +- .../demo/case/layout-fruchterman-basic.ts | 19 +- .../demo/case/layout-fruchterman-cluster.ts | 30 +- .../demo/case/layout-fruchterman-fix.ts | 15 +- .../g6/__tests__/demo/case/layout-grid.ts | 15 +- packages/g6/__tests__/demo/case/layout-mds.ts | 18 +- .../demo/case/layout-radial-basic.ts | 12 +- .../layout-radial-configuration-translate.ts | 18 +- .../layout-radial-prevent-overlap-unstrict.ts | 30 +- .../case/layout-radial-prevent-overlap.ts | 30 +- .../__tests__/demo/case/layout-radial-sort.ts | 30 +- .../__tests__/demo/case/plugin-grid-line.ts | 7 +- packages/g6/__tests__/demo/case/theme.ts | 86 + .../g6/__tests__/demo/case/viewport-fit.ts | 2 +- .../demo/static/controller-element-z-index.ts | 6 +- .../g6/__tests__/demo/static/edge-arrow.ts | 1 + .../demo/static/edge-cubic-horizontal.ts | 1 + .../demo/static/edge-cubic-vertical.ts | 1 + .../g6/__tests__/demo/static/edge-cubic.ts | 1 + .../demo/static/edge-custom-arrow.ts | 1 + .../g6/__tests__/demo/static/edge-line.ts | 1 + .../__tests__/demo/static/edge-loop-curve.ts | 1 + .../__tests__/demo/static/edge-quadratic.ts | 1 + .../demo/static/element-label-background.ts | 1 + .../demo/static/element-label-oversized.ts | 2 + .../g6/__tests__/demo/static/graph-element.ts | 5 +- .../g6/__tests__/demo/static/node-circle.ts | 1 - .../g6/__tests__/demo/static/node-diamond.ts | 1 - .../g6/__tests__/demo/static/node-ellipse.ts | 1 - .../g6/__tests__/demo/static/node-image.ts | 1 - .../g6/__tests__/demo/static/node-rect.ts | 1 - .../g6/__tests__/demo/static/node-star.ts | 1 - .../g6/__tests__/demo/static/node-triangle.ts | 1 - .../controller-element-1000(3_3).svg | 15 +- .../animation/controller-element-200(2_3).svg | 19 +- .../animation/controller-element-50(1_3).svg | 19 +- .../controller-element-position-0(1_3).svg | 24 +- .../controller-element-position-1000(3_3).svg | 24 +- .../controller-element-position-200(2_3).svg | 24 +- .../controller-element-state-0(1_2).svg | 11 +- .../controller-element-state-1000(2_2).svg | 11 +- .../snapshots/animation/edge-cubic-0(1_3).svg | 12 +- .../animation/edge-cubic-1000(3_3).svg | 12 +- .../animation/edge-cubic-500(2_3).svg | 12 +- .../snapshots/animation/edge-line-0(1_3).svg | 22 +- .../animation/edge-line-1000(3_3).svg | 22 +- .../animation/edge-line-500(2_3).svg | 22 +- .../animation/edge-quadratic-0(1_3).svg | 12 +- .../animation/edge-quadratic-1000(3_3).svg | 12 +- .../animation/edge-quadratic-500(2_3).svg | 12 +- .../static/controller-element-position.svg | 24 +- .../static/controller-element-visibility.svg | 12 +- .../static/controller-element-z-index.svg | 6 - .../snapshots/static/controller-element.svg | 12 +- .../static/controller-layout-circular.svg | 128 +- .../static/controller-layout-compact-box.svg | 465 +-- .../static/controller-layout-d3-force.svg | 128 +- .../static/controller-layout-dagre.svg | 40 +- .../static/controller-layout-dendrogram.svg | 467 +-- .../static/controller-layout-grid.svg | 128 +- .../static/controller-layout-indented.svg | 76 +- .../static/controller-layout-mindmap.svg | 124 +- .../static/controller-layout-radial.svg | 136 +- .../snapshots/static/controller-viewport.svg | 30 +- .../snapshots/static/edge-arrow.svg | 368 +-- .../static/edge-cubic-horizontal.svg | 217 +- .../snapshots/static/edge-cubic-vertical.svg | 217 +- .../snapshots/static/edge-cubic.svg | 209 +- .../snapshots/static/edge-custom-arrow.svg | 106 +- .../snapshots/static/edge-line.svg | 209 +- .../snapshots/static/edge-loop-curve.svg | 240 +- .../snapshots/static/edge-loop-polyline.svg | 232 +- .../snapshots/static/edge-loop.svg | 1349 -------- .../snapshots/static/edge-port.svg | 120 +- .../snapshots/static/edge-quadratic.svg | 209 +- .../static/element-label-background.svg | 100 +- .../static/element-label-oversized.svg | 8 +- .../snapshots/static/graph-element.svg | 70 +- .../snapshots/static/node-circle.svg | 156 +- .../snapshots/static/node-diamond.svg | 154 +- .../snapshots/static/node-ellipse.svg | 160 +- .../snapshots/static/node-image.svg | 154 +- .../snapshots/static/node-rect.svg | 160 +- .../snapshots/static/node-star.svg | 152 +- .../snapshots/static/node-triangle.svg | 136 +- .../behavior-drag-canvas/default.svg | 136 +- .../behavior-drag-node/after-drag.svg | 104 +- .../behaviors/behavior-drag-node/default.svg | 104 +- .../behavior-drag-node/hideEdges-both.svg | 104 +- .../behavior-drag-node/hideEdges-in.svg | 104 +- .../behavior-drag-node/hideEdges-out.svg | 104 +- .../behavior-drag-node/shadow-after-drag.svg | 104 +- .../behaviors/behavior-drag-node/shadow.svg | 104 +- .../behavior-zoom-canvas/default.svg | 136 +- .../elements/change-type/change_type.svg | 27 +- .../elements/change-type/default.svg | 31 +- .../elements/combo/circle-collapse-bottom.svg | 125 +- .../combo/circle-collapse-bottomLeft.svg | 125 +- .../combo/circle-collapse-bottomRight.svg | 125 +- .../elements/combo/circle-collapse-center.svg | 123 +- .../elements/combo/circle-collapse-left.svg | 125 +- .../elements/combo/circle-collapse-right.svg | 125 +- .../elements/combo/circle-collapse-top.svg | 125 +- .../combo/circle-collapse-topLeft.svg | 125 +- .../combo/circle-collapse-topRight.svg | 125 +- .../combo/circle-marker-childCount.svg | 125 +- .../elements/combo/circle-marker-custom.svg | 125 +- .../combo/circle-marker-descendantCount.svg | 125 +- .../combo/circle-marker-nodeCount.svg | 125 +- .../snapshots/elements/combo/default.svg | 133 +- .../elements/combo/rect-collapse-bottom.svg | 125 +- .../combo/rect-collapse-bottomLeft.svg | 125 +- .../combo/rect-collapse-bottomRight.svg | 125 +- .../elements/combo/rect-collapse-center.svg | 125 +- .../elements/combo/rect-collapse-left.svg | 125 +- .../elements/combo/rect-collapse-right.svg | 125 +- .../elements/combo/rect-collapse-top.svg | 117 +- .../elements/combo/rect-collapse-topLeft.svg | 117 +- .../elements/combo/rect-collapse-topRight.svg | 125 +- .../edge-polyline-controlPoints.svg | 30 +- .../edge-polyline/edge-polyline-radius.svg | 30 +- ...edge-polyline-router-has-controlPoints.svg | 30 +- .../edge-polyline-router-no-controlPoints.svg | 28 +- .../snapshots/elements/port/port_hidden.svg | 74 +- .../elements/port/port_linkToCenter.svg | 80 +- .../snapshots/elements/port/port_show.svg | 80 +- .../snapshots/elements/position/default.svg | 12 +- .../position/translateElementBy-single.svg | 12 +- .../elements/position/translateElementBy.svg | 12 +- .../position/translateElementTo-single.svg | 12 +- .../elements/position/translateElementTo.svg | 12 +- .../snapshots/elements/state/default.svg | 8 +- .../state/setState-single-default.svg | 9 +- .../elements/state/setState-single.svg | 7 +- .../snapshots/elements/state/setState.svg | 11 +- .../snapshots/elements/visibility/default.svg | 172 +- .../elements/visibility/hide-single.svg | 178 +- .../snapshots/elements/visibility/hide.svg | 178 +- .../elements/visibility/show-and-hide.svg | 178 +- .../elements/visibility/show-single.svg | 178 +- .../snapshots/elements/visibility/show.svg | 178 +- .../circular/layout-circular-basic.svg | 650 ++-- ...cular-configuration-translate-division.svg | 1970 ++++++------ ...ayout-circular-configuration-translate.svg | 1970 ++++++------ .../circular/layout-circular-degree.svg | 2772 +++++++++++------ .../circular/layout-circular-division.svg | 2754 +++++++++------- .../circular/layout-circular-spiral.svg | 2652 +++++++--------- .../layouts/dagre-flow/flow-combo.svg | 1244 ++++---- .../snapshots/layouts/dagre-flow/flow.svg | 484 ++- .../fruchterman/layout-fruchterman-basic.svg | 648 ++-- .../layout-fruchterman-cluster.svg | 2396 +++----------- .../snapshots/layouts/grid/sortby_default.svg | 1090 ++----- .../snapshots/layouts/grid/sortby_id.svg | 1090 ++----- .../layout-concentric-basic.svg | 2345 +++++++------- .../__tests__/snapshots/layouts/mds/ld100.svg | 646 ++-- .../snapshots/layouts/radial-layout/basic.svg | 1014 ++---- .../radial-layout/configuration-translate.svg | 2522 +++++++-------- .../prevent-overlap-unstrict.svg | 2570 +++++++-------- .../layouts/radial-layout/prevent-overlap.svg | 2586 +++++++-------- .../snapshots/layouts/radial-layout/sort.svg | 2522 +++++++-------- .../snapshots/runtime/element/default.svg | 70 +- .../runtime/element/visibility/hidden.svg | 12 +- .../runtime/element/visibility/visible.svg | 12 +- .../runtime/element/z-index/back.svg | 6 - .../runtime/element/z-index/default.svg | 6 - .../runtime/element/z-index/front.svg | 6 - .../runtime/graph/graph/after-draw.svg | 26 +- .../runtime/graph/graph/after-layout.svg | 32 +- .../runtime/graph/graph/after-rotate-90.svg | 32 +- .../graph/graph/after-translate-node-1.svg | 32 +- .../runtime/graph/graph/after-translate.svg | 32 +- .../runtime/graph/graph/after-zoom-2.svg | 32 +- .../runtime/graph/graph/before-draw.svg | 648 ++-- .../runtime/graph/graph/before-layout.svg | 30 +- .../auto-fit-with-padding-animation.svg | 8 - .../viewport/auto-fit-with-padding.svg | 8 - .../runtime/viewport/before-fit-animation.svg | 8 - .../snapshots/runtime/viewport/before-fit.svg | 8 - .../runtime/viewport/fitCenter-animation.svg | 8 - .../snapshots/runtime/viewport/fitCenter.svg | 8 - .../runtime/viewport/fitView-animation.svg | 8 - .../snapshots/runtime/viewport/fitView.svg | 8 - .../viewport/focusElement-animation.svg | 8 - .../runtime/viewport/focusElement.svg | 8 - .../viewport/re-fitCenter-animation.svg | 8 - .../runtime/viewport/re-fitCenter.svg | 8 - .../viewport/re-focusElement-animation.svg | 8 - .../runtime/viewport/re-focusElement.svg | 8 - .../snapshots/runtime/viewport/rotate-135.svg | 30 +- .../snapshots/runtime/viewport/rotate-90.svg | 30 +- .../snapshots/runtime/viewport/translate.svg | 30 +- .../snapshots/runtime/viewport/zoom-0.5.svg | 30 +- .../snapshots/runtime/viewport/zoom-2.svg | 30 +- .../theme/theme_node_palette_spectral.svg | 2402 ++++++++++++++ .../unit/runtime/graph/graph.spec.ts | 27 +- .../__tests__/unit/spec/element/node.spec.ts | 2 +- packages/g6/__tests__/unit/spec/theme.spec.ts | 27 +- .../g6/__tests__/unit/utils/element.spec.ts | 2 +- .../g6/__tests__/unit/utils/palette.spec.ts | 9 +- packages/g6/__tests__/unit/utils/size.spec.ts | 2 +- packages/g6/src/elements/edges/base-edge.ts | 5 +- packages/g6/src/elements/nodes/base-node.ts | 3 +- packages/g6/src/elements/nodes/circle.ts | 2 +- packages/g6/src/elements/nodes/rect.ts | 2 +- packages/g6/src/runtime/canvas.ts | 15 +- packages/g6/src/runtime/element.ts | 18 +- packages/g6/src/runtime/graph.ts | 21 +- packages/g6/src/spec/canvas.ts | 6 + packages/g6/src/spec/element/palette.ts | 15 +- packages/g6/src/themes/base.ts | 235 ++ packages/g6/src/themes/dark.ts | 204 +- packages/g6/src/themes/light.ts | 197 +- packages/g6/src/themes/types.ts | 1 + packages/g6/src/utils/palette.ts | 21 +- packages/g6/src/utils/size.ts | 3 +- .../examples/feature/features/demo/meta.json | 2 +- .../feature/features/demo/themeSwitch.js | 341 -- .../feature/features/demo/themeSwitch.ts | 195 ++ .../examples/item/defaultNodes/demo/circle.ts | 8 +- .../item/defaultNodes/demo/diamond.ts | 8 +- .../examples/item/defaultNodes/demo/rect.ts | 8 +- .../net/forceDirected/demo/basicForce.js | 14 +- .../site/examples/net/gridLayout/demo/grid.ts | 5 + packages/site/package.json | 3 +- 238 files changed, 21890 insertions(+), 29867 deletions(-) create mode 100644 packages/g6/__tests__/dataset/dagre-combo.json create mode 100644 packages/g6/__tests__/demo/case/theme.ts delete mode 100644 packages/g6/__tests__/integration/snapshots/static/edge-loop.svg create mode 100644 packages/g6/__tests__/snapshots/spec/theme/theme_node_palette_spectral.svg create mode 100644 packages/g6/src/themes/base.ts delete mode 100644 packages/site/examples/feature/features/demo/themeSwitch.js create mode 100644 packages/site/examples/feature/features/demo/themeSwitch.ts diff --git a/.vscode/settings.json b/.vscode/settings.json index e923e3b13b..ee15af195e 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -15,6 +15,7 @@ "aftersizechange", "aftertransform", "afterviewportanimate", + "antv", "bbox", "beforeanimate", "beforedraw", diff --git a/packages/g6/__tests__/dataset/dagre-combo.json b/packages/g6/__tests__/dataset/dagre-combo.json new file mode 100644 index 0000000000..89bd30fe5c --- /dev/null +++ b/packages/g6/__tests__/dataset/dagre-combo.json @@ -0,0 +1,35 @@ +{ + "nodes": [ + { "id": "0" }, + { "id": "1" }, + { "id": "2" }, + { "id": "3" }, + { "id": "4", "style": { "parentId": "A" } }, + { "id": "5", "style": { "parentId": "B" } }, + { "id": "6", "style": { "parentId": "A" } }, + { "id": "7", "style": { "parentId": "C" } }, + { "id": "8", "style": { "parentId": "C" } }, + { "id": "9", "style": { "parentId": "A" } }, + { "id": "10", "style": { "parentId": "B" } }, + { "id": "11", "style": { "parentId": "B" } } + ], + "edges": [ + { "id": "edge-102", "source": "0", "target": "1" }, + { "id": "edge-161", "source": "0", "target": "2" }, + { "id": "edge-237", "source": "1", "target": "4" }, + { "id": "edge-253", "source": "0", "target": "3" }, + { "id": "edge-133", "source": "3", "target": "4" }, + { "id": "edge-320", "source": "2", "target": "5" }, + { "id": "edge-355", "source": "1", "target": "6" }, + { "id": "edge-823", "source": "1", "target": "7" }, + { "id": "edge-665", "source": "3", "target": "8" }, + { "id": "edge-884", "source": "3", "target": "9" }, + { "id": "edge-536", "source": "5", "target": "10" }, + { "id": "edge-401", "source": "5", "target": "11" } + ], + "combos": [ + { "id": "A", "style": { "type": "rect" } }, + { "id": "B", "style": { "type": "rect" } }, + { "id": "C", "style": { "type": "rect" } } + ] +} diff --git a/packages/g6/__tests__/demo/animation/controller-element-state.ts b/packages/g6/__tests__/demo/animation/controller-element-state.ts index a95169a074..60ec139d88 100644 --- a/packages/g6/__tests__/demo/animation/controller-element-state.ts +++ b/packages/g6/__tests__/demo/animation/controller-element-state.ts @@ -29,11 +29,11 @@ export const controllerElementState: AnimationTestCase = async (context) => { lineWidth: 2, }, selected: { - fill: 'pink', + color: 'pink', }, }, animation: { - update: [{ fields: ['lineWidth', 'fill'] }], + update: [{ fields: ['lineWidth', 'color'] }], }, }, edge: { @@ -43,13 +43,13 @@ export const controllerElementState: AnimationTestCase = async (context) => { state: { active: { lineWidth: 2, - stroke: 'pink', + color: 'pink', }, }, animation: { update: [ { - fields: ['lineWidth', 'stroke'], + fields: ['lineWidth', 'color'], }, ], }, diff --git a/packages/g6/__tests__/demo/animation/controller-element.ts b/packages/g6/__tests__/demo/animation/controller-element.ts index e18d46019a..1983c53394 100644 --- a/packages/g6/__tests__/demo/animation/controller-element.ts +++ b/packages/g6/__tests__/demo/animation/controller-element.ts @@ -33,9 +33,9 @@ export const controllerElement: AnimationTestCase = async (context) => { await graph.render(); graph.addNodeData([ - { id: 'node-4', style: { x: 50, y: 200, fill: 'orange' } }, - { id: 'node-5', style: { x: 75, y: 150, fill: 'purple' } }, - { id: 'node-6', style: { x: 200, y: 100, fill: 'cyan' } }, + { id: 'node-4', style: { x: 50, y: 200, color: 'orange' } }, + { id: 'node-5', style: { x: 75, y: 150, color: 'purple' } }, + { id: 'node-6', style: { x: 200, y: 100, color: 'cyan' } }, ]); graph.removeNodeData(['node-1']); diff --git a/packages/g6/__tests__/demo/case/element-change-type.ts b/packages/g6/__tests__/demo/case/element-change-type.ts index d96f28c477..491e952924 100644 --- a/packages/g6/__tests__/demo/case/element-change-type.ts +++ b/packages/g6/__tests__/demo/case/element-change-type.ts @@ -6,7 +6,7 @@ export const elementChangeType: STDTestCase = async (context) => { ...context, data: { nodes: [ - { id: 'node-1', style: { x: 100, y: 100, type: 'rect' } }, + { id: 'node-1', style: { x: 100, y: 100, type: 'rect', color: 'transparent', stroke: '#1783ff' } }, { id: 'node-2', style: { x: 200, y: 100 } }, ], edges: [{ id: 'edge-1', source: 'node-1', target: 'node-2' }], diff --git a/packages/g6/__tests__/demo/case/element-state.ts b/packages/g6/__tests__/demo/case/element-state.ts index 690f7c33f1..0439ff68e5 100644 --- a/packages/g6/__tests__/demo/case/element-state.ts +++ b/packages/g6/__tests__/demo/case/element-state.ts @@ -27,7 +27,7 @@ export const elementState: STDTestCase = async (context) => { lineWidth: 2, }, selected: { - fill: 'pink', + color: 'pink', }, }, animation: { @@ -41,7 +41,7 @@ export const elementState: STDTestCase = async (context) => { state: { active: { lineWidth: 2, - stroke: 'pink', + color: 'pink', }, }, animation: { diff --git a/packages/g6/__tests__/demo/case/index.ts b/packages/g6/__tests__/demo/case/index.ts index 70a75f671a..c45dd2bbff 100644 --- a/packages/g6/__tests__/demo/case/index.ts +++ b/packages/g6/__tests__/demo/case/index.ts @@ -30,4 +30,5 @@ export * from './layout-radial-prevent-overlap'; export * from './layout-radial-prevent-overlap-unstrict'; export * from './layout-radial-sort'; export * from './plugin-grid-line'; +export * from './theme'; export * from './viewport-fit'; diff --git a/packages/g6/__tests__/demo/case/layout-circular-basic.ts b/packages/g6/__tests__/demo/case/layout-circular-basic.ts index cbd7037603..7260b7664a 100644 --- a/packages/g6/__tests__/demo/case/layout-circular-basic.ts +++ b/packages/g6/__tests__/demo/case/layout-circular-basic.ts @@ -5,20 +5,12 @@ import type { STDTestCase } from '../types'; export const layoutCircularBasic: STDTestCase = async (context) => { const graph = new Graph({ ...context, + autoFit: 'view', data, layout: { type: 'circular', }, - node: { - style: { - size: 20, - fill: '#EFF4FF', - lineWidth: 1, - stroke: '#5F95FF', - }, - }, behaviors: ['zoom-canvas', 'drag-canvas'], - autoFit: 'view', }); await graph.render(); diff --git a/packages/g6/__tests__/demo/case/layout-circular-configuration-translate.ts b/packages/g6/__tests__/demo/case/layout-circular-configuration-translate.ts index 50d4a1fabc..5fea2abe96 100644 --- a/packages/g6/__tests__/demo/case/layout-circular-configuration-translate.ts +++ b/packages/g6/__tests__/demo/case/layout-circular-configuration-translate.ts @@ -5,28 +5,18 @@ import type { STDTestCase } from '../types'; export const layoutCircularConfigurationTranslate: STDTestCase = async (context) => { const graph = new Graph({ ...context, + autoFit: 'view', data, + edge: { + style: { + endArrow: true, + endArrowType: 'vee', + }, + }, layout: { type: 'circular', }, - node: { - style: { - size: 20, - fill: '#EFF4FF', - lineWidth: 1, - stroke: '#5F95FF', - }, - }, - edge: { - style: { - endArrow: { - path: 'M 0,0 L 8,4 L 8,-4 Z', - fill: '#e2e2e2', - }, - }, - }, behaviors: ['drag-canvas', 'drag-node'], - autoFit: 'view', }); await graph.render(); diff --git a/packages/g6/__tests__/demo/case/layout-circular-degree.ts b/packages/g6/__tests__/demo/case/layout-circular-degree.ts index 996a49b69f..dc7a9c7e4d 100644 --- a/packages/g6/__tests__/demo/case/layout-circular-degree.ts +++ b/packages/g6/__tests__/demo/case/layout-circular-degree.ts @@ -5,22 +5,24 @@ import type { STDTestCase } from '../types'; export const layoutCircularDegree: STDTestCase = async (context) => { const graph = new Graph({ ...context, + autoFit: 'view', data, + node: { + style: { + labelText: (d: { id: string }) => d.id, + }, + }, + edge: { + style: { + endArrow: true, + endArrowType: 'vee', + }, + }, layout: { type: 'circular', ordering: 'degree', }, - node: { - style: { - size: 20, - labelText: (d: { id: string }) => d.id, - fill: '#EFF4FF', - lineWidth: 1, - stroke: '#5F95FF', - }, - }, behaviors: ['zoom-canvas', 'drag-canvas'], - autoFit: 'view', }); await graph.render(); diff --git a/packages/g6/__tests__/demo/case/layout-circular-division.ts b/packages/g6/__tests__/demo/case/layout-circular-division.ts index 472dfb0d4f..f041478a4c 100644 --- a/packages/g6/__tests__/demo/case/layout-circular-division.ts +++ b/packages/g6/__tests__/demo/case/layout-circular-division.ts @@ -5,7 +5,19 @@ import type { STDTestCase } from '../types'; export const layoutCircularDivision: STDTestCase = async (context) => { const graph = new Graph({ ...context, + autoFit: 'view', data, + node: { + style: { + labelText: (d: { id: string }) => d.id, + }, + }, + edge: { + style: { + endArrow: true, + endArrowType: 'vee', + }, + }, layout: { type: 'circular', divisions: 5, @@ -13,24 +25,7 @@ export const layoutCircularDivision: STDTestCase = async (context) => { startAngle: Math.PI / 4, endAngle: Math.PI, }, - node: { - style: { - size: 20, - fill: '#EFF4FF', - lineWidth: 1, - stroke: '#5F95FF', - }, - }, - edge: { - style: { - endArrow: { - path: 'M 0,0 L 8,4 L 8,-4 Z', - fill: '#e2e2e2', - }, - }, - }, - behaviors: ['drag-canvas', 'drag-node'], - autoFit: 'view', + behaviors: ['zoom-canvas', 'drag-canvas'], }); await graph.render(); diff --git a/packages/g6/__tests__/demo/case/layout-circular-spiral.ts b/packages/g6/__tests__/demo/case/layout-circular-spiral.ts index b16e5096a7..f101807900 100644 --- a/packages/g6/__tests__/demo/case/layout-circular-spiral.ts +++ b/packages/g6/__tests__/demo/case/layout-circular-spiral.ts @@ -5,31 +5,25 @@ import type { STDTestCase } from '../types'; export const layoutCircularSpiral: STDTestCase = async (context) => { const graph = new Graph({ ...context, + autoFit: 'view', data, + node: { + style: { + labelText: (d: { id: string }) => d.id, + }, + }, + edge: { + style: { + endArrow: true, + endArrowType: 'vee', + }, + }, layout: { type: 'circular', startRadius: 10, endRadius: 300, }, - node: { - style: { - size: 20, - labelText: (d: { id: string }) => d.id, - fill: '#EFF4FF', - lineWidth: 1, - stroke: '#5F95FF', - }, - }, - edge: { - style: { - endArrow: { - path: 'M 0,0 L 8,4 L 8,-4 Z', - fill: '#e2e2e2', - }, - }, - }, - behaviors: ['drag-canvas', 'drag-node'], - autoFit: 'view', + behaviors: ['zoom-canvas', 'drag-canvas'], }); await graph.render(); diff --git a/packages/g6/__tests__/demo/case/layout-concentric.ts b/packages/g6/__tests__/demo/case/layout-concentric.ts index e125ed825c..ef78653e78 100644 --- a/packages/g6/__tests__/demo/case/layout-concentric.ts +++ b/packages/g6/__tests__/demo/case/layout-concentric.ts @@ -5,27 +5,14 @@ import type { STDTestCase } from '../types'; export const layoutConcentric: STDTestCase = async (context) => { const graph = new Graph({ ...context, - autoFit: 'center', + autoFit: 'view', data, - behaviors: ['zoom-canvas', 'drag-canvas', 'drag-node'], layout: { type: 'concentric', maxLevelDiff: 0.5, preventOverlap: true, }, - node: { - style: { - size: 5, - stroke: '#5B8FF9', - fill: '#C6E5FF', - lineWidth: 1, - }, - }, - edge: { - style: { - stroke: '#E2E2E2', - }, - }, + behaviors: ['zoom-canvas', 'drag-canvas', 'drag-node'], animation: false, }); diff --git a/packages/g6/__tests__/demo/case/layout-dagre-flow-combo.ts b/packages/g6/__tests__/demo/case/layout-dagre-flow-combo.ts index 565a8da853..034d58714d 100644 --- a/packages/g6/__tests__/demo/case/layout-dagre-flow-combo.ts +++ b/packages/g6/__tests__/demo/case/layout-dagre-flow-combo.ts @@ -1,5 +1,5 @@ import { Graph } from '@/src'; -import data from '@@/dataset/dagre.json'; +import data from '@@/dataset/dagre-combo.json'; import type { STDTestCase } from '../types'; type Item = { @@ -12,41 +12,40 @@ type Item = { export const layoutDagreFlowCombo: STDTestCase = async (context) => { const graph = new Graph({ ...context, + autoFit: 'view', data, - layout: { - type: 'dagre', - ranksep: 50, - nodesep: 5, - }, node: { style: { type: 'rect', size: [60, 30], radius: 8, - labelPlacement: 'center', labelText: (d: Item) => d.id, - fill: (item: Item) => { - const styles: { [key: string]: string } = { A: '#F09056', B: '#D580FF', C: '#01C9C9' }; - return styles[item.style?.parentId] || '#1883FF'; - }, + labelPlacement: 'center', + }, + palette: { + field: (d: any) => d.style?.parentId, }, }, edge: { style: { type: 'polyline', endArrow: true, - lineWidth: 2, - stroke: '#C2C8D5', }, }, combo: { style: { + type: 'rect', + radius: 8, labelText: (d: Item) => d.id, lineDash: 0, collapsedLineDash: [5, 5], }, }, - autoFit: 'view', + layout: { + type: 'dagre', + ranksep: 50, + nodesep: 5, + }, behaviors: ['drag-combo', 'drag-node', 'drag-canvas', 'zoom-canvas'], }); diff --git a/packages/g6/__tests__/demo/case/layout-dagre-flow.ts b/packages/g6/__tests__/demo/case/layout-dagre-flow.ts index d7b4d375b3..634e3ace47 100644 --- a/packages/g6/__tests__/demo/case/layout-dagre-flow.ts +++ b/packages/g6/__tests__/demo/case/layout-dagre-flow.ts @@ -5,6 +5,7 @@ import type { STDTestCase } from '../types'; export const layoutDagreFlow: STDTestCase = async (context) => { const graph = new Graph({ ...context, + autoFit: 'view', data, node: { style: { @@ -18,12 +19,18 @@ export const layoutDagreFlow: STDTestCase = async (context) => { edge: { style: { type: 'polyline', + radius: 20, endArrow: true, lineWidth: 2, - stroke: '#C2C8D5', + color: '#C2C8D5', }, }, - autoFit: 'view', + layout: { + type: 'dagre', + nodesep: 100, + ranksep: 70, + controlPoints: true, + }, behaviors: ['drag-combo', 'drag-node', 'drag-canvas', 'zoom-canvas'], }); diff --git a/packages/g6/__tests__/demo/case/layout-fruchterman-basic.ts b/packages/g6/__tests__/demo/case/layout-fruchterman-basic.ts index 9a60cd25bd..6437224c72 100644 --- a/packages/g6/__tests__/demo/case/layout-fruchterman-basic.ts +++ b/packages/g6/__tests__/demo/case/layout-fruchterman-basic.ts @@ -6,23 +6,18 @@ export const layoutFruchtermanBasic: STDTestCase = async (context) => { const graph = new Graph({ ...context, data, - behaviors: ['drag-canvas', 'drag-node'], + node: { + style: { + labelPlacement: 'center', + labelText: (d: any) => d.id, + }, + }, layout: { type: 'fruchterman', gravity: 5, speed: 5, }, - node: { - style: { - size: 30, - stroke: '#5B8FF9', - fill: '#C6E5FF', - lineWidth: 1, - labelPlacement: 'center', - labelText: (d: any) => d.id, - labelBackground: false, - }, - }, + behaviors: ['drag-canvas', 'drag-node'], }); await graph.render(); diff --git a/packages/g6/__tests__/demo/case/layout-fruchterman-cluster.ts b/packages/g6/__tests__/demo/case/layout-fruchterman-cluster.ts index 8678000a90..5d51cf37f0 100644 --- a/packages/g6/__tests__/demo/case/layout-fruchterman-cluster.ts +++ b/packages/g6/__tests__/demo/case/layout-fruchterman-cluster.ts @@ -6,31 +6,23 @@ export const layoutFruchtermanCluster: STDTestCase = async (context) => { const graph = new Graph({ ...context, data: { ...data, nodes: data.nodes.map((n) => ({ ...n, cluster: n.data.cluster })) }, - behaviors: ['drag-canvas', 'drag-node'], + node: { + style: { + labelPlacement: 'center', + labelText: (d: any) => d.id, + }, + palette: { + field: 'cluster', + }, + }, layout: { type: 'fruchterman', - gravity: 10, + gravity: 5, speed: 5, clustering: true, nodeClusterBy: 'cluster', }, - node: { - style: { - size: 20, - stroke: '#5B8FF9', - fill: '#C6E5FF', - lineWidth: 1, - labelPlacement: 'center', - labelText: (d: any) => d.id, - labelBackground: false, - }, - }, - edge: { - style: { - endArrow: true, - endArrowPath: 'M 0,0 L 4,2 L 4,-2 Z', - }, - }, + behaviors: ['drag-canvas', 'drag-node'], }); await graph.render(); diff --git a/packages/g6/__tests__/demo/case/layout-fruchterman-fix.ts b/packages/g6/__tests__/demo/case/layout-fruchterman-fix.ts index f3bcd070ea..bd51188746 100644 --- a/packages/g6/__tests__/demo/case/layout-fruchterman-fix.ts +++ b/packages/g6/__tests__/demo/case/layout-fruchterman-fix.ts @@ -6,25 +6,12 @@ export const layoutFruchtermanFix: STDTestCase = async (context) => { const graph = new Graph({ ...context, data, - behaviors: ['drag-canvas', 'drag-node'], layout: { type: 'fruchterman', speed: 10, maxIteration: 500, }, - node: { - style: { - size: 15, - stroke: '#5B8FF9', - fill: '#C6E5FF', - lineWidth: 1, - }, - }, - edge: { - style: { - stroke: '#E2E2E2', - }, - }, + behaviors: ['drag-canvas', 'drag-node'], }); graph.on('node:dragstart', function () { diff --git a/packages/g6/__tests__/demo/case/layout-grid.ts b/packages/g6/__tests__/demo/case/layout-grid.ts index 2fd88c32b3..9244dfde35 100644 --- a/packages/g6/__tests__/demo/case/layout-grid.ts +++ b/packages/g6/__tests__/demo/case/layout-grid.ts @@ -6,19 +6,16 @@ export const layoutGrid: STDTestCase = async (context) => { const graph = new Graph({ ...context, data, - behaviors: ['zoom-canvas', 'drag-canvas', 'drag-node', 'click-select'], + node: { + style: { + labelText: (d: any) => d.id, + }, + }, layout: { type: 'grid', sortBy: 'cluster', }, - node: { - style: { - size: 20, - stroke: '#ccc', - lineWidth: 1, - labelText: (d: any) => d.id, - }, - }, + behaviors: ['zoom-canvas', 'drag-canvas', 'drag-node', 'click-select'], }); await graph.render(); diff --git a/packages/g6/__tests__/demo/case/layout-mds.ts b/packages/g6/__tests__/demo/case/layout-mds.ts index c02c65bf7b..a1aa6d269b 100644 --- a/packages/g6/__tests__/demo/case/layout-mds.ts +++ b/packages/g6/__tests__/demo/case/layout-mds.ts @@ -8,22 +8,16 @@ export const layoutMDS: STDTestCase = async (context) => { padding: 20, autoFit: 'view', data, + node: { + style: { + labelText: (d: any) => d.id, + labelPlacement: 'center', + }, + }, layout: { type: 'mds', linkDistance: 100, }, - node: { - style: { - size: 20, - stroke: '#9ec9ff', - fill: '#eee', - lineWidth: 1, - labelText: (d: any) => d.id, - labelFontSize: 12, - labelPlacement: 'center', - labelBackground: false, - }, - }, behaviors: ['drag-node', 'drag-canvas', 'zoom-canvas', 'click-select'], }); diff --git a/packages/g6/__tests__/demo/case/layout-radial-basic.ts b/packages/g6/__tests__/demo/case/layout-radial-basic.ts index 87440475af..2c5ade43db 100644 --- a/packages/g6/__tests__/demo/case/layout-radial-basic.ts +++ b/packages/g6/__tests__/demo/case/layout-radial-basic.ts @@ -6,20 +6,16 @@ export const layoutRadialBasic: STDTestCase = async (context) => { const graph = new Graph({ ...context, data, - layout: { - type: 'radial', - unitRadius: 50, - }, node: { style: { labelText: (d: { id: string }) => d.id, labelPlacement: 'center', - size: 20, - fill: '#EFF4FF', - lineWidth: 1, - stroke: '#5F95FF', }, }, + layout: { + type: 'radial', + unitRadius: 50, + }, behaviors: ['drag-canvas', 'drag-node'], }); diff --git a/packages/g6/__tests__/demo/case/layout-radial-configuration-translate.ts b/packages/g6/__tests__/demo/case/layout-radial-configuration-translate.ts index b626e34a31..a06cda2c3e 100644 --- a/packages/g6/__tests__/demo/case/layout-radial-configuration-translate.ts +++ b/packages/g6/__tests__/demo/case/layout-radial-configuration-translate.ts @@ -6,28 +6,22 @@ export const layoutRadialConfigurationTranslate: STDTestCase = async (context) = const graph = new Graph({ ...context, data, - layout: { - type: 'radial', - unitRadius: 50, - }, node: { style: { labelText: (d: { id: string }) => d.id, labelPlacement: 'center', - size: 20, - fill: '#EFF4FF', - lineWidth: 1, - stroke: '#5F95FF', }, }, edge: { style: { - endArrow: { - path: 'M 0,0 L 8,4 L 8,-4 Z', - fill: '#e2e2e2', - }, + endArrow: true, + endArrowType: 'vee', }, }, + layout: { + type: 'radial', + unitRadius: 50, + }, behaviors: ['drag-canvas', 'drag-node'], }); diff --git a/packages/g6/__tests__/demo/case/layout-radial-prevent-overlap-unstrict.ts b/packages/g6/__tests__/demo/case/layout-radial-prevent-overlap-unstrict.ts index 4e7d971a2a..665af7a231 100644 --- a/packages/g6/__tests__/demo/case/layout-radial-prevent-overlap-unstrict.ts +++ b/packages/g6/__tests__/demo/case/layout-radial-prevent-overlap-unstrict.ts @@ -6,30 +6,24 @@ export const layoutRadialPreventOverlapUnstrict: STDTestCase = async (context) = const graph = new Graph({ ...context, data, + node: { + style: { + labelText: (d: { id: string }) => d.id, + labelPlacement: 'center', + }, + }, + edge: { + style: { + endArrow: true, + endArrowType: 'vee', + }, + }, layout: { type: 'radial', unitRadius: 70, preventOverlap: true, strictRadial: false, }, - node: { - style: { - labelText: (d: { id: string }) => d.id, - labelPlacement: 'center', - size: 20, - fill: '#EFF4FF', - lineWidth: 1, - stroke: '#5F95FF', - }, - }, - edge: { - style: { - endArrow: { - path: 'M 0,0 L 8,4 L 8,-4 Z', - fill: '#e2e2e2', - }, - }, - }, behaviors: ['drag-canvas', 'drag-node'], }); diff --git a/packages/g6/__tests__/demo/case/layout-radial-prevent-overlap.ts b/packages/g6/__tests__/demo/case/layout-radial-prevent-overlap.ts index acc7ad3bea..0ff29f30ea 100644 --- a/packages/g6/__tests__/demo/case/layout-radial-prevent-overlap.ts +++ b/packages/g6/__tests__/demo/case/layout-radial-prevent-overlap.ts @@ -6,30 +6,24 @@ export const layoutRadialPreventOverlap: STDTestCase = async (context) => { const graph = new Graph({ ...context, data, + node: { + style: { + labelText: (d: { id: string }) => d.id, + labelPlacement: 'center', + }, + }, + edge: { + style: { + endArrow: true, + endArrowType: 'vee', + }, + }, layout: { type: 'radial', unitRadius: 50, preventOverlap: true, maxPreventOverlapIteration: 100, }, - node: { - style: { - labelText: (d: { id: string }) => d.id, - labelPlacement: 'center', - size: 20, - fill: '#EFF4FF', - lineWidth: 1, - stroke: '#5F95FF', - }, - }, - edge: { - style: { - endArrow: { - path: 'M 0,0 L 8,4 L 8,-4 Z', - fill: '#e2e2e2', - }, - }, - }, behaviors: ['drag-canvas', 'drag-node'], }); diff --git a/packages/g6/__tests__/demo/case/layout-radial-sort.ts b/packages/g6/__tests__/demo/case/layout-radial-sort.ts index 9435fd12e3..9018b3cdfd 100644 --- a/packages/g6/__tests__/demo/case/layout-radial-sort.ts +++ b/packages/g6/__tests__/demo/case/layout-radial-sort.ts @@ -6,6 +6,18 @@ export const layoutRadialSort: STDTestCase = async (context) => { const graph = new Graph({ ...context, data, + node: { + style: { + labelText: (d: { id: string }) => d.id, + labelPlacement: 'center', + }, + }, + edge: { + style: { + endArrow: true, + endArrowType: 'vee', + }, + }, layout: { type: 'radial', unitRadius: 70, @@ -16,24 +28,6 @@ export const layoutRadialSort: STDTestCase = async (context) => { sortBy: 'sortAttr2', sortStrength: 50, }, - node: { - style: { - labelText: (d: { id: string }) => d.id, - labelPlacement: 'center', - size: 20, - fill: '#EFF4FF', - lineWidth: 1, - stroke: '#5F95FF', - }, - }, - edge: { - style: { - endArrow: { - path: 'M 0,0 L 8,4 L 8,-4 Z', - fill: '#e2e2e2', - }, - }, - }, behaviors: ['drag-canvas', 'drag-node'], }); diff --git a/packages/g6/__tests__/demo/case/plugin-grid-line.ts b/packages/g6/__tests__/demo/case/plugin-grid-line.ts index 30834cec4c..0b88d8713b 100644 --- a/packages/g6/__tests__/demo/case/plugin-grid-line.ts +++ b/packages/g6/__tests__/demo/case/plugin-grid-line.ts @@ -6,13 +6,8 @@ import type { STDTestCase } from '../types'; export const pluginGridLine: STDTestCase = async (context) => { const graph = new Graph({ ...context, - data, - node: { - style: { - size: 20, - }, - }, autoResize: true, + data, layout: { type: 'd3force' }, behaviors: ['drag-canvas'], plugins: [{ type: 'grid-line', follow: false }], diff --git a/packages/g6/__tests__/demo/case/theme.ts b/packages/g6/__tests__/demo/case/theme.ts new file mode 100644 index 0000000000..c7592fa568 --- /dev/null +++ b/packages/g6/__tests__/demo/case/theme.ts @@ -0,0 +1,86 @@ +import { Graph } from '@/src'; +import data from '../../dataset/cluster.json'; +import type { STDTestCase } from '../types'; + +export const theme: STDTestCase = async (context) => { + const graph = new Graph({ + ...context, + autoFit: 'view', + data, + node: { + palette: { + field: 'cluster', + }, + }, + layout: { + type: 'radial', + unitRadius: 80, + }, + }); + + await graph.render(); + + theme.form = (panel) => { + const config = { + theme: 'light', + }; + const options = { Light: 'light', Dark: 'dark', Blue: 'blue' }; + + const themeOptions: { [key: string]: any } = { + light: { + background: '#fff', + theme: 'light', + node: { + palette: { + field: 'cluster', + }, + }, + }, + dark: { + background: '#000', + theme: 'dark', + node: { + palette: { + field: 'cluster', + }, + }, + }, + blue: { + background: '#f3faff', + theme: 'light', + node: { + palette: { + type: 'group', + field: 'cluster', + color: 'blues', + invert: true, + }, + }, + }, + yellow: { + background: '#fcf9f1', + theme: 'light', + node: { + palette: { + type: 'group', + field: 'cluster', + color: ['#ffe7ba', '#ffd591', '#ffc069', '#ffa940', '#fa8c16', '#d46b08', '#ad4e00', '#873800', '#612500'], + }, + }, + }, + }; + + const changeTheme = (theme: string) => { + graph.setOptions(themeOptions[theme]); + graph.render(); + }; + + return [ + panel.add(config, 'theme', options).onChange((value: string) => { + changeTheme(value); + }), + ]; + }; + + return graph; +}; diff --git a/packages/g6/__tests__/demo/case/viewport-fit.ts b/packages/g6/__tests__/demo/case/viewport-fit.ts index 23fcb74e1b..a2488e9de2 100644 --- a/packages/g6/__tests__/demo/case/viewport-fit.ts +++ b/packages/g6/__tests__/demo/case/viewport-fit.ts @@ -15,7 +15,7 @@ export const viewportFit: STDTestCase = async (context) => { node: { style: { size: 50, - fill: (d: any) => (d.id === '1' ? '#d4414c' : '#2f363d'), + color: (d: any) => (d.id === '1' ? '#d4414c' : '#2f363d'), }, }, behaviors: ['zoom-canvas', 'drag-canvas'], diff --git a/packages/g6/__tests__/demo/static/controller-element-z-index.ts b/packages/g6/__tests__/demo/static/controller-element-z-index.ts index ca0a732e4f..789da7f61b 100644 --- a/packages/g6/__tests__/demo/static/controller-element-z-index.ts +++ b/packages/g6/__tests__/demo/static/controller-element-z-index.ts @@ -7,9 +7,9 @@ export const controllerElementZIndex: STDTestCase = async (context) => { ...context, data: { nodes: [ - { id: 'node-1', style: { x: 150, y: 150, fill: 'red' } }, - { id: 'node-2', style: { x: 175, y: 175, fill: 'green' } }, - { id: 'node-3', style: { x: 200, y: 200, fill: 'blue' } }, + { id: 'node-1', style: { x: 150, y: 150, color: 'red' } }, + { id: 'node-2', style: { x: 175, y: 175, color: 'green' } }, + { id: 'node-3', style: { x: 200, y: 200, color: 'blue' } }, ], }, theme: 'light', diff --git a/packages/g6/__tests__/demo/static/edge-arrow.ts b/packages/g6/__tests__/demo/static/edge-arrow.ts index 820f201027..84cfa9e56b 100644 --- a/packages/g6/__tests__/demo/static/edge-arrow.ts +++ b/packages/g6/__tests__/demo/static/edge-arrow.ts @@ -29,6 +29,7 @@ export const edgeArrow: StaticTestCase = async (context) => { style: { type: 'line', // ๐Ÿ‘ˆ๐Ÿป Edge shape type. labelText: (d: any) => d.id, + labelBackground: true, endArrow: true, endArrowType: (d: any) => d.id.split('-')[0], }, diff --git a/packages/g6/__tests__/demo/static/edge-cubic-horizontal.ts b/packages/g6/__tests__/demo/static/edge-cubic-horizontal.ts index b86352f49b..fdecadda55 100644 --- a/packages/g6/__tests__/demo/static/edge-cubic-horizontal.ts +++ b/packages/g6/__tests__/demo/static/edge-cubic-horizontal.ts @@ -49,6 +49,7 @@ export const edgeCubicHorizontal: StaticTestCase = async (context) => { style: { type: 'cubic-horizontal', // ๐Ÿ‘ˆ๐Ÿป Edge shape type. labelText: (d: any) => d.id, + labelBackground: true, endArrow: true, }, }, diff --git a/packages/g6/__tests__/demo/static/edge-cubic-vertical.ts b/packages/g6/__tests__/demo/static/edge-cubic-vertical.ts index 5b881c7931..fb394a2e9a 100644 --- a/packages/g6/__tests__/demo/static/edge-cubic-vertical.ts +++ b/packages/g6/__tests__/demo/static/edge-cubic-vertical.ts @@ -49,6 +49,7 @@ export const edgeCubicVertical: StaticTestCase = async (context) => { style: { type: 'cubic-vertical', // ๐Ÿ‘ˆ๐Ÿป Edge shape type. labelText: (d: any) => d.id, + labelBackground: true, endArrow: true, }, }, diff --git a/packages/g6/__tests__/demo/static/edge-cubic.ts b/packages/g6/__tests__/demo/static/edge-cubic.ts index c125032d78..5695b738b2 100644 --- a/packages/g6/__tests__/demo/static/edge-cubic.ts +++ b/packages/g6/__tests__/demo/static/edge-cubic.ts @@ -43,6 +43,7 @@ export const edgeCubic: StaticTestCase = async (context) => { style: { type: 'cubic', // ๐Ÿ‘ˆ๐Ÿป Edge shape type. labelText: (d: any) => d.id, + labelBackground: true, endArrow: true, }, }, diff --git a/packages/g6/__tests__/demo/static/edge-custom-arrow.ts b/packages/g6/__tests__/demo/static/edge-custom-arrow.ts index a9a3d79663..c52914dbac 100644 --- a/packages/g6/__tests__/demo/static/edge-custom-arrow.ts +++ b/packages/g6/__tests__/demo/static/edge-custom-arrow.ts @@ -44,6 +44,7 @@ export const edgeCustomArrow: StaticTestCase = async (context) => { type: 'line', // ๐Ÿ‘ˆ๐Ÿป Edge shape type. color: '#F6BD16', labelText: (d: any) => d.id, + labelBackground: true, endArrow: true, }, }, diff --git a/packages/g6/__tests__/demo/static/edge-line.ts b/packages/g6/__tests__/demo/static/edge-line.ts index 688343b671..258b0d5b15 100644 --- a/packages/g6/__tests__/demo/static/edge-line.ts +++ b/packages/g6/__tests__/demo/static/edge-line.ts @@ -43,6 +43,7 @@ export const edgeLine: StaticTestCase = async (context) => { style: { type: 'line', // ๐Ÿ‘ˆ๐Ÿป Edge shape type. labelText: (d: any) => d.id, + labelBackground: true, endArrow: true, }, }, diff --git a/packages/g6/__tests__/demo/static/edge-loop-curve.ts b/packages/g6/__tests__/demo/static/edge-loop-curve.ts index 39b5a294cd..17c3f55cfc 100644 --- a/packages/g6/__tests__/demo/static/edge-loop-curve.ts +++ b/packages/g6/__tests__/demo/static/edge-loop-curve.ts @@ -81,6 +81,7 @@ export const edgeLoopCurve: StaticTestCase = async (context) => { style: { type: 'rect', size: [80, 30], + labelBackground: true, port: (d: any) => d.id.includes('ports'), portR: 3, ports: [ diff --git a/packages/g6/__tests__/demo/static/edge-quadratic.ts b/packages/g6/__tests__/demo/static/edge-quadratic.ts index 1b6fb5655a..8621f3c9de 100644 --- a/packages/g6/__tests__/demo/static/edge-quadratic.ts +++ b/packages/g6/__tests__/demo/static/edge-quadratic.ts @@ -43,6 +43,7 @@ export const edgeQuadratic: StaticTestCase = async (context) => { style: { type: 'quadratic', // ๐Ÿ‘ˆ๐Ÿป Edge shape type. labelText: (d: any) => d.id, + labelBackground: true, endArrow: true, }, }, diff --git a/packages/g6/__tests__/demo/static/element-label-background.ts b/packages/g6/__tests__/demo/static/element-label-background.ts index 3f73086f4a..9522908847 100644 --- a/packages/g6/__tests__/demo/static/element-label-background.ts +++ b/packages/g6/__tests__/demo/static/element-label-background.ts @@ -48,6 +48,7 @@ export const elementLabelBackground: StaticTestCase = async (context) => { labelFill: '#e66465', labelFontSize: 12, labelFontStyle: 'italic', + labelBackground: true, labelBackgroundFill: '#eee', labelBackgroundStroke: '#9ec9ff', labelBackgroundRadius: 2, diff --git a/packages/g6/__tests__/demo/static/element-label-oversized.ts b/packages/g6/__tests__/demo/static/element-label-oversized.ts index 43f2c111a4..9d5b7db1f9 100644 --- a/packages/g6/__tests__/demo/static/element-label-oversized.ts +++ b/packages/g6/__tests__/demo/static/element-label-oversized.ts @@ -49,6 +49,7 @@ export const elementLabelOversized: StaticTestCase = async (context) => { labelPlacement: 'bottom', labelText: (d: any) => d.data.label, labelMaxWidth: '90%', + labelBackground: true, labelBackgroundFill: '#eee', labelBackgroundFillOpacity: 0.5, labelBackgroundRadius: 4, @@ -62,6 +63,7 @@ export const elementLabelOversized: StaticTestCase = async (context) => { labelTextBaseline: 'bottom', labelText: (d: any) => d.data.label, labelMaxWidth: '80%', + labelBackground: true, labelBackgroundFill: 'red', labelBackgroundFillOpacity: 0.5, labelBackgroundRadius: 4, diff --git a/packages/g6/__tests__/demo/static/graph-element.ts b/packages/g6/__tests__/demo/static/graph-element.ts index edaffab465..b73070711b 100644 --- a/packages/g6/__tests__/demo/static/graph-element.ts +++ b/packages/g6/__tests__/demo/static/graph-element.ts @@ -12,8 +12,9 @@ export const graphElement: STDTestCase = async (context) => { { id: 'node-3', style: { x: 125, y: 150, parentId: 'combo-1', states: ['selected'] }, data: { value: 150 } }, ], edges: [ - { source: 'node-1', target: 'node-2', data: { weight: 250 } }, + { id: 'edge-1', source: 'node-1', target: 'node-2', data: { weight: 250 } }, { + id: 'edge-2', source: 'node-2', target: 'node-3', style: { lineWidth: 5, states: ['active', 'selected'] }, @@ -45,7 +46,7 @@ export const graphElement: STDTestCase = async (context) => { lineWidth: 4, }, }, - palette: { type: 'group', color: 'oranges', invert: true }, + palette: { type: 'group', color: 'oranges', field: (d: any) => d.id, invert: true }, }, combo: { style: {}, diff --git a/packages/g6/__tests__/demo/static/node-circle.ts b/packages/g6/__tests__/demo/static/node-circle.ts index 089d19f447..b47cd1a11b 100644 --- a/packages/g6/__tests__/demo/static/node-circle.ts +++ b/packages/g6/__tests__/demo/static/node-circle.ts @@ -26,7 +26,6 @@ export const nodeCircle: StaticTestCase = async (context) => { style: { type: 'circle', // ๐Ÿ‘ˆ๐Ÿป Node shape type. size: 40, - labelMaxWidth: 120, labelText: (d: any) => d.id, iconHeight: 20, iconWidth: 20, diff --git a/packages/g6/__tests__/demo/static/node-diamond.ts b/packages/g6/__tests__/demo/static/node-diamond.ts index adcba8cecc..045f639e24 100644 --- a/packages/g6/__tests__/demo/static/node-diamond.ts +++ b/packages/g6/__tests__/demo/static/node-diamond.ts @@ -25,7 +25,6 @@ export const nodeDiamond: StaticTestCase = async (context) => { style: { type: 'diamond', // ๐Ÿ‘ˆ๐Ÿป Node shape type. size: 40, - labelMaxWidth: 120, labelText: (d: any) => d.id, iconWidth: 20, iconHeight: 20, diff --git a/packages/g6/__tests__/demo/static/node-ellipse.ts b/packages/g6/__tests__/demo/static/node-ellipse.ts index cf9deb2824..68e13a47f6 100644 --- a/packages/g6/__tests__/demo/static/node-ellipse.ts +++ b/packages/g6/__tests__/demo/static/node-ellipse.ts @@ -26,7 +26,6 @@ export const nodeEllipse: StaticTestCase = async (context) => { style: { type: 'ellipse', // ๐Ÿ‘ˆ๐Ÿป Node shape type. size: [45, 35], - labelMaxWidth: 120, labelText: (d: any) => d.id, iconHeight: 20, iconWidth: 20, diff --git a/packages/g6/__tests__/demo/static/node-image.ts b/packages/g6/__tests__/demo/static/node-image.ts index 2c33eda89e..ec83064de2 100644 --- a/packages/g6/__tests__/demo/static/node-image.ts +++ b/packages/g6/__tests__/demo/static/node-image.ts @@ -26,7 +26,6 @@ export const nodeImage: StaticTestCase = async (context) => { style: { type: 'image', // ๐Ÿ‘ˆ๐Ÿป Node shape type. size: 40, - labelMaxWidth: 120, labelText: (d: any) => d.id, src: 'https://gw.alipayobjects.com/mdn/rms_6ae20b/afts/img/A*N4ZMS7gHsUIAAAAAAAAAAABkARQnAQ', halo: (d: any) => d.id.includes('halo'), diff --git a/packages/g6/__tests__/demo/static/node-rect.ts b/packages/g6/__tests__/demo/static/node-rect.ts index b179074f22..a646eca789 100644 --- a/packages/g6/__tests__/demo/static/node-rect.ts +++ b/packages/g6/__tests__/demo/static/node-rect.ts @@ -27,7 +27,6 @@ export const nodeRect: StaticTestCase = async (context) => { type: 'rect', // ๐Ÿ‘ˆ๐Ÿป Node shape type. radius: 4, // ๐Ÿ‘ˆ๐Ÿป Set the radius. size: 40, - labelMaxWidth: 120, labelText: (d: any) => d.id, iconWidth: 20, iconHeight: 20, diff --git a/packages/g6/__tests__/demo/static/node-star.ts b/packages/g6/__tests__/demo/static/node-star.ts index 20ab7bfa87..052afe8362 100644 --- a/packages/g6/__tests__/demo/static/node-star.ts +++ b/packages/g6/__tests__/demo/static/node-star.ts @@ -26,7 +26,6 @@ export const nodeStar: StaticTestCase = async (context) => { style: { type: 'star', // ๐Ÿ‘ˆ๐Ÿป Node shape type. size: 40, - labelMaxWidth: 120, labelText: (d: any) => d.id, iconSrc: 'https://gw.alipayobjects.com/zos/basement_prod/012bcf4f-423b-4922-8c24-32a89f8c41ce.svg', halo: (d: any) => d.id.includes('halo'), diff --git a/packages/g6/__tests__/demo/static/node-triangle.ts b/packages/g6/__tests__/demo/static/node-triangle.ts index 0c174aefbd..affdfd13de 100644 --- a/packages/g6/__tests__/demo/static/node-triangle.ts +++ b/packages/g6/__tests__/demo/static/node-triangle.ts @@ -26,7 +26,6 @@ export const nodeTriangle: StaticTestCase = async (context) => { type: 'triangle', // ๐Ÿ‘ˆ๐Ÿป Node shape type. size: 40, direction: (d: any) => d.data?.direction, - labelMaxWidth: 120, labelText: (d: any) => d.id, iconSrc: 'https://gw.alipayobjects.com/zos/basement_prod/012bcf4f-423b-4922-8c24-32a89f8c41ce.svg', halo: (d: any) => d.id.includes('halo'), diff --git a/packages/g6/__tests__/integration/snapshots/animation/controller-element-1000(3_3).svg b/packages/g6/__tests__/integration/snapshots/animation/controller-element-1000(3_3).svg index 9729823cd5..f681be5573 100644 --- a/packages/g6/__tests__/integration/snapshots/animation/controller-element-1000(3_3).svg +++ b/packages/g6/__tests__/integration/snapshots/animation/controller-element-1000(3_3).svg @@ -49,13 +49,12 @@ @@ -63,12 +62,10 @@ @@ -81,8 +78,6 @@ transform="translate(-10,-10)" cx="10" cy="10" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="10" /> @@ -95,8 +90,6 @@ transform="translate(-10,-10)" cx="10" cy="10" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="10" /> @@ -109,8 +102,6 @@ transform="translate(-10,-10)" cx="10" cy="10" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="10" /> diff --git a/packages/g6/__tests__/integration/snapshots/animation/controller-element-200(2_3).svg b/packages/g6/__tests__/integration/snapshots/animation/controller-element-200(2_3).svg index a358e9a9f3..8f06d08101 100644 --- a/packages/g6/__tests__/integration/snapshots/animation/controller-element-200(2_3).svg +++ b/packages/g6/__tests__/integration/snapshots/animation/controller-element-200(2_3).svg @@ -117,12 +117,10 @@ @@ -132,13 +130,12 @@ @@ -146,12 +143,10 @@ @@ -164,8 +159,6 @@ transform="translate(-10,-10)" cx="10" cy="10" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="10" opacity="0.6270672695016452" /> @@ -179,8 +172,6 @@ transform="translate(-10,-10)" cx="10" cy="10" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="10" opacity="0.6270672695016452" /> @@ -194,8 +185,6 @@ transform="translate(-10,-10)" cx="10" cy="10" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="10" opacity="0.6270672695016452" /> diff --git a/packages/g6/__tests__/integration/snapshots/animation/controller-element-50(1_3).svg b/packages/g6/__tests__/integration/snapshots/animation/controller-element-50(1_3).svg index 5741bb6bde..8798687402 100644 --- a/packages/g6/__tests__/integration/snapshots/animation/controller-element-50(1_3).svg +++ b/packages/g6/__tests__/integration/snapshots/animation/controller-element-50(1_3).svg @@ -117,12 +117,10 @@ @@ -132,13 +130,12 @@ @@ -146,12 +143,10 @@ @@ -164,8 +159,6 @@ transform="translate(-10,-10)" cx="10" cy="10" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="10" opacity="0.17441823980162885" /> @@ -179,8 +172,6 @@ transform="translate(-10,-10)" cx="10" cy="10" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="10" opacity="0.17441823980162885" /> @@ -194,8 +185,6 @@ transform="translate(-10,-10)" cx="10" cy="10" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="10" opacity="0.17441823980162885" /> diff --git a/packages/g6/__tests__/integration/snapshots/animation/controller-element-position-0(1_3).svg b/packages/g6/__tests__/integration/snapshots/animation/controller-element-position-0(1_3).svg index e81d637a0f..c091c4db8c 100644 --- a/packages/g6/__tests__/integration/snapshots/animation/controller-element-position-0(1_3).svg +++ b/packages/g6/__tests__/integration/snapshots/animation/controller-element-position-0(1_3).svg @@ -305,12 +305,10 @@ @@ -319,12 +317,10 @@ @@ -333,12 +329,10 @@ @@ -347,12 +341,10 @@ @@ -361,12 +353,10 @@ @@ -375,12 +365,10 @@ diff --git a/packages/g6/__tests__/integration/snapshots/animation/controller-element-position-1000(3_3).svg b/packages/g6/__tests__/integration/snapshots/animation/controller-element-position-1000(3_3).svg index fb8dbfec08..bb12fa72e6 100644 --- a/packages/g6/__tests__/integration/snapshots/animation/controller-element-position-1000(3_3).svg +++ b/packages/g6/__tests__/integration/snapshots/animation/controller-element-position-1000(3_3).svg @@ -305,12 +305,10 @@ @@ -319,12 +317,10 @@ @@ -333,12 +329,10 @@ @@ -347,12 +341,10 @@ @@ -361,12 +353,10 @@ @@ -375,12 +365,10 @@ diff --git a/packages/g6/__tests__/integration/snapshots/animation/controller-element-position-200(2_3).svg b/packages/g6/__tests__/integration/snapshots/animation/controller-element-position-200(2_3).svg index df3bc56559..6a1b5f320c 100644 --- a/packages/g6/__tests__/integration/snapshots/animation/controller-element-position-200(2_3).svg +++ b/packages/g6/__tests__/integration/snapshots/animation/controller-element-position-200(2_3).svg @@ -305,12 +305,10 @@ @@ -319,12 +317,10 @@ @@ -333,12 +329,10 @@ @@ -351,12 +345,10 @@ @@ -365,12 +357,10 @@ @@ -383,12 +373,10 @@ diff --git a/packages/g6/__tests__/integration/snapshots/animation/controller-element-state-0(1_2).svg b/packages/g6/__tests__/integration/snapshots/animation/controller-element-state-0(1_2).svg index 0e3cc9aabc..27064eaf25 100644 --- a/packages/g6/__tests__/integration/snapshots/animation/controller-element-state-0(1_2).svg +++ b/packages/g6/__tests__/integration/snapshots/animation/controller-element-state-0(1_2).svg @@ -154,8 +154,8 @@ cx="10" cy="10" stroke-width="12" - stroke="rgba(34,126,255,1)" r="10" + stroke="rgba(23,131,255,1)" stroke-dasharray="0,0" stroke-opacity="0.25" pointer-events="none" @@ -164,12 +164,11 @@ @@ -183,8 +182,8 @@ cx="10" cy="10" stroke-width="12" - stroke="rgba(34,126,255,1)" r="10" + stroke="rgba(23,131,255,1)" stroke-dasharray="0,0" stroke-opacity="0.25" pointer-events="none" @@ -193,13 +192,13 @@ diff --git a/packages/g6/__tests__/integration/snapshots/animation/controller-element-state-1000(2_2).svg b/packages/g6/__tests__/integration/snapshots/animation/controller-element-state-1000(2_2).svg index c1c410eae4..46563049e3 100644 --- a/packages/g6/__tests__/integration/snapshots/animation/controller-element-state-1000(2_2).svg +++ b/packages/g6/__tests__/integration/snapshots/animation/controller-element-state-1000(2_2).svg @@ -135,7 +135,7 @@ @@ -183,8 +182,8 @@ cx="10" cy="10" stroke-width="12" - stroke="rgba(255,192,203,1)" r="10" + stroke="rgba(255,192,203,1)" stroke-dasharray="0,0" stroke-opacity="0.25" pointer-events="none" @@ -198,8 +197,8 @@ cx="10" cy="10" stroke-width="3" - stroke="rgba(0,0,0,1)" r="10" + stroke="rgba(0,0,0,1)" /> diff --git a/packages/g6/__tests__/integration/snapshots/animation/edge-cubic-0(1_3).svg b/packages/g6/__tests__/integration/snapshots/animation/edge-cubic-0(1_3).svg index 9bf9f58ffa..a9612bda20 100644 --- a/packages/g6/__tests__/integration/snapshots/animation/edge-cubic-0(1_3).svg +++ b/packages/g6/__tests__/integration/snapshots/animation/edge-cubic-0(1_3).svg @@ -20,20 +20,20 @@ - + diff --git a/packages/g6/__tests__/integration/snapshots/animation/edge-cubic-1000(3_3).svg b/packages/g6/__tests__/integration/snapshots/animation/edge-cubic-1000(3_3).svg index f81b30b41c..cea639add4 100644 --- a/packages/g6/__tests__/integration/snapshots/animation/edge-cubic-1000(3_3).svg +++ b/packages/g6/__tests__/integration/snapshots/animation/edge-cubic-1000(3_3).svg @@ -20,20 +20,20 @@ - + diff --git a/packages/g6/__tests__/integration/snapshots/animation/edge-cubic-500(2_3).svg b/packages/g6/__tests__/integration/snapshots/animation/edge-cubic-500(2_3).svg index e59df3ae4a..2bc61335d5 100644 --- a/packages/g6/__tests__/integration/snapshots/animation/edge-cubic-500(2_3).svg +++ b/packages/g6/__tests__/integration/snapshots/animation/edge-cubic-500(2_3).svg @@ -20,20 +20,20 @@ - + diff --git a/packages/g6/__tests__/integration/snapshots/animation/edge-line-0(1_3).svg b/packages/g6/__tests__/integration/snapshots/animation/edge-line-0(1_3).svg index 030cb693a5..984cbbbea0 100644 --- a/packages/g6/__tests__/integration/snapshots/animation/edge-line-0(1_3).svg +++ b/packages/g6/__tests__/integration/snapshots/animation/edge-line-0(1_3).svg @@ -33,35 +33,35 @@ - + - + diff --git a/packages/g6/__tests__/integration/snapshots/animation/edge-line-1000(3_3).svg b/packages/g6/__tests__/integration/snapshots/animation/edge-line-1000(3_3).svg index 09154e54b4..9d8d417927 100644 --- a/packages/g6/__tests__/integration/snapshots/animation/edge-line-1000(3_3).svg +++ b/packages/g6/__tests__/integration/snapshots/animation/edge-line-1000(3_3).svg @@ -33,35 +33,35 @@ - + - + diff --git a/packages/g6/__tests__/integration/snapshots/animation/edge-line-500(2_3).svg b/packages/g6/__tests__/integration/snapshots/animation/edge-line-500(2_3).svg index 4e7aa7a95b..5387f382db 100644 --- a/packages/g6/__tests__/integration/snapshots/animation/edge-line-500(2_3).svg +++ b/packages/g6/__tests__/integration/snapshots/animation/edge-line-500(2_3).svg @@ -33,35 +33,35 @@ - + - + diff --git a/packages/g6/__tests__/integration/snapshots/animation/edge-quadratic-0(1_3).svg b/packages/g6/__tests__/integration/snapshots/animation/edge-quadratic-0(1_3).svg index 28d0573f9b..0728f92a1c 100644 --- a/packages/g6/__tests__/integration/snapshots/animation/edge-quadratic-0(1_3).svg +++ b/packages/g6/__tests__/integration/snapshots/animation/edge-quadratic-0(1_3).svg @@ -20,20 +20,20 @@ - + diff --git a/packages/g6/__tests__/integration/snapshots/animation/edge-quadratic-1000(3_3).svg b/packages/g6/__tests__/integration/snapshots/animation/edge-quadratic-1000(3_3).svg index a064e42ea2..f47f9cd074 100644 --- a/packages/g6/__tests__/integration/snapshots/animation/edge-quadratic-1000(3_3).svg +++ b/packages/g6/__tests__/integration/snapshots/animation/edge-quadratic-1000(3_3).svg @@ -20,20 +20,20 @@ - + diff --git a/packages/g6/__tests__/integration/snapshots/animation/edge-quadratic-500(2_3).svg b/packages/g6/__tests__/integration/snapshots/animation/edge-quadratic-500(2_3).svg index 088db6c492..592290cb0f 100644 --- a/packages/g6/__tests__/integration/snapshots/animation/edge-quadratic-500(2_3).svg +++ b/packages/g6/__tests__/integration/snapshots/animation/edge-quadratic-500(2_3).svg @@ -20,20 +20,20 @@ - + diff --git a/packages/g6/__tests__/integration/snapshots/static/controller-element-position.svg b/packages/g6/__tests__/integration/snapshots/static/controller-element-position.svg index fb8dbfec08..bb12fa72e6 100644 --- a/packages/g6/__tests__/integration/snapshots/static/controller-element-position.svg +++ b/packages/g6/__tests__/integration/snapshots/static/controller-element-position.svg @@ -305,12 +305,10 @@ @@ -319,12 +317,10 @@ @@ -333,12 +329,10 @@ @@ -347,12 +341,10 @@ @@ -361,12 +353,10 @@ @@ -375,12 +365,10 @@ diff --git a/packages/g6/__tests__/integration/snapshots/static/controller-element-visibility.svg b/packages/g6/__tests__/integration/snapshots/static/controller-element-visibility.svg index 9bda973619..daf3eaaee1 100644 --- a/packages/g6/__tests__/integration/snapshots/static/controller-element-visibility.svg +++ b/packages/g6/__tests__/integration/snapshots/static/controller-element-visibility.svg @@ -115,12 +115,10 @@ @@ -129,12 +127,10 @@ @@ -143,12 +139,10 @@ diff --git a/packages/g6/__tests__/integration/snapshots/static/controller-element-z-index.svg b/packages/g6/__tests__/integration/snapshots/static/controller-element-z-index.svg index b6da06ee81..9bcca3195e 100644 --- a/packages/g6/__tests__/integration/snapshots/static/controller-element-z-index.svg +++ b/packages/g6/__tests__/integration/snapshots/static/controller-element-z-index.svg @@ -20,8 +20,6 @@ transform="translate(-25,-25)" cx="25" cy="25" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="25" /> @@ -34,8 +32,6 @@ transform="translate(-25,-25)" cx="25" cy="25" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="25" /> @@ -48,8 +44,6 @@ transform="translate(-25,-25)" cx="25" cy="25" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="25" /> diff --git a/packages/g6/__tests__/integration/snapshots/static/controller-element.svg b/packages/g6/__tests__/integration/snapshots/static/controller-element.svg index 812c4ba8bb..f36c7ad920 100644 --- a/packages/g6/__tests__/integration/snapshots/static/controller-element.svg +++ b/packages/g6/__tests__/integration/snapshots/static/controller-element.svg @@ -113,12 +113,10 @@ @@ -127,12 +125,10 @@ @@ -141,12 +137,10 @@ diff --git a/packages/g6/__tests__/integration/snapshots/static/controller-layout-circular.svg b/packages/g6/__tests__/integration/snapshots/static/controller-layout-circular.svg index 753a9ae7fd..e518298664 100644 --- a/packages/g6/__tests__/integration/snapshots/static/controller-layout-circular.svg +++ b/packages/g6/__tests__/integration/snapshots/static/controller-layout-circular.svg @@ -2065,12 +2065,10 @@ @@ -2083,12 +2081,10 @@ @@ -2101,12 +2097,10 @@ @@ -2119,12 +2113,10 @@ @@ -2137,12 +2129,10 @@ @@ -2155,12 +2145,10 @@ @@ -2173,12 +2161,10 @@ @@ -2191,12 +2177,10 @@ @@ -2205,12 +2189,10 @@ @@ -2223,12 +2205,10 @@ @@ -2241,12 +2221,10 @@ @@ -2259,12 +2237,10 @@ @@ -2277,12 +2253,10 @@ @@ -2295,12 +2269,10 @@ @@ -2313,12 +2285,10 @@ @@ -2331,12 +2301,10 @@ @@ -2345,12 +2313,10 @@ @@ -2363,12 +2329,10 @@ @@ -2381,12 +2345,10 @@ @@ -2399,12 +2361,10 @@ @@ -2417,12 +2377,10 @@ @@ -2435,12 +2393,10 @@ @@ -2453,12 +2409,10 @@ @@ -2471,12 +2425,10 @@ @@ -2485,12 +2437,10 @@ @@ -2503,12 +2453,10 @@ @@ -2521,12 +2469,10 @@ @@ -2539,12 +2485,10 @@ @@ -2557,12 +2501,10 @@ @@ -2575,12 +2517,10 @@ @@ -2593,12 +2533,10 @@ @@ -2611,12 +2549,10 @@ diff --git a/packages/g6/__tests__/integration/snapshots/static/controller-layout-compact-box.svg b/packages/g6/__tests__/integration/snapshots/static/controller-layout-compact-box.svg index 3945499a6c..12cdc50c96 100644 --- a/packages/g6/__tests__/integration/snapshots/static/controller-layout-compact-box.svg +++ b/packages/g6/__tests__/integration/snapshots/static/controller-layout-compact-box.svg @@ -981,27 +981,14 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2087,12 +2085,10 @@ @@ -2105,12 +2101,10 @@ @@ -2123,12 +2117,10 @@ @@ -2141,12 +2133,10 @@ @@ -2159,12 +2149,10 @@ @@ -2177,12 +2165,10 @@ @@ -2195,12 +2181,10 @@ @@ -2213,12 +2197,10 @@ @@ -2231,12 +2213,10 @@ @@ -2249,12 +2229,10 @@ @@ -2267,12 +2245,10 @@ @@ -2285,12 +2261,10 @@ @@ -2303,12 +2277,10 @@ @@ -2321,12 +2293,10 @@ @@ -2339,12 +2309,10 @@ @@ -2357,12 +2325,10 @@ @@ -2375,12 +2341,10 @@ @@ -2393,12 +2357,10 @@ @@ -2411,12 +2373,10 @@ @@ -2429,12 +2389,10 @@ @@ -2447,12 +2405,10 @@ @@ -2465,12 +2421,10 @@ @@ -2483,12 +2437,10 @@ @@ -2501,12 +2453,10 @@ @@ -2519,12 +2469,10 @@ @@ -2537,12 +2485,10 @@ @@ -2555,12 +2501,10 @@ @@ -2573,12 +2517,10 @@ @@ -2591,12 +2533,10 @@ @@ -2609,12 +2549,10 @@ @@ -2627,12 +2565,10 @@ diff --git a/packages/g6/__tests__/integration/snapshots/static/controller-layout-dagre.svg b/packages/g6/__tests__/integration/snapshots/static/controller-layout-dagre.svg index 87d5cf125e..d3b29df76c 100644 --- a/packages/g6/__tests__/integration/snapshots/static/controller-layout-dagre.svg +++ b/packages/g6/__tests__/integration/snapshots/static/controller-layout-dagre.svg @@ -401,12 +401,10 @@ @@ -415,12 +413,10 @@ @@ -429,12 +425,10 @@ @@ -443,12 +437,10 @@ @@ -457,12 +449,10 @@ @@ -471,12 +461,10 @@ @@ -485,12 +473,10 @@ @@ -499,12 +485,10 @@ @@ -513,12 +497,10 @@ @@ -527,12 +509,10 @@ diff --git a/packages/g6/__tests__/integration/snapshots/static/controller-layout-dendrogram.svg b/packages/g6/__tests__/integration/snapshots/static/controller-layout-dendrogram.svg index a4645f4eee..2a16f73e97 100644 --- a/packages/g6/__tests__/integration/snapshots/static/controller-layout-dendrogram.svg +++ b/packages/g6/__tests__/integration/snapshots/static/controller-layout-dendrogram.svg @@ -981,27 +981,14 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Multi-layer feed forward neural ... + Multi-layer feed forward neural network @@ -2213,27 +1836,14 @@ - - - - - - @@ -2087,12 +2085,10 @@ @@ -2105,12 +2101,10 @@ @@ -2119,12 +2113,10 @@ @@ -2133,12 +2125,10 @@ @@ -2151,12 +2141,10 @@ @@ -2165,12 +2153,10 @@ @@ -2179,12 +2165,10 @@ @@ -2197,12 +2181,10 @@ @@ -2215,12 +2197,10 @@ @@ -2233,12 +2213,10 @@ @@ -2247,12 +2225,10 @@ @@ -2265,12 +2241,10 @@ @@ -2283,12 +2257,10 @@ @@ -2297,12 +2269,10 @@ @@ -2315,12 +2285,10 @@ @@ -2333,12 +2301,10 @@ @@ -2351,12 +2317,10 @@ @@ -2365,12 +2329,10 @@ @@ -2379,12 +2341,10 @@ @@ -2393,12 +2353,10 @@ @@ -2407,12 +2365,10 @@ @@ -2421,12 +2377,10 @@ @@ -2439,12 +2393,10 @@ @@ -2453,12 +2405,10 @@ @@ -2467,12 +2417,10 @@ @@ -2485,12 +2433,10 @@ @@ -2503,12 +2449,10 @@ @@ -2517,12 +2461,10 @@ @@ -2535,12 +2477,10 @@ @@ -2549,12 +2489,10 @@ @@ -2563,12 +2501,10 @@ diff --git a/packages/g6/__tests__/integration/snapshots/static/controller-layout-indented.svg b/packages/g6/__tests__/integration/snapshots/static/controller-layout-indented.svg index df4a1494b2..038b9b08be 100644 --- a/packages/g6/__tests__/integration/snapshots/static/controller-layout-indented.svg +++ b/packages/g6/__tests__/integration/snapshots/static/controller-layout-indented.svg @@ -596,12 +596,10 @@ @@ -610,12 +608,10 @@ @@ -624,12 +620,10 @@ @@ -638,12 +632,10 @@ @@ -652,12 +644,10 @@ @@ -666,12 +656,10 @@ @@ -680,12 +668,10 @@ @@ -694,12 +680,10 @@ @@ -708,12 +692,10 @@ @@ -722,12 +704,10 @@ @@ -736,12 +716,10 @@ @@ -750,12 +728,10 @@ @@ -764,12 +740,10 @@ @@ -778,12 +752,10 @@ @@ -792,12 +764,10 @@ @@ -806,12 +776,10 @@ @@ -820,12 +788,10 @@ @@ -834,12 +800,10 @@ @@ -848,12 +812,10 @@ diff --git a/packages/g6/__tests__/integration/snapshots/static/controller-layout-mindmap.svg b/packages/g6/__tests__/integration/snapshots/static/controller-layout-mindmap.svg index 4cab0994aa..bba1497f0c 100644 --- a/packages/g6/__tests__/integration/snapshots/static/controller-layout-mindmap.svg +++ b/packages/g6/__tests__/integration/snapshots/static/controller-layout-mindmap.svg @@ -981,12 +981,10 @@ @@ -999,12 +997,10 @@ @@ -1017,12 +1013,10 @@ @@ -1035,12 +1029,10 @@ @@ -1049,12 +1041,10 @@ @@ -1067,12 +1057,10 @@ @@ -1085,12 +1073,10 @@ @@ -1103,12 +1089,10 @@ @@ -1121,12 +1105,10 @@ @@ -1139,12 +1121,10 @@ @@ -1153,12 +1133,10 @@ @@ -1171,12 +1149,10 @@ @@ -1189,12 +1165,10 @@ @@ -1207,12 +1181,10 @@ @@ -1225,12 +1197,10 @@ @@ -1243,12 +1213,10 @@ @@ -1261,12 +1229,10 @@ @@ -1279,12 +1245,10 @@ @@ -1293,12 +1257,10 @@ @@ -1311,12 +1273,10 @@ @@ -1329,12 +1289,10 @@ @@ -1343,12 +1301,10 @@ @@ -1357,12 +1313,10 @@ @@ -1371,12 +1325,10 @@ @@ -1385,12 +1337,10 @@ @@ -1399,12 +1349,10 @@ @@ -1417,12 +1365,10 @@ @@ -1435,12 +1381,10 @@ @@ -1453,12 +1397,10 @@ @@ -1471,12 +1413,10 @@ @@ -1489,12 +1429,10 @@ diff --git a/packages/g6/__tests__/integration/snapshots/static/controller-layout-radial.svg b/packages/g6/__tests__/integration/snapshots/static/controller-layout-radial.svg index 71e634f303..943102be32 100644 --- a/packages/g6/__tests__/integration/snapshots/static/controller-layout-radial.svg +++ b/packages/g6/__tests__/integration/snapshots/static/controller-layout-radial.svg @@ -1873,12 +1873,10 @@ @@ -1887,12 +1885,10 @@ @@ -1901,12 +1897,10 @@ @@ -1915,12 +1909,10 @@ @@ -1929,12 +1921,10 @@ @@ -1943,12 +1933,10 @@ @@ -1957,12 +1945,10 @@ @@ -1971,12 +1957,10 @@ @@ -1985,12 +1969,10 @@ @@ -1999,12 +1981,10 @@ @@ -2017,12 +1997,10 @@ @@ -2035,12 +2013,10 @@ @@ -2053,12 +2029,10 @@ @@ -2071,12 +2045,10 @@ @@ -2089,12 +2061,10 @@ @@ -2107,12 +2077,10 @@ @@ -2125,12 +2093,10 @@ @@ -2143,12 +2109,10 @@ @@ -2161,12 +2125,10 @@ @@ -2179,12 +2141,10 @@ @@ -2197,12 +2157,10 @@ @@ -2215,12 +2173,10 @@ @@ -2233,12 +2189,10 @@ @@ -2251,12 +2205,10 @@ @@ -2269,12 +2221,10 @@ @@ -2283,12 +2233,10 @@ @@ -2301,12 +2249,10 @@ @@ -2315,12 +2261,10 @@ @@ -2333,12 +2277,10 @@ @@ -2347,12 +2289,10 @@ @@ -2365,12 +2305,10 @@ @@ -2383,12 +2321,10 @@ @@ -2401,12 +2337,10 @@ @@ -2419,12 +2353,10 @@ diff --git a/packages/g6/__tests__/integration/snapshots/static/controller-viewport.svg b/packages/g6/__tests__/integration/snapshots/static/controller-viewport.svg index 848fc4c9be..ab61b939fe 100644 --- a/packages/g6/__tests__/integration/snapshots/static/controller-viewport.svg +++ b/packages/g6/__tests__/integration/snapshots/static/controller-viewport.svg @@ -26,18 +26,18 @@ stroke="transparent" stroke-width="3" /> - + @@ -49,13 +49,11 @@ @@ -63,13 +61,11 @@ diff --git a/packages/g6/__tests__/integration/snapshots/static/edge-arrow.svg b/packages/g6/__tests__/integration/snapshots/static/edge-arrow.svg index 26191736c6..728dcd5a3d 100644 --- a/packages/g6/__tests__/integration/snapshots/static/edge-arrow.svg +++ b/packages/g6/__tests__/integration/snapshots/static/edge-arrow.svg @@ -26,11 +26,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -41,27 +41,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -108,11 +108,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -123,27 +123,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -190,11 +190,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -205,27 +205,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -272,11 +272,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -287,27 +287,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -354,11 +354,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -369,27 +369,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -436,11 +436,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -451,27 +451,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -518,11 +518,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -533,27 +533,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -600,11 +600,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -615,27 +615,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -673,13 +673,11 @@ @@ -687,13 +685,11 @@ @@ -701,13 +697,11 @@ @@ -715,13 +709,11 @@ @@ -729,13 +721,11 @@ @@ -743,13 +733,11 @@ @@ -757,13 +745,11 @@ @@ -771,13 +757,11 @@ @@ -785,13 +769,11 @@ @@ -799,13 +781,11 @@ @@ -813,13 +793,11 @@ @@ -827,13 +805,11 @@ @@ -841,13 +817,11 @@ @@ -855,13 +829,11 @@ @@ -869,13 +841,11 @@ @@ -883,13 +853,11 @@ diff --git a/packages/g6/__tests__/integration/snapshots/static/edge-cubic-horizontal.svg b/packages/g6/__tests__/integration/snapshots/static/edge-cubic-horizontal.svg index eb028c2e13..bcd88b6d2f 100644 --- a/packages/g6/__tests__/integration/snapshots/static/edge-cubic-horizontal.svg +++ b/packages/g6/__tests__/integration/snapshots/static/edge-cubic-horizontal.svg @@ -26,11 +26,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -41,27 +41,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -69,7 +69,7 @@ - + - + @@ -149,27 +149,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -177,7 +177,7 @@ - + - + @@ -257,32 +257,32 @@ stroke-width="2" stroke="transparent" /> - + - + - + @@ -340,27 +340,27 @@ stroke-width="2" stroke="transparent" /> - + @@ -368,7 +368,7 @@ - + - + @@ -455,7 +457,7 @@ line-inactive @@ -485,87 +488,75 @@ - + - + - + - + - + - + diff --git a/packages/g6/__tests__/integration/snapshots/static/edge-cubic-vertical.svg b/packages/g6/__tests__/integration/snapshots/static/edge-cubic-vertical.svg index ed7032eaf8..b1f7ca9816 100644 --- a/packages/g6/__tests__/integration/snapshots/static/edge-cubic-vertical.svg +++ b/packages/g6/__tests__/integration/snapshots/static/edge-cubic-vertical.svg @@ -26,11 +26,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -41,27 +41,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -69,7 +69,7 @@ - + - + @@ -149,27 +149,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -177,7 +177,7 @@ - + - + @@ -257,32 +257,32 @@ stroke-width="2" stroke="transparent" /> - + - + - + @@ -340,27 +340,27 @@ stroke-width="2" stroke="transparent" /> - + @@ -368,7 +368,7 @@ - + - + @@ -455,7 +457,7 @@ line-inactive @@ -485,87 +488,75 @@ - + - + - + - + - + - + diff --git a/packages/g6/__tests__/integration/snapshots/static/edge-cubic.svg b/packages/g6/__tests__/integration/snapshots/static/edge-cubic.svg index 9a13db3f64..2d5544c184 100644 --- a/packages/g6/__tests__/integration/snapshots/static/edge-cubic.svg +++ b/packages/g6/__tests__/integration/snapshots/static/edge-cubic.svg @@ -26,11 +26,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -41,27 +41,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -69,7 +69,7 @@ - + - + @@ -149,27 +149,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -177,7 +177,7 @@ - + - + @@ -257,27 +257,27 @@ stroke-width="2" stroke="transparent" /> - + @@ -285,7 +285,7 @@ - + @@ -344,27 +344,27 @@ stroke-width="2" stroke="transparent" /> - + @@ -372,7 +372,7 @@ - + - + @@ -459,7 +461,7 @@ line-inactive @@ -493,13 +496,11 @@ @@ -511,13 +512,11 @@ @@ -529,13 +528,11 @@ @@ -547,13 +544,11 @@ @@ -565,13 +560,11 @@ @@ -583,13 +576,11 @@ diff --git a/packages/g6/__tests__/integration/snapshots/static/edge-custom-arrow.svg b/packages/g6/__tests__/integration/snapshots/static/edge-custom-arrow.svg index 4e3b6f31bc..2881978f03 100644 --- a/packages/g6/__tests__/integration/snapshots/static/edge-custom-arrow.svg +++ b/packages/g6/__tests__/integration/snapshots/static/edge-custom-arrow.svg @@ -26,11 +26,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -41,7 +41,7 @@ stroke-width="3" stroke="transparent" /> - + @@ -108,11 +108,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -123,7 +123,7 @@ stroke-width="3" stroke="transparent" /> - + @@ -190,11 +190,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -205,7 +205,7 @@ stroke-width="3" stroke="transparent" /> - + @@ -283,13 +281,11 @@ @@ -297,13 +293,11 @@ @@ -311,13 +305,11 @@ @@ -325,13 +317,11 @@ @@ -339,13 +329,11 @@ diff --git a/packages/g6/__tests__/integration/snapshots/static/edge-line.svg b/packages/g6/__tests__/integration/snapshots/static/edge-line.svg index 9b56c0d312..21d11c41d8 100644 --- a/packages/g6/__tests__/integration/snapshots/static/edge-line.svg +++ b/packages/g6/__tests__/integration/snapshots/static/edge-line.svg @@ -26,11 +26,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -41,27 +41,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -69,7 +69,7 @@ - + - + @@ -149,27 +149,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -177,7 +177,7 @@ - + - + @@ -257,27 +257,27 @@ stroke-width="2" stroke="transparent" /> - + @@ -285,7 +285,7 @@ - + @@ -344,27 +344,27 @@ stroke-width="2" stroke="transparent" /> - + @@ -372,7 +372,7 @@ - + - + @@ -459,7 +461,7 @@ line-inactive @@ -493,13 +496,11 @@ @@ -511,13 +512,11 @@ @@ -529,13 +528,11 @@ @@ -547,13 +544,11 @@ @@ -565,13 +560,11 @@ @@ -583,13 +576,11 @@ diff --git a/packages/g6/__tests__/integration/snapshots/static/edge-loop-curve.svg b/packages/g6/__tests__/integration/snapshots/static/edge-loop-curve.svg index ccce5e0b6a..556f8041ac 100644 --- a/packages/g6/__tests__/integration/snapshots/static/edge-loop-curve.svg +++ b/packages/g6/__tests__/integration/snapshots/static/edge-loop-curve.svg @@ -30,38 +30,38 @@ - + @@ -86,38 +86,38 @@ - + @@ -142,38 +142,38 @@ - + @@ -198,38 +198,38 @@ - + @@ -254,38 +254,38 @@ - + @@ -310,38 +310,38 @@ - + @@ -366,38 +366,38 @@ - + @@ -422,38 +422,38 @@ - + @@ -489,27 +489,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -534,38 +534,38 @@ - + @@ -577,11 +577,9 @@ @@ -591,11 +589,9 @@ @@ -605,11 +601,9 @@ @@ -617,7 +611,7 @@ @@ -657,7 +649,7 @@ - + @@ -97,27 +97,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -142,38 +142,38 @@ - + @@ -198,38 +198,38 @@ - + @@ -265,27 +265,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -310,38 +310,38 @@ - + @@ -366,38 +366,38 @@ - + @@ -422,38 +422,38 @@ - + @@ -489,27 +489,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -534,38 +534,38 @@ - + @@ -577,11 +577,9 @@ @@ -591,11 +589,9 @@ @@ -605,11 +601,9 @@ @@ -617,7 +611,7 @@ @@ -657,7 +649,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ๐Ÿ”ƒ - - - - - - - - - - - - - - - - - - top - - - - - - - - - - - - - - - - - - right - - - - - - - - - - - - - - - - - - bott... - - - - - - - - - - - - - - - - - - left - - - - - - - - - - - - - - - ๐Ÿ”ƒ - - - - - - - - - - - - - - - - - - top-r... - - - - - - - - - - - - - - - - - - bott... - - - - - - - - - - - - - - - - - - top-l... - - - - - - - - - - - - - - - - - - bott... - - - - - - - - - - - - - - - ๐Ÿ”„ - - - - - - - - - - - - - - - - - - top - - - - - - - - - - - - - - - - - - right - - - - - - - - - - - - - - - - - - bot... - - - - - - - - - - - - - - - - - - left - - - - - - - - - - - - - - - ๐Ÿ”„ - - - - - - - - - - - - - - - - - - top-... - - - - - - - - - - - - - - - - - - bott... - - - - - - - - - - - - - - - - - - top... - - - - - - - - - - - - - - - - - - bott... - - - - - - - \ No newline at end of file diff --git a/packages/g6/__tests__/integration/snapshots/static/edge-port.svg b/packages/g6/__tests__/integration/snapshots/static/edge-port.svg index 7e4b05f67e..5479a7426f 100644 --- a/packages/g6/__tests__/integration/snapshots/static/edge-port.svg +++ b/packages/g6/__tests__/integration/snapshots/static/edge-port.svg @@ -46,20 +46,20 @@ - + @@ -218,20 +218,20 @@ - + @@ -352,20 +352,20 @@ - + @@ -485,20 +485,20 @@ - + @@ -618,20 +618,20 @@ - + @@ -730,20 +730,20 @@ - + @@ -841,20 +841,20 @@ - + @@ -949,20 +949,20 @@ - + @@ -1056,20 +1056,20 @@ - + @@ -1164,20 +1164,20 @@ - + diff --git a/packages/g6/__tests__/integration/snapshots/static/edge-quadratic.svg b/packages/g6/__tests__/integration/snapshots/static/edge-quadratic.svg index c7a4752014..aa3042fda8 100644 --- a/packages/g6/__tests__/integration/snapshots/static/edge-quadratic.svg +++ b/packages/g6/__tests__/integration/snapshots/static/edge-quadratic.svg @@ -26,11 +26,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -41,27 +41,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -69,7 +69,7 @@ - + - + @@ -149,27 +149,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -177,7 +177,7 @@ - + - + @@ -257,27 +257,27 @@ stroke-width="2" stroke="transparent" /> - + @@ -285,7 +285,7 @@ - + @@ -344,27 +344,27 @@ stroke-width="2" stroke="transparent" /> - + @@ -372,7 +372,7 @@ - + - + @@ -459,7 +461,7 @@ line-inactive @@ -493,13 +496,11 @@ @@ -511,13 +512,11 @@ @@ -529,13 +528,11 @@ @@ -547,13 +544,11 @@ @@ -565,13 +560,11 @@ @@ -583,13 +576,11 @@ diff --git a/packages/g6/__tests__/integration/snapshots/static/element-label-background.svg b/packages/g6/__tests__/integration/snapshots/static/element-label-background.svg index 31f41fbf91..d024036a62 100644 --- a/packages/g6/__tests__/integration/snapshots/static/element-label-background.svg +++ b/packages/g6/__tests__/integration/snapshots/static/element-label-background.svg @@ -26,18 +26,18 @@ stroke="transparent" stroke-width="3" /> - + @@ -45,20 +45,8 @@ - - - - + @@ -111,20 +99,8 @@ - - - - + - - - - + - + - + @@ -128,11 +126,9 @@ diff --git a/packages/g6/__tests__/integration/snapshots/static/graph-element.svg b/packages/g6/__tests__/integration/snapshots/static/graph-element.svg index 3586e45cdc..ef703b3370 100644 --- a/packages/g6/__tests__/integration/snapshots/static/graph-element.svg +++ b/packages/g6/__tests__/integration/snapshots/static/graph-element.svg @@ -15,70 +15,70 @@ - + - + - + @@ -120,12 +120,12 @@ @@ -134,12 +134,10 @@ @@ -148,12 +146,12 @@ diff --git a/packages/g6/__tests__/integration/snapshots/static/node-circle.svg b/packages/g6/__tests__/integration/snapshots/static/node-circle.svg index 190569e157..577fd85d60 100644 --- a/packages/g6/__tests__/integration/snapshots/static/node-circle.svg +++ b/packages/g6/__tests__/integration/snapshots/static/node-circle.svg @@ -20,27 +20,14 @@ - - - @@ -102,27 +89,14 @@ - - - - - - - - - @@ -449,27 +397,14 @@ - - - - - - - - - - - - - - - circle-disabled diff --git a/packages/g6/__tests__/integration/snapshots/static/node-diamond.svg b/packages/g6/__tests__/integration/snapshots/static/node-diamond.svg index 75adf726e1..3aac982364 100644 --- a/packages/g6/__tests__/integration/snapshots/static/node-diamond.svg +++ b/packages/g6/__tests__/integration/snapshots/static/node-diamond.svg @@ -20,24 +20,11 @@ - - - @@ -96,24 +83,11 @@ - - - - - - - - - @@ -431,24 +379,11 @@ - - - - - - - diamond-select... + diamond-selected @@ -572,7 +496,7 @@ - - - - - - - - - diamond-disabled diff --git a/packages/g6/__tests__/integration/snapshots/static/node-ellipse.svg b/packages/g6/__tests__/integration/snapshots/static/node-ellipse.svg index 4e6572842f..cae21f7a07 100644 --- a/packages/g6/__tests__/integration/snapshots/static/node-ellipse.svg +++ b/packages/g6/__tests__/integration/snapshots/static/node-ellipse.svg @@ -20,28 +20,15 @@ - - - @@ -104,28 +91,15 @@ - - - - - - - - - @@ -463,28 +411,15 @@ - - - - - - - - - - - - - - - ellipse-disabled diff --git a/packages/g6/__tests__/integration/snapshots/static/node-image.svg b/packages/g6/__tests__/integration/snapshots/static/node-image.svg index 942d0f8abf..439cb881d6 100644 --- a/packages/g6/__tests__/integration/snapshots/static/node-image.svg +++ b/packages/g6/__tests__/integration/snapshots/static/node-image.svg @@ -20,30 +20,17 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - image-disabled diff --git a/packages/g6/__tests__/integration/snapshots/static/node-rect.svg b/packages/g6/__tests__/integration/snapshots/static/node-rect.svg index cf9f745c62..97518912b9 100644 --- a/packages/g6/__tests__/integration/snapshots/static/node-rect.svg +++ b/packages/g6/__tests__/integration/snapshots/static/node-rect.svg @@ -20,27 +20,14 @@ - - - @@ -98,27 +85,14 @@ - - - - - - - - - @@ -445,27 +393,14 @@ - - - - - - - - - - - - - - - rect-disabled diff --git a/packages/g6/__tests__/integration/snapshots/static/node-star.svg b/packages/g6/__tests__/integration/snapshots/static/node-star.svg index 8b6fe8bcbe..e7166bdb05 100644 --- a/packages/g6/__tests__/integration/snapshots/static/node-star.svg +++ b/packages/g6/__tests__/integration/snapshots/static/node-star.svg @@ -20,10 +20,8 @@ - - - @@ -96,10 +83,8 @@ - - - - - - - - - @@ -451,10 +399,8 @@ - - - - - - - - - @@ -682,17 +593,6 @@ fill="none" transform="matrix(1,0,0,1,0.000001,16.180340)" > - - - - - - star-disabled diff --git a/packages/g6/__tests__/integration/snapshots/static/node-triangle.svg b/packages/g6/__tests__/integration/snapshots/static/node-triangle.svg index 9e4b6f12df..705566d56e 100644 --- a/packages/g6/__tests__/integration/snapshots/static/node-triangle.svg +++ b/packages/g6/__tests__/integration/snapshots/static/node-triangle.svg @@ -20,24 +20,11 @@ - - - @@ -96,24 +83,11 @@ - - - - - - - - - @@ -418,24 +366,11 @@ - - - - - - - - - - - - @@ -1951,12 +1949,10 @@ @@ -1965,12 +1961,10 @@ @@ -1979,12 +1973,10 @@ @@ -1993,12 +1985,10 @@ @@ -2007,12 +1997,10 @@ @@ -2021,12 +2009,10 @@ @@ -2035,12 +2021,10 @@ @@ -2049,12 +2033,10 @@ @@ -2063,12 +2045,10 @@ @@ -2081,12 +2061,10 @@ @@ -2099,12 +2077,10 @@ @@ -2117,12 +2093,10 @@ @@ -2135,12 +2109,10 @@ @@ -2153,12 +2125,10 @@ @@ -2171,12 +2141,10 @@ @@ -2189,12 +2157,10 @@ @@ -2207,12 +2173,10 @@ @@ -2225,12 +2189,10 @@ @@ -2243,12 +2205,10 @@ @@ -2261,12 +2221,10 @@ @@ -2279,12 +2237,10 @@ @@ -2297,12 +2253,10 @@ @@ -2315,12 +2269,10 @@ @@ -2333,12 +2285,10 @@ @@ -2351,12 +2301,10 @@ @@ -2369,12 +2317,10 @@ @@ -2387,12 +2333,10 @@ @@ -2405,12 +2349,10 @@ @@ -2423,12 +2365,10 @@ @@ -2441,12 +2381,10 @@ @@ -2459,12 +2397,10 @@ @@ -2477,12 +2413,10 @@ @@ -2495,12 +2429,10 @@ diff --git a/packages/g6/__tests__/snapshots/behaviors/behavior-drag-node/after-drag.svg b/packages/g6/__tests__/snapshots/behaviors/behavior-drag-node/after-drag.svg index 92d4190614..8ad6477ba1 100644 --- a/packages/g6/__tests__/snapshots/behaviors/behavior-drag-node/after-drag.svg +++ b/packages/g6/__tests__/snapshots/behaviors/behavior-drag-node/after-drag.svg @@ -46,38 +46,38 @@ - + @@ -102,38 +102,38 @@ - + @@ -158,38 +158,38 @@ - + @@ -214,38 +214,38 @@ - + @@ -257,12 +257,10 @@ @@ -271,12 +269,10 @@ @@ -285,12 +281,10 @@ @@ -299,12 +293,10 @@ diff --git a/packages/g6/__tests__/snapshots/behaviors/behavior-drag-node/default.svg b/packages/g6/__tests__/snapshots/behaviors/behavior-drag-node/default.svg index aa81050b12..295325fdfa 100644 --- a/packages/g6/__tests__/snapshots/behaviors/behavior-drag-node/default.svg +++ b/packages/g6/__tests__/snapshots/behaviors/behavior-drag-node/default.svg @@ -46,38 +46,38 @@ - + @@ -102,38 +102,38 @@ - + @@ -158,38 +158,38 @@ - + @@ -214,38 +214,38 @@ - + @@ -257,12 +257,10 @@ @@ -271,12 +269,10 @@ @@ -285,12 +281,10 @@ @@ -299,12 +293,10 @@ diff --git a/packages/g6/__tests__/snapshots/behaviors/behavior-drag-node/hideEdges-both.svg b/packages/g6/__tests__/snapshots/behaviors/behavior-drag-node/hideEdges-both.svg index fddc9b3fa0..06d6e064c8 100644 --- a/packages/g6/__tests__/snapshots/behaviors/behavior-drag-node/hideEdges-both.svg +++ b/packages/g6/__tests__/snapshots/behaviors/behavior-drag-node/hideEdges-both.svg @@ -46,38 +46,38 @@ - + @@ -102,7 +102,7 @@ - + @@ -162,38 +162,38 @@ - + @@ -218,7 +218,7 @@ - + @@ -265,12 +265,10 @@ @@ -279,12 +277,10 @@ @@ -293,12 +289,10 @@ @@ -307,12 +301,10 @@ diff --git a/packages/g6/__tests__/snapshots/behaviors/behavior-drag-node/hideEdges-in.svg b/packages/g6/__tests__/snapshots/behaviors/behavior-drag-node/hideEdges-in.svg index 79a068e398..0cf5aed46d 100644 --- a/packages/g6/__tests__/snapshots/behaviors/behavior-drag-node/hideEdges-in.svg +++ b/packages/g6/__tests__/snapshots/behaviors/behavior-drag-node/hideEdges-in.svg @@ -46,38 +46,38 @@ - + @@ -102,7 +102,7 @@ - + @@ -162,7 +162,7 @@ - + @@ -222,7 +222,7 @@ - + @@ -269,12 +269,10 @@ @@ -283,12 +281,10 @@ @@ -297,12 +293,10 @@ @@ -311,12 +305,10 @@ diff --git a/packages/g6/__tests__/snapshots/behaviors/behavior-drag-node/hideEdges-out.svg b/packages/g6/__tests__/snapshots/behaviors/behavior-drag-node/hideEdges-out.svg index baa3bed253..5d7eef3c27 100644 --- a/packages/g6/__tests__/snapshots/behaviors/behavior-drag-node/hideEdges-out.svg +++ b/packages/g6/__tests__/snapshots/behaviors/behavior-drag-node/hideEdges-out.svg @@ -46,38 +46,38 @@ - + @@ -102,7 +102,7 @@ - + @@ -162,7 +162,7 @@ - + @@ -222,7 +222,7 @@ - + @@ -269,12 +269,10 @@ @@ -283,12 +281,10 @@ @@ -297,12 +293,10 @@ @@ -311,12 +305,10 @@ diff --git a/packages/g6/__tests__/snapshots/behaviors/behavior-drag-node/shadow-after-drag.svg b/packages/g6/__tests__/snapshots/behaviors/behavior-drag-node/shadow-after-drag.svg index fcd81e08c7..b323eebacc 100644 --- a/packages/g6/__tests__/snapshots/behaviors/behavior-drag-node/shadow-after-drag.svg +++ b/packages/g6/__tests__/snapshots/behaviors/behavior-drag-node/shadow-after-drag.svg @@ -46,38 +46,38 @@ - + @@ -102,7 +102,7 @@ - + @@ -162,7 +162,7 @@ - + @@ -222,7 +222,7 @@ - + @@ -269,12 +269,10 @@ @@ -283,12 +281,10 @@ @@ -297,12 +293,10 @@ @@ -311,12 +305,10 @@ diff --git a/packages/g6/__tests__/snapshots/behaviors/behavior-drag-node/shadow.svg b/packages/g6/__tests__/snapshots/behaviors/behavior-drag-node/shadow.svg index 60d53642dd..643ff08e0a 100644 --- a/packages/g6/__tests__/snapshots/behaviors/behavior-drag-node/shadow.svg +++ b/packages/g6/__tests__/snapshots/behaviors/behavior-drag-node/shadow.svg @@ -46,38 +46,38 @@ - + @@ -102,7 +102,7 @@ - + @@ -162,7 +162,7 @@ - + @@ -222,7 +222,7 @@ - + @@ -269,12 +269,10 @@ @@ -283,12 +281,10 @@ @@ -297,12 +293,10 @@ @@ -311,12 +305,10 @@ diff --git a/packages/g6/__tests__/snapshots/behaviors/behavior-zoom-canvas/default.svg b/packages/g6/__tests__/snapshots/behaviors/behavior-zoom-canvas/default.svg index 4568d961d8..f5f8e301dc 100644 --- a/packages/g6/__tests__/snapshots/behaviors/behavior-zoom-canvas/default.svg +++ b/packages/g6/__tests__/snapshots/behaviors/behavior-zoom-canvas/default.svg @@ -1937,12 +1937,10 @@ @@ -1951,12 +1949,10 @@ @@ -1965,12 +1961,10 @@ @@ -1979,12 +1973,10 @@ @@ -1993,12 +1985,10 @@ @@ -2007,12 +1997,10 @@ @@ -2021,12 +2009,10 @@ @@ -2035,12 +2021,10 @@ @@ -2049,12 +2033,10 @@ @@ -2063,12 +2045,10 @@ @@ -2081,12 +2061,10 @@ @@ -2099,12 +2077,10 @@ @@ -2117,12 +2093,10 @@ @@ -2135,12 +2109,10 @@ @@ -2153,12 +2125,10 @@ @@ -2171,12 +2141,10 @@ @@ -2189,12 +2157,10 @@ @@ -2207,12 +2173,10 @@ @@ -2225,12 +2189,10 @@ @@ -2243,12 +2205,10 @@ @@ -2261,12 +2221,10 @@ @@ -2279,12 +2237,10 @@ @@ -2297,12 +2253,10 @@ @@ -2315,12 +2269,10 @@ @@ -2333,12 +2285,10 @@ @@ -2351,12 +2301,10 @@ @@ -2369,12 +2317,10 @@ @@ -2387,12 +2333,10 @@ @@ -2405,12 +2349,10 @@ @@ -2423,12 +2365,10 @@ @@ -2441,12 +2381,10 @@ @@ -2459,12 +2397,10 @@ @@ -2477,12 +2413,10 @@ @@ -2495,12 +2429,10 @@ diff --git a/packages/g6/__tests__/snapshots/elements/change-type/change_type.svg b/packages/g6/__tests__/snapshots/elements/change-type/change_type.svg index f99dbd6e5d..e00b05de85 100644 --- a/packages/g6/__tests__/snapshots/elements/change-type/change_type.svg +++ b/packages/g6/__tests__/snapshots/elements/change-type/change_type.svg @@ -26,18 +26,18 @@ stroke="transparent" stroke-width="3" /> - + @@ -49,24 +49,21 @@ - + diff --git a/packages/g6/__tests__/snapshots/elements/change-type/default.svg b/packages/g6/__tests__/snapshots/elements/change-type/default.svg index f264946386..cd96ab700c 100644 --- a/packages/g6/__tests__/snapshots/elements/change-type/default.svg +++ b/packages/g6/__tests__/snapshots/elements/change-type/default.svg @@ -26,18 +26,18 @@ stroke="transparent" stroke-width="3" /> - + @@ -49,13 +49,12 @@ @@ -63,13 +62,11 @@ diff --git a/packages/g6/__tests__/snapshots/elements/combo/circle-collapse-bottom.svg b/packages/g6/__tests__/snapshots/elements/combo/circle-collapse-bottom.svg index a424a3ac4f..ac72a037fe 100644 --- a/packages/g6/__tests__/snapshots/elements/combo/circle-collapse-bottom.svg +++ b/packages/g6/__tests__/snapshots/elements/combo/circle-collapse-bottom.svg @@ -13,7 +13,7 @@ - - - - - - - + - + @@ -151,18 +129,18 @@ stroke="transparent" stroke-width="3" /> - + @@ -174,27 +152,14 @@ - - - - + - - - - + - - - - + - - - - - - - + - + @@ -151,18 +129,18 @@ stroke="transparent" stroke-width="3" /> - + @@ -174,27 +152,14 @@ - - - - + - - - - + - - - - + - - - - - - - + - + @@ -151,18 +129,18 @@ stroke="transparent" stroke-width="3" /> - + @@ -174,27 +152,14 @@ - - - - + - - - - + - - - - + - - - - - - - + - + @@ -147,18 +125,18 @@ stroke="transparent" stroke-width="3" /> - + @@ -170,27 +148,14 @@ - - - - + - - - - + - - - - + - + - - - - - - - + - + @@ -147,18 +125,18 @@ stroke="transparent" stroke-width="3" /> - + @@ -170,27 +148,14 @@ - - - - + - - - - + - - - - + - + - - - - - - - + - + @@ -147,18 +125,18 @@ stroke="transparent" stroke-width="3" /> - + @@ -170,27 +148,14 @@ - - - - + - - - - + - - - - + - - - - - - - + - + @@ -151,18 +129,18 @@ stroke="transparent" stroke-width="3" /> - + @@ -174,27 +152,14 @@ - - - - + - - - - + - - - - + - - - - - - - + - + @@ -151,18 +129,18 @@ stroke="transparent" stroke-width="3" /> - + @@ -174,27 +152,14 @@ - - - - + - - - - + - - - - + - - - - - - - + - + @@ -151,18 +129,18 @@ stroke="transparent" stroke-width="3" /> - + @@ -174,27 +152,14 @@ - - - - + - - - - + - - - - + - - - - - - - + - + @@ -166,18 +144,18 @@ stroke="transparent" stroke-width="3" /> - + @@ -189,27 +167,14 @@ - - - - + - - - - + - - - - + - - - - - - - + - + @@ -166,18 +144,18 @@ stroke="transparent" stroke-width="3" /> - + @@ -189,27 +167,14 @@ - - - - + - - - - + - - - - + - - - - - - - + - + @@ -166,18 +144,18 @@ stroke="transparent" stroke-width="3" /> - + @@ -189,27 +167,14 @@ - - - - + - - - - + - - - - + - - - - - - - + - + @@ -166,18 +144,18 @@ stroke="transparent" stroke-width="3" /> - + @@ -189,27 +167,14 @@ - - - - + - - - - + - - - - + - - - - + - - - - + - + @@ -147,18 +125,18 @@ stroke="transparent" stroke-width="3" /> - + @@ -170,27 +148,14 @@ - - - - + - - - - + - - - - + - - - - + - + - - - - + @@ -143,18 +121,18 @@ stroke="transparent" stroke-width="3" /> - + @@ -166,27 +144,14 @@ - - - - + - - - - + - - - - + - - - - + - + - - - - + @@ -143,18 +121,18 @@ stroke="transparent" stroke-width="3" /> - + @@ -166,27 +144,14 @@ - - - - + - - - - + - - - - + - - - - + - + - - - - + @@ -143,18 +121,18 @@ stroke="transparent" stroke-width="3" /> - + @@ -166,27 +144,14 @@ - - - - + - - - - + - - - - + - - - - + - - - - + @@ -151,18 +129,18 @@ stroke="transparent" stroke-width="3" /> - + @@ -174,27 +152,14 @@ - - - - + - - - - + - - - - + - - - - + - - - - + @@ -151,18 +129,18 @@ stroke="transparent" stroke-width="3" /> - + @@ -174,27 +152,14 @@ - - - - + - - - - + - - - - + - - - - + - - - - + @@ -151,18 +129,18 @@ stroke="transparent" stroke-width="3" /> - + @@ -174,27 +152,14 @@ - - - - + - - - - + - - - - + - - - - + - - - - + @@ -147,18 +125,18 @@ stroke="transparent" stroke-width="3" /> - + @@ -170,27 +148,14 @@ - - - - + - - - - + - - - - + - - - - + - - - - + @@ -147,18 +125,18 @@ stroke="transparent" stroke-width="3" /> - + @@ -170,27 +148,14 @@ - - - - + - - - - + - - - - + - - - - + - - - - + @@ -147,18 +125,18 @@ stroke="transparent" stroke-width="3" /> - + @@ -170,27 +148,14 @@ - - - - + - - - - + - - - - + - + @@ -49,13 +49,11 @@ @@ -63,13 +61,11 @@ diff --git a/packages/g6/__tests__/snapshots/elements/edge-polyline/edge-polyline-radius.svg b/packages/g6/__tests__/snapshots/elements/edge-polyline/edge-polyline-radius.svg index 37445cbe52..e81d552a1c 100644 --- a/packages/g6/__tests__/snapshots/elements/edge-polyline/edge-polyline-radius.svg +++ b/packages/g6/__tests__/snapshots/elements/edge-polyline/edge-polyline-radius.svg @@ -26,18 +26,18 @@ stroke="transparent" stroke-width="3" /> - + @@ -49,13 +49,11 @@ @@ -63,13 +61,11 @@ diff --git a/packages/g6/__tests__/snapshots/elements/edge-polyline/edge-polyline-router-has-controlPoints.svg b/packages/g6/__tests__/snapshots/elements/edge-polyline/edge-polyline-router-has-controlPoints.svg index 121e05ef23..870f1c9abc 100644 --- a/packages/g6/__tests__/snapshots/elements/edge-polyline/edge-polyline-router-has-controlPoints.svg +++ b/packages/g6/__tests__/snapshots/elements/edge-polyline/edge-polyline-router-has-controlPoints.svg @@ -26,18 +26,18 @@ stroke="transparent" stroke-width="3" /> - + @@ -49,13 +49,11 @@ @@ -63,13 +61,11 @@ diff --git a/packages/g6/__tests__/snapshots/elements/edge-polyline/edge-polyline-router-no-controlPoints.svg b/packages/g6/__tests__/snapshots/elements/edge-polyline/edge-polyline-router-no-controlPoints.svg index 6b1e6a8fc2..e52c49f77b 100644 --- a/packages/g6/__tests__/snapshots/elements/edge-polyline/edge-polyline-router-no-controlPoints.svg +++ b/packages/g6/__tests__/snapshots/elements/edge-polyline/edge-polyline-router-no-controlPoints.svg @@ -30,14 +30,14 @@ @@ -49,13 +49,11 @@ @@ -63,13 +61,11 @@ diff --git a/packages/g6/__tests__/snapshots/elements/port/port_hidden.svg b/packages/g6/__tests__/snapshots/elements/port/port_hidden.svg index 53677f8d42..b355d9a633 100644 --- a/packages/g6/__tests__/snapshots/elements/port/port_hidden.svg +++ b/packages/g6/__tests__/snapshots/elements/port/port_hidden.svg @@ -30,38 +30,38 @@ - + @@ -86,38 +86,38 @@ - + @@ -142,38 +142,38 @@ - + @@ -185,12 +185,10 @@ @@ -199,11 +197,9 @@ diff --git a/packages/g6/__tests__/snapshots/elements/port/port_linkToCenter.svg b/packages/g6/__tests__/snapshots/elements/port/port_linkToCenter.svg index bdc19eb6dc..6a725d7795 100644 --- a/packages/g6/__tests__/snapshots/elements/port/port_linkToCenter.svg +++ b/packages/g6/__tests__/snapshots/elements/port/port_linkToCenter.svg @@ -30,38 +30,38 @@ - + @@ -86,38 +86,38 @@ - + @@ -142,38 +142,38 @@ - + @@ -185,12 +185,10 @@ @@ -199,11 +197,9 @@ @@ -211,7 +207,7 @@ - + @@ -86,38 +86,38 @@ - + @@ -142,38 +142,38 @@ - + @@ -185,12 +185,10 @@ @@ -199,11 +197,9 @@ @@ -211,7 +207,7 @@ @@ -127,12 +125,10 @@ @@ -141,12 +137,10 @@ diff --git a/packages/g6/__tests__/snapshots/elements/position/translateElementBy-single.svg b/packages/g6/__tests__/snapshots/elements/position/translateElementBy-single.svg index 04ad081bf0..a49201e770 100644 --- a/packages/g6/__tests__/snapshots/elements/position/translateElementBy-single.svg +++ b/packages/g6/__tests__/snapshots/elements/position/translateElementBy-single.svg @@ -113,12 +113,10 @@ @@ -127,12 +125,10 @@ @@ -141,12 +137,10 @@ diff --git a/packages/g6/__tests__/snapshots/elements/position/translateElementBy.svg b/packages/g6/__tests__/snapshots/elements/position/translateElementBy.svg index 9eb6246546..b58da0c8fa 100644 --- a/packages/g6/__tests__/snapshots/elements/position/translateElementBy.svg +++ b/packages/g6/__tests__/snapshots/elements/position/translateElementBy.svg @@ -113,12 +113,10 @@ @@ -127,12 +125,10 @@ @@ -141,12 +137,10 @@ diff --git a/packages/g6/__tests__/snapshots/elements/position/translateElementTo-single.svg b/packages/g6/__tests__/snapshots/elements/position/translateElementTo-single.svg index decccfc086..815f1df0b4 100644 --- a/packages/g6/__tests__/snapshots/elements/position/translateElementTo-single.svg +++ b/packages/g6/__tests__/snapshots/elements/position/translateElementTo-single.svg @@ -113,12 +113,10 @@ @@ -127,12 +125,10 @@ @@ -141,12 +137,10 @@ diff --git a/packages/g6/__tests__/snapshots/elements/position/translateElementTo.svg b/packages/g6/__tests__/snapshots/elements/position/translateElementTo.svg index bbec3fbd7e..14c9de55d5 100644 --- a/packages/g6/__tests__/snapshots/elements/position/translateElementTo.svg +++ b/packages/g6/__tests__/snapshots/elements/position/translateElementTo.svg @@ -113,12 +113,10 @@ @@ -127,12 +125,10 @@ @@ -141,12 +137,10 @@ diff --git a/packages/g6/__tests__/snapshots/elements/state/default.svg b/packages/g6/__tests__/snapshots/elements/state/default.svg index 7797c28fff..1e8bc6cd55 100644 --- a/packages/g6/__tests__/snapshots/elements/state/default.svg +++ b/packages/g6/__tests__/snapshots/elements/state/default.svg @@ -164,12 +164,11 @@ @@ -183,8 +182,8 @@ cx="10" cy="10" stroke-width="12" - stroke="rgba(34,126,255,1)" r="10" + stroke="rgba(23,131,255,1)" stroke-dasharray="0,0" stroke-opacity="0.25" pointer-events="none" @@ -193,12 +192,11 @@ diff --git a/packages/g6/__tests__/snapshots/elements/state/setState-single-default.svg b/packages/g6/__tests__/snapshots/elements/state/setState-single-default.svg index 8cb9939eae..045ae69459 100644 --- a/packages/g6/__tests__/snapshots/elements/state/setState-single-default.svg +++ b/packages/g6/__tests__/snapshots/elements/state/setState-single-default.svg @@ -135,7 +135,7 @@ @@ -183,8 +183,8 @@ cx="10" cy="10" stroke-width="12" - stroke="rgba(34,126,255,1)" r="10" + stroke="rgba(23,131,255,1)" stroke-dasharray="0,0" stroke-opacity="0.25" pointer-events="none" @@ -193,12 +193,11 @@ diff --git a/packages/g6/__tests__/snapshots/elements/state/setState-single.svg b/packages/g6/__tests__/snapshots/elements/state/setState-single.svg index 5202453275..8a6a8cda8a 100644 --- a/packages/g6/__tests__/snapshots/elements/state/setState-single.svg +++ b/packages/g6/__tests__/snapshots/elements/state/setState-single.svg @@ -184,8 +184,8 @@ cx="10" cy="10" stroke-width="3" - stroke="rgba(0,0,0,1)" r="10" + stroke="rgba(0,0,0,1)" /> @@ -198,8 +198,8 @@ cx="10" cy="10" stroke-width="12" - stroke="rgba(34,126,255,1)" r="10" + stroke="rgba(23,131,255,1)" stroke-dasharray="0,0" stroke-opacity="0.25" pointer-events="none" @@ -208,12 +208,11 @@ diff --git a/packages/g6/__tests__/snapshots/elements/state/setState.svg b/packages/g6/__tests__/snapshots/elements/state/setState.svg index 17a2ecddde..639bac7fdc 100644 --- a/packages/g6/__tests__/snapshots/elements/state/setState.svg +++ b/packages/g6/__tests__/snapshots/elements/state/setState.svg @@ -140,7 +140,7 @@ cx="10" cy="10" stroke-width="12" - stroke="rgba(34,126,255,1)" + stroke="rgba(23,131,255,1)" r="10" stroke-dasharray="0,0" stroke-opacity="0.25" @@ -150,7 +150,7 @@ @@ -198,8 +198,8 @@ cx="10" cy="10" stroke-width="12" - stroke="rgba(34,126,255,1)" r="10" + stroke="rgba(23,131,255,1)" stroke-dasharray="0,0" stroke-opacity="0.25" pointer-events="none" @@ -208,12 +208,11 @@ diff --git a/packages/g6/__tests__/snapshots/elements/visibility/default.svg b/packages/g6/__tests__/snapshots/elements/visibility/default.svg index 644218fe46..ba6d573dd5 100644 --- a/packages/g6/__tests__/snapshots/elements/visibility/default.svg +++ b/packages/g6/__tests__/snapshots/elements/visibility/default.svg @@ -30,54 +30,43 @@ - + - - - - + @@ -153,17 +142,6 @@ fill="none" transform="matrix(0.600005,-0.799996,0.799996,0.600005,160.099976,103.199989)" > - - - - + @@ -239,17 +217,6 @@ fill="none" transform="matrix(0.600000,0.800000,-0.800000,0.600000,85.099998,96.800003)" > - - - - - - - - - - - - - - - - + - - - - + @@ -163,18 +151,6 @@ fill="none" transform="matrix(0.600005,-0.799996,0.799996,0.600005,160.099976,103.199989)" > - - - - + @@ -255,18 +231,6 @@ fill="none" transform="matrix(0.600000,0.800000,-0.800000,0.600000,85.099998,96.800003)" > - - - - - - - - - - - - - - - - + - - - - + @@ -163,18 +151,6 @@ fill="none" transform="matrix(0.600005,-0.799996,0.799996,0.600005,160.099976,103.199989)" > - - - - + @@ -255,18 +231,6 @@ fill="none" transform="matrix(0.600000,0.800000,-0.800000,0.600000,85.099998,96.800003)" > - - - - - - - - - - - - - - - - + - - - - + @@ -163,18 +151,6 @@ fill="none" transform="matrix(0.600005,-0.799996,0.799996,0.600005,160.099976,103.199989)" > - - - - + @@ -255,18 +231,6 @@ fill="none" transform="matrix(0.600000,0.800000,-0.800000,0.600000,85.099998,96.800003)" > - - - - - - - - - - - - - - - - + - - - - + @@ -163,18 +151,6 @@ fill="none" transform="matrix(0.600005,-0.799996,0.799996,0.600005,160.099976,103.199989)" > - - - - + @@ -255,18 +231,6 @@ fill="none" transform="matrix(0.600000,0.800000,-0.800000,0.600000,85.099998,96.800003)" > - - - - - - - - - - - - - - - - + - - - - + @@ -163,18 +151,6 @@ fill="none" transform="matrix(0.600005,-0.799996,0.799996,0.600005,160.099976,103.199989)" > - - - - + @@ -255,18 +231,6 @@ fill="none" transform="matrix(0.600000,0.800000,-0.800000,0.600000,85.099998,96.800003)" > - - - - - - - - - - - - - - - @@ -29,11 +29,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -61,11 +61,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -93,11 +93,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -125,11 +125,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -157,11 +157,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -189,11 +189,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -221,11 +221,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -253,11 +253,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -285,11 +285,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -317,11 +317,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -349,11 +349,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -381,11 +381,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -413,11 +413,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -445,11 +445,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -477,11 +477,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -509,11 +509,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -541,11 +541,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -573,11 +573,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -605,11 +605,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -637,11 +637,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -669,11 +669,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -701,11 +701,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -733,11 +733,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -765,11 +765,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -797,11 +797,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -829,11 +829,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -861,11 +861,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -893,11 +893,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -925,11 +925,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -957,11 +957,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -989,11 +989,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1021,11 +1021,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1053,11 +1053,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1085,11 +1085,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1117,11 +1117,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1149,11 +1149,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1181,11 +1181,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1213,11 +1213,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1245,11 +1245,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1277,11 +1277,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1309,11 +1309,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1341,11 +1341,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1373,11 +1373,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1405,11 +1405,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1437,11 +1437,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1469,11 +1469,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1501,11 +1501,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1533,11 +1533,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1565,11 +1565,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1597,11 +1597,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1629,11 +1629,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1661,11 +1661,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1693,11 +1693,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1725,11 +1725,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1757,11 +1757,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1789,11 +1789,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1821,11 +1821,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1853,11 +1853,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1885,11 +1885,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1917,11 +1917,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1940,13 +1940,11 @@ @@ -1954,13 +1952,11 @@ @@ -1968,13 +1964,11 @@ @@ -1982,13 +1976,11 @@ @@ -1996,13 +1988,11 @@ @@ -2010,13 +2000,11 @@ @@ -2024,13 +2012,11 @@ @@ -2038,13 +2024,11 @@ @@ -2052,13 +2036,11 @@ @@ -2066,13 +2048,11 @@ @@ -2084,13 +2064,11 @@ @@ -2102,13 +2080,11 @@ @@ -2116,13 +2092,11 @@ @@ -2130,13 +2104,11 @@ @@ -2144,13 +2116,11 @@ @@ -2158,13 +2128,11 @@ @@ -2172,13 +2140,11 @@ @@ -2186,13 +2152,11 @@ @@ -2200,13 +2164,11 @@ @@ -2214,13 +2176,11 @@ @@ -2228,13 +2188,11 @@ @@ -2242,13 +2200,11 @@ @@ -2256,13 +2212,11 @@ @@ -2270,13 +2224,11 @@ @@ -2284,13 +2236,11 @@ @@ -2298,13 +2248,11 @@ @@ -2312,13 +2260,11 @@ @@ -2326,13 +2272,11 @@ @@ -2340,13 +2284,11 @@ @@ -2354,13 +2296,11 @@ @@ -2368,13 +2308,11 @@ @@ -2386,13 +2324,11 @@ @@ -2404,13 +2340,11 @@ @@ -2422,13 +2356,11 @@ diff --git a/packages/g6/__tests__/snapshots/layouts/circular/layout-circular-configuration-translate-division.svg b/packages/g6/__tests__/snapshots/layouts/circular/layout-circular-configuration-translate-division.svg index 2fcfb22c54..5a4d4f9f4a 100644 --- a/packages/g6/__tests__/snapshots/layouts/circular/layout-circular-configuration-translate-division.svg +++ b/packages/g6/__tests__/snapshots/layouts/circular/layout-circular-configuration-translate-division.svg @@ -9,7 +9,7 @@ @@ -18,22 +18,22 @@ id="0-1" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -44,27 +44,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -74,22 +74,22 @@ id="0-2" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -100,27 +100,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -130,22 +130,22 @@ id="0-3" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -156,27 +156,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -186,22 +186,22 @@ id="0-4" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -212,27 +212,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -242,22 +242,22 @@ id="0-5" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -268,27 +268,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -298,22 +298,22 @@ id="0-7" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -324,27 +324,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -354,22 +354,22 @@ id="0-8" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -380,27 +380,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -410,22 +410,22 @@ id="0-9" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -436,27 +436,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -466,22 +466,22 @@ id="0-10" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -492,27 +492,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -522,22 +522,22 @@ id="0-11" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -548,27 +548,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -578,22 +578,22 @@ id="0-13" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -604,27 +604,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -634,22 +634,22 @@ id="0-14" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -660,27 +660,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -690,22 +690,22 @@ id="0-15" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -716,27 +716,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -746,22 +746,22 @@ id="0-16" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -772,27 +772,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -802,22 +802,22 @@ id="2-3" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -828,27 +828,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -858,22 +858,22 @@ id="4-5" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -884,27 +884,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -914,22 +914,22 @@ id="4-6" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -940,27 +940,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -970,22 +970,22 @@ id="5-6" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -996,27 +996,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1026,22 +1026,22 @@ id="7-13" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1052,27 +1052,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1082,22 +1082,22 @@ id="8-14" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1108,27 +1108,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1138,22 +1138,22 @@ id="9-10" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1164,27 +1164,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1194,22 +1194,22 @@ id="10-22" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1220,27 +1220,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1250,22 +1250,22 @@ id="10-14" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1276,27 +1276,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1306,22 +1306,22 @@ id="10-12" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1332,27 +1332,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1362,22 +1362,22 @@ id="10-24" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1388,27 +1388,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1418,22 +1418,22 @@ id="10-21" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1444,27 +1444,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1474,22 +1474,22 @@ id="10-20" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1500,27 +1500,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1530,22 +1530,22 @@ id="11-24" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1556,27 +1556,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1586,22 +1586,22 @@ id="11-22" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1612,27 +1612,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1642,22 +1642,22 @@ id="11-14" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1668,27 +1668,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1698,22 +1698,22 @@ id="12-13" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1724,27 +1724,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1754,22 +1754,22 @@ id="16-17" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1780,27 +1780,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1810,22 +1810,22 @@ id="16-18" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1836,27 +1836,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1866,22 +1866,22 @@ id="16-21" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1892,27 +1892,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1922,22 +1922,22 @@ id="16-22" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1948,27 +1948,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1978,22 +1978,22 @@ id="17-18" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2004,27 +2004,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2034,22 +2034,22 @@ id="17-20" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2060,27 +2060,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2090,22 +2090,22 @@ id="18-19" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2116,27 +2116,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2146,22 +2146,22 @@ id="19-20" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2172,27 +2172,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2202,22 +2202,22 @@ id="19-33" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2228,27 +2228,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2258,22 +2258,22 @@ id="19-22" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2284,27 +2284,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2314,22 +2314,22 @@ id="19-23" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2340,27 +2340,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2370,22 +2370,22 @@ id="20-21" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2396,27 +2396,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2426,22 +2426,22 @@ id="21-22" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2452,27 +2452,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2482,22 +2482,22 @@ id="22-24" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2508,27 +2508,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2538,22 +2538,22 @@ id="22-25" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2564,27 +2564,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2594,22 +2594,22 @@ id="22-26" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2620,27 +2620,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2650,22 +2650,22 @@ id="22-23" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2676,27 +2676,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2706,22 +2706,22 @@ id="22-28" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2732,27 +2732,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2762,22 +2762,22 @@ id="22-30" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2788,27 +2788,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2818,22 +2818,22 @@ id="22-31" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2844,27 +2844,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2874,22 +2874,22 @@ id="22-32" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2900,27 +2900,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2930,22 +2930,22 @@ id="22-33" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2956,27 +2956,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2986,22 +2986,22 @@ id="23-28" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -3012,27 +3012,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -3042,22 +3042,22 @@ id="23-27" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -3068,27 +3068,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -3098,22 +3098,22 @@ id="23-29" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -3124,27 +3124,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -3154,22 +3154,22 @@ id="23-30" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -3180,27 +3180,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -3210,22 +3210,22 @@ id="23-31" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -3236,27 +3236,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -3266,22 +3266,22 @@ id="23-33" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -3292,27 +3292,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -3322,22 +3322,22 @@ id="32-33" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -3348,27 +3348,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -3380,13 +3380,11 @@ @@ -3394,13 +3392,11 @@ @@ -3408,13 +3404,11 @@ @@ -3422,13 +3416,11 @@ @@ -3436,13 +3428,11 @@ @@ -3450,13 +3440,11 @@ @@ -3464,13 +3452,11 @@ @@ -3478,13 +3464,11 @@ @@ -3492,13 +3476,11 @@ @@ -3506,13 +3488,11 @@ @@ -3524,13 +3504,11 @@ @@ -3538,13 +3516,11 @@ @@ -3556,13 +3532,11 @@ @@ -3570,13 +3544,11 @@ @@ -3584,13 +3556,11 @@ @@ -3602,13 +3572,11 @@ @@ -3620,13 +3588,11 @@ @@ -3634,13 +3600,11 @@ @@ -3648,13 +3612,11 @@ @@ -3666,13 +3628,11 @@ @@ -3680,13 +3640,11 @@ @@ -3694,13 +3652,11 @@ @@ -3712,13 +3668,11 @@ @@ -3730,13 +3684,11 @@ @@ -3744,13 +3696,11 @@ @@ -3762,13 +3712,11 @@ @@ -3780,13 +3728,11 @@ @@ -3798,13 +3744,11 @@ @@ -3812,13 +3756,11 @@ @@ -3830,13 +3772,11 @@ @@ -3844,13 +3784,11 @@ @@ -3858,13 +3796,11 @@ @@ -3872,13 +3808,11 @@ @@ -3886,13 +3820,11 @@ diff --git a/packages/g6/__tests__/snapshots/layouts/circular/layout-circular-configuration-translate.svg b/packages/g6/__tests__/snapshots/layouts/circular/layout-circular-configuration-translate.svg index b4ee98fb15..ba4515acca 100644 --- a/packages/g6/__tests__/snapshots/layouts/circular/layout-circular-configuration-translate.svg +++ b/packages/g6/__tests__/snapshots/layouts/circular/layout-circular-configuration-translate.svg @@ -9,7 +9,7 @@ @@ -18,22 +18,22 @@ id="0-1" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -44,27 +44,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -74,22 +74,22 @@ id="0-2" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -100,27 +100,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -130,22 +130,22 @@ id="0-3" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -156,27 +156,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -186,22 +186,22 @@ id="0-4" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -212,27 +212,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -242,22 +242,22 @@ id="0-5" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -268,27 +268,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -298,22 +298,22 @@ id="0-7" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -324,27 +324,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -354,22 +354,22 @@ id="0-8" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -380,27 +380,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -410,22 +410,22 @@ id="0-9" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -436,27 +436,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -466,22 +466,22 @@ id="0-10" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -492,27 +492,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -522,22 +522,22 @@ id="0-11" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -548,27 +548,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -578,22 +578,22 @@ id="0-13" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -604,27 +604,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -634,22 +634,22 @@ id="0-14" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -660,27 +660,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -690,22 +690,22 @@ id="0-15" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -716,27 +716,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -746,22 +746,22 @@ id="0-16" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -772,27 +772,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -802,22 +802,22 @@ id="2-3" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -828,27 +828,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -858,22 +858,22 @@ id="4-5" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -884,27 +884,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -914,22 +914,22 @@ id="4-6" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -940,27 +940,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -970,22 +970,22 @@ id="5-6" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -996,27 +996,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1026,22 +1026,22 @@ id="7-13" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1052,27 +1052,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1082,22 +1082,22 @@ id="8-14" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1108,27 +1108,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1138,22 +1138,22 @@ id="9-10" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1164,27 +1164,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1194,22 +1194,22 @@ id="10-22" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1220,27 +1220,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1250,22 +1250,22 @@ id="10-14" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1276,27 +1276,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1306,22 +1306,22 @@ id="10-12" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1332,27 +1332,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1362,22 +1362,22 @@ id="10-24" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1388,27 +1388,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1418,22 +1418,22 @@ id="10-21" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1444,27 +1444,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1474,22 +1474,22 @@ id="10-20" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1500,27 +1500,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1530,22 +1530,22 @@ id="11-24" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1556,27 +1556,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1586,22 +1586,22 @@ id="11-22" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1612,27 +1612,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1642,22 +1642,22 @@ id="11-14" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1668,27 +1668,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1698,22 +1698,22 @@ id="12-13" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1724,27 +1724,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1754,22 +1754,22 @@ id="16-17" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1780,27 +1780,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1810,22 +1810,22 @@ id="16-18" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1836,27 +1836,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1866,22 +1866,22 @@ id="16-21" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1892,27 +1892,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1922,22 +1922,22 @@ id="16-22" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1948,27 +1948,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1978,22 +1978,22 @@ id="17-18" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2004,27 +2004,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2034,22 +2034,22 @@ id="17-20" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2060,27 +2060,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2090,22 +2090,22 @@ id="18-19" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2116,27 +2116,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2146,22 +2146,22 @@ id="19-20" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2172,27 +2172,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2202,22 +2202,22 @@ id="19-33" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2228,27 +2228,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2258,22 +2258,22 @@ id="19-22" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2284,27 +2284,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2314,22 +2314,22 @@ id="19-23" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2340,27 +2340,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2370,22 +2370,22 @@ id="20-21" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2396,27 +2396,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2426,22 +2426,22 @@ id="21-22" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2452,27 +2452,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2482,22 +2482,22 @@ id="22-24" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2508,27 +2508,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2538,22 +2538,22 @@ id="22-25" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2564,27 +2564,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2594,22 +2594,22 @@ id="22-26" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2620,27 +2620,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2650,22 +2650,22 @@ id="22-23" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2676,27 +2676,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2706,22 +2706,22 @@ id="22-28" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2732,27 +2732,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2762,22 +2762,22 @@ id="22-30" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2788,27 +2788,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2818,22 +2818,22 @@ id="22-31" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2844,27 +2844,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2874,22 +2874,22 @@ id="22-32" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2900,27 +2900,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2930,22 +2930,22 @@ id="22-33" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2956,27 +2956,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2986,22 +2986,22 @@ id="23-28" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -3012,27 +3012,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -3042,22 +3042,22 @@ id="23-27" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -3068,27 +3068,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -3098,22 +3098,22 @@ id="23-29" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -3124,27 +3124,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -3154,22 +3154,22 @@ id="23-30" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -3180,27 +3180,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -3210,22 +3210,22 @@ id="23-31" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -3236,27 +3236,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -3266,22 +3266,22 @@ id="23-33" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -3292,27 +3292,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -3322,22 +3322,22 @@ id="32-33" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -3348,27 +3348,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -3380,13 +3380,11 @@ @@ -3394,13 +3392,11 @@ @@ -3408,13 +3404,11 @@ @@ -3422,13 +3416,11 @@ @@ -3436,13 +3428,11 @@ @@ -3450,13 +3440,11 @@ @@ -3464,13 +3452,11 @@ @@ -3478,13 +3464,11 @@ @@ -3492,13 +3476,11 @@ @@ -3506,13 +3488,11 @@ @@ -3524,13 +3504,11 @@ @@ -3542,13 +3520,11 @@ @@ -3556,13 +3532,11 @@ @@ -3570,13 +3544,11 @@ @@ -3584,13 +3556,11 @@ @@ -3598,13 +3568,11 @@ @@ -3612,13 +3580,11 @@ @@ -3626,13 +3592,11 @@ @@ -3640,13 +3604,11 @@ @@ -3654,13 +3616,11 @@ @@ -3668,13 +3628,11 @@ @@ -3682,13 +3640,11 @@ @@ -3696,13 +3652,11 @@ @@ -3710,13 +3664,11 @@ @@ -3724,13 +3676,11 @@ @@ -3738,13 +3688,11 @@ @@ -3752,13 +3700,11 @@ @@ -3766,13 +3712,11 @@ @@ -3780,13 +3724,11 @@ @@ -3794,13 +3736,11 @@ @@ -3808,13 +3748,11 @@ @@ -3826,13 +3764,11 @@ @@ -3844,13 +3780,11 @@ @@ -3862,13 +3796,11 @@ diff --git a/packages/g6/__tests__/snapshots/layouts/circular/layout-circular-degree.svg b/packages/g6/__tests__/snapshots/layouts/circular/layout-circular-degree.svg index d9914a0515..847eebf49d 100644 --- a/packages/g6/__tests__/snapshots/layouts/circular/layout-circular-degree.svg +++ b/packages/g6/__tests__/snapshots/layouts/circular/layout-circular-degree.svg @@ -9,7 +9,7 @@ @@ -18,22 +18,22 @@ id="0-1" fill="none" marker-start="false" - marker-end="false" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -44,28 +44,52 @@ stroke-width="3" stroke="transparent" /> + + + + - + @@ -76,28 +100,52 @@ stroke-width="3" stroke="transparent" /> + + + + - + @@ -108,28 +156,52 @@ stroke-width="3" stroke="transparent" /> + + + + - + @@ -140,28 +212,52 @@ stroke-width="3" stroke="transparent" /> + + + + - + @@ -172,28 +268,52 @@ stroke-width="3" stroke="transparent" /> + + + + - + @@ -204,28 +324,52 @@ stroke-width="3" stroke="transparent" /> + + + + - + @@ -236,28 +380,52 @@ stroke-width="3" stroke="transparent" /> + + + + - + @@ -268,28 +436,52 @@ stroke-width="3" stroke="transparent" /> + + + + - + @@ -300,28 +492,52 @@ stroke-width="3" stroke="transparent" /> + + + + - + @@ -332,28 +548,52 @@ stroke-width="3" stroke="transparent" /> + + + + - + @@ -364,28 +604,52 @@ stroke-width="3" stroke="transparent" /> + + + + - + @@ -396,28 +660,52 @@ stroke-width="3" stroke="transparent" /> + + + + - + @@ -428,28 +716,52 @@ stroke-width="3" stroke="transparent" /> + + + + - + @@ -460,28 +772,52 @@ stroke-width="3" stroke="transparent" /> + + + + - + @@ -492,28 +828,52 @@ stroke-width="3" stroke="transparent" /> + + + + - + @@ -524,28 +884,52 @@ stroke-width="3" stroke="transparent" /> + + + + - + @@ -556,28 +940,52 @@ stroke-width="3" stroke="transparent" /> + + + + - + @@ -588,28 +996,52 @@ stroke-width="3" stroke="transparent" /> + + + + - + @@ -620,28 +1052,52 @@ stroke-width="3" stroke="transparent" /> + + + + - + @@ -652,28 +1108,52 @@ stroke-width="3" stroke="transparent" /> + + + + - + @@ -684,28 +1164,52 @@ stroke-width="3" stroke="transparent" /> + + + + - + @@ -716,28 +1220,52 @@ stroke-width="3" stroke="transparent" /> + + + + - + @@ -748,28 +1276,52 @@ stroke-width="3" stroke="transparent" /> + + + + - + @@ -780,28 +1332,52 @@ stroke-width="3" stroke="transparent" /> + + + + - + @@ -812,28 +1388,52 @@ stroke-width="3" stroke="transparent" /> + + + + - + @@ -844,28 +1444,52 @@ stroke-width="3" stroke="transparent" /> + + + + - + @@ -876,28 +1500,52 @@ stroke-width="3" stroke="transparent" /> + + + + - + @@ -908,28 +1556,52 @@ stroke-width="3" stroke="transparent" /> + + + + - + @@ -940,28 +1612,52 @@ stroke-width="3" stroke="transparent" /> + + + + - + @@ -972,28 +1668,52 @@ stroke-width="3" stroke="transparent" /> + + + + - + @@ -1004,28 +1724,52 @@ stroke-width="3" stroke="transparent" /> + + + + - + @@ -1036,28 +1780,52 @@ stroke-width="3" stroke="transparent" /> + + + + - + @@ -1068,28 +1836,52 @@ stroke-width="3" stroke="transparent" /> + + + + - + @@ -1100,28 +1892,52 @@ stroke-width="3" stroke="transparent" /> + + + + - + @@ -1132,28 +1948,52 @@ stroke-width="3" stroke="transparent" /> + + + + - + @@ -1164,28 +2004,52 @@ stroke-width="3" stroke="transparent" /> + + + + - + @@ -1196,28 +2060,52 @@ stroke-width="3" stroke="transparent" /> + + + + - + @@ -1228,28 +2116,52 @@ stroke-width="3" stroke="transparent" /> + + + + - + @@ -1260,28 +2172,52 @@ stroke-width="3" stroke="transparent" /> + + + + - + @@ -1292,28 +2228,52 @@ stroke-width="3" stroke="transparent" /> + + + + - + @@ -1324,28 +2284,52 @@ stroke-width="3" stroke="transparent" /> + + + + - + @@ -1356,28 +2340,52 @@ stroke-width="3" stroke="transparent" /> + + + + - + @@ -1388,28 +2396,52 @@ stroke-width="3" stroke="transparent" /> + + + + - + @@ -1420,28 +2452,52 @@ stroke-width="3" stroke="transparent" /> + + + + - + @@ -1452,28 +2508,52 @@ stroke-width="3" stroke="transparent" /> + + + + - + @@ -1484,28 +2564,52 @@ stroke-width="3" stroke="transparent" /> + + + + - + @@ -1516,28 +2620,52 @@ stroke-width="3" stroke="transparent" /> + + + + - + @@ -1548,28 +2676,52 @@ stroke-width="3" stroke="transparent" /> + + + + - + @@ -1580,28 +2732,52 @@ stroke-width="3" stroke="transparent" /> + + + + - + @@ -1612,28 +2788,52 @@ stroke-width="3" stroke="transparent" /> + + + + - + @@ -1644,28 +2844,52 @@ stroke-width="3" stroke="transparent" /> + + + + - + @@ -1676,28 +2900,52 @@ stroke-width="3" stroke="transparent" /> + + + + - + @@ -1708,28 +2956,52 @@ stroke-width="3" stroke="transparent" /> + + + + - + @@ -1740,28 +3012,52 @@ stroke-width="3" stroke="transparent" /> + + + + - + @@ -1772,28 +3068,52 @@ stroke-width="3" stroke="transparent" /> + + + + - + @@ -1804,28 +3124,52 @@ stroke-width="3" stroke="transparent" /> + + + + - + @@ -1836,28 +3180,52 @@ stroke-width="3" stroke="transparent" /> + + + + - + @@ -1868,28 +3236,52 @@ stroke-width="3" stroke="transparent" /> + + + + - + @@ -1900,28 +3292,52 @@ stroke-width="3" stroke="transparent" /> + + + + - + @@ -1932,6 +3348,30 @@ stroke-width="3" stroke="transparent" /> + + + + @@ -1940,27 +3380,14 @@ - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + @@ -18,22 +18,22 @@ id="0-1" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -44,27 +44,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -74,22 +74,22 @@ id="0-2" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -100,27 +100,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -130,22 +130,22 @@ id="0-3" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -156,27 +156,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -186,22 +186,22 @@ id="0-4" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -212,27 +212,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -242,22 +242,22 @@ id="0-5" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -268,27 +268,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -298,22 +298,22 @@ id="0-7" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -324,27 +324,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -354,22 +354,22 @@ id="0-8" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -380,27 +380,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -410,22 +410,22 @@ id="0-9" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -436,27 +436,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -466,22 +466,22 @@ id="0-10" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -492,27 +492,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -522,22 +522,22 @@ id="0-11" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -548,27 +548,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -578,22 +578,22 @@ id="0-13" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -604,27 +604,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -634,22 +634,22 @@ id="0-14" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -660,27 +660,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -690,22 +690,22 @@ id="0-15" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -716,27 +716,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -746,22 +746,22 @@ id="0-16" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -772,27 +772,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -802,22 +802,22 @@ id="2-3" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -828,27 +828,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -858,22 +858,22 @@ id="4-5" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -884,27 +884,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -914,22 +914,22 @@ id="4-6" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -940,27 +940,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -970,22 +970,22 @@ id="5-6" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -996,27 +996,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1026,22 +1026,22 @@ id="7-13" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1052,27 +1052,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1082,22 +1082,22 @@ id="8-14" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1108,27 +1108,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1138,22 +1138,22 @@ id="9-10" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1164,27 +1164,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1194,22 +1194,22 @@ id="10-22" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1220,27 +1220,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1250,22 +1250,22 @@ id="10-14" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1276,27 +1276,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1306,22 +1306,22 @@ id="10-12" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1332,27 +1332,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1362,22 +1362,22 @@ id="10-24" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1388,27 +1388,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1418,22 +1418,22 @@ id="10-21" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1444,27 +1444,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1474,22 +1474,22 @@ id="10-20" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1500,27 +1500,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1530,22 +1530,22 @@ id="11-24" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1556,27 +1556,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1586,22 +1586,22 @@ id="11-22" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1612,27 +1612,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1642,22 +1642,22 @@ id="11-14" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1668,27 +1668,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1698,22 +1698,22 @@ id="12-13" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1724,27 +1724,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1754,22 +1754,22 @@ id="16-17" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1780,27 +1780,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1810,22 +1810,22 @@ id="16-18" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1836,27 +1836,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1866,22 +1866,22 @@ id="16-21" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1892,27 +1892,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1922,22 +1922,22 @@ id="16-22" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1948,27 +1948,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1978,22 +1978,22 @@ id="17-18" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2004,27 +2004,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2034,22 +2034,22 @@ id="17-20" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2060,27 +2060,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2090,22 +2090,22 @@ id="18-19" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2116,27 +2116,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2146,22 +2146,22 @@ id="19-20" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2172,27 +2172,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2202,22 +2202,22 @@ id="19-33" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2228,27 +2228,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2258,22 +2258,22 @@ id="19-22" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2284,27 +2284,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2314,22 +2314,22 @@ id="19-23" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2340,27 +2340,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2370,22 +2370,22 @@ id="20-21" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2396,27 +2396,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2426,22 +2426,22 @@ id="21-22" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2452,27 +2452,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2482,22 +2482,22 @@ id="22-24" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2508,27 +2508,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2538,22 +2538,22 @@ id="22-25" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2564,27 +2564,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2594,22 +2594,22 @@ id="22-26" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2620,27 +2620,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2650,22 +2650,22 @@ id="22-23" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2676,27 +2676,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2706,22 +2706,22 @@ id="22-28" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2732,27 +2732,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2762,22 +2762,22 @@ id="22-30" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2788,27 +2788,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2818,22 +2818,22 @@ id="22-31" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2844,27 +2844,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2874,22 +2874,22 @@ id="22-32" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2900,27 +2900,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2930,22 +2930,22 @@ id="22-33" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2956,27 +2956,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2986,22 +2986,22 @@ id="23-28" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -3012,27 +3012,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -3042,22 +3042,22 @@ id="23-27" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -3068,27 +3068,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -3098,22 +3098,22 @@ id="23-29" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -3124,27 +3124,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -3154,22 +3154,22 @@ id="23-30" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -3180,27 +3180,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -3210,22 +3210,22 @@ id="23-31" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -3236,27 +3236,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -3266,22 +3266,22 @@ id="23-33" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -3292,27 +3292,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -3322,22 +3322,22 @@ id="32-33" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -3348,27 +3348,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -3380,141 +3380,281 @@ + + + + 0 + + + + + + + 1 + + + + + + + 2 + + + + + + + 3 + + + + + + + 4 + + + + + + + 5 + + + + + + + 6 + + + + + + + 7 + + + + + + + 8 + + + + + + + 9 + + + + + + + 10 + + + + + + + 11 + + + + + + + 12 + + + + + + + 13 + + + + + + + 14 + + + + + + + 15 + + + + + + + 16 + + + + + + + 17 + + + + + + + 18 + + + + + + + 19 + + + + + + + 20 + + + + + + + 21 + + + + + + + 22 + + + + + + + 23 + + + + + + + 24 + + + + + + + 25 + + + + + + + 26 + + + + + + + 27 + + + + + + + 28 + + + + + + + 29 + + + + + + + 30 + + + + + + + 31 + + + + + + + 32 + + + + + + + 33 + + + diff --git a/packages/g6/__tests__/snapshots/layouts/circular/layout-circular-spiral.svg b/packages/g6/__tests__/snapshots/layouts/circular/layout-circular-spiral.svg index 3c52014715..bccbc96a23 100644 --- a/packages/g6/__tests__/snapshots/layouts/circular/layout-circular-spiral.svg +++ b/packages/g6/__tests__/snapshots/layouts/circular/layout-circular-spiral.svg @@ -9,7 +9,7 @@ @@ -18,22 +18,22 @@ id="0-1" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -44,27 +44,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -74,22 +74,22 @@ id="0-2" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -100,27 +100,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -130,22 +130,22 @@ id="0-3" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -156,27 +156,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -186,22 +186,22 @@ id="0-4" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -212,27 +212,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -242,22 +242,22 @@ id="0-5" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -268,27 +268,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -298,22 +298,22 @@ id="0-7" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -324,27 +324,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -354,22 +354,22 @@ id="0-8" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -380,27 +380,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -410,22 +410,22 @@ id="0-9" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -436,27 +436,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -466,22 +466,22 @@ id="0-10" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -492,27 +492,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -522,22 +522,22 @@ id="0-11" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -548,27 +548,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -578,22 +578,22 @@ id="0-13" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -604,27 +604,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -634,22 +634,22 @@ id="0-14" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -660,27 +660,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -690,22 +690,22 @@ id="0-15" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -716,27 +716,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -746,22 +746,22 @@ id="0-16" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -772,27 +772,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -802,22 +802,22 @@ id="2-3" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -828,27 +828,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -858,22 +858,22 @@ id="4-5" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -884,27 +884,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -914,22 +914,22 @@ id="4-6" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -940,27 +940,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -970,22 +970,22 @@ id="5-6" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -996,27 +996,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1026,22 +1026,22 @@ id="7-13" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1052,27 +1052,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1082,22 +1082,22 @@ id="8-14" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1108,27 +1108,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1138,22 +1138,22 @@ id="9-10" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1164,27 +1164,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1194,22 +1194,22 @@ id="10-22" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1220,27 +1220,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1250,22 +1250,22 @@ id="10-14" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1276,27 +1276,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1306,22 +1306,22 @@ id="10-12" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1332,27 +1332,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1362,22 +1362,22 @@ id="10-24" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1388,27 +1388,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1418,22 +1418,22 @@ id="10-21" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1444,27 +1444,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1474,22 +1474,22 @@ id="10-20" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1500,27 +1500,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1530,22 +1530,22 @@ id="11-24" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1556,27 +1556,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1586,22 +1586,22 @@ id="11-22" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1612,27 +1612,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1642,22 +1642,22 @@ id="11-14" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1668,27 +1668,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1698,22 +1698,22 @@ id="12-13" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1724,27 +1724,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1754,22 +1754,22 @@ id="16-17" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1780,27 +1780,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1810,22 +1810,22 @@ id="16-18" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1836,27 +1836,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1866,22 +1866,22 @@ id="16-21" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1892,27 +1892,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1922,22 +1922,22 @@ id="16-22" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1948,27 +1948,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1978,22 +1978,22 @@ id="17-18" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2004,27 +2004,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2034,22 +2034,22 @@ id="17-20" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2060,27 +2060,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2090,22 +2090,22 @@ id="18-19" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2116,27 +2116,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2146,22 +2146,22 @@ id="19-20" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2172,27 +2172,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2202,22 +2202,22 @@ id="19-33" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2228,27 +2228,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2258,22 +2258,22 @@ id="19-22" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2284,27 +2284,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2314,22 +2314,22 @@ id="19-23" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2340,27 +2340,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2370,22 +2370,22 @@ id="20-21" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2396,27 +2396,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2426,22 +2426,22 @@ id="21-22" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2452,27 +2452,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2482,22 +2482,22 @@ id="22-24" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2508,27 +2508,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2538,22 +2538,22 @@ id="22-25" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2564,27 +2564,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2594,22 +2594,22 @@ id="22-26" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2620,27 +2620,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2650,22 +2650,22 @@ id="22-23" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2676,27 +2676,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2706,22 +2706,22 @@ id="22-28" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2732,27 +2732,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2762,22 +2762,22 @@ id="22-30" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2788,27 +2788,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2818,22 +2818,22 @@ id="22-31" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2844,27 +2844,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2874,22 +2874,22 @@ id="22-32" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2900,27 +2900,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2930,22 +2930,22 @@ id="22-33" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2956,27 +2956,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2986,22 +2986,22 @@ id="23-28" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -3012,27 +3012,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -3042,22 +3042,22 @@ id="23-27" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -3068,27 +3068,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -3098,22 +3098,22 @@ id="23-29" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -3124,27 +3124,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -3154,22 +3154,22 @@ id="23-30" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -3180,27 +3180,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -3210,22 +3210,22 @@ id="23-31" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -3236,27 +3236,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -3266,22 +3266,22 @@ id="23-33" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -3292,27 +3292,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -3322,22 +3322,22 @@ id="32-33" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -3348,27 +3348,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -3380,27 +3380,14 @@ - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - + + + + + + + + + A + + + + + + + + + + + + B + + + + + + + + + + + + C + + + + + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -688,31 +782,18 @@ - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - + + + + + + + + 10 + + + + + + + + + + + + 11 + + + + diff --git a/packages/g6/__tests__/snapshots/layouts/dagre-flow/flow.svg b/packages/g6/__tests__/snapshots/layouts/dagre-flow/flow.svg index bec41036bc..5096396fc2 100644 --- a/packages/g6/__tests__/snapshots/layouts/dagre-flow/flow.svg +++ b/packages/g6/__tests__/snapshots/layouts/dagre-flow/flow.svg @@ -9,7 +9,7 @@ @@ -29,11 +29,11 @@ stroke="transparent" stroke-width="4" /> - + @@ -44,27 +44,27 @@ stroke-width="4" stroke="transparent" /> - + @@ -85,11 +85,11 @@ stroke="transparent" stroke-width="4" /> - + @@ -100,27 +100,27 @@ stroke-width="4" stroke="transparent" /> - + @@ -141,11 +141,11 @@ stroke="transparent" stroke-width="4" /> - + @@ -156,27 +156,27 @@ stroke-width="4" stroke="transparent" /> - + @@ -197,11 +197,11 @@ stroke="transparent" stroke-width="4" /> - + @@ -212,27 +212,27 @@ stroke-width="4" stroke="transparent" /> - + @@ -253,11 +253,11 @@ stroke="transparent" stroke-width="4" /> - + @@ -268,27 +268,27 @@ stroke-width="4" stroke="transparent" /> - + @@ -309,11 +309,11 @@ stroke="transparent" stroke-width="4" /> - + @@ -324,27 +324,27 @@ stroke-width="4" stroke="transparent" /> - + @@ -365,11 +365,11 @@ stroke="transparent" stroke-width="4" /> - + @@ -380,27 +380,27 @@ stroke-width="4" stroke="transparent" /> - + @@ -421,11 +421,11 @@ stroke="transparent" stroke-width="4" /> - + @@ -436,27 +436,27 @@ stroke-width="4" stroke="transparent" /> - + @@ -477,11 +477,11 @@ stroke="transparent" stroke-width="4" /> - + @@ -492,27 +492,27 @@ stroke-width="4" stroke="transparent" /> - + @@ -533,11 +533,11 @@ stroke="transparent" stroke-width="4" /> - + @@ -548,27 +548,27 @@ stroke-width="4" stroke="transparent" /> - + @@ -589,11 +589,11 @@ stroke="transparent" stroke-width="4" /> - + @@ -604,27 +604,27 @@ stroke-width="4" stroke="transparent" /> - + @@ -645,11 +645,11 @@ stroke="transparent" stroke-width="4" /> - + @@ -660,27 +660,27 @@ stroke-width="4" stroke="transparent" /> - + @@ -688,31 +688,18 @@ - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + @@ -58,11 +58,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -90,11 +90,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -122,11 +122,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -154,11 +154,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -186,11 +186,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -218,11 +218,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -250,11 +250,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -282,11 +282,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -314,11 +314,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -346,11 +346,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -378,11 +378,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -410,11 +410,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -442,11 +442,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -474,11 +474,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -506,11 +506,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -538,11 +538,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -570,11 +570,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -602,11 +602,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -634,11 +634,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -666,11 +666,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -698,11 +698,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -730,11 +730,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -762,11 +762,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -794,11 +794,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -826,11 +826,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -858,11 +858,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -890,11 +890,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -922,11 +922,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -954,11 +954,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -986,11 +986,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1018,11 +1018,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1050,11 +1050,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1082,11 +1082,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1114,11 +1114,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1146,11 +1146,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1178,11 +1178,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1210,11 +1210,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1242,11 +1242,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1274,11 +1274,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1306,11 +1306,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1338,11 +1338,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1370,11 +1370,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1402,11 +1402,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1434,11 +1434,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1466,11 +1466,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1498,11 +1498,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1530,11 +1530,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1562,11 +1562,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1594,11 +1594,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1626,11 +1626,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1658,11 +1658,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1690,11 +1690,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1722,11 +1722,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1754,11 +1754,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1786,11 +1786,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1818,11 +1818,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1850,11 +1850,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1882,11 +1882,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1914,11 +1914,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1937,13 +1937,11 @@ @@ -1966,13 +1964,11 @@ @@ -1995,13 +1991,11 @@ @@ -2024,13 +2018,11 @@ @@ -2053,13 +2045,11 @@ @@ -2082,13 +2072,11 @@ @@ -2111,13 +2099,11 @@ @@ -2140,13 +2126,11 @@ @@ -2169,13 +2153,11 @@ @@ -2198,13 +2180,11 @@ @@ -2231,13 +2211,11 @@ @@ -2264,13 +2242,11 @@ @@ -2297,13 +2273,11 @@ @@ -2330,13 +2304,11 @@ @@ -2363,13 +2335,11 @@ @@ -2396,13 +2366,11 @@ @@ -2429,13 +2397,11 @@ @@ -2462,13 +2428,11 @@ @@ -2495,13 +2459,11 @@ @@ -2524,13 +2486,11 @@ @@ -2557,13 +2517,11 @@ @@ -2590,13 +2548,11 @@ @@ -2623,13 +2579,11 @@ @@ -2656,13 +2610,11 @@ @@ -2689,13 +2641,11 @@ @@ -2718,13 +2668,11 @@ @@ -2747,13 +2695,11 @@ @@ -2780,13 +2726,11 @@ @@ -2813,13 +2757,11 @@ @@ -2846,13 +2788,11 @@ @@ -2879,13 +2819,11 @@ @@ -2912,13 +2850,11 @@ @@ -2945,13 +2881,11 @@ @@ -2978,13 +2912,11 @@ diff --git a/packages/g6/__tests__/snapshots/layouts/fruchterman/layout-fruchterman-cluster.svg b/packages/g6/__tests__/snapshots/layouts/fruchterman/layout-fruchterman-cluster.svg index 71bd1f2b25..5d5b069869 100644 --- a/packages/g6/__tests__/snapshots/layouts/fruchterman/layout-fruchterman-cluster.svg +++ b/packages/g6/__tests__/snapshots/layouts/fruchterman/layout-fruchterman-cluster.svg @@ -15,22 +15,22 @@ id="0-1" fill="none" marker-start="false" - marker-end="true" + marker-end="false" transform="matrix(1,0,0,1,0,0)" > - + @@ -41,52 +41,28 @@ stroke-width="3" stroke="transparent" /> - - - - - + @@ -97,52 +73,28 @@ stroke-width="3" stroke="transparent" /> - - - - - + @@ -153,52 +105,28 @@ stroke-width="3" stroke="transparent" /> - - - - - + @@ -209,52 +137,28 @@ stroke-width="3" stroke="transparent" /> - - - - - + @@ -265,52 +169,28 @@ stroke-width="3" stroke="transparent" /> - - - - - + @@ -321,52 +201,28 @@ stroke-width="3" stroke="transparent" /> - - - - - + @@ -377,52 +233,28 @@ stroke-width="3" stroke="transparent" /> - - - - - + @@ -433,52 +265,28 @@ stroke-width="3" stroke="transparent" /> - - - - - + @@ -489,52 +297,28 @@ stroke-width="3" stroke="transparent" /> - - - - - + @@ -545,52 +329,28 @@ stroke-width="3" stroke="transparent" /> - - - - - + @@ -601,52 +361,28 @@ stroke-width="3" stroke="transparent" /> - - - - - + @@ -657,52 +393,28 @@ stroke-width="3" stroke="transparent" /> - - - - - + @@ -713,52 +425,28 @@ stroke-width="3" stroke="transparent" /> - - - - - + @@ -769,52 +457,28 @@ stroke-width="3" stroke="transparent" /> - - - - - + @@ -825,52 +489,28 @@ stroke-width="3" stroke="transparent" /> - - - - - + @@ -881,52 +521,28 @@ stroke-width="3" stroke="transparent" /> - - - - - + @@ -937,52 +553,28 @@ stroke-width="3" stroke="transparent" /> - - - - - + @@ -993,52 +585,28 @@ stroke-width="3" stroke="transparent" /> - - - - - + @@ -1049,52 +617,28 @@ stroke-width="3" stroke="transparent" /> - - - - - + @@ -1105,52 +649,28 @@ stroke-width="3" stroke="transparent" /> - - - - - + @@ -1161,52 +681,28 @@ stroke-width="3" stroke="transparent" /> - - - - - + @@ -1217,52 +713,28 @@ stroke-width="3" stroke="transparent" /> - - - - - + @@ -1273,52 +745,28 @@ stroke-width="3" stroke="transparent" /> - - - - - + @@ -1329,52 +777,28 @@ stroke-width="3" stroke="transparent" /> - - - - - + @@ -1385,52 +809,28 @@ stroke-width="3" stroke="transparent" /> - - - - - + @@ -1441,52 +841,28 @@ stroke-width="3" stroke="transparent" /> - - - - - + @@ -1497,52 +873,28 @@ stroke-width="3" stroke="transparent" /> - - - - - + @@ -1553,52 +905,28 @@ stroke-width="3" stroke="transparent" /> - - - - - + @@ -1609,52 +937,28 @@ stroke-width="3" stroke="transparent" /> - - - - - + @@ -1665,52 +969,28 @@ stroke-width="3" stroke="transparent" /> - - - - - + @@ -1721,52 +1001,28 @@ stroke-width="3" stroke="transparent" /> - - - - - + @@ -1777,52 +1033,28 @@ stroke-width="3" stroke="transparent" /> - - - - - + @@ -1833,52 +1065,28 @@ stroke-width="3" stroke="transparent" /> - - - - - + @@ -1889,52 +1097,28 @@ stroke-width="3" stroke="transparent" /> - - - - - + @@ -1945,52 +1129,28 @@ stroke-width="3" stroke="transparent" /> - - - - - + @@ -2001,52 +1161,28 @@ stroke-width="3" stroke="transparent" /> - - - - - + @@ -2057,52 +1193,28 @@ stroke-width="3" stroke="transparent" /> - - - - - + @@ -2113,52 +1225,28 @@ stroke-width="3" stroke="transparent" /> - - - - - + @@ -2169,52 +1257,28 @@ stroke-width="3" stroke="transparent" /> - - - - - + @@ -2225,52 +1289,28 @@ stroke-width="3" stroke="transparent" /> - - - - - + @@ -2281,52 +1321,28 @@ stroke-width="3" stroke="transparent" /> - - - - - + @@ -2337,52 +1353,28 @@ stroke-width="3" stroke="transparent" /> - - - - - + @@ -2393,52 +1385,28 @@ stroke-width="3" stroke="transparent" /> - - - - - + @@ -2449,52 +1417,28 @@ stroke-width="3" stroke="transparent" /> - - - - - + @@ -2505,52 +1449,28 @@ stroke-width="3" stroke="transparent" /> - - - - - + @@ -2561,52 +1481,28 @@ stroke-width="3" stroke="transparent" /> - - - - - + @@ -2617,52 +1513,28 @@ stroke-width="3" stroke="transparent" /> - - - - - + @@ -2673,52 +1545,28 @@ stroke-width="3" stroke="transparent" /> - - - - - + @@ -2729,52 +1577,28 @@ stroke-width="3" stroke="transparent" /> - - - - - + @@ -2785,52 +1609,28 @@ stroke-width="3" stroke="transparent" /> - - - - - + @@ -2841,52 +1641,28 @@ stroke-width="3" stroke="transparent" /> - - - - - + @@ -2897,52 +1673,28 @@ stroke-width="3" stroke="transparent" /> - - - - - + @@ -2953,52 +1705,28 @@ stroke-width="3" stroke="transparent" /> - - - - - + @@ -3009,52 +1737,28 @@ stroke-width="3" stroke="transparent" /> - - - - - + @@ -3065,52 +1769,28 @@ stroke-width="3" stroke="transparent" /> - - - - - + @@ -3121,52 +1801,28 @@ stroke-width="3" stroke="transparent" /> - - - - - + @@ -3177,52 +1833,28 @@ stroke-width="3" stroke="transparent" /> - - - - - + @@ -3233,52 +1865,28 @@ stroke-width="3" stroke="transparent" /> - - - - - + @@ -3289,52 +1897,28 @@ stroke-width="3" stroke="transparent" /> - - - - - + @@ -3345,45 +1929,19 @@ stroke-width="3" stroke="transparent" /> - - - - - + @@ -3402,17 +1960,15 @@ - + @@ -3431,17 +1987,15 @@ - + @@ -3460,17 +2014,15 @@ - + @@ -3489,17 +2041,15 @@ - + @@ -3518,17 +2068,15 @@ - + @@ -3547,17 +2095,15 @@ - + @@ -3576,17 +2122,15 @@ - + @@ -3605,17 +2149,15 @@ - + @@ -3634,17 +2176,15 @@ - + @@ -3666,18 +2206,16 @@ @@ -3699,18 +2237,16 @@ @@ -3732,18 +2268,16 @@ @@ -3765,18 +2299,16 @@ @@ -3798,18 +2330,16 @@ @@ -3831,18 +2361,16 @@ @@ -3864,18 +2392,16 @@ @@ -3897,18 +2423,16 @@ @@ -3930,18 +2454,16 @@ @@ -3963,18 +2485,16 @@ @@ -3993,17 +2513,15 @@ - + @@ -4025,18 +2543,16 @@ @@ -4058,18 +2574,16 @@ @@ -4091,18 +2605,16 @@ @@ -4121,17 +2633,15 @@ - + @@ -4153,18 +2663,16 @@ @@ -4186,18 +2694,16 @@ @@ -4219,18 +2725,16 @@ @@ -4252,18 +2756,16 @@ @@ -4285,18 +2787,16 @@ @@ -4318,18 +2818,16 @@ @@ -4351,18 +2849,16 @@ @@ -4384,18 +2880,16 @@ @@ -4417,18 +2911,16 @@ diff --git a/packages/g6/__tests__/snapshots/layouts/grid/sortby_default.svg b/packages/g6/__tests__/snapshots/layouts/grid/sortby_default.svg index 10df5c8b77..c702c674ff 100644 --- a/packages/g6/__tests__/snapshots/layouts/grid/sortby_default.svg +++ b/packages/g6/__tests__/snapshots/layouts/grid/sortby_default.svg @@ -26,11 +26,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -58,11 +58,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -90,11 +90,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -122,11 +122,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -154,11 +154,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -186,11 +186,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -218,11 +218,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -250,11 +250,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -282,11 +282,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -314,11 +314,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -346,11 +346,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -378,11 +378,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -410,11 +410,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -442,11 +442,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -474,11 +474,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -506,11 +506,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -538,11 +538,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -570,11 +570,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -602,11 +602,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -634,11 +634,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -666,11 +666,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -698,11 +698,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -730,11 +730,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -762,11 +762,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -794,11 +794,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -826,11 +826,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -858,11 +858,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -890,11 +890,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -922,11 +922,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -954,11 +954,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -986,11 +986,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1018,11 +1018,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1050,11 +1050,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1082,11 +1082,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1114,11 +1114,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1146,11 +1146,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1178,11 +1178,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1210,11 +1210,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1242,11 +1242,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1274,11 +1274,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1306,11 +1306,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1338,11 +1338,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1370,11 +1370,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1402,11 +1402,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1434,11 +1434,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1466,11 +1466,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1498,11 +1498,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1530,11 +1530,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1562,11 +1562,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1594,11 +1594,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1626,11 +1626,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1658,11 +1658,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1690,11 +1690,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1722,11 +1722,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1754,11 +1754,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1786,11 +1786,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1818,11 +1818,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1850,11 +1850,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1882,11 +1882,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1914,11 +1914,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1937,27 +1937,14 @@ - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - + @@ -58,11 +58,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -90,11 +90,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -122,11 +122,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -154,11 +154,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -186,11 +186,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -218,11 +218,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -250,11 +250,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -282,11 +282,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -314,11 +314,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -346,11 +346,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -378,11 +378,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -410,11 +410,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -442,11 +442,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -474,11 +474,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -506,11 +506,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -538,11 +538,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -570,11 +570,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -602,11 +602,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -634,11 +634,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -666,11 +666,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -698,11 +698,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -730,11 +730,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -762,11 +762,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -794,11 +794,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -826,11 +826,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -858,11 +858,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -890,11 +890,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -922,11 +922,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -954,11 +954,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -986,11 +986,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1018,11 +1018,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1050,11 +1050,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1082,11 +1082,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1114,11 +1114,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1146,11 +1146,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1178,11 +1178,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1210,11 +1210,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1242,11 +1242,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1274,11 +1274,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1306,11 +1306,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1338,11 +1338,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1370,11 +1370,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1402,11 +1402,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1434,11 +1434,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1466,11 +1466,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1498,11 +1498,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1530,11 +1530,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1562,11 +1562,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1594,11 +1594,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1626,11 +1626,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1658,11 +1658,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1690,11 +1690,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1722,11 +1722,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1754,11 +1754,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1786,11 +1786,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1818,11 +1818,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1850,11 +1850,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1882,11 +1882,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1914,11 +1914,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1937,27 +1937,14 @@ - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - + @@ -26,13 +29,13 @@ stroke="transparent" stroke-width="3" /> - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -5289,1421 +5252,1251 @@ - + - + - + - + - + - + - + - + - + - + diff --git a/packages/g6/__tests__/snapshots/layouts/mds/ld100.svg b/packages/g6/__tests__/snapshots/layouts/mds/ld100.svg index 4b62f42e14..a4660188d2 100644 --- a/packages/g6/__tests__/snapshots/layouts/mds/ld100.svg +++ b/packages/g6/__tests__/snapshots/layouts/mds/ld100.svg @@ -9,7 +9,7 @@ @@ -29,11 +29,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -61,11 +61,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -93,11 +93,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -125,11 +125,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -157,11 +157,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -189,11 +189,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -221,11 +221,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -253,11 +253,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -285,11 +285,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -317,11 +317,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -349,11 +349,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -381,11 +381,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -413,11 +413,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -445,11 +445,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -477,7 +477,7 @@ stroke="transparent" stroke-width="3" /> - + - + - + @@ -573,11 +573,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -605,11 +605,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -637,11 +637,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -669,11 +669,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -701,11 +701,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -733,11 +733,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -765,11 +765,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -797,11 +797,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -829,11 +829,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -861,11 +861,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -893,11 +893,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -925,11 +925,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -957,11 +957,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -989,11 +989,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1021,11 +1021,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1053,11 +1053,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1085,11 +1085,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1117,11 +1117,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1149,11 +1149,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1181,11 +1181,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1213,11 +1213,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1245,11 +1245,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1277,11 +1277,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1309,11 +1309,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1341,11 +1341,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1373,11 +1373,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1405,11 +1405,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1437,11 +1437,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1469,11 +1469,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1501,11 +1501,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1533,11 +1533,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1565,11 +1565,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1597,11 +1597,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1629,11 +1629,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1661,11 +1661,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1693,11 +1693,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1725,11 +1725,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1757,11 +1757,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1789,11 +1789,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1821,11 +1821,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1853,11 +1853,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1885,11 +1885,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1917,11 +1917,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1940,13 +1940,11 @@ @@ -1969,13 +1967,11 @@ @@ -1998,13 +1994,11 @@ @@ -2027,13 +2021,11 @@ @@ -2056,13 +2048,11 @@ @@ -2085,13 +2075,11 @@ @@ -2114,13 +2102,11 @@ @@ -2143,13 +2129,11 @@ @@ -2172,13 +2156,11 @@ @@ -2201,13 +2183,11 @@ @@ -2234,13 +2214,11 @@ @@ -2267,13 +2245,11 @@ @@ -2300,13 +2276,11 @@ @@ -2333,13 +2307,11 @@ @@ -2366,13 +2338,11 @@ @@ -2399,13 +2369,11 @@ @@ -2432,13 +2400,11 @@ @@ -2461,13 +2427,11 @@ @@ -2490,13 +2454,11 @@ @@ -2519,13 +2481,11 @@ @@ -2552,13 +2512,11 @@ @@ -2585,13 +2543,11 @@ @@ -2618,13 +2574,11 @@ @@ -2647,13 +2601,11 @@ @@ -2680,13 +2632,11 @@ @@ -2713,13 +2663,11 @@ @@ -2746,13 +2694,11 @@ @@ -2779,13 +2725,11 @@ @@ -2808,13 +2752,11 @@ @@ -2841,13 +2783,11 @@ @@ -2870,13 +2810,11 @@ @@ -2899,13 +2837,11 @@ @@ -2928,13 +2864,11 @@ @@ -2957,13 +2891,11 @@ diff --git a/packages/g6/__tests__/snapshots/layouts/radial-layout/basic.svg b/packages/g6/__tests__/snapshots/layouts/radial-layout/basic.svg index 04183ba88a..256b5f6150 100644 --- a/packages/g6/__tests__/snapshots/layouts/radial-layout/basic.svg +++ b/packages/g6/__tests__/snapshots/layouts/radial-layout/basic.svg @@ -26,11 +26,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -58,11 +58,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -90,11 +90,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -122,11 +122,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -154,11 +154,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -186,11 +186,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -218,11 +218,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -250,11 +250,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -282,11 +282,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -314,11 +314,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -346,11 +346,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -378,11 +378,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -410,11 +410,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -442,11 +442,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -474,11 +474,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -506,11 +506,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -538,11 +538,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -570,11 +570,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -602,11 +602,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -634,11 +634,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -666,11 +666,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -698,11 +698,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -730,11 +730,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -762,11 +762,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -794,11 +794,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -826,11 +826,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -858,11 +858,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -890,11 +890,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -922,11 +922,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -954,11 +954,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -986,11 +986,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1018,11 +1018,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1050,11 +1050,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1082,11 +1082,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1114,11 +1114,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1146,11 +1146,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1178,11 +1178,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1210,11 +1210,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1242,11 +1242,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1274,11 +1274,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1306,11 +1306,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1338,11 +1338,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1370,11 +1370,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1402,11 +1402,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1434,11 +1434,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1466,11 +1466,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1498,11 +1498,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1530,11 +1530,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1562,11 +1562,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1594,11 +1594,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1626,11 +1626,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1658,11 +1658,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1690,11 +1690,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1722,11 +1722,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1754,11 +1754,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1786,11 +1786,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1818,11 +1818,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1850,11 +1850,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1873,27 +1873,14 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -41,27 +41,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -71,22 +71,22 @@ id="0-2" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -97,27 +97,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -127,22 +127,22 @@ id="0-3" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -153,27 +153,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -183,22 +183,22 @@ id="0-4" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -209,27 +209,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -239,22 +239,22 @@ id="0-5" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -265,27 +265,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -295,22 +295,22 @@ id="0-7" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -321,27 +321,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -351,22 +351,22 @@ id="0-8" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -377,27 +377,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -407,22 +407,22 @@ id="0-9" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -433,27 +433,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -463,22 +463,22 @@ id="0-10" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -489,27 +489,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -519,22 +519,22 @@ id="0-11" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -545,27 +545,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -575,22 +575,22 @@ id="0-13" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -601,27 +601,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -631,22 +631,22 @@ id="0-14" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -657,27 +657,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -687,22 +687,22 @@ id="0-15" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -713,27 +713,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -743,22 +743,22 @@ id="0-16" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -769,27 +769,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -799,22 +799,22 @@ id="2-3" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -825,27 +825,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -855,22 +855,22 @@ id="4-5" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -881,27 +881,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -911,22 +911,22 @@ id="4-6" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -937,27 +937,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -967,22 +967,22 @@ id="5-6" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -993,27 +993,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1023,22 +1023,22 @@ id="7-13" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1049,27 +1049,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1079,22 +1079,22 @@ id="8-14" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1105,27 +1105,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1135,22 +1135,22 @@ id="10-22" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1161,27 +1161,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1191,22 +1191,22 @@ id="10-14" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1217,27 +1217,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1247,22 +1247,22 @@ id="10-12" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1273,27 +1273,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1303,22 +1303,22 @@ id="10-24" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1329,27 +1329,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1359,22 +1359,22 @@ id="10-21" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1385,27 +1385,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1415,22 +1415,22 @@ id="10-20" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1441,27 +1441,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1471,22 +1471,22 @@ id="11-24" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1497,27 +1497,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1527,22 +1527,22 @@ id="11-22" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1553,27 +1553,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1583,22 +1583,22 @@ id="11-14" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1609,27 +1609,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1639,22 +1639,22 @@ id="12-13" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1665,27 +1665,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1695,22 +1695,22 @@ id="16-17" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1721,27 +1721,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1751,22 +1751,22 @@ id="16-18" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1777,27 +1777,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1807,22 +1807,22 @@ id="16-21" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1833,27 +1833,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1863,22 +1863,22 @@ id="16-22" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1889,27 +1889,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1919,22 +1919,22 @@ id="17-18" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1945,27 +1945,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1975,22 +1975,22 @@ id="17-20" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2001,27 +2001,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2031,22 +2031,22 @@ id="18-19" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2057,27 +2057,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2087,22 +2087,22 @@ id="19-20" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2113,27 +2113,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2143,22 +2143,22 @@ id="19-33" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2169,27 +2169,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2199,22 +2199,22 @@ id="19-22" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2225,27 +2225,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2255,22 +2255,22 @@ id="19-23" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2281,27 +2281,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2311,22 +2311,22 @@ id="20-21" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2337,27 +2337,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2367,22 +2367,22 @@ id="21-22" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2393,27 +2393,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2423,22 +2423,22 @@ id="22-24" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2449,27 +2449,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2479,22 +2479,22 @@ id="22-26" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2505,27 +2505,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2535,22 +2535,22 @@ id="22-23" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2561,27 +2561,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2591,22 +2591,22 @@ id="22-28" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2617,27 +2617,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2647,22 +2647,22 @@ id="22-30" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2673,27 +2673,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2703,22 +2703,22 @@ id="22-31" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2729,27 +2729,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2759,22 +2759,22 @@ id="22-32" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2785,27 +2785,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2815,22 +2815,22 @@ id="22-33" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2841,27 +2841,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2871,22 +2871,22 @@ id="23-28" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2897,27 +2897,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2927,22 +2927,22 @@ id="23-27" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2953,27 +2953,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2983,22 +2983,22 @@ id="23-29" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -3009,27 +3009,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -3039,22 +3039,22 @@ id="23-30" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -3065,27 +3065,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -3095,22 +3095,22 @@ id="23-31" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -3121,27 +3121,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -3151,22 +3151,22 @@ id="23-33" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -3177,27 +3177,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -3207,22 +3207,22 @@ id="32-33" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -3233,27 +3233,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -3265,27 +3265,14 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -41,27 +41,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -71,22 +71,22 @@ id="0-2" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -97,27 +97,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -127,22 +127,22 @@ id="0-3" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -153,27 +153,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -183,22 +183,22 @@ id="0-4" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -209,27 +209,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -239,22 +239,22 @@ id="0-5" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -265,27 +265,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -295,22 +295,22 @@ id="0-7" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -321,27 +321,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -351,22 +351,22 @@ id="0-8" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -377,27 +377,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -407,22 +407,22 @@ id="0-9" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -433,27 +433,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -463,22 +463,22 @@ id="0-10" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -489,27 +489,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -519,22 +519,22 @@ id="0-11" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -545,27 +545,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -575,22 +575,22 @@ id="0-13" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -601,27 +601,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -631,22 +631,22 @@ id="0-14" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -657,27 +657,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -687,22 +687,22 @@ id="0-15" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -713,27 +713,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -743,22 +743,22 @@ id="0-16" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -769,27 +769,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -799,22 +799,22 @@ id="2-3" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -825,27 +825,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -855,22 +855,22 @@ id="4-5" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -881,27 +881,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -911,22 +911,22 @@ id="4-6" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -937,27 +937,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -967,22 +967,22 @@ id="5-6" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -993,27 +993,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1023,22 +1023,22 @@ id="7-13" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1049,27 +1049,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1079,22 +1079,22 @@ id="8-14" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1105,27 +1105,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1135,22 +1135,22 @@ id="10-22" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1161,27 +1161,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1191,22 +1191,22 @@ id="10-14" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1217,27 +1217,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1247,22 +1247,22 @@ id="10-12" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1273,27 +1273,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1303,22 +1303,22 @@ id="10-24" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1329,27 +1329,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1359,22 +1359,22 @@ id="10-21" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1385,27 +1385,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1415,22 +1415,22 @@ id="10-20" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1441,27 +1441,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1471,22 +1471,22 @@ id="11-24" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1497,27 +1497,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1527,22 +1527,22 @@ id="11-22" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1553,27 +1553,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1583,22 +1583,22 @@ id="11-14" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1609,27 +1609,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1639,22 +1639,22 @@ id="12-13" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1665,27 +1665,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1695,22 +1695,22 @@ id="16-17" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1721,27 +1721,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1751,22 +1751,22 @@ id="16-18" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1777,27 +1777,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1807,22 +1807,22 @@ id="16-21" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1833,27 +1833,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1863,22 +1863,22 @@ id="16-22" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1889,27 +1889,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1919,22 +1919,22 @@ id="17-18" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1945,27 +1945,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1975,22 +1975,22 @@ id="17-20" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2001,27 +2001,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2031,22 +2031,22 @@ id="18-19" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2057,27 +2057,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2087,22 +2087,22 @@ id="19-20" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2113,27 +2113,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2143,22 +2143,22 @@ id="19-33" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2169,27 +2169,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2199,22 +2199,22 @@ id="19-22" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2225,27 +2225,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2255,22 +2255,22 @@ id="19-23" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2281,27 +2281,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2311,22 +2311,22 @@ id="20-21" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2337,27 +2337,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2367,22 +2367,22 @@ id="21-22" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2393,27 +2393,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2423,22 +2423,22 @@ id="22-24" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2449,27 +2449,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2479,22 +2479,22 @@ id="22-26" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2505,27 +2505,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2535,22 +2535,22 @@ id="22-23" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2561,27 +2561,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2591,22 +2591,22 @@ id="22-28" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2617,27 +2617,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2647,22 +2647,22 @@ id="22-30" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2673,27 +2673,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2703,22 +2703,22 @@ id="22-31" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2729,27 +2729,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2759,22 +2759,22 @@ id="22-32" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2785,27 +2785,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2815,22 +2815,22 @@ id="22-33" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2841,27 +2841,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2871,22 +2871,22 @@ id="23-28" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2897,27 +2897,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2927,22 +2927,22 @@ id="23-27" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2953,27 +2953,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2983,22 +2983,22 @@ id="23-29" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -3009,27 +3009,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -3039,22 +3039,22 @@ id="23-30" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -3065,27 +3065,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -3095,22 +3095,22 @@ id="23-31" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -3121,27 +3121,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -3151,22 +3151,22 @@ id="23-33" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -3177,27 +3177,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -3207,22 +3207,22 @@ id="32-33" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -3233,27 +3233,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -3265,27 +3265,14 @@ - - - - + - - - - + - - - - + - - - - + - - - - + - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - + - - - - - - - - - - + - - - - - - - + - - - - - - - + - - - - + - - - - + - - - - + - - - - + @@ -41,27 +41,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -71,22 +71,22 @@ id="0-2" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -97,27 +97,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -127,22 +127,22 @@ id="0-3" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -153,27 +153,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -183,22 +183,22 @@ id="0-4" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -209,27 +209,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -239,22 +239,22 @@ id="0-5" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -265,27 +265,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -295,22 +295,22 @@ id="0-7" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -321,27 +321,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -351,22 +351,22 @@ id="0-8" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -377,27 +377,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -407,22 +407,22 @@ id="0-9" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -433,27 +433,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -463,22 +463,22 @@ id="0-10" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -489,27 +489,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -519,22 +519,22 @@ id="0-11" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -545,27 +545,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -575,22 +575,22 @@ id="0-13" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -601,27 +601,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -631,22 +631,22 @@ id="0-14" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -657,27 +657,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -687,22 +687,22 @@ id="0-15" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -713,27 +713,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -743,22 +743,22 @@ id="0-16" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -769,27 +769,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -799,22 +799,22 @@ id="2-3" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -825,27 +825,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -855,22 +855,22 @@ id="4-5" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -881,27 +881,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -911,22 +911,22 @@ id="4-6" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -937,27 +937,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -967,22 +967,22 @@ id="5-6" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -993,27 +993,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1023,22 +1023,22 @@ id="7-13" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1049,27 +1049,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1079,22 +1079,22 @@ id="8-14" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1105,27 +1105,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1135,22 +1135,22 @@ id="10-22" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1161,27 +1161,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1191,22 +1191,22 @@ id="10-14" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1217,27 +1217,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1247,22 +1247,22 @@ id="10-12" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1273,27 +1273,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1303,22 +1303,22 @@ id="10-24" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1329,27 +1329,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1359,22 +1359,22 @@ id="10-21" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1385,27 +1385,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1415,22 +1415,22 @@ id="10-20" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1441,27 +1441,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1471,22 +1471,22 @@ id="11-24" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1497,27 +1497,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1527,22 +1527,22 @@ id="11-22" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1553,27 +1553,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1583,22 +1583,22 @@ id="11-14" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1609,27 +1609,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1639,22 +1639,22 @@ id="12-13" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1665,27 +1665,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1695,22 +1695,22 @@ id="16-17" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1721,27 +1721,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1751,22 +1751,22 @@ id="16-18" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1777,27 +1777,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1807,22 +1807,22 @@ id="16-21" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1833,27 +1833,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1863,22 +1863,22 @@ id="16-22" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1889,27 +1889,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1919,22 +1919,22 @@ id="17-18" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1945,27 +1945,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1975,22 +1975,22 @@ id="17-20" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2001,27 +2001,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2031,22 +2031,22 @@ id="18-19" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2057,27 +2057,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2087,22 +2087,22 @@ id="19-20" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2113,27 +2113,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2143,22 +2143,22 @@ id="19-33" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2169,27 +2169,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2199,22 +2199,22 @@ id="19-22" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2225,27 +2225,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2255,22 +2255,22 @@ id="19-23" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2281,27 +2281,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2311,22 +2311,22 @@ id="20-21" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2337,27 +2337,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2367,22 +2367,22 @@ id="21-22" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2393,27 +2393,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2423,22 +2423,22 @@ id="22-24" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2449,27 +2449,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2479,22 +2479,22 @@ id="22-26" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2505,27 +2505,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2535,22 +2535,22 @@ id="22-23" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2561,27 +2561,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2591,22 +2591,22 @@ id="22-28" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2617,27 +2617,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2647,22 +2647,22 @@ id="22-30" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2673,27 +2673,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2703,22 +2703,22 @@ id="22-31" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2729,27 +2729,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2759,22 +2759,22 @@ id="22-32" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2785,27 +2785,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2815,22 +2815,22 @@ id="22-33" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2841,27 +2841,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2871,22 +2871,22 @@ id="23-28" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2897,27 +2897,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2927,22 +2927,22 @@ id="23-27" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2953,27 +2953,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2983,22 +2983,22 @@ id="23-29" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -3009,27 +3009,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -3039,22 +3039,22 @@ id="23-30" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -3065,27 +3065,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -3095,22 +3095,22 @@ id="23-31" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -3121,27 +3121,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -3151,22 +3151,22 @@ id="23-33" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -3177,27 +3177,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -3207,22 +3207,22 @@ id="32-33" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -3233,27 +3233,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -3265,27 +3265,14 @@ - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - + - - - - - - - - - - - - - - - - + @@ -41,27 +41,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -71,22 +71,22 @@ id="0-2" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -97,27 +97,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -127,22 +127,22 @@ id="0-3" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -153,27 +153,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -183,22 +183,22 @@ id="0-4" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -209,27 +209,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -239,22 +239,22 @@ id="0-5" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -265,27 +265,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -295,22 +295,22 @@ id="0-7" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -321,27 +321,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -351,22 +351,22 @@ id="0-8" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -377,27 +377,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -407,22 +407,22 @@ id="0-9" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -433,27 +433,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -463,22 +463,22 @@ id="0-10" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -489,27 +489,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -519,22 +519,22 @@ id="0-11" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -545,27 +545,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -575,22 +575,22 @@ id="0-13" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -601,27 +601,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -631,22 +631,22 @@ id="0-14" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -657,27 +657,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -687,22 +687,22 @@ id="0-15" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -713,27 +713,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -743,22 +743,22 @@ id="0-16" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -769,27 +769,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -799,22 +799,22 @@ id="2-3" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -825,27 +825,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -855,22 +855,22 @@ id="4-5" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -881,27 +881,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -911,22 +911,22 @@ id="4-6" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -937,27 +937,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -967,22 +967,22 @@ id="5-6" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -993,27 +993,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1023,22 +1023,22 @@ id="7-13" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1049,27 +1049,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1079,22 +1079,22 @@ id="8-14" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1105,27 +1105,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1135,22 +1135,22 @@ id="10-22" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1161,27 +1161,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1191,22 +1191,22 @@ id="10-14" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1217,27 +1217,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1247,22 +1247,22 @@ id="10-12" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1273,27 +1273,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1303,22 +1303,22 @@ id="10-24" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1329,27 +1329,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1359,22 +1359,22 @@ id="10-21" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1385,27 +1385,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1415,22 +1415,22 @@ id="10-20" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1441,27 +1441,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1471,22 +1471,22 @@ id="11-24" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1497,27 +1497,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1527,22 +1527,22 @@ id="11-22" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1553,27 +1553,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1583,22 +1583,22 @@ id="11-14" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1609,27 +1609,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1639,22 +1639,22 @@ id="12-13" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1665,27 +1665,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1695,22 +1695,22 @@ id="16-17" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1721,27 +1721,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1751,22 +1751,22 @@ id="16-18" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1777,27 +1777,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1807,22 +1807,22 @@ id="16-21" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1833,27 +1833,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1863,22 +1863,22 @@ id="16-22" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1889,27 +1889,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1919,22 +1919,22 @@ id="17-18" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -1945,27 +1945,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -1975,22 +1975,22 @@ id="17-20" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2001,27 +2001,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2031,22 +2031,22 @@ id="18-19" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2057,27 +2057,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2087,22 +2087,22 @@ id="19-20" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2113,27 +2113,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2143,22 +2143,22 @@ id="19-33" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2169,27 +2169,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2199,22 +2199,22 @@ id="19-22" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2225,27 +2225,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2255,22 +2255,22 @@ id="19-23" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2281,27 +2281,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2311,22 +2311,22 @@ id="20-21" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2337,27 +2337,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2367,22 +2367,22 @@ id="21-22" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2393,27 +2393,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2423,22 +2423,22 @@ id="22-24" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2449,27 +2449,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2479,22 +2479,22 @@ id="22-26" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2505,27 +2505,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2535,22 +2535,22 @@ id="22-23" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2561,27 +2561,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2591,22 +2591,22 @@ id="22-28" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2617,27 +2617,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2647,22 +2647,22 @@ id="22-30" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2673,27 +2673,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2703,22 +2703,22 @@ id="22-31" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2729,27 +2729,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2759,22 +2759,22 @@ id="22-32" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2785,27 +2785,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2815,22 +2815,22 @@ id="22-33" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2841,27 +2841,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2871,22 +2871,22 @@ id="23-28" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2897,27 +2897,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2927,22 +2927,22 @@ id="23-27" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -2953,27 +2953,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -2983,22 +2983,22 @@ id="23-29" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -3009,27 +3009,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -3039,22 +3039,22 @@ id="23-30" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -3065,27 +3065,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -3095,22 +3095,22 @@ id="23-31" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -3121,27 +3121,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -3151,22 +3151,22 @@ id="23-33" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -3177,27 +3177,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -3207,22 +3207,22 @@ id="32-33" fill="none" marker-start="false" - marker-end="[object Object]" + marker-end="true" transform="matrix(1,0,0,1,0,0)" > - + @@ -3233,27 +3233,27 @@ stroke-width="3" stroke="transparent" /> - + @@ -3265,27 +3265,14 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + @@ -120,12 +120,12 @@ @@ -134,12 +134,10 @@ @@ -148,12 +146,12 @@ diff --git a/packages/g6/__tests__/snapshots/runtime/element/visibility/hidden.svg b/packages/g6/__tests__/snapshots/runtime/element/visibility/hidden.svg index b99726a389..4b907d95a8 100644 --- a/packages/g6/__tests__/snapshots/runtime/element/visibility/hidden.svg +++ b/packages/g6/__tests__/snapshots/runtime/element/visibility/hidden.svg @@ -119,12 +119,10 @@ @@ -133,12 +131,10 @@ @@ -147,12 +143,10 @@ @@ -133,12 +131,10 @@ @@ -147,12 +143,10 @@ @@ -34,8 +32,6 @@ transform="translate(-25,-25)" cx="25" cy="25" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="25" /> @@ -48,8 +44,6 @@ transform="translate(-25,-25)" cx="25" cy="25" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="25" /> diff --git a/packages/g6/__tests__/snapshots/runtime/element/z-index/default.svg b/packages/g6/__tests__/snapshots/runtime/element/z-index/default.svg index b6da06ee81..9bcca3195e 100644 --- a/packages/g6/__tests__/snapshots/runtime/element/z-index/default.svg +++ b/packages/g6/__tests__/snapshots/runtime/element/z-index/default.svg @@ -20,8 +20,6 @@ transform="translate(-25,-25)" cx="25" cy="25" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="25" /> @@ -34,8 +32,6 @@ transform="translate(-25,-25)" cx="25" cy="25" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="25" /> @@ -48,8 +44,6 @@ transform="translate(-25,-25)" cx="25" cy="25" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="25" /> diff --git a/packages/g6/__tests__/snapshots/runtime/element/z-index/front.svg b/packages/g6/__tests__/snapshots/runtime/element/z-index/front.svg index d132a91a2d..2beed6234e 100644 --- a/packages/g6/__tests__/snapshots/runtime/element/z-index/front.svg +++ b/packages/g6/__tests__/snapshots/runtime/element/z-index/front.svg @@ -20,8 +20,6 @@ transform="translate(-25,-25)" cx="25" cy="25" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="25" /> @@ -34,8 +32,6 @@ transform="translate(-25,-25)" cx="25" cy="25" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="25" /> @@ -48,8 +44,6 @@ transform="translate(-25,-25)" cx="25" cy="25" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="25" /> diff --git a/packages/g6/__tests__/snapshots/runtime/graph/graph/after-draw.svg b/packages/g6/__tests__/snapshots/runtime/graph/graph/after-draw.svg index a408f6b0a6..e165d7833d 100644 --- a/packages/g6/__tests__/snapshots/runtime/graph/graph/after-draw.svg +++ b/packages/g6/__tests__/snapshots/runtime/graph/graph/after-draw.svg @@ -26,7 +26,7 @@ stroke="transparent" stroke-width="7" /> - + @@ -63,13 +61,11 @@ diff --git a/packages/g6/__tests__/snapshots/runtime/graph/graph/after-layout.svg b/packages/g6/__tests__/snapshots/runtime/graph/graph/after-layout.svg index b76d1c5b0c..9a64db3696 100644 --- a/packages/g6/__tests__/snapshots/runtime/graph/graph/after-layout.svg +++ b/packages/g6/__tests__/snapshots/runtime/graph/graph/after-layout.svg @@ -26,11 +26,11 @@ stroke="transparent" stroke-width="7" /> - + @@ -53,13 +53,13 @@ @@ -72,12 +72,12 @@ diff --git a/packages/g6/__tests__/snapshots/runtime/graph/graph/after-rotate-90.svg b/packages/g6/__tests__/snapshots/runtime/graph/graph/after-rotate-90.svg index f223ae0b3e..6dbdaaa1fc 100644 --- a/packages/g6/__tests__/snapshots/runtime/graph/graph/after-rotate-90.svg +++ b/packages/g6/__tests__/snapshots/runtime/graph/graph/after-rotate-90.svg @@ -26,11 +26,11 @@ stroke="transparent" stroke-width="7" /> - + @@ -53,13 +53,13 @@ @@ -72,12 +72,12 @@ diff --git a/packages/g6/__tests__/snapshots/runtime/graph/graph/after-translate-node-1.svg b/packages/g6/__tests__/snapshots/runtime/graph/graph/after-translate-node-1.svg index 3bb53a3059..acbd8c122b 100644 --- a/packages/g6/__tests__/snapshots/runtime/graph/graph/after-translate-node-1.svg +++ b/packages/g6/__tests__/snapshots/runtime/graph/graph/after-translate-node-1.svg @@ -26,11 +26,11 @@ stroke="transparent" stroke-width="7" /> - + @@ -53,13 +53,13 @@ @@ -72,12 +72,12 @@ diff --git a/packages/g6/__tests__/snapshots/runtime/graph/graph/after-translate.svg b/packages/g6/__tests__/snapshots/runtime/graph/graph/after-translate.svg index 6b0ebedcce..6c9f13fbe4 100644 --- a/packages/g6/__tests__/snapshots/runtime/graph/graph/after-translate.svg +++ b/packages/g6/__tests__/snapshots/runtime/graph/graph/after-translate.svg @@ -26,11 +26,11 @@ stroke="transparent" stroke-width="7" /> - + @@ -53,13 +53,13 @@ @@ -72,12 +72,12 @@ diff --git a/packages/g6/__tests__/snapshots/runtime/graph/graph/after-zoom-2.svg b/packages/g6/__tests__/snapshots/runtime/graph/graph/after-zoom-2.svg index ea6560f860..4adfa636f8 100644 --- a/packages/g6/__tests__/snapshots/runtime/graph/graph/after-zoom-2.svg +++ b/packages/g6/__tests__/snapshots/runtime/graph/graph/after-zoom-2.svg @@ -26,11 +26,11 @@ stroke="transparent" stroke-width="7" /> - + @@ -53,13 +53,13 @@ @@ -72,12 +72,12 @@ diff --git a/packages/g6/__tests__/snapshots/runtime/graph/graph/before-draw.svg b/packages/g6/__tests__/snapshots/runtime/graph/graph/before-draw.svg index 63d9ca64cc..a75786d9bd 100644 --- a/packages/g6/__tests__/snapshots/runtime/graph/graph/before-draw.svg +++ b/packages/g6/__tests__/snapshots/runtime/graph/graph/before-draw.svg @@ -26,11 +26,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -58,11 +58,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -90,11 +90,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -122,11 +122,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -154,11 +154,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -186,11 +186,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -218,11 +218,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -250,11 +250,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -282,11 +282,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -314,11 +314,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -346,11 +346,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -378,11 +378,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -410,11 +410,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -442,11 +442,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -474,11 +474,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -506,11 +506,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -538,11 +538,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -570,11 +570,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -602,11 +602,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -634,11 +634,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -666,11 +666,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -698,11 +698,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -730,11 +730,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -762,11 +762,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -794,11 +794,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -826,11 +826,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -858,11 +858,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -890,11 +890,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -922,11 +922,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -954,11 +954,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -986,11 +986,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1018,11 +1018,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1050,11 +1050,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1082,11 +1082,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1114,11 +1114,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1146,11 +1146,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1178,11 +1178,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1210,11 +1210,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1242,11 +1242,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1274,11 +1274,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1306,11 +1306,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1338,11 +1338,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1370,11 +1370,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1402,11 +1402,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1434,11 +1434,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1466,11 +1466,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1498,11 +1498,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1530,11 +1530,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1562,11 +1562,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1594,11 +1594,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1626,11 +1626,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1658,11 +1658,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1690,11 +1690,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1722,11 +1722,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1754,11 +1754,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1786,11 +1786,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1818,11 +1818,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1850,11 +1850,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1882,11 +1882,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1914,11 +1914,11 @@ stroke="transparent" stroke-width="3" /> - + @@ -1937,13 +1937,11 @@ @@ -1951,13 +1949,11 @@ @@ -1965,13 +1961,11 @@ @@ -1979,13 +1973,11 @@ @@ -1993,13 +1985,11 @@ @@ -2007,13 +1997,11 @@ @@ -2021,13 +2009,11 @@ @@ -2035,13 +2021,11 @@ @@ -2049,13 +2033,11 @@ @@ -2063,13 +2045,11 @@ @@ -2081,13 +2061,11 @@ @@ -2099,13 +2077,11 @@ @@ -2117,13 +2093,11 @@ @@ -2135,13 +2109,11 @@ @@ -2153,13 +2125,11 @@ @@ -2171,13 +2141,11 @@ @@ -2189,13 +2157,11 @@ @@ -2207,13 +2173,11 @@ @@ -2225,13 +2189,11 @@ @@ -2243,13 +2205,11 @@ @@ -2261,13 +2221,11 @@ @@ -2279,13 +2237,11 @@ @@ -2297,13 +2253,11 @@ @@ -2315,13 +2269,11 @@ @@ -2333,13 +2285,11 @@ @@ -2351,13 +2301,11 @@ @@ -2369,13 +2317,11 @@ @@ -2387,13 +2333,11 @@ @@ -2405,13 +2349,11 @@ @@ -2423,13 +2365,11 @@ @@ -2441,13 +2381,11 @@ @@ -2459,13 +2397,11 @@ @@ -2477,13 +2413,11 @@ @@ -2495,13 +2429,11 @@ diff --git a/packages/g6/__tests__/snapshots/runtime/graph/graph/before-layout.svg b/packages/g6/__tests__/snapshots/runtime/graph/graph/before-layout.svg index d15f5a4f83..15f3f94591 100644 --- a/packages/g6/__tests__/snapshots/runtime/graph/graph/before-layout.svg +++ b/packages/g6/__tests__/snapshots/runtime/graph/graph/before-layout.svg @@ -26,7 +26,7 @@ stroke="transparent" stroke-width="7" /> - + @@ -64,12 +64,12 @@ diff --git a/packages/g6/__tests__/snapshots/runtime/viewport/auto-fit-with-padding-animation.svg b/packages/g6/__tests__/snapshots/runtime/viewport/auto-fit-with-padding-animation.svg index f2056eb6ac..3bee06efa5 100644 --- a/packages/g6/__tests__/snapshots/runtime/viewport/auto-fit-with-padding-animation.svg +++ b/packages/g6/__tests__/snapshots/runtime/viewport/auto-fit-with-padding-animation.svg @@ -23,8 +23,6 @@ transform="translate(-25,-25)" cx="25" cy="25" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="25" /> @@ -37,8 +35,6 @@ transform="translate(-25,-25)" cx="25" cy="25" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="25" /> @@ -51,8 +47,6 @@ transform="translate(-25,-25)" cx="25" cy="25" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="25" /> @@ -65,8 +59,6 @@ transform="translate(-25,-25)" cx="25" cy="25" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="25" /> diff --git a/packages/g6/__tests__/snapshots/runtime/viewport/auto-fit-with-padding.svg b/packages/g6/__tests__/snapshots/runtime/viewport/auto-fit-with-padding.svg index 36f6c31891..21c7b81c23 100644 --- a/packages/g6/__tests__/snapshots/runtime/viewport/auto-fit-with-padding.svg +++ b/packages/g6/__tests__/snapshots/runtime/viewport/auto-fit-with-padding.svg @@ -23,8 +23,6 @@ transform="translate(-25,-25)" cx="25" cy="25" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="25" /> @@ -37,8 +35,6 @@ transform="translate(-25,-25)" cx="25" cy="25" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="25" /> @@ -51,8 +47,6 @@ transform="translate(-25,-25)" cx="25" cy="25" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="25" /> @@ -65,8 +59,6 @@ transform="translate(-25,-25)" cx="25" cy="25" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="25" /> diff --git a/packages/g6/__tests__/snapshots/runtime/viewport/before-fit-animation.svg b/packages/g6/__tests__/snapshots/runtime/viewport/before-fit-animation.svg index 1276af0036..97768e648a 100644 --- a/packages/g6/__tests__/snapshots/runtime/viewport/before-fit-animation.svg +++ b/packages/g6/__tests__/snapshots/runtime/viewport/before-fit-animation.svg @@ -20,8 +20,6 @@ transform="translate(-25,-25)" cx="25" cy="25" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="25" /> @@ -34,8 +32,6 @@ transform="translate(-25,-25)" cx="25" cy="25" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="25" /> @@ -48,8 +44,6 @@ transform="translate(-25,-25)" cx="25" cy="25" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="25" /> @@ -62,8 +56,6 @@ transform="translate(-25,-25)" cx="25" cy="25" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="25" /> diff --git a/packages/g6/__tests__/snapshots/runtime/viewport/before-fit.svg b/packages/g6/__tests__/snapshots/runtime/viewport/before-fit.svg index 1276af0036..97768e648a 100644 --- a/packages/g6/__tests__/snapshots/runtime/viewport/before-fit.svg +++ b/packages/g6/__tests__/snapshots/runtime/viewport/before-fit.svg @@ -20,8 +20,6 @@ transform="translate(-25,-25)" cx="25" cy="25" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="25" /> @@ -34,8 +32,6 @@ transform="translate(-25,-25)" cx="25" cy="25" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="25" /> @@ -48,8 +44,6 @@ transform="translate(-25,-25)" cx="25" cy="25" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="25" /> @@ -62,8 +56,6 @@ transform="translate(-25,-25)" cx="25" cy="25" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="25" /> diff --git a/packages/g6/__tests__/snapshots/runtime/viewport/fitCenter-animation.svg b/packages/g6/__tests__/snapshots/runtime/viewport/fitCenter-animation.svg index 1276af0036..97768e648a 100644 --- a/packages/g6/__tests__/snapshots/runtime/viewport/fitCenter-animation.svg +++ b/packages/g6/__tests__/snapshots/runtime/viewport/fitCenter-animation.svg @@ -20,8 +20,6 @@ transform="translate(-25,-25)" cx="25" cy="25" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="25" /> @@ -34,8 +32,6 @@ transform="translate(-25,-25)" cx="25" cy="25" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="25" /> @@ -48,8 +44,6 @@ transform="translate(-25,-25)" cx="25" cy="25" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="25" /> @@ -62,8 +56,6 @@ transform="translate(-25,-25)" cx="25" cy="25" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="25" /> diff --git a/packages/g6/__tests__/snapshots/runtime/viewport/fitCenter.svg b/packages/g6/__tests__/snapshots/runtime/viewport/fitCenter.svg index 190002d2dc..dcddaea70f 100644 --- a/packages/g6/__tests__/snapshots/runtime/viewport/fitCenter.svg +++ b/packages/g6/__tests__/snapshots/runtime/viewport/fitCenter.svg @@ -20,8 +20,6 @@ transform="translate(-25,-25)" cx="25" cy="25" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="25" /> @@ -34,8 +32,6 @@ transform="translate(-25,-25)" cx="25" cy="25" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="25" /> @@ -48,8 +44,6 @@ transform="translate(-25,-25)" cx="25" cy="25" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="25" /> @@ -62,8 +56,6 @@ transform="translate(-25,-25)" cx="25" cy="25" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="25" /> diff --git a/packages/g6/__tests__/snapshots/runtime/viewport/fitView-animation.svg b/packages/g6/__tests__/snapshots/runtime/viewport/fitView-animation.svg index 9f4b4b8e12..db29d33d96 100644 --- a/packages/g6/__tests__/snapshots/runtime/viewport/fitView-animation.svg +++ b/packages/g6/__tests__/snapshots/runtime/viewport/fitView-animation.svg @@ -23,8 +23,6 @@ transform="translate(-25,-25)" cx="25" cy="25" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="25" /> @@ -37,8 +35,6 @@ transform="translate(-25,-25)" cx="25" cy="25" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="25" /> @@ -51,8 +47,6 @@ transform="translate(-25,-25)" cx="25" cy="25" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="25" /> @@ -65,8 +59,6 @@ transform="translate(-25,-25)" cx="25" cy="25" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="25" /> diff --git a/packages/g6/__tests__/snapshots/runtime/viewport/fitView.svg b/packages/g6/__tests__/snapshots/runtime/viewport/fitView.svg index 35c8fac601..7ebecb7be8 100644 --- a/packages/g6/__tests__/snapshots/runtime/viewport/fitView.svg +++ b/packages/g6/__tests__/snapshots/runtime/viewport/fitView.svg @@ -23,8 +23,6 @@ transform="translate(-25,-25)" cx="25" cy="25" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="25" /> @@ -37,8 +35,6 @@ transform="translate(-25,-25)" cx="25" cy="25" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="25" /> @@ -51,8 +47,6 @@ transform="translate(-25,-25)" cx="25" cy="25" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="25" /> @@ -65,8 +59,6 @@ transform="translate(-25,-25)" cx="25" cy="25" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="25" /> diff --git a/packages/g6/__tests__/snapshots/runtime/viewport/focusElement-animation.svg b/packages/g6/__tests__/snapshots/runtime/viewport/focusElement-animation.svg index e5fe3825a8..ebca7a0255 100644 --- a/packages/g6/__tests__/snapshots/runtime/viewport/focusElement-animation.svg +++ b/packages/g6/__tests__/snapshots/runtime/viewport/focusElement-animation.svg @@ -20,8 +20,6 @@ transform="translate(-25,-25)" cx="25" cy="25" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="25" /> @@ -34,8 +32,6 @@ transform="translate(-25,-25)" cx="25" cy="25" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="25" /> @@ -48,8 +44,6 @@ transform="translate(-25,-25)" cx="25" cy="25" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="25" /> @@ -62,8 +56,6 @@ transform="translate(-25,-25)" cx="25" cy="25" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="25" /> diff --git a/packages/g6/__tests__/snapshots/runtime/viewport/focusElement.svg b/packages/g6/__tests__/snapshots/runtime/viewport/focusElement.svg index e5fe3825a8..ebca7a0255 100644 --- a/packages/g6/__tests__/snapshots/runtime/viewport/focusElement.svg +++ b/packages/g6/__tests__/snapshots/runtime/viewport/focusElement.svg @@ -20,8 +20,6 @@ transform="translate(-25,-25)" cx="25" cy="25" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="25" /> @@ -34,8 +32,6 @@ transform="translate(-25,-25)" cx="25" cy="25" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="25" /> @@ -48,8 +44,6 @@ transform="translate(-25,-25)" cx="25" cy="25" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="25" /> @@ -62,8 +56,6 @@ transform="translate(-25,-25)" cx="25" cy="25" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="25" /> diff --git a/packages/g6/__tests__/snapshots/runtime/viewport/re-fitCenter-animation.svg b/packages/g6/__tests__/snapshots/runtime/viewport/re-fitCenter-animation.svg index 9f4b4b8e12..db29d33d96 100644 --- a/packages/g6/__tests__/snapshots/runtime/viewport/re-fitCenter-animation.svg +++ b/packages/g6/__tests__/snapshots/runtime/viewport/re-fitCenter-animation.svg @@ -23,8 +23,6 @@ transform="translate(-25,-25)" cx="25" cy="25" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="25" /> @@ -37,8 +35,6 @@ transform="translate(-25,-25)" cx="25" cy="25" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="25" /> @@ -51,8 +47,6 @@ transform="translate(-25,-25)" cx="25" cy="25" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="25" /> @@ -65,8 +59,6 @@ transform="translate(-25,-25)" cx="25" cy="25" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="25" /> diff --git a/packages/g6/__tests__/snapshots/runtime/viewport/re-fitCenter.svg b/packages/g6/__tests__/snapshots/runtime/viewport/re-fitCenter.svg index d5cfc24acc..5713d16163 100644 --- a/packages/g6/__tests__/snapshots/runtime/viewport/re-fitCenter.svg +++ b/packages/g6/__tests__/snapshots/runtime/viewport/re-fitCenter.svg @@ -23,8 +23,6 @@ transform="translate(-25,-25)" cx="25" cy="25" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="25" /> @@ -37,8 +35,6 @@ transform="translate(-25,-25)" cx="25" cy="25" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="25" /> @@ -51,8 +47,6 @@ transform="translate(-25,-25)" cx="25" cy="25" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="25" /> @@ -65,8 +59,6 @@ transform="translate(-25,-25)" cx="25" cy="25" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="25" /> diff --git a/packages/g6/__tests__/snapshots/runtime/viewport/re-focusElement-animation.svg b/packages/g6/__tests__/snapshots/runtime/viewport/re-focusElement-animation.svg index db1d5d61f7..8fae27e22b 100644 --- a/packages/g6/__tests__/snapshots/runtime/viewport/re-focusElement-animation.svg +++ b/packages/g6/__tests__/snapshots/runtime/viewport/re-focusElement-animation.svg @@ -23,8 +23,6 @@ transform="translate(-25,-25)" cx="25" cy="25" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="25" /> @@ -37,8 +35,6 @@ transform="translate(-25,-25)" cx="25" cy="25" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="25" /> @@ -51,8 +47,6 @@ transform="translate(-25,-25)" cx="25" cy="25" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="25" /> @@ -65,8 +59,6 @@ transform="translate(-25,-25)" cx="25" cy="25" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="25" /> diff --git a/packages/g6/__tests__/snapshots/runtime/viewport/re-focusElement.svg b/packages/g6/__tests__/snapshots/runtime/viewport/re-focusElement.svg index 76994bbc9f..922288dcb7 100644 --- a/packages/g6/__tests__/snapshots/runtime/viewport/re-focusElement.svg +++ b/packages/g6/__tests__/snapshots/runtime/viewport/re-focusElement.svg @@ -23,8 +23,6 @@ transform="translate(-25,-25)" cx="25" cy="25" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="25" /> @@ -37,8 +35,6 @@ transform="translate(-25,-25)" cx="25" cy="25" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="25" /> @@ -51,8 +47,6 @@ transform="translate(-25,-25)" cx="25" cy="25" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="25" /> @@ -65,8 +59,6 @@ transform="translate(-25,-25)" cx="25" cy="25" - stroke-width="0" - stroke="rgba(0,0,0,1)" r="25" /> diff --git a/packages/g6/__tests__/snapshots/runtime/viewport/rotate-135.svg b/packages/g6/__tests__/snapshots/runtime/viewport/rotate-135.svg index 1dbd6f81e2..249e9af66e 100644 --- a/packages/g6/__tests__/snapshots/runtime/viewport/rotate-135.svg +++ b/packages/g6/__tests__/snapshots/runtime/viewport/rotate-135.svg @@ -29,18 +29,18 @@ stroke="transparent" stroke-width="3" /> - + @@ -52,13 +52,11 @@ @@ -66,13 +64,11 @@ diff --git a/packages/g6/__tests__/snapshots/runtime/viewport/rotate-90.svg b/packages/g6/__tests__/snapshots/runtime/viewport/rotate-90.svg index 62df3d979c..5f073e40f7 100644 --- a/packages/g6/__tests__/snapshots/runtime/viewport/rotate-90.svg +++ b/packages/g6/__tests__/snapshots/runtime/viewport/rotate-90.svg @@ -26,18 +26,18 @@ stroke="transparent" stroke-width="3" /> - + @@ -49,13 +49,11 @@ @@ -63,13 +61,11 @@ diff --git a/packages/g6/__tests__/snapshots/runtime/viewport/translate.svg b/packages/g6/__tests__/snapshots/runtime/viewport/translate.svg index c55cb7006d..36490ab2db 100644 --- a/packages/g6/__tests__/snapshots/runtime/viewport/translate.svg +++ b/packages/g6/__tests__/snapshots/runtime/viewport/translate.svg @@ -26,18 +26,18 @@ stroke="transparent" stroke-width="3" /> - + @@ -49,13 +49,11 @@ @@ -63,13 +61,11 @@ diff --git a/packages/g6/__tests__/snapshots/runtime/viewport/zoom-0.5.svg b/packages/g6/__tests__/snapshots/runtime/viewport/zoom-0.5.svg index 9328b2ec64..5ffa6b2188 100644 --- a/packages/g6/__tests__/snapshots/runtime/viewport/zoom-0.5.svg +++ b/packages/g6/__tests__/snapshots/runtime/viewport/zoom-0.5.svg @@ -29,18 +29,18 @@ stroke="transparent" stroke-width="3" /> - + @@ -52,13 +52,11 @@ @@ -66,13 +64,11 @@ diff --git a/packages/g6/__tests__/snapshots/runtime/viewport/zoom-2.svg b/packages/g6/__tests__/snapshots/runtime/viewport/zoom-2.svg index 3a1e080744..460d651ed6 100644 --- a/packages/g6/__tests__/snapshots/runtime/viewport/zoom-2.svg +++ b/packages/g6/__tests__/snapshots/runtime/viewport/zoom-2.svg @@ -26,18 +26,18 @@ stroke="transparent" stroke-width="3" /> - + @@ -49,13 +49,11 @@ @@ -63,13 +61,11 @@ diff --git a/packages/g6/__tests__/snapshots/spec/theme/theme_node_palette_spectral.svg b/packages/g6/__tests__/snapshots/spec/theme/theme_node_palette_spectral.svg new file mode 100644 index 0000000000..316851945e --- /dev/null +++ b/packages/g6/__tests__/snapshots/spec/theme/theme_node_palette_spectral.svg @@ -0,0 +1,2402 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/packages/g6/__tests__/unit/runtime/graph/graph.spec.ts b/packages/g6/__tests__/unit/runtime/graph/graph.spec.ts index 695dbcb335..a07606448b 100644 --- a/packages/g6/__tests__/unit/runtime/graph/graph.spec.ts +++ b/packages/g6/__tests__/unit/runtime/graph/graph.spec.ts @@ -22,32 +22,41 @@ describe('Graph', () => { it('setNode/getNode', () => { const options = graph.getOptions(); - graph.setNode(Object.assign({}, options.node, { state: { selected: { fill: 'pink' } } })); + graph.setNode(Object.assign({}, options.node, { state: { selected: { color: 'pink' } } })); expect(graph.getOptions().node!.state!.selected).toEqual({ - fill: 'pink', + color: 'pink', }); }); it('setEdge/getEdge', () => { const options = graph.getOptions(); - graph.setEdge(Object.assign({}, options.edge, { state: { selected: { stroke: 'pink' } } })); + graph.setEdge(Object.assign({}, options.edge, { state: { selected: { color: 'pink' } } })); expect(graph.getOptions().edge!.state!.selected).toEqual({ - stroke: 'pink', + color: 'pink', }); }); it('setCombo/getCombo', () => { const options = graph.getOptions(); - graph.setCombo(Object.assign({}, options.combo, { state: { selected: { fill: 'pink' } } })); + graph.setCombo(Object.assign({}, options.combo, { state: { selected: { color: 'pink' } } })); expect(graph.getOptions().combo!.state!.selected).toEqual({ - fill: 'pink', + color: 'pink', }); }); + it('setBackground/getBackground', () => { + expect(graph.getBackground()).toEqual('#fff'); + }); + it('getSize', () => { expect(graph.getSize()).toEqual([500, 500]); }); + it('setTheme', () => { + graph.setTheme('light'); + expect(graph.getTheme()).toEqual('light'); + }); + it('getTheme', () => { expect(graph.getTheme()).toEqual('light'); }); @@ -169,9 +178,9 @@ describe('Graph', () => { it('getElementRenderBounds', () => { const renderBounds = graph.getElementRenderBounds('node-1'); - // the default size of the node is 32 - expect(renderBounds.min).toEqual([-16, -16, 0]); - expect(renderBounds.max).toEqual([16, 16, 0]); + // the default size of the node is 24 + expect(renderBounds.min).toEqual([-12, -12, 0]); + expect(renderBounds.max).toEqual([12, 12, 0]); }); it('setElementState/getElementState/getElementDataByState', async () => { diff --git a/packages/g6/__tests__/unit/spec/element/node.spec.ts b/packages/g6/__tests__/unit/spec/element/node.spec.ts index 112457539d..6f5f3b3849 100644 --- a/packages/g6/__tests__/unit/spec/element/node.spec.ts +++ b/packages/g6/__tests__/unit/spec/element/node.spec.ts @@ -18,7 +18,7 @@ describe('spec element node', () => { x: 1, y: 1, }, - palette: 'category10', + palette: 'spectral', state: { selected: { any: 1, diff --git a/packages/g6/__tests__/unit/spec/theme.spec.ts b/packages/g6/__tests__/unit/spec/theme.spec.ts index 08bb3da97b..e35b1d8a27 100644 --- a/packages/g6/__tests__/unit/spec/theme.spec.ts +++ b/packages/g6/__tests__/unit/spec/theme.spec.ts @@ -1,9 +1,32 @@ -import type { ThemeOptions } from '@/src'; +import type { Graph, ThemeOptions } from '@/src'; +import { theme } from '@@/demo/case'; +import { createDemoGraph } from '@@/utils'; describe('spec theme', () => { - it('theme', () => { + let graph: Graph; + + beforeAll(async () => { + graph = await createDemoGraph(theme, { animation: false }); + }); + + it('theme', async () => { const theme: ThemeOptions = 'light'; expect(theme).toBeTruthy(); }); + + it('palette', async () => { + graph.setOptions({ + node: { + palette: { + type: 'group', + field: 'cluster', + color: 'spectral', + }, + }, + }); + graph.render(); + + await expect(graph).toMatchSnapshot(__filename, 'theme_node_palette_spectral'); + }); }); diff --git a/packages/g6/__tests__/unit/utils/element.spec.ts b/packages/g6/__tests__/unit/utils/element.spec.ts index f362378bf5..01708e8d1f 100644 --- a/packages/g6/__tests__/unit/utils/element.spec.ts +++ b/packages/g6/__tests__/unit/utils/element.spec.ts @@ -149,7 +149,7 @@ describe('element', () => { portLinkToCenter: true, }, }); - expect(getPortConnectionPoint(node.getPorts()['left'], [0, 0])).toEqual([75, 100, 0]); + expect(getPortConnectionPoint(node.getPorts()['left'], [0, 0])).toEqual([88, 100, 0]); }); it('getTextStyleByPlacement', () => { diff --git a/packages/g6/__tests__/unit/utils/palette.spec.ts b/packages/g6/__tests__/unit/utils/palette.spec.ts index d3f97ba75f..39e9f89ba0 100644 --- a/packages/g6/__tests__/unit/utils/palette.spec.ts +++ b/packages/g6/__tests__/unit/utils/palette.spec.ts @@ -3,11 +3,8 @@ import { assignColorByPalette, getPaletteColors, parsePalette } from '@/src/util describe('palette', () => { it('parsePalette', () => { - expect(parsePalette('category3')).toEqual({ type: 'group', color: 'category3' }); - expect(parsePalette(['red', 'green', 'blue'])).toEqual({ - type: 'group', - color: ['red', 'green', 'blue'], - }); + expect(parsePalette('category3')?.color).toEqual('category3'); + expect(parsePalette(['red', 'green', 'blue'])?.color).toEqual(['red', 'green', 'blue']); expect(parsePalette({ type: 'value', color: 'custom-blues', field: 'value' })).toEqual({ type: 'value', color: 'custom-blues', @@ -94,6 +91,7 @@ describe('palette', () => { expect( assignColorByPalette(data5, { type: 'group', + field: (d: any) => d.id, color: 'category3', }), ).toEqual({ @@ -107,6 +105,7 @@ describe('palette', () => { expect( assignColorByPalette(data5, { type: 'group', + field: (d: any) => d.id, color: 'spectral', }), ).toEqual({ diff --git a/packages/g6/__tests__/unit/utils/size.spec.ts b/packages/g6/__tests__/unit/utils/size.spec.ts index 4b20d6aba6..dea9989def 100644 --- a/packages/g6/__tests__/unit/utils/size.spec.ts +++ b/packages/g6/__tests__/unit/utils/size.spec.ts @@ -4,7 +4,7 @@ describe('size', () => { it('parseSize', () => { expect(parseSize()).toEqual([0, 0, 0]); expect(parseSize(10)).toEqual([10, 10, 10]); - expect(parseSize([10, 20])).toEqual([10, 20, 0]); + expect(parseSize([10, 20])).toEqual([10, 20, 10]); expect(parseSize([10, 20, 30])).toEqual([10, 20, 30]); }); }); diff --git a/packages/g6/src/elements/edges/base-edge.ts b/packages/g6/src/elements/edges/base-edge.ts index e639778718..03a8417173 100644 --- a/packages/g6/src/elements/edges/base-edge.ts +++ b/packages/g6/src/elements/edges/base-edge.ts @@ -54,6 +54,7 @@ export abstract class BaseEdge extends BaseShape { labelOffsetY: 0, labelPlacement: 'center', labelTextBaseline: 'middle', + labelWordWrap: false, halo: false, haloDroppable: false, haloLineDash: 0, @@ -63,14 +64,14 @@ export abstract class BaseEdge extends BaseShape { haloZIndex: -1, startArrow: false, startArrowAnchor: '0.5 0.5', - startArrowSize: 10, + startArrowSize: 8, startArrowLineDash: 0, startArrowLineWidth: 1, startArrowTransformOrigin: 'center', startArrowType: 'triangle', endArrow: false, endArrowAnchor: '0.5 0.5', - endArrowSize: 10, + endArrowSize: 8, endArrowLineDash: 0, endArrowLineWidth: 1, endArrowTransformOrigin: 'center', diff --git a/packages/g6/src/elements/nodes/base-node.ts b/packages/g6/src/elements/nodes/base-node.ts index 9dde51fac8..91a512d7a8 100644 --- a/packages/g6/src/elements/nodes/base-node.ts +++ b/packages/g6/src/elements/nodes/base-node.ts @@ -59,7 +59,7 @@ export abstract class BaseNode extends BaseS static defaultStyleProps: BaseNodeStyleProps = { x: 0, y: 0, - size: 32, + size: 24, droppable: true, draggable: true, port: true, @@ -82,6 +82,7 @@ export abstract class BaseNode extends BaseS labelIsBillboard: true, labelMaxWidth: '200%', labelPlacement: 'bottom', + labelWordWrap: false, labelZIndex: 0, }; diff --git a/packages/g6/src/elements/nodes/circle.ts b/packages/g6/src/elements/nodes/circle.ts index 84d7861f2b..399635b679 100644 --- a/packages/g6/src/elements/nodes/circle.ts +++ b/packages/g6/src/elements/nodes/circle.ts @@ -17,7 +17,7 @@ type KeyStyleProps = GCircleStyleProps; */ export class Circle extends BaseNode { static defaultStyleProps: Partial = { - size: 50, + size: 24, }; constructor(options: DisplayObjectConfig) { diff --git a/packages/g6/src/elements/nodes/rect.ts b/packages/g6/src/elements/nodes/rect.ts index 10028d15f7..37cc01de52 100644 --- a/packages/g6/src/elements/nodes/rect.ts +++ b/packages/g6/src/elements/nodes/rect.ts @@ -15,7 +15,7 @@ type KeyStyleProps = GRectStyleProps; */ export class Rect extends BaseNode { static defaultStyleProps: Partial = { - size: [100, 30], + size: [48, 24], anchor: [0.5, 0.5], }; diff --git a/packages/g6/src/runtime/canvas.ts b/packages/g6/src/runtime/canvas.ts index cfd89a20a6..74a1758180 100644 --- a/packages/g6/src/runtime/canvas.ts +++ b/packages/g6/src/runtime/canvas.ts @@ -15,8 +15,9 @@ import type { CanvasLayer } from '../types/canvas'; import { getCombinedBBox } from '../utils/bbox'; export interface CanvasConfig - extends Pick { + extends Pick { renderer?: CanvasOptions['renderer']; + background?: string; } /** @@ -55,7 +56,7 @@ export class Canvas { const allCanvas = Object.entries(this.canvas); if (allCanvas.every(([, canvas]) => !canvas)) { - const { renderer: getRenderer, ...restConfig } = this.config; + const { renderer: getRenderer, background, ...restConfig } = this.config; const names: CanvasLayer[] = ['main', 'label', 'transient', 'transientLabel', 'background']; const { renderers, canvas } = names.reduce( @@ -106,6 +107,8 @@ export class Canvas { }); } + this.setBackground(); + return Promise.all(Object.values(this.canvas).map((canvas) => canvas.ready)); } @@ -134,6 +137,14 @@ export class Canvas { return this.config; } + public setBackground(background = this.config.background) { + const container = this.getContainer(); + if (container && background) { + container.style.background = background; + container.style.transition = 'background 0.5s'; + } + } + public setCursor(cursor: Cursor) { Object.values(this.canvas).forEach((canvas) => { canvas.setCursor(cursor); diff --git a/packages/g6/src/runtime/element.ts b/packages/g6/src/runtime/element.ts index 101891d36f..0703573aad 100644 --- a/packages/g6/src/runtime/element.ts +++ b/packages/g6/src/runtime/element.ts @@ -3,7 +3,7 @@ import type { BaseStyleProps, DisplayObject, IAnimation } from '@antv/g'; import { Group } from '@antv/g'; import type { ID } from '@antv/graphlib'; -import { groupBy } from '@antv/util'; +import { groupBy, isEmpty } from '@antv/util'; import { executor as animationExecutor } from '../animations'; import type { AnimationContext } from '../animations/types'; import { AnimationType, ChangeTypeEnum, GraphEvent } from '../constants'; @@ -103,17 +103,22 @@ export class ElementController { this.paletteStyle = {}; this.forEachElementData((elementType, elementData) => { - const palette = parsePalette(this.getTheme(elementType)?.palette || options[elementType]?.palette); - if (palette) { + const palette = Object.assign( + {}, + parsePalette(this.getTheme(elementType)?.palette), + parsePalette(options[elementType]?.palette), + ); + if (!isEmpty(palette) && palette?.field) { Object.assign(this.paletteStyle, assignColorByPalette(elementData, palette)); } }); } public getPaletteStyle(id: ID) { - return { - color: this.paletteStyle[id], - }; + const color = this.paletteStyle[id]; + if (!color) return {}; + + return { color }; } public getDataStyle(id: ID): NodeLikeStyle | EdgeStyle { @@ -564,6 +569,7 @@ export class ElementController { const originalStyle = { ...shape.attributes }; updateStyle(shape, style); + return () => animator?.(id, shape, originalStyle) || null; } diff --git a/packages/g6/src/runtime/graph.ts b/packages/g6/src/runtime/graph.ts index a4e55054b8..c25c90383d 100644 --- a/packages/g6/src/runtime/graph.ts +++ b/packages/g6/src/runtime/graph.ts @@ -3,6 +3,7 @@ import type { AABB, BaseStyleProps, DataURLOptions } from '@antv/g'; import type { ID } from '@antv/graphlib'; import { debounce, isEqual, isFunction, isNumber, isObject, isString, omit } from '@antv/util'; import { GraphEvent } from '../constants'; +import { getExtension } from '../registry'; import type { BehaviorOptions, ComboData, @@ -99,6 +100,8 @@ export class Graph extends EventEmitter { */ public setOptions(options: G6Spec): void { const { + animation, + background, behaviors, combo, container, @@ -115,6 +118,7 @@ export class Graph extends EventEmitter { zoom, } = options; + if (background) this.setBackground(background); if (behaviors) this.setBehaviors(behaviors); if (combo) this.setCombo(combo); if (data) this.setData(data); @@ -131,6 +135,15 @@ export class Graph extends EventEmitter { if (isNumber(padding)) this.options.padding = padding; } + public setBackground(background: G6Spec['background']): void { + this.options.background = background; + this.context.canvas?.setBackground(background); + } + + public getBackground(): G6Spec['background'] { + return this.options.background; + } + public getSize(): [number, number] { if (this.context.canvas) return this.context.canvas.getSize(); return [this.options.width || 0, this.options.height || 0]; @@ -167,6 +180,11 @@ export class Graph extends EventEmitter { public setTheme(theme: CallableValue): void { this.options.theme = isFunction(theme) ? theme(this.getTheme()) : theme; + + const { background } = getExtension('theme', this.options.theme) || {}; + if (background && !this.options.background) { + this.setBackground(background); + } } public setLayout(layout: CallableValue): void { @@ -308,10 +326,11 @@ export class Graph extends EventEmitter { private createCanvas() { if (this.context.canvas) return this.context.canvas; - const { container = 'container', width, height, renderer } = this.options; + const { container = 'container', width, height, renderer, background } = this.options; if (container instanceof Canvas) { this.context.canvas = container; + container.setBackground(background); } else { const $container = isString(container) ? document.getElementById(container!) : container; diff --git a/packages/g6/src/spec/canvas.ts b/packages/g6/src/spec/canvas.ts index 0bb2036681..321bf491b0 100644 --- a/packages/g6/src/spec/canvas.ts +++ b/packages/g6/src/spec/canvas.ts @@ -34,4 +34,10 @@ export type CanvasOptions = Pick & { * whether to auto resize canvas */ autoResize?: boolean; + /** + * ็”ปๅธƒ่ƒŒๆ™ฏ่‰ฒ + * + * canvas background color + */ + background?: string; }; diff --git a/packages/g6/src/spec/element/palette.ts b/packages/g6/src/spec/element/palette.ts index 71b22f9293..5a545d886c 100644 --- a/packages/g6/src/spec/element/palette.ts +++ b/packages/g6/src/spec/element/palette.ts @@ -1,4 +1,5 @@ import type { Palette } from '../../palettes/types'; +import type { ElementDatum } from '../../types'; /** * ่‰ฒๆฟ้…็ฝฎ้กน @@ -16,13 +17,13 @@ interface CategoricalPaletteOptions extends BasePaletteOptions { * * Coloring by group */ - type: 'group'; + type?: 'group'; /** - * ๅˆ†็ป„ๅญ—ๆฎต๏ผŒๆœชๆŒ‡ๅฎšๆ—ถๅŸบไบŽ่Š‚็‚น id ๅˆ†็ป„ + * ๅˆ†็ป„ๅญ—ๆฎต๏ผŒๆœชๆŒ‡ๅฎšๆ—ถไธๅˆ†็ป„ * - * Group field, when not specified, group by node id + * Group field, no grouping when not specified */ - field?: string; + field?: string | ((datum: ElementDatum) => string); } interface ContinuousPaletteOptions extends BasePaletteOptions { @@ -31,13 +32,13 @@ interface ContinuousPaletteOptions extends BasePaletteOptions { * * Coloring based on field value */ - type: 'value'; + type?: 'value'; /** * ๅ–ๅ€ผๅญ—ๆฎต * * Value field */ - field: string; + field?: string | ((datum: ElementDatum) => string); } export interface BasePaletteOptions { @@ -46,7 +47,7 @@ export interface BasePaletteOptions { * * Palette color */ - color: Palette; + color?: Palette; /** * ๅ€’ๅบๅ–่‰ฒ * diff --git a/packages/g6/src/themes/base.ts b/packages/g6/src/themes/base.ts new file mode 100644 index 0000000000..5d5d3da304 --- /dev/null +++ b/packages/g6/src/themes/base.ts @@ -0,0 +1,235 @@ +import type { Palette } from '../palettes/types'; +import type { PaletteOptions } from '../spec/element/palette'; +import type { Theme } from './types'; + +const BADGE_PALETTE: Palette = ['#7E92B5', '#f5222d', '#faad14']; + +const NODE_PALETTE_OPTIONS: PaletteOptions = { + type: 'group', + color: ['#1783FF', '#00C9C9', '#F08F56', '#D580FF', '#7863FF', '#DB9D0D', '#60C42D', '#FF80CA', '#2491B3', '#17C76F'], +}; + +const EDGE_PALETTE_OPTIONS: PaletteOptions = { + type: 'group', + color: [ + '#99ADD1', + '#1783FF', + '#00C9C9', + '#F08F56', + '#D580FF', + '#7863FF', + '#DB9D0D', + '#60C42D', + '#FF80CA', + '#2491B3', + '#17C76F', + ], +}; + +type ThemeTokens = { + bgColor: string; + textColor: string; + nodeColor: string; + nodeColorDisabled: string; + nodeStroke: string; + nodeBadgePalette?: string[]; + nodePaletteOptions?: PaletteOptions; + edgeColor: string; + edgeColorDisabled: string; + edgePaletteOptions?: PaletteOptions; + comboColor: string; + comboColorDisabled: string; + comboStroke: string; + comboStrokeDisabled: string; +}; + +/** + * ๅˆ›ๅปบไธป้ข˜ + * + * Create a theme based on the given tokens + * @param tokens - ไธป้ข˜้…็ฝฎ้กน Theme tokens + * @returns ไธป้ข˜ Theme + */ +export function create(tokens: ThemeTokens): Theme { + const { + bgColor, + textColor, + nodeColor, + nodeColorDisabled, + nodeStroke, + nodeBadgePalette = BADGE_PALETTE, + nodePaletteOptions = NODE_PALETTE_OPTIONS, + edgeColor, + edgeColorDisabled, + edgePaletteOptions = EDGE_PALETTE_OPTIONS, + comboColor, + comboColorDisabled, + comboStroke, + comboStrokeDisabled, + } = tokens; + + return { + background: bgColor, + node: { + palette: nodePaletteOptions, + style: { + badgeFill: bgColor, + badgeFontSize: 8, + badgePadding: [1, 4], + badgePalette: nodeBadgePalette, + color: nodeColor, + halo: false, + haloLineWidth: 12, + haloStrokeOpacity: 0.25, + iconFill: bgColor, + iconFontSize: 16, + labelBackground: false, + labelBackgroundFill: bgColor, + labelBackgroundLineWidth: 0, + labelBackgroundOpacity: 0.5, + labelBackgroundPadding: [0, 2], + labelFill: textColor, + labelFontSize: 12, + portFill: nodeColor, + portLineWidth: 1, + portStroke: nodeStroke, + portStrokeOpacity: 0.65, + }, + state: { + selected: { + halo: true, + labelFontSize: 14, + labelFontWeight: 700, + lineWidth: 3, + stroke: nodeStroke, + }, + active: { + halo: true, + }, + highlight: { + labelFontWeight: 700, + lineWidth: 3, + stroke: nodeStroke, + strokeOpacity: 0.85, + }, + inactive: { + iconOpacity: 0.25, + labelOpacity: 0.25, + opacity: 0.25, + }, + disabled: { + color: nodeColorDisabled, + labelOpacity: 0.25, + }, + }, + animation: { + enter: 'fade', + exit: 'fade', + visibility: 'fade', + update: [{ fields: ['x', 'y', 'color', 'stroke'] }], + }, + }, + edge: { + palette: edgePaletteOptions, + style: { + color: edgeColor, + halo: false, + haloLineWidth: 12, + haloStrokeOpacity: 0.25, + increasedLineWidthForHitTesting: 2, + labelBackground: false, + labelBackgroundFill: bgColor, + labelBackgroundLineWidth: 0, + labelBackgroundOpacity: 0.75, + labelBackgroundPadding: [4, 4, 4, 4], + labelFill: textColor, + labelFontSize: 12, + labelPlacement: 'middle', + labelTextBaseline: 'middle', + lineWidth: 1, + }, + state: { + selected: { + halo: true, + labelFontSize: 14, + labelFontWeight: 700, + lineWidth: 2, + }, + active: { + halo: true, + }, + highlight: { + labelFontWeight: 700, + lineWidth: 2, + }, + inactive: { + labelOpacity: 0.25, + opacity: 0.25, + }, + disabled: { + labelOpacity: 0.25, + color: edgeColorDisabled, + }, + }, + animation: { + enter: 'fade', + exit: 'fade', + visibility: 'fade', + update: [{ fields: ['color'] }, { fields: ['path'], shape: 'key' }], + }, + }, + combo: { + style: { + collapsedMaskFill: comboColor, + collapsedMaskFontSize: 12, + collapsedSize: 32, + color: comboColor, + haloLineWidth: 12, + haloStrokeOpacity: 0.25, + labelBackground: false, + labelBackgroundFill: bgColor, + labelBackgroundLineWidth: 0, + labelBackgroundOpacity: 0.75, + labelBackgroundPadding: [2, 4, 2, 4], + labelFill: textColor, + labelFontSize: 12, + lineDash: 0, + lineWidth: 1, + padding: 10, + size: 0, + stroke: comboStroke, + }, + state: { + selected: { + halo: true, + labelFontSize: 14, + labelFontWeight: 700, + lineWidth: 4, + }, + active: { + halo: true, + }, + highlight: { + labelFontWeight: 700, + lineWidth: 4, + }, + inactive: { + labelOpacity: 0.25, + opacity: 0.65, + }, + disabled: { + color: comboColorDisabled, + labelOpacity: 0.25, + opacity: 0.25, + stroke: comboStrokeDisabled, + }, + }, + animation: { + enter: 'fade', + exit: 'fade', + visibility: 'fade', + update: [{ fields: ['x', 'y'] }, { fields: ['size', 'color', 'stroke'], shape: 'key' }], + }, + }, + }; +} diff --git a/packages/g6/src/themes/dark.ts b/packages/g6/src/themes/dark.ts index 1f1934d914..7fff6ab356 100644 --- a/packages/g6/src/themes/dark.ts +++ b/packages/g6/src/themes/dark.ts @@ -1,192 +1,18 @@ +import { create } from './base'; import type { Theme } from './types'; -const SUBJECT_COLOR = '#1783ff'; -const BG_COLOR = '#000000'; -const TEXT_COLOR = '#ffffffd9'; - -const NODE_COLOR = SUBJECT_COLOR; -const NODE_COLOR_DISABLED = '#d0e4ff'; -const NODE_STROKE = '#d0e4ff'; - -const EDGE_STROKE = '#99add1'; -const EDGE_STROKE_DISABLED = '#969696'; -const EDGE_STROKE_INACTIVE = '#99ADD173'; - -const COMBO_FILL = '#fdfdfd'; -const COMBO_FILL_DISABLED = '#D0E4FF'; -const COMBO_STROKE = '#99add1'; -const COMBO_STROKE_SELECTED = '#d0e4ff'; - -export const dark: Theme = { - node: { - style: { - badgeFill: BG_COLOR, - badgePalette: ['#7E92B5', '#F86254', '#EDB74B'], - badgePadding: [1, 4], - badgeFontSize: 8, - fill: NODE_COLOR, - halo: false, - haloLineWidth: 12, - haloStrokeOpacity: 0.45, - iconFill: BG_COLOR, - iconFontSize: 16, - labelBackgroundFill: BG_COLOR, - labelBackgroundLineWidth: 0, - labelBackgroundOpacity: 0.5, - labelBackgroundPadding: [0, 2], - labelFill: TEXT_COLOR, - labelFontSize: 12, - labelMaxLines: 1, - labelMaxWidth: '200%', - labelOpacity: 0.85, - labelTextOverflow: 'ellipsis', - labelWordWrap: true, - lineWidth: 0, - portFill: NODE_COLOR, - portLineWidth: 1, - portStroke: NODE_STROKE, - portStrokeOpacity: 0.65, - size: 32, - stroke: NODE_STROKE, - }, - state: { - selected: { - halo: true, - labelFontSize: 14, - labelFontWeight: 700, - lineWidth: 3, - }, - active: { - halo: true, - haloStrokeOpacity: 0.25, - }, - highlight: { - labelFontWeight: 700, - lineWidth: 3, - }, - inactive: { - iconOpacity: 0.45, - labelOpacity: 0.45, - opacity: 0.45, - }, - disabled: { - fill: NODE_COLOR_DISABLED, - }, - }, - animation: { - enter: 'fade', - exit: 'fade', - visibility: 'fade', - update: [{ fields: ['x', 'y', 'fill', 'stroke'] }], - }, - }, - edge: { - style: { - halo: false, - haloLineWidth: 12, - haloStrokeOpacity: 0.25, - increasedLineWidthForHitTesting: 2, - labelBackgroundFill: BG_COLOR, - labelBackgroundLineWidth: 0, - labelBackgroundOpacity: 0.75, - labelBackgroundPadding: [4, 4, 4, 4], - labelFill: TEXT_COLOR, - labelFontSize: 12, - labelMaxLines: 1, - labelMaxWidth: '60%', - labelOpacity: 0.85, - labelPlacement: 'middle', - labelTextBaseline: 'middle', - labelTextOverflow: 'ellipsis', - labelWordWrap: true, - lineWidth: 1, - stroke: EDGE_STROKE, - }, - state: { - selected: { - halo: true, - labelFontSize: 14, - labelFontWeight: 700, - lineWidth: 2, - }, - active: { - halo: true, - }, - highlight: { - lineWidth: 2, - labelFontWeight: 700, - }, - inactive: { - opacity: EDGE_STROKE_INACTIVE, - }, - disabled: { - stroke: EDGE_STROKE_DISABLED, - }, - }, - animation: { - enter: 'fade', - exit: 'fade', - visibility: 'fade', - update: [{ fields: ['stroke'] }, { fields: ['path'], shape: 'key' }], - }, - }, - combo: { - style: { - collapsedSize: 32, - fill: COMBO_FILL, - haloLineWidth: 12, - haloStrokeOpacity: 0.25, - iconFill: COMBO_STROKE, - iconFontSize: 12, - labelBackgroundFill: BG_COLOR, - labelBackgroundLineWidth: 0, - labelBackgroundOpacity: 0.75, - labelBackgroundPadding: [2, 4, 2, 4], - labelFill: '#000', - labelFontSize: 12, - labelMaxLines: 1, - lineDash: 0, - lineWidth: 1, - padding: 10, - size: 0, - stroke: COMBO_STROKE, - }, - state: { - selected: { - lineWidth: 2, - stroke: COMBO_STROKE_SELECTED, - halo: true, - labelFontSize: 14, - labelFontWeight: 700, - }, - active: { - stroke: COMBO_STROKE_SELECTED, - halo: true, - }, - highlight: { - lineWidth: 4, - stroke: COMBO_STROKE_SELECTED, - labelFontWeight: 700, - }, - inactive: { - labelOpacity: 0.65, - }, - disabled: { - fill: COMBO_FILL_DISABLED, - opacity: 0.25, - iconFill: COMBO_FILL_DISABLED, - iconOpacity: 0.25, - labelOpacity: 0.25, - }, - }, - animation: { - enter: 'fade', - exit: 'fade', - visibility: 'fade', - update: [ - { fields: ['cx', 'cy', 'r', 'x', 'y', 'width', 'height'], shape: 'key' }, - { fields: ['x', 'y'], shape: 'label' }, - ], - }, - }, +const tokens = { + bgColor: '#000000', + textColor: '#ffffffd9', + nodeColor: '#1783ff', + nodeColorDisabled: '#d0e4ff', + nodeStroke: '#d0e4ff', + edgeColor: '#99add1', + edgeColorDisabled: '#969696', + comboColor: '#fdfdfd', + comboColorDisabled: '#d0e4ff', + comboStroke: '#99add1', + comboStrokeDisabled: '#969696', }; + +export const dark: Theme = create(tokens); diff --git a/packages/g6/src/themes/light.ts b/packages/g6/src/themes/light.ts index b9f082db62..e1d2254f0e 100644 --- a/packages/g6/src/themes/light.ts +++ b/packages/g6/src/themes/light.ts @@ -1,185 +1,18 @@ +import { create } from './base'; import type { Theme } from './types'; -const SUBJECT_COLOR = '#227eff'; -const BG_COLOR = '#fff'; -const TEXT_COLOR = '#000000D9'; - -const NODE_COLOR = SUBJECT_COLOR; -const NODE_COLOR_DISABLED = '#f0f0f0'; -const NODE_STROKE = '#000000'; - -const EDGE_STROKE = '#99add1'; -const EDGE_STROKE_DISABLED = '#d9d9d9'; -const EDGE_STROKE_INACTIVE = '#d2dae9'; - -const COMBO_FILL = '#fdfdfd'; -const COMBO_FILL_DISABLED = '#f0f0f0'; -const COMBO_STROKE = '#99add1'; -const COMBO_STROKE_DISABLED = '#d9d9d9'; -const COMBO_STROKE_SELECTED = '#1b324f'; - -export const light: Theme = { - node: { - style: { - badgeFill: BG_COLOR, - badgePalette: ['#7E92B5', '#F86254', '#EDB74B'], - badgePadding: [1, 4], - badgeFontSize: 8, - fill: NODE_COLOR, - halo: false, - haloLineWidth: 12, - haloStrokeOpacity: 0.25, - iconFill: BG_COLOR, - iconFontSize: 16, - labelBackgroundFill: BG_COLOR, - labelBackgroundLineWidth: 0, - labelBackgroundOpacity: 0.5, - labelBackgroundPadding: [0, 2], - labelFill: TEXT_COLOR, - labelFontSize: 12, - labelMaxLines: 1, - labelMaxWidth: '200%', - labelTextOverflow: 'ellipsis', - labelWordWrap: true, - lineWidth: 0, - portFill: NODE_COLOR, - portLineWidth: 1, - portStroke: NODE_STROKE, - portStrokeOpacity: 0.65, - size: 32, - stroke: NODE_STROKE, - }, - state: { - selected: { - halo: true, - labelFontSize: 14, - labelFontWeight: 700, - lineWidth: 3, - }, - active: { - halo: true, - }, - highlight: { - labelFontWeight: 700, - lineWidth: 3, - strokeOpacity: 0.85, - }, - inactive: { - iconOpacity: 0.25, - labelOpacity: 0.25, - opacity: 0.25, - }, - disabled: { - fill: NODE_COLOR_DISABLED, - }, - }, - animation: { - enter: 'fade', - exit: 'fade', - visibility: 'fade', - update: [{ fields: ['x', 'y', 'fill', 'stroke'] }], - }, - }, - edge: { - style: { - halo: false, - haloLineWidth: 12, - haloStrokeOpacity: 0.25, - increasedLineWidthForHitTesting: 2, - labelBackgroundFill: BG_COLOR, - labelBackgroundLineWidth: 0, - labelBackgroundOpacity: 0.75, - labelBackgroundPadding: [4, 4, 4, 4], - labelFill: TEXT_COLOR, - labelFontSize: 12, - labelMaxLines: 1, - labelMaxWidth: '60%', - labelPlacement: 'middle', - labelTextBaseline: 'middle', - labelTextOverflow: 'ellipsis', - labelWordWrap: true, - lineWidth: 1, - stroke: EDGE_STROKE, - }, - state: { - selected: { - halo: true, - labelFontSize: 14, - labelFontWeight: 700, - lineWidth: 2, - }, - active: { - halo: true, - }, - highlight: { - labelFontWeight: 700, - lineWidth: 2, - }, - inactive: { - stroke: EDGE_STROKE_INACTIVE, - }, - disabled: { - stroke: EDGE_STROKE_DISABLED, - }, - }, - animation: { - enter: 'fade', - exit: 'fade', - visibility: 'fade', - update: [{ fields: ['stroke'] }, { fields: ['path'], shape: 'key' }], - }, - }, - combo: { - style: { - collapsedSize: 32, - fill: COMBO_FILL, - haloLineWidth: 12, - haloStrokeOpacity: 0.25, - iconFill: COMBO_STROKE, - iconFontSize: 12, - labelBackgroundFill: BG_COLOR, - labelBackgroundLineWidth: 0, - labelBackgroundOpacity: 0.75, - labelBackgroundPadding: [2, 4, 2, 4], - labelFill: '#000', - labelFontSize: 12, - labelMaxLines: 1, - lineDash: 0, - lineWidth: 1, - padding: 10, - size: 0, - stroke: COMBO_STROKE, - }, - state: { - selected: { - halo: true, - labelFontSize: 14, - labelFontWeight: 700, - lineWidth: 4, - stroke: COMBO_STROKE_SELECTED, - }, - active: { - halo: true, - }, - highlight: { - labelFontWeight: 700, - lineWidth: 4, - }, - inactive: { - opacity: 0.65, - }, - disabled: { - fill: COMBO_FILL_DISABLED, - labelOpacity: 0.25, - opacity: 0.25, - stroke: COMBO_STROKE_DISABLED, - }, - }, - animation: { - enter: 'fade', - exit: 'fade', - visibility: 'fade', - update: [{ fields: ['x', 'y'] }, { fields: ['r', 'width', 'height'], shape: 'key' }], - }, - }, +const tokens = { + bgColor: '#fff', + textColor: '#000000d9', + nodeColor: '#1783ff', + nodeColorDisabled: '#f0f0f0', + nodeStroke: '#000000', + edgeColor: '#99add1', + edgeColorDisabled: '#d9d9d9', + comboColor: '#fdfdfd', + comboColorDisabled: '#f0f0f0', + comboStroke: '#99add1', + comboStrokeDisabled: '#d9d9d9', }; + +export const light: Theme = create(tokens); diff --git a/packages/g6/src/themes/types.ts b/packages/g6/src/themes/types.ts index 3078e8aea0..1385ec63db 100644 --- a/packages/g6/src/themes/types.ts +++ b/packages/g6/src/themes/types.ts @@ -8,4 +8,5 @@ export type Theme = { node?: StaticNodeOptions; edge?: StaticEdgeOptions; combo?: StaticComboOptions; + background?: string; }; diff --git a/packages/g6/src/utils/palette.ts b/packages/g6/src/utils/palette.ts index 2f10f525a5..ed83f05e57 100644 --- a/packages/g6/src/utils/palette.ts +++ b/packages/g6/src/utils/palette.ts @@ -24,11 +24,13 @@ export function parsePalette(palette?: PaletteOptions): STDPaletteOptions | unde // ้ขœ่‰ฒๆ•ฐ็ป„ color array Array.isArray(palette) ) { - // ้ป˜่ฎคไธบ็ฆปๆ•ฃ่‰ฒๆฟ๏ผŒ้ป˜่ฎคๅˆ†็ป„ๅญ—ๆฎตไธบ id + // ้ป˜่ฎคไธบ็ฆปๆ•ฃ่‰ฒๆฟ // Default to discrete palette, default group field is id return { type: 'group', + field: (d: any) => d.id, color: palette, + invert: false, }; } return palette; @@ -65,13 +67,14 @@ export function assignColorByPalette(data: ElementData, palette?: STDPaletteOpti return {}; }; + const parseField = (field: STDPaletteOptions['field'], datum: ElementDatum) => + isString(field) ? datum.data?.[field] : field?.(datum); + if (type === 'group') { - // @ts-expect-error @antv/util groupBy condition ๅ‚ๆ•ฐๅบ”ๅฝ“ๆ”ฏๆŒ่ฟ”ๅ›ž string ๆˆ–่€… number / groupBy condition parameter should support return string or number const groupData = groupBy(data, (datum) => { - if (!datum.data || !field) { - return idOf(datum); - } - return String(datum.data[field]); + if (!field) return 'default'; + const key = parseField(field, datum); + return key ? String(key) : 'default'; }); const groupKeys = Object.keys(groupData); @@ -84,10 +87,10 @@ export function assignColorByPalette(data: ElementData, palette?: STDPaletteOpti }); }); return result; - } else { + } else if (type === 'value') { const [min, max] = data.reduce( ([min, max], datum) => { - const value = datum?.data?.[field]; + const value = parseField(field, datum); if (!isNumber(value)) throw new Error(`Palette field ${field} is not a number`); return [Math.min(min, value), Math.max(max, value)]; }, @@ -96,7 +99,7 @@ export function assignColorByPalette(data: ElementData, palette?: STDPaletteOpti const range = max - min; return assignColor( - data.map((datum) => [datum.id, ((datum?.data?.[field] as number) - min) / range]) as [ID, number][], + data.map((datum) => [datum.id, ((parseField(field, datum) as number) - min) / range]) as [ID, number][], ); } } diff --git a/packages/g6/src/utils/size.ts b/packages/g6/src/utils/size.ts index 825d69b5d3..92401c5600 100644 --- a/packages/g6/src/utils/size.ts +++ b/packages/g6/src/utils/size.ts @@ -8,5 +8,6 @@ import type { STDSize, Size } from '../types'; */ export function parseSize(size: Size = 0): STDSize { if (isNumber(size)) return Array(3).fill(size) as STDSize; - return [...size, 0, 0, 0].slice(0, 3) as STDSize; + const [x, y = x, z = x] = size; + return [x, y, z]; } diff --git a/packages/site/examples/feature/features/demo/meta.json b/packages/site/examples/feature/features/demo/meta.json index 15497b04b2..a228c7d2c4 100644 --- a/packages/site/examples/feature/features/demo/meta.json +++ b/packages/site/examples/feature/features/demo/meta.json @@ -45,7 +45,7 @@ "screenshot": "https://mdn.alipayobjects.com/huamei_qa8qxu/afts/img/A*NUFVRqAJv6QAAAAAAAAAAAAADmJ7AQ/original" }, { - "filename": "themeSwitch.js", + "filename": "themeSwitch.ts", "title": { "zh": "ไธป้ข˜ๅˆ‡ๆข", "en": "Theme Switch" diff --git a/packages/site/examples/feature/features/demo/themeSwitch.js b/packages/site/examples/feature/features/demo/themeSwitch.js deleted file mode 100644 index 05d11ded3d..0000000000 --- a/packages/site/examples/feature/features/demo/themeSwitch.js +++ /dev/null @@ -1,341 +0,0 @@ -import { Graph, Extensions, extend } from '@antv/g6'; -import Algorithm from '@antv/layout'; - -const container = document.getElementById('container'); -const width = container.scrollWidth; -const height = container.scrollHeight || 500; - -const themes = { - '๐ŸŒž Light': { - type: 'spec', - base: 'light', - specification: { - node: { - dataTypeField: 'cluster', - }, - }, - }, - '๐ŸŒš Dark': { - type: 'spec', - base: 'dark', - specification: { - node: { - dataTypeField: 'cluster', - }, - }, - }, - '๐ŸŒŽ Blue': { - type: 'spec', - base: 'light', - specification: { - canvas: { - backgroundColor: '#f3faff', - }, - node: { - dataTypeField: 'cluster', - palette: ['#bae0ff', '#91caff', '#69b1ff', '#4096ff', '#1677ff', '#0958d9', '#003eb3', '#002c8c', '#001d66'], - }, - }, - }, - '๐ŸŒ• yellow': { - type: 'spec', - base: 'light', - specification: { - canvas: { - backgroundColor: '#fcf9f1', - }, - node: { - dataTypeField: 'cluster', - palette: ['#ffe7ba', '#ffd591', '#ffc069', '#ffa940', '#fa8c16', '#d46b08', '#ad4e00', '#873800', '#612500'], - }, - }, - }, -}; - -const getDefaultNodeAnimates = (delay) => ({ - buildIn: [ - { - fields: ['opacity'], - duration: 1000, - delay: delay === undefined ? 1000 + Math.random() * 1000 : delay, - }, - ], - buildOut: [ - { - fields: ['opacity'], - duration: 200, - }, - ], - update: [ - { - fields: ['lineWidth', 'fill', 'r'], - shapeId: 'keyShape', - }, - { - fields: ['fontSize'], - shapeId: 'iconShape', - }, - { - fields: ['opacity'], - shapeId: 'haloShape', - }, - ], - hide: [ - { - fields: ['size'], - duration: 200, - }, - { - fields: ['opacity'], - duration: 200, - shapeId: 'keyShape', - }, - { - fields: ['opacity'], - duration: 200, - shapeId: 'labelShape', - }, - ], - show: [ - { - fields: ['size'], - duration: 200, - }, - { - fields: ['opacity'], - duration: 200, - shapeId: 'keyShape', - order: 0, - }, - ], -}); - -const getDefaultEdgeAnimates = (delay) => ({ - buildIn: [ - { - fields: ['opacity'], - duration: 300, - delay: delay === undefined ? 1000 + Math.random() * 1000 : delay, - }, - ], - buildOut: [ - { - fields: ['opacity'], - duration: 200, - }, - ], - update: [ - { - fields: ['lineWidth'], - shapeId: 'keyShape', - }, - { - fields: ['opacity'], - shapeId: 'haloShape', - }, - ], -}); - -const dataFormat = (dataAUR, options = {}, graphCore) => { - const { dataAdded, dataUpdated, dataRemoved } = dataAUR; - return { - dataAdded: dataFormatHandler(dataAdded, options, graphCore), - dataUpdated: dataFormatHandler(dataUpdated, options, graphCore), - dataRemoved, - }; -}; - -const dataFormatHandler = (data, options = {}, graphCore) => { - if (!data.nodes || !data.edges) return {}; - const map = new Map(); - const nodes = []; - data.nodes?.forEach((node) => { - if (map.has(node.id)) return; - nodes.push(node); - map.set(node.id, true); - }); - data.edges?.forEach((edge) => { - const sourceDegree = map.get(edge.source) || 0; - map.set(edge.source, sourceDegree + 1); - const targetDegree = map.get(edge.target) || 0; - map.set(edge.target, targetDegree + 1); - }); - return { - nodes: nodes.map((node) => { - const { id, x, y, z, olabel, data } = node; - return { - id, - data: { - x, - y, - z, - label: olabel, - ...data, - degree: map.get(id), - }, - }; - }), - edges: - data.edges?.map((edge) => ({ - id: `edge-${Math.random()}`, - source: edge.source, - target: edge.target, - })) || [], - }; -}; - -const clusteringNodes = (dataAUR = {}, options = {}, graphCore) => { - const { dataAdded = {}, dataUpdated = {}, dataRemoved = {} } = dataAUR; - const handler = (data = {}, options = {}, core) => { - if (!Algorithm?.labelPropagation || !data.nodes?.length) return data; - const nodes = graphCore ? core.getAllNodes() : data.nodes; - const edges = graphCore ? core.getAllEdges() : data.edges; - const clusteredData = Algorithm.labelPropagation({ nodes, edges }, false); - clusteredData.clusters.forEach((cluster, i) => { - cluster.nodes.forEach((node) => { - node.data.cluster = `c${i}`; - }); - }); - return data; - }; - return { - dataAdded: handler(dataAdded, options, graphCore), - dataUpdated: handler(dataUpdated, options, graphCore), - dataRemoved: dataRemoved || {}, - }; -}; - -const ExtGraph = extend(Graph, { - transforms: { - 'data-format': dataFormat, - 'clustering-node': clusteringNodes, - 'map-node-size': Extensions.MapNodeSize, - }, - nodes: { - 'sphere-node': Extensions.SphereNode, - }, - behaviors: { - 'brush-select': Extensions.BrushSelect, - 'orbit-canvas-3d': Extensions.OrbitCanvas3D, - 'zoom-canvas-3d': Extensions.ZoomCanvas3D, - }, -}); - -const btnContainer = document.createElement('div'); -btnContainer.style.position = 'absolute'; -btnContainer.style.zIndex = 10; -container.appendChild(btnContainer); -const tip2 = document.createElement('span'); -tip2.innerHTML = '๐ŸŒŠ Fetching data....'; -btnContainer.appendChild(tip2); -const tip = document.createElement('span'); -tip.innerHTML = '
๐Ÿ‘‰ Change Theme:'; -btnContainer.appendChild(tip); - -const graph = new ExtGraph({ - container, - width, - height, - transforms: [ - 'data-format', - 'clustering-node', - { - type: 'map-node-size', - field: 'degree', - range: [6, 30], - }, - ], - modes: { - default: [ - { type: 'zoom-canvas', key: '123', triggerOnItems: true }, - 'drag-node', - 'drag-canvas', - 'brush-select', - 'click-select', - ], - }, - theme: { ...themes['๐ŸŒž Light'] }, - autoFit: 'view', - edge: (innerModel) => { - return { - ...innerModel, - data: { - ...innerModel.data, - type: 'line-edge', - animates: getDefaultEdgeAnimates(), - keyShape: { - lineWidth: 0.8, - opacity: 0.5, - }, - }, - }; - }, - // ่Š‚็‚น้…็ฝฎ - node: (innerModel) => { - return { - ...innerModel, - data: { - animates: getDefaultNodeAnimates(), - ...innerModel.data, - labelShape: { - text: innerModel.data.label, - maxWidth: '400%', - offsetY: 8, - lod: 'auto', - }, - - labelBackgroundShape: { - lod: 'auto', - }, - }, - }; - }, - nodeState: { - selected: { - keyShape: { - lineWidth: 1, - }, - haloShape: { - lineWidth: 4, - }, - }, - }, - edgeState: { - selected: { - keyShape: { - lineWidth: 2, - }, - haloShape: { - lineWidth: 4, - }, - }, - }, -}); - -fetch('https://gw.alipayobjects.com/os/basement_prod/da5a1b47-37d6-44d7-8d10-f3e046dabf82.json') - .then((res) => res.json()) - .then((data) => { - tip2.innerHTML = '๐ŸŽจ Rendering....'; - graph.read(data); - - Object.keys(themes).forEach((name, i) => { - const btn = document.createElement('a'); - btn.innerHTML = name; - btn.style.backgroundColor = 'rgba(255, 255, 255, 0.8)'; - btn.style.padding = '4px'; - btn.style.marginLeft = i > 0 ? '24px' : '8px'; - btnContainer.appendChild(btn); - btn.addEventListener('click', () => { - graph.updateTheme(themes[name]); - if (name === '๐ŸŒš Dark') { - tip2.style.color = '#fff'; - tip.style.color = '#fff'; - } else { - tip2.style.color = '#000'; - tip.style.color = '#000'; - } - }); - }); - }); - -window.graph = graph; diff --git a/packages/site/examples/feature/features/demo/themeSwitch.ts b/packages/site/examples/feature/features/demo/themeSwitch.ts new file mode 100644 index 0000000000..e7985939cb --- /dev/null +++ b/packages/site/examples/feature/features/demo/themeSwitch.ts @@ -0,0 +1,195 @@ +import { Graph } from '@antv/g6'; + +const data = { + nodes: [ + { id: '0', data: { cluster: 'a' } }, + { id: '1', data: { cluster: 'a' } }, + { id: '2', data: { cluster: 'a' } }, + { id: '3', data: { cluster: 'a' } }, + { id: '4', data: { cluster: 'a' } }, + { id: '5', data: { cluster: 'a' } }, + { id: '6', data: { cluster: 'a' } }, + { id: '7', data: { cluster: 'a' } }, + { id: '8', data: { cluster: 'a' } }, + { id: '9', data: { cluster: 'a' } }, + { id: '10', data: { cluster: 'a' } }, + { id: '11', data: { cluster: 'a' } }, + { id: '12', data: { cluster: 'a' } }, + { id: '13', data: { cluster: 'b' } }, + { id: '14', data: { cluster: 'b' } }, + { id: '15', data: { cluster: 'b' } }, + { id: '16', data: { cluster: 'b' } }, + { id: '17', data: { cluster: 'b' } }, + { id: '18', data: { cluster: 'c' } }, + { id: '19', data: { cluster: 'c' } }, + { id: '20', data: { cluster: 'c' } }, + { id: '21', data: { cluster: 'c' } }, + { id: '22', data: { cluster: 'c' } }, + { id: '23', data: { cluster: 'c' } }, + { id: '24', data: { cluster: 'c' } }, + { id: '25', data: { cluster: 'c' } }, + { id: '26', data: { cluster: 'c' } }, + { id: '27', data: { cluster: 'c' } }, + { id: '28', data: { cluster: 'c' } }, + { id: '29', data: { cluster: 'c' } }, + { id: '30', data: { cluster: 'c' } }, + { id: '31', data: { cluster: 'd' } }, + { id: '32', data: { cluster: 'd' } }, + { id: '33', data: { cluster: 'd' } }, + ], + edges: [ + { source: '0', target: '1' }, + { source: '0', target: '2' }, + { source: '0', target: '3' }, + { source: '0', target: '4' }, + { source: '0', target: '5' }, + { source: '0', target: '7' }, + { source: '0', target: '8' }, + { source: '0', target: '9' }, + { source: '0', target: '10' }, + { source: '0', target: '11' }, + { source: '0', target: '13' }, + { source: '0', target: '14' }, + { source: '0', target: '15' }, + { source: '0', target: '16' }, + { source: '2', target: '3' }, + { source: '4', target: '5' }, + { source: '4', target: '6' }, + { source: '5', target: '6' }, + { source: '7', target: '13' }, + { source: '8', target: '14' }, + { source: '9', target: '10' }, + { source: '10', target: '22' }, + { source: '10', target: '14' }, + { source: '10', target: '12' }, + { source: '10', target: '24' }, + { source: '10', target: '21' }, + { source: '10', target: '20' }, + { source: '11', target: '24' }, + { source: '11', target: '22' }, + { source: '11', target: '14' }, + { source: '12', target: '13' }, + { source: '16', target: '17' }, + { source: '16', target: '18' }, + { source: '16', target: '21' }, + { source: '16', target: '22' }, + { source: '17', target: '18' }, + { source: '17', target: '20' }, + { source: '18', target: '19' }, + { source: '19', target: '20' }, + { source: '19', target: '33' }, + { source: '19', target: '22' }, + { source: '19', target: '23' }, + { source: '20', target: '21' }, + { source: '21', target: '22' }, + { source: '22', target: '24' }, + { source: '22', target: '25' }, + { source: '22', target: '26' }, + { source: '22', target: '23' }, + { source: '22', target: '28' }, + { source: '22', target: '30' }, + { source: '22', target: '31' }, + { source: '22', target: '32' }, + { source: '22', target: '33' }, + { source: '23', target: '28' }, + { source: '23', target: '27' }, + { source: '23', target: '29' }, + { source: '23', target: '30' }, + { source: '23', target: '31' }, + { source: '23', target: '33' }, + { source: '32', target: '33' }, + ], +}; + +const themes = { + '๐ŸŒž Light': { + background: '#fff', + theme: 'light', + node: { + palette: { + type: 'group', + field: 'cluster', + color: 'antv', + }, + }, + }, + '๐ŸŒš Dark': { + background: '#000', + theme: 'dark', + node: { + palette: { + type: 'group', + field: 'cluster', + color: 'antv', + }, + }, + }, + '๐ŸŒŽ Blue': { + background: '#f3faff', + theme: 'light', + node: { + palette: { + type: 'group', + field: 'cluster', + color: 'blues', + invert: true, + }, + }, + }, + '๐ŸŒ• yellow': { + background: '#fcf9f1', + theme: 'light', + node: { + palette: { + type: 'group', + field: 'cluster', + color: ['#ffe7ba', '#ffd591', '#ffc069', '#ffa940', '#fa8c16', '#d46b08', '#ad4e00', '#873800', '#612500'], + }, + }, + }, +}; + +const graph = new Graph({ + container: 'container', + autoFit: 'view', + background: '#fff', + theme: 'light', + data, + node: { + palette: { + type: 'group', + field: 'cluster', + color: 'antv', + }, + }, + layout: { + type: 'circular', + }, +}); + +graph.render(); + +const container = document.getElementById('container')!; +const btnContainer = document.createElement('div'); +btnContainer.style.position = 'absolute'; +btnContainer.style.zIndex = '10'; +container.appendChild(btnContainer); +const tip2 = document.createElement('span'); +tip2.innerHTML = '๐ŸŒŠ Fetching data....'; +btnContainer.appendChild(tip2); +const tip = document.createElement('span'); +tip.innerHTML = '
๐Ÿ‘‰ Change Theme:'; +btnContainer.appendChild(tip); + +Object.keys(themes).forEach((name, i) => { + const btn = document.createElement('a'); + btn.innerHTML = name; + btn.style.backgroundColor = 'rgba(255, 255, 255, 0.8)'; + btn.style.padding = '4px'; + btn.style.marginLeft = i > 0 ? '24px' : '8px'; + btnContainer.appendChild(btn); + btn.addEventListener('click', () => { + graph.setOptions(themes[name]); + graph.render(); + }); +}); diff --git a/packages/site/examples/item/defaultNodes/demo/circle.ts b/packages/site/examples/item/defaultNodes/demo/circle.ts index 15a6396058..9fd0ad7432 100644 --- a/packages/site/examples/item/defaultNodes/demo/circle.ts +++ b/packages/site/examples/item/defaultNodes/demo/circle.ts @@ -30,14 +30,14 @@ const graph = new Graph({ portR: 3, ports: (d) => d.id.includes('ports') - ? [{ position: 'left' }, { position: 'right' }, { position: 'top' }, { position: 'bottom' }] + ? [{ placement: 'left' }, { placement: 'right' }, { placement: 'top' }, { placement: 'bottom' }] : [], badges: (d) => d.id.includes('badges') ? [ - { text: 'A', position: 'right-top' }, - { text: 'Important', position: 'right' }, - { text: 'Notice', position: 'right-bottom' }, + { text: 'A', placement: 'right-top' }, + { text: 'Important', placement: 'right' }, + { text: 'Notice', placement: 'right-bottom' }, ] : [], }, diff --git a/packages/site/examples/item/defaultNodes/demo/diamond.ts b/packages/site/examples/item/defaultNodes/demo/diamond.ts index 789940f4b4..885dad192e 100644 --- a/packages/site/examples/item/defaultNodes/demo/diamond.ts +++ b/packages/site/examples/item/defaultNodes/demo/diamond.ts @@ -30,14 +30,14 @@ const graph = new Graph({ portR: 3, ports: (d) => d.id.includes('ports') - ? [{ position: 'left' }, { position: 'right' }, { position: 'top' }, { position: 'bottom' }] + ? [{ placement: 'left' }, { placement: 'right' }, { placement: 'top' }, { placement: 'bottom' }] : [], badges: (d) => d.id.includes('badges') ? [ - { text: 'A', position: 'right-top' }, - { text: 'Important', position: 'right' }, - { text: 'Notice', position: 'right-bottom' }, + { text: 'A', placement: 'right-top' }, + { text: 'Important', placement: 'right' }, + { text: 'Notice', placement: 'right-bottom' }, ] : [], }, diff --git a/packages/site/examples/item/defaultNodes/demo/rect.ts b/packages/site/examples/item/defaultNodes/demo/rect.ts index 0fb56d5768..0eda89ca9d 100644 --- a/packages/site/examples/item/defaultNodes/demo/rect.ts +++ b/packages/site/examples/item/defaultNodes/demo/rect.ts @@ -29,14 +29,14 @@ const graph = new Graph({ portR: 3, ports: (d) => d.id.includes('ports') - ? [{ position: 'left' }, { position: 'right' }, { position: 'top' }, { position: 'bottom' }] + ? [{ placement: 'left' }, { placement: 'right' }, { placement: 'top' }, { placement: 'bottom' }] : [], badges: (d) => d.id.includes('badges') ? [ - { text: 'A', position: 'right-top' }, - { text: 'Important', position: 'right' }, - { text: 'Notice', position: 'right-bottom' }, + { text: 'A', placement: 'right-top' }, + { text: 'Important', placement: 'right' }, + { text: 'Notice', placement: 'right-bottom' }, ] : [], }, diff --git a/packages/site/examples/net/forceDirected/demo/basicForce.js b/packages/site/examples/net/forceDirected/demo/basicForce.js index 6d9fadda8b..97de06e290 100644 --- a/packages/site/examples/net/forceDirected/demo/basicForce.js +++ b/packages/site/examples/net/forceDirected/demo/basicForce.js @@ -513,13 +513,6 @@ const data = { data.nodes.forEach((node) => (node.data.size = Math.random() * 30 + 5)); -const COLORS = { - a: '#4087FF', - b: '#CD74FE', - c: '#05B8A7', - d: '#FE8834', -}; - const graph = new Graph({ container: 'container', data, @@ -529,7 +522,11 @@ const graph = new Graph({ size: (d) => d.data.size, labelText: (d) => d.id, ports: [], - fill: (d) => COLORS[d.data.cluster], + }, + palette: { + type: 'group', + field: 'cluster', + color: 'antv', }, }, layout: { @@ -540,6 +537,7 @@ const graph = new Graph({ nodeClusterBy: 'cluster', clusterNodeStrength: 70, }, + behaviors: ['zoom-canvas', 'drag-canvas'], zoomRange: [0.1, 5], autoResize: true, diff --git a/packages/site/examples/net/gridLayout/demo/grid.ts b/packages/site/examples/net/gridLayout/demo/grid.ts index 5a0b71d223..4943dc7977 100644 --- a/packages/site/examples/net/gridLayout/demo/grid.ts +++ b/packages/site/examples/net/gridLayout/demo/grid.ts @@ -619,6 +619,11 @@ const graph = new Graph({ lineWidth: 1, labelText: (d) => d.id, }, + palette: { + type: 'group', + field: 'cluster', + color: 'antv', + }, }, behaviors: ['zoom-canvas', 'drag-canvas', 'drag-node', 'click-select'], animation: true, diff --git a/packages/site/package.json b/packages/site/package.json index 8a760d3e77..ef89cc06a0 100644 --- a/packages/site/package.json +++ b/packages/site/package.json @@ -42,6 +42,7 @@ "@antv/g2": "^5.1.15", "@antv/g6": "workspace:*", "@antv/graphlib": "^2.0.2", + "@antv/layout": "^0.3.25", "@antv/layout-gpu": "^1.1.5", "@antv/layout-wasm": "^1.3.4", "@antv/util": "^3.3.5", @@ -59,4 +60,4 @@ "prettier": "^3.1.1", "ts-node": "^10.9.2" } -} \ No newline at end of file +}