From f43254c7149e93716254b5002482d874abe68cd8 Mon Sep 17 00:00:00 2001 From: bubkoo Date: Sun, 12 Jul 2020 13:11:17 +0800 Subject: [PATCH] fix: interp definition --- packages/x6/src/common/animation/interp.ts | 21 ++++++++-------- packages/x6/src/common/index.ts | 1 - packages/x6/src/connection/index.ts | 7 ------ packages/x6/src/definition/index.ts | 8 ------ packages/x6/src/global/util.ts | 2 +- packages/x6/src/global/version.ts | 6 ++--- packages/x6/src/graph/background.ts | 2 +- packages/x6/src/graph/defs.ts | 3 +-- packages/x6/src/graph/graph.ts | 4 +-- packages/x6/src/graph/grid.ts | 2 +- packages/x6/src/graph/highlight.ts | 2 +- packages/x6/src/graph/options.ts | 2 +- packages/x6/src/model/animation.ts | 2 +- packages/x6/src/model/cell.ts | 15 ++++++++--- packages/x6/src/model/edge.ts | 6 ++--- packages/x6/src/model/node.ts | 25 ++++++++++--------- packages/x6/src/model/port.ts | 2 +- packages/x6/src/model/registry.ts | 2 +- .../{definition => registry}/attr/align.ts | 0 .../attr/connection.ts | 0 .../src/{definition => registry}/attr/fill.ts | 0 .../{definition => registry}/attr/filter.ts | 0 .../src/{definition => registry}/attr/html.ts | 0 .../{definition => registry}/attr/index.ts | 2 +- .../src/{definition => registry}/attr/main.ts | 0 .../{definition => registry}/attr/marker.ts | 2 +- .../src/{definition => registry}/attr/port.ts | 0 .../src/{definition => registry}/attr/raw.ts | 0 .../src/{definition => registry}/attr/ref.ts | 0 .../{definition => registry}/attr/stroke.ts | 0 .../{definition => registry}/attr/style.ts | 0 .../src/{definition => registry}/attr/text.ts | 0 .../{definition => registry}/attr/title.ts | 0 .../background/flip-x.ts | 0 .../background/flip-xy.ts | 0 .../background/flip-y.ts | 0 .../background/index.ts | 3 ++- .../background/main.ts | 0 .../background/watermark.ts | 0 .../connection-point/anchor.ts | 0 .../connection-point/bbox.ts | 0 .../connection-point/boundary.ts | 0 .../connection-point/index.ts | 2 +- .../connection-point/main.ts | 0 .../connection-point/rect.ts | 0 .../connection-point/util.ts | 0 .../connector/index.ts | 2 +- .../connector/jumpover.ts | 0 .../connector/main.ts | 0 .../connector/normal.ts | 0 .../connector/rounded.ts | 0 .../connector/smooth.ts | 0 .../edge-anchor/closest.ts | 0 .../edge-anchor/index.ts | 2 +- .../edge-anchor/length.ts | 0 .../edge-anchor/main.ts | 0 .../edge-anchor/orth.ts | 0 .../edge-anchor/ratio.ts | 0 .../{definition => registry}/filter/blur.ts | 0 .../filter/brightness.ts | 0 .../filter/contrast.ts | 0 .../filter/drop-shadow.ts | 0 .../filter/gray-scale.ts | 0 .../filter/highlight.ts | 0 .../filter/hue-rotate.ts | 0 .../{definition => registry}/filter/index.ts | 2 +- .../{definition => registry}/filter/invert.ts | 0 .../{definition => registry}/filter/main.ts | 0 .../filter/outline.ts | 0 .../filter/saturate.ts | 0 .../{definition => registry}/filter/sepia.ts | 0 .../{definition => registry}/filter/util.ts | 0 .../src/{definition => registry}/grid/dot.ts | 0 .../grid/double-mesh.ts | 0 .../grid/fixed-dot.ts | 0 .../{definition => registry}/grid/index.ts | 2 +- .../src/{definition => registry}/grid/main.ts | 0 .../src/{definition => registry}/grid/mesh.ts | 0 .../highlighter/class.ts | 0 .../highlighter/index.ts | 2 +- .../highlighter/main.ts | 0 .../highlighter/opacity.ts | 0 .../highlighter/stroke.ts | 0 packages/x6/src/registry/index.ts | 19 ++++++++++++++ .../{connection => registry}/marker/async.ts | 0 .../{connection => registry}/marker/circle.ts | 2 +- .../marker/classic.ts | 0 .../{connection => registry}/marker/cross.ts | 2 +- .../marker/diamond.ts | 2 +- .../marker/ellipse.ts | 2 +- .../{connection => registry}/marker/index.ts | 4 +-- .../{connection => registry}/marker/main.ts | 0 .../{connection => registry}/marker/path.ts | 2 +- .../{connection => registry}/marker/util.ts | 0 .../node-anchor/bbox.ts | 0 .../node-anchor/index.ts | 2 +- .../node-anchor/main.ts | 0 .../node-anchor/middle-side.ts | 0 .../node-anchor/node-center.ts | 0 .../node-anchor/orth.ts | 0 .../node-anchor/util.ts | 0 .../port-label-layout/index.ts | 4 +-- .../port-label-layout/inout.ts | 0 .../port-label-layout/main.ts | 0 .../port-label-layout/radial.ts | 0 .../port-label-layout/side.ts | 0 .../port-label-layout/util.ts | 0 .../port-layout/absolute.ts | 0 .../port-layout/ellipse.ts | 0 .../port-layout/index.ts | 2 +- .../port-layout/line.ts | 0 .../port-layout/main.ts | 0 .../port-layout/util.ts | 0 .../x6/src/{common => registry}/registry.ts | 0 .../src/{connection => registry}/router/er.ts | 0 .../{connection => registry}/router/index.ts | 2 +- .../{connection => registry}/router/main.ts | 0 .../router/manhattan/index.ts | 0 .../router/manhattan/obstacle-map.ts | 0 .../router/manhattan/options.ts | 0 .../router/manhattan/router.ts | 0 .../router/manhattan/sorted-set.ts | 0 .../router/manhattan/util.ts | 0 .../{connection => registry}/router/metro.ts | 0 .../{connection => registry}/router/normal.ts | 0 .../router/oneside.ts | 0 .../{connection => registry}/router/orth.ts | 0 .../{connection => registry}/router/util.ts | 0 .../strategy/index.ts | 4 +-- .../{connection => registry}/strategy/main.ts | 0 .../{connection => registry}/strategy/noop.ts | 0 .../{connection => registry}/strategy/pin.ts | 0 .../{definition => registry}/tool/anchor.ts | 0 .../tool/arrowhead.ts | 0 .../{definition => registry}/tool/boundary.ts | 0 .../{definition => registry}/tool/button.ts | 0 .../{definition => registry}/tool/index.ts | 2 +- .../{definition => registry}/tool/segments.ts | 0 .../src/{definition => registry}/tool/util.ts | 2 +- .../{definition => registry}/tool/vertices.ts | 0 packages/x6/src/shape/basic/text-block.ts | 2 +- packages/x6/src/shape/standard/html.ts | 2 +- packages/x6/src/shape/standard/text-block.ts | 2 +- packages/x6/src/view/attr.ts | 2 +- packages/x6/src/view/cell.ts | 5 ++-- packages/x6/src/view/edge.ts | 4 +-- packages/x6/src/view/markup.ts | 2 +- packages/x6/src/view/node.ts | 2 +- packages/x6/src/view/tool.ts | 2 +- packages/x6/src/view/view.ts | 2 +- 150 files changed, 108 insertions(+), 99 deletions(-) delete mode 100644 packages/x6/src/connection/index.ts delete mode 100644 packages/x6/src/definition/index.ts rename packages/x6/src/{definition => registry}/attr/align.ts (100%) rename packages/x6/src/{definition => registry}/attr/connection.ts (100%) rename packages/x6/src/{definition => registry}/attr/fill.ts (100%) rename packages/x6/src/{definition => registry}/attr/filter.ts (100%) rename packages/x6/src/{definition => registry}/attr/html.ts (100%) rename packages/x6/src/{definition => registry}/attr/index.ts (98%) rename packages/x6/src/{definition => registry}/attr/main.ts (100%) rename packages/x6/src/{definition => registry}/attr/marker.ts (98%) rename packages/x6/src/{definition => registry}/attr/port.ts (100%) rename packages/x6/src/{definition => registry}/attr/raw.ts (100%) rename packages/x6/src/{definition => registry}/attr/ref.ts (100%) rename packages/x6/src/{definition => registry}/attr/stroke.ts (100%) rename packages/x6/src/{definition => registry}/attr/style.ts (100%) rename packages/x6/src/{definition => registry}/attr/text.ts (100%) rename packages/x6/src/{definition => registry}/attr/title.ts (100%) rename packages/x6/src/{definition => registry}/background/flip-x.ts (100%) rename packages/x6/src/{definition => registry}/background/flip-xy.ts (100%) rename packages/x6/src/{definition => registry}/background/flip-y.ts (100%) rename packages/x6/src/{definition => registry}/background/index.ts (97%) rename packages/x6/src/{definition => registry}/background/main.ts (100%) rename packages/x6/src/{definition => registry}/background/watermark.ts (100%) rename packages/x6/src/{connection => registry}/connection-point/anchor.ts (100%) rename packages/x6/src/{connection => registry}/connection-point/bbox.ts (100%) rename packages/x6/src/{connection => registry}/connection-point/boundary.ts (100%) rename packages/x6/src/{connection => registry}/connection-point/index.ts (97%) rename packages/x6/src/{connection => registry}/connection-point/main.ts (100%) rename packages/x6/src/{connection => registry}/connection-point/rect.ts (100%) rename packages/x6/src/{connection => registry}/connection-point/util.ts (100%) rename packages/x6/src/{connection => registry}/connector/index.ts (96%) rename packages/x6/src/{connection => registry}/connector/jumpover.ts (100%) rename packages/x6/src/{connection => registry}/connector/main.ts (100%) rename packages/x6/src/{connection => registry}/connector/normal.ts (100%) rename packages/x6/src/{connection => registry}/connector/rounded.ts (100%) rename packages/x6/src/{connection => registry}/connector/smooth.ts (100%) rename packages/x6/src/{connection => registry}/edge-anchor/closest.ts (100%) rename packages/x6/src/{connection => registry}/edge-anchor/index.ts (96%) rename packages/x6/src/{connection => registry}/edge-anchor/length.ts (100%) rename packages/x6/src/{connection => registry}/edge-anchor/main.ts (100%) rename packages/x6/src/{connection => registry}/edge-anchor/orth.ts (100%) rename packages/x6/src/{connection => registry}/edge-anchor/ratio.ts (100%) rename packages/x6/src/{definition => registry}/filter/blur.ts (100%) rename packages/x6/src/{definition => registry}/filter/brightness.ts (100%) rename packages/x6/src/{definition => registry}/filter/contrast.ts (100%) rename packages/x6/src/{definition => registry}/filter/drop-shadow.ts (100%) rename packages/x6/src/{definition => registry}/filter/gray-scale.ts (100%) rename packages/x6/src/{definition => registry}/filter/highlight.ts (100%) rename packages/x6/src/{definition => registry}/filter/hue-rotate.ts (100%) rename packages/x6/src/{definition => registry}/filter/index.ts (95%) rename packages/x6/src/{definition => registry}/filter/invert.ts (100%) rename packages/x6/src/{definition => registry}/filter/main.ts (100%) rename packages/x6/src/{definition => registry}/filter/outline.ts (100%) rename packages/x6/src/{definition => registry}/filter/saturate.ts (100%) rename packages/x6/src/{definition => registry}/filter/sepia.ts (100%) rename packages/x6/src/{definition => registry}/filter/util.ts (100%) rename packages/x6/src/{definition => registry}/grid/dot.ts (100%) rename packages/x6/src/{definition => registry}/grid/double-mesh.ts (100%) rename packages/x6/src/{definition => registry}/grid/fixed-dot.ts (100%) rename packages/x6/src/{definition => registry}/grid/index.ts (98%) rename packages/x6/src/{definition => registry}/grid/main.ts (100%) rename packages/x6/src/{definition => registry}/grid/mesh.ts (100%) rename packages/x6/src/{definition => registry}/highlighter/class.ts (100%) rename packages/x6/src/{definition => registry}/highlighter/index.ts (97%) rename packages/x6/src/{definition => registry}/highlighter/main.ts (100%) rename packages/x6/src/{definition => registry}/highlighter/opacity.ts (100%) rename packages/x6/src/{definition => registry}/highlighter/stroke.ts (100%) create mode 100644 packages/x6/src/registry/index.ts rename packages/x6/src/{connection => registry}/marker/async.ts (100%) rename packages/x6/src/{connection => registry}/marker/circle.ts (95%) rename packages/x6/src/{connection => registry}/marker/classic.ts (100%) rename packages/x6/src/{connection => registry}/marker/cross.ts (94%) rename packages/x6/src/{connection => registry}/marker/diamond.ts (94%) rename packages/x6/src/{connection => registry}/marker/ellipse.ts (90%) rename packages/x6/src/{connection => registry}/marker/index.ts (93%) rename packages/x6/src/{connection => registry}/marker/main.ts (100%) rename packages/x6/src/{connection => registry}/marker/path.ts (90%) rename packages/x6/src/{connection => registry}/marker/util.ts (100%) rename packages/x6/src/{connection => registry}/node-anchor/bbox.ts (100%) rename packages/x6/src/{connection => registry}/node-anchor/index.ts (97%) rename packages/x6/src/{connection => registry}/node-anchor/main.ts (100%) rename packages/x6/src/{connection => registry}/node-anchor/middle-side.ts (100%) rename packages/x6/src/{connection => registry}/node-anchor/node-center.ts (100%) rename packages/x6/src/{connection => registry}/node-anchor/orth.ts (100%) rename packages/x6/src/{connection => registry}/node-anchor/util.ts (100%) rename packages/x6/src/{definition => registry}/port-label-layout/index.ts (93%) rename packages/x6/src/{definition => registry}/port-label-layout/inout.ts (100%) rename packages/x6/src/{definition => registry}/port-label-layout/main.ts (100%) rename packages/x6/src/{definition => registry}/port-label-layout/radial.ts (100%) rename packages/x6/src/{definition => registry}/port-label-layout/side.ts (100%) rename packages/x6/src/{definition => registry}/port-label-layout/util.ts (100%) rename packages/x6/src/{definition => registry}/port-layout/absolute.ts (100%) rename packages/x6/src/{definition => registry}/port-layout/ellipse.ts (100%) rename packages/x6/src/{definition => registry}/port-layout/index.ts (96%) rename packages/x6/src/{definition => registry}/port-layout/line.ts (100%) rename packages/x6/src/{definition => registry}/port-layout/main.ts (100%) rename packages/x6/src/{definition => registry}/port-layout/util.ts (100%) rename packages/x6/src/{common => registry}/registry.ts (100%) rename packages/x6/src/{connection => registry}/router/er.ts (100%) rename packages/x6/src/{connection => registry}/router/index.ts (96%) rename packages/x6/src/{connection => registry}/router/main.ts (100%) rename packages/x6/src/{connection => registry}/router/manhattan/index.ts (100%) rename packages/x6/src/{connection => registry}/router/manhattan/obstacle-map.ts (100%) rename packages/x6/src/{connection => registry}/router/manhattan/options.ts (100%) rename packages/x6/src/{connection => registry}/router/manhattan/router.ts (100%) rename packages/x6/src/{connection => registry}/router/manhattan/sorted-set.ts (100%) rename packages/x6/src/{connection => registry}/router/manhattan/util.ts (100%) rename packages/x6/src/{connection => registry}/router/metro.ts (100%) rename packages/x6/src/{connection => registry}/router/normal.ts (100%) rename packages/x6/src/{connection => registry}/router/oneside.ts (100%) rename packages/x6/src/{connection => registry}/router/orth.ts (100%) rename packages/x6/src/{connection => registry}/router/util.ts (100%) rename packages/x6/src/{connection => registry}/strategy/index.ts (96%) rename packages/x6/src/{connection => registry}/strategy/main.ts (100%) rename packages/x6/src/{connection => registry}/strategy/noop.ts (100%) rename packages/x6/src/{connection => registry}/strategy/pin.ts (100%) rename packages/x6/src/{definition => registry}/tool/anchor.ts (100%) rename packages/x6/src/{definition => registry}/tool/arrowhead.ts (100%) rename packages/x6/src/{definition => registry}/tool/boundary.ts (100%) rename packages/x6/src/{definition => registry}/tool/button.ts (100%) rename packages/x6/src/{definition => registry}/tool/index.ts (98%) rename packages/x6/src/{definition => registry}/tool/segments.ts (100%) rename packages/x6/src/{definition => registry}/tool/util.ts (93%) rename packages/x6/src/{definition => registry}/tool/vertices.ts (100%) diff --git a/packages/x6/src/common/animation/interp.ts b/packages/x6/src/common/animation/interp.ts index 9f9776e8304..b83a0b4e566 100644 --- a/packages/x6/src/common/animation/interp.ts +++ b/packages/x6/src/common/animation/interp.ts @@ -1,17 +1,18 @@ export namespace Interp { - export function number(a: number, b: number) { + export type Definition = (from: T, to: T) => (time: number) => T +} + +export namespace Interp { + export const number: Definition = (a, b) => { const d = b - a return (t: number) => { return a + d * t } } - export function object( - a: { [key: string]: number }, - b: { [key: string]: number }, - ) { + export const object: Definition<{ [key: string]: number }> = (a, b) => { const keys = Object.keys(a) - return (t: number) => { + return (t) => { const ret: { [key: string]: number } = {} for (let i = keys.length - 1; i !== -1; i -= 1) { const key = keys[i] @@ -21,7 +22,7 @@ export namespace Interp { } } - export function unit(a: string, b: string) { + export const unit: Definition = (a, b) => { const reg = /(-?[0-9]*.[0-9]*)(px|em|cm|mm|in|pt|pc|%)/ const ma = reg.exec(a) const mb = reg.exec(b) @@ -36,12 +37,12 @@ export namespace Interp { const d = bb - aa const u = ma ? ma[2] : '' - return (t: number) => { + return (t) => { return (aa + d * t).toFixed(precision) + u } } - export function color(a: string, b: string) { + export const color: Definition = (a, b) => { const ca = parseInt(a.slice(1), 16) const cb = parseInt(b.slice(1), 16) const ra = ca & 0x0000ff @@ -51,7 +52,7 @@ export namespace Interp { const ba = ca & 0xff0000 const bd = (cb & 0xff0000) - ba - return (t: number) => { + return (t) => { const r = (ra + rd * t) & 0x000000ff const g = (ga + gd * t) & 0x0000ff00 const b = (ba + bd * t) & 0x00ff0000 diff --git a/packages/x6/src/common/index.ts b/packages/x6/src/common/index.ts index ce7df09cec3..2897f1a5c41 100644 --- a/packages/x6/src/common/index.ts +++ b/packages/x6/src/common/index.ts @@ -6,5 +6,4 @@ export * from './dictionary' export * from './algorithm' export * from './animation' -export * from './registry' export * from './localstorage' diff --git a/packages/x6/src/connection/index.ts b/packages/x6/src/connection/index.ts deleted file mode 100644 index fc633a45842..00000000000 --- a/packages/x6/src/connection/index.ts +++ /dev/null @@ -1,7 +0,0 @@ -export * from './marker' -export * from './node-anchor' -export * from './edge-anchor' -export * from './connection-point' -export * from './router' -export * from './connector' -export * from './strategy' diff --git a/packages/x6/src/definition/index.ts b/packages/x6/src/definition/index.ts deleted file mode 100644 index f3e7c4ac63b..00000000000 --- a/packages/x6/src/definition/index.ts +++ /dev/null @@ -1,8 +0,0 @@ -export * from './attr' -export * from './grid' -export * from './filter' -export * from './background' -export * from './highlighter' -export * from './port-layout' -export * from './port-label-layout' -export * from './tool' diff --git a/packages/x6/src/global/util.ts b/packages/x6/src/global/util.ts index 17725228c47..fdf25624034 100644 --- a/packages/x6/src/global/util.ts +++ b/packages/x6/src/global/util.ts @@ -1,6 +1,6 @@ import { KeyValue } from '../types' import { snapToGrid as snap } from '../geometry/util' -import { normalize } from '../connection/marker/util' +import { normalize } from '../registry/marker/util' import { Cell } from '../model/cell' import { Node } from '../model/node' import { Edge } from '../model/edge' diff --git a/packages/x6/src/global/version.ts b/packages/x6/src/global/version.ts index aac3d962f4b..8cefd631a17 100644 --- a/packages/x6/src/global/version.ts +++ b/packages/x6/src/global/version.ts @@ -1,7 +1,7 @@ /* tslint:disable */ /** - * Auto generated version file, do not modify it! - */ -const version = '0.10.25' +* Auto generated version file, do not modify it! +*/ +const version = '0.10.27' export { version } diff --git a/packages/x6/src/graph/background.ts b/packages/x6/src/graph/background.ts index a81d7e107e3..32e5494be89 100644 --- a/packages/x6/src/graph/background.ts +++ b/packages/x6/src/graph/background.ts @@ -1,6 +1,6 @@ import { ObjectExt } from '../util' import { Rectangle } from '../geometry' -import { Background } from '../definition' +import { Background } from '../registry' import { Base } from './base' export class BackgroundManager extends Base { diff --git a/packages/x6/src/graph/defs.ts b/packages/x6/src/graph/defs.ts index d88dfd08633..094c828cf95 100644 --- a/packages/x6/src/graph/defs.ts +++ b/packages/x6/src/graph/defs.ts @@ -1,7 +1,6 @@ import { StringExt, Dom } from '../util' -import { Attr, Filter } from '../definition' +import { Attr, Filter, Marker } from '../registry' import { Markup } from '../view' -import { Marker } from '../connection' import { Base } from './base' export class DefsManager extends Base { diff --git a/packages/x6/src/graph/graph.ts b/packages/x6/src/graph/graph.ts index 52b29cef4da..39f263a0a60 100644 --- a/packages/x6/src/graph/graph.ts +++ b/packages/x6/src/graph/graph.ts @@ -44,8 +44,6 @@ import { Filter as FilterDefinition, Background as BackgroundDefinition, Highlighter as HighlightDefinition, -} from '../definition' -import { Marker, Router, Connector, @@ -53,7 +51,7 @@ import { ConnectionStrategy, NodeConnectionAnchor, EdgeConnectionAnchor, -} from '../connection' +} from '../registry' export class Graph extends Basecoat { public readonly options: GraphOptions.Definition diff --git a/packages/x6/src/graph/grid.ts b/packages/x6/src/graph/grid.ts index 26a20825b8a..e3df1991e49 100644 --- a/packages/x6/src/graph/grid.ts +++ b/packages/x6/src/graph/grid.ts @@ -1,4 +1,4 @@ -import { Grid as GridDefinition } from '../definition' +import { Grid as GridDefinition } from '../registry' import { Dom } from '../util' import { Base } from './base' diff --git a/packages/x6/src/graph/highlight.ts b/packages/x6/src/graph/highlight.ts index 61eeb8aadb4..c11a7f89636 100644 --- a/packages/x6/src/graph/highlight.ts +++ b/packages/x6/src/graph/highlight.ts @@ -1,7 +1,7 @@ import { Dom } from '../util' import { KeyValue } from '../types' import { CellView } from '../view' -import { Highlighter } from '../definition' +import { Highlighter } from '../registry' import { Base } from './base' export class HighlightManager extends Base { diff --git a/packages/x6/src/graph/options.ts b/packages/x6/src/graph/options.ts index 6d36ce9f4bd..f34d047f377 100644 --- a/packages/x6/src/graph/options.ts +++ b/packages/x6/src/graph/options.ts @@ -12,7 +12,7 @@ import { ConnectionStrategy, NodeConnectionAnchor, EdgeConnectionAnchor, -} from '../connection' +} from '../registry' import { Widget } from '../addon/common' import { Hook } from './hook' import { Graph } from './graph' diff --git a/packages/x6/src/model/animation.ts b/packages/x6/src/model/animation.ts index 8c39fd0c8a2..5c60770443e 100644 --- a/packages/x6/src/model/animation.ts +++ b/packages/x6/src/model/animation.ts @@ -123,6 +123,6 @@ export namespace Animation { delay?: number duration?: number timing?: Timing.Names | Timing.Definition - interp?: (from: T, to: T) => (time: number) => T + interp?: Interp.Definition } } diff --git a/packages/x6/src/model/cell.ts b/packages/x6/src/model/cell.ts index 55fecba9b9f..421278a1ff7 100644 --- a/packages/x6/src/model/cell.ts +++ b/packages/x6/src/model/cell.ts @@ -3,7 +3,7 @@ import { ArrayExt, StringExt, ObjectExt } from '../util' import { Rectangle, Point } from '../geometry' import { KeyValue, Size } from '../types' import { Basecoat } from '../common' -import { Attr } from '../definition' +import { Attr } from '../registry' import { Markup, CellView } from '../view' import { Graph } from '../graph' import { Model } from './model' @@ -240,7 +240,7 @@ export class Cell< options?: Cell.SetOptions, ): this setProp(key: string, value: any, options?: Cell.SetOptions): this - setProp(data: Partial, options?: Cell.SetOptions): this + setProp(props: Partial, options?: Cell.SetOptions): this setProp( key: string | Partial, value?: any, @@ -311,7 +311,7 @@ export class Cell< ): this prop(key: string, value: any, options?: Cell.SetOptions): this prop(path: string[], value: any, options?: Cell.SetOptions): this - prop(data: Partial, options?: Cell.SetOptions): this + prop(props: Partial, options?: Cell.SetOptions): this prop( key?: string | string[] | Partial, value?: any, @@ -837,6 +837,7 @@ export class Cell< } else { this.store.remove('parent', options) } + return this } setChildren(children: Cell[] | null, options: Cell.SetOptions = {}) { @@ -850,6 +851,7 @@ export class Cell< } else { this.store.remove('children', options) } + return this } unembed(child: Cell, options: Cell.SetOptions = {}) { @@ -869,7 +871,7 @@ export class Cell< } addTo(model: Model, options?: Cell.SetOptions): this - addTo(graph: Graph, options: Cell.SetOptions): this + addTo(graph: Graph, options?: Cell.SetOptions): this addTo(parent: Cell, options?: Cell.SetOptions): this addTo(target: Model | Graph | Cell, options: Cell.SetOptions = {}) { if (target instanceof Cell) { @@ -882,6 +884,7 @@ export class Cell< insertTo(parent: Cell, index?: number, options: Cell.SetOptions = {}) { parent.insertChild(this, index, options) + return this } addChild(child: Cell | null, options: Cell.SetOptions = {}) { @@ -952,6 +955,7 @@ export class Cell< const index = parent.getChildIndex(this) parent.removeChildAt(index, options) } + return this } removeChild(child: Cell, options: Cell.RemoveOptions = {}) { @@ -985,6 +989,7 @@ export class Cell< } }) } + return this } // #endregion @@ -1199,12 +1204,14 @@ export class Cell< if (this.model) { this.model.startBatch(name, { ...data, cell: this }) } + return this } stopBatch(name: Model.BatchName, data: KeyValue = {}) { if (this.model) { this.model.stopBatch(name, { ...data, cell: this }) } + return this } batchUpdate(name: Model.BatchName, execute: () => T, data?: KeyValue): T { diff --git a/packages/x6/src/model/edge.ts b/packages/x6/src/model/edge.ts index 7ae1963369a..3ccb249d4bb 100644 --- a/packages/x6/src/model/edge.ts +++ b/packages/x6/src/model/edge.ts @@ -1,17 +1,17 @@ -import { Registry } from '../common' import { Size, KeyValue } from '../types' import { ObjectExt, StringExt } from '../util' import { Point, Polyline } from '../geometry' import { + Registry, + Attr, Router, Connector, EdgeConnectionAnchor, NodeConnectionAnchor, ConnectionPoint, ConnectionStrategy, -} from '../connection' +} from '../registry' import { Markup } from '../view/markup' -import { Attr } from '../definition' import { Share } from './registry' import { Store } from './store' import { Cell } from './cell' diff --git a/packages/x6/src/model/node.ts b/packages/x6/src/model/node.ts index e7efda2a497..b764a6d4fca 100644 --- a/packages/x6/src/model/node.ts +++ b/packages/x6/src/model/node.ts @@ -1,5 +1,5 @@ import { DeepPartial } from 'utility-types' -import { Registry } from '../common' +import { Registry } from '../registry' import { Size, KeyValue } from '../types' import { Point, Rectangle, Angle } from '../geometry' import { StringExt, ObjectExt, NumberExt } from '../util' @@ -9,6 +9,8 @@ import { Edge } from './edge' import { Store } from './store' import { Share } from './registry' import { PortManager } from './port' +import { Animation } from './animation' +import { Interp } from '../common' export class Node< Properties extends Node.Properties = Node.Properties @@ -383,16 +385,15 @@ export class Node< options.ty = ty if (options.transition) { - // if (!isObject(options.transition)) options.transition = {} - // this.transition( - // 'position', - // translatedPosition, - // assign({}, options.transition, { - // valueFunction: interpolate.object, - // }), - // ) - // // Recursively call `translate()` on all the embeds cells. - // this.eachChild(child => child.translate(tx, ty, options)) + if (typeof options.transition !== 'object') { + options.transition = {} + } + + this.transition('position', translatedPosition, { + ...options.transition, + interp: Interp.object, + }) + this.eachChild((child) => child.translate(tx, ty, options)) } else { this.startBatch('translate', options) this.store.set('position', translatedPosition, options) @@ -1011,7 +1012,7 @@ export namespace Node { } export interface TranslateOptions extends Cell.TranslateOptions { - transition?: boolean + transition?: boolean | Animation.Options restrictedArea?: Rectangle.RectangleLike | null } diff --git a/packages/x6/src/model/port.ts b/packages/x6/src/model/port.ts index 62278c2693e..3bca84a215a 100644 --- a/packages/x6/src/model/port.ts +++ b/packages/x6/src/model/port.ts @@ -1,4 +1,4 @@ -import { Attr, PortLayout, PortLabelLayout } from '../definition' +import { Attr, PortLayout, PortLabelLayout } from '../registry' import { JSONObject, ObjectExt } from '../util' import { Point, Rectangle } from '../geometry' import { Size, KeyValue } from '../types' diff --git a/packages/x6/src/model/registry.ts b/packages/x6/src/model/registry.ts index 3edb377dd84..3a15592275d 100644 --- a/packages/x6/src/model/registry.ts +++ b/packages/x6/src/model/registry.ts @@ -1,4 +1,4 @@ -import { Registry } from '../common' +import { Registry } from '../registry' export namespace Share { let edgeRegistry: Registry diff --git a/packages/x6/src/definition/attr/align.ts b/packages/x6/src/registry/attr/align.ts similarity index 100% rename from packages/x6/src/definition/attr/align.ts rename to packages/x6/src/registry/attr/align.ts diff --git a/packages/x6/src/definition/attr/connection.ts b/packages/x6/src/registry/attr/connection.ts similarity index 100% rename from packages/x6/src/definition/attr/connection.ts rename to packages/x6/src/registry/attr/connection.ts diff --git a/packages/x6/src/definition/attr/fill.ts b/packages/x6/src/registry/attr/fill.ts similarity index 100% rename from packages/x6/src/definition/attr/fill.ts rename to packages/x6/src/registry/attr/fill.ts diff --git a/packages/x6/src/definition/attr/filter.ts b/packages/x6/src/registry/attr/filter.ts similarity index 100% rename from packages/x6/src/definition/attr/filter.ts rename to packages/x6/src/registry/attr/filter.ts diff --git a/packages/x6/src/definition/attr/html.ts b/packages/x6/src/registry/attr/html.ts similarity index 100% rename from packages/x6/src/definition/attr/html.ts rename to packages/x6/src/registry/attr/html.ts diff --git a/packages/x6/src/definition/attr/index.ts b/packages/x6/src/registry/attr/index.ts similarity index 98% rename from packages/x6/src/definition/attr/index.ts rename to packages/x6/src/registry/attr/index.ts index b6508d25d92..ad4e437937c 100644 --- a/packages/x6/src/definition/attr/index.ts +++ b/packages/x6/src/registry/attr/index.ts @@ -1,8 +1,8 @@ import { Rectangle, Point } from '../../geometry' import { JSONObject } from '../../util' -import { Registry } from '../../common' import { Cell } from '../../model' import { CellView } from '../../view' +import { Registry } from '../registry' import { raw } from './raw' import * as attrs from './main' diff --git a/packages/x6/src/definition/attr/main.ts b/packages/x6/src/registry/attr/main.ts similarity index 100% rename from packages/x6/src/definition/attr/main.ts rename to packages/x6/src/registry/attr/main.ts diff --git a/packages/x6/src/definition/attr/marker.ts b/packages/x6/src/registry/attr/marker.ts similarity index 98% rename from packages/x6/src/definition/attr/marker.ts rename to packages/x6/src/registry/attr/marker.ts index d108a589438..6063cc18f54 100644 --- a/packages/x6/src/definition/attr/marker.ts +++ b/packages/x6/src/registry/attr/marker.ts @@ -1,7 +1,7 @@ import { KeyValue } from '../../types' import { CellView } from '../../view' -import { Marker } from '../../connection' import { ObjectExt, JSONObject } from '../../util' +import { Marker } from '../marker' import { Attr } from './index' function qualify(value: any) { diff --git a/packages/x6/src/definition/attr/port.ts b/packages/x6/src/registry/attr/port.ts similarity index 100% rename from packages/x6/src/definition/attr/port.ts rename to packages/x6/src/registry/attr/port.ts diff --git a/packages/x6/src/definition/attr/raw.ts b/packages/x6/src/registry/attr/raw.ts similarity index 100% rename from packages/x6/src/definition/attr/raw.ts rename to packages/x6/src/registry/attr/raw.ts diff --git a/packages/x6/src/definition/attr/ref.ts b/packages/x6/src/registry/attr/ref.ts similarity index 100% rename from packages/x6/src/definition/attr/ref.ts rename to packages/x6/src/registry/attr/ref.ts diff --git a/packages/x6/src/definition/attr/stroke.ts b/packages/x6/src/registry/attr/stroke.ts similarity index 100% rename from packages/x6/src/definition/attr/stroke.ts rename to packages/x6/src/registry/attr/stroke.ts diff --git a/packages/x6/src/definition/attr/style.ts b/packages/x6/src/registry/attr/style.ts similarity index 100% rename from packages/x6/src/definition/attr/style.ts rename to packages/x6/src/registry/attr/style.ts diff --git a/packages/x6/src/definition/attr/text.ts b/packages/x6/src/registry/attr/text.ts similarity index 100% rename from packages/x6/src/definition/attr/text.ts rename to packages/x6/src/registry/attr/text.ts diff --git a/packages/x6/src/definition/attr/title.ts b/packages/x6/src/registry/attr/title.ts similarity index 100% rename from packages/x6/src/definition/attr/title.ts rename to packages/x6/src/registry/attr/title.ts diff --git a/packages/x6/src/definition/background/flip-x.ts b/packages/x6/src/registry/background/flip-x.ts similarity index 100% rename from packages/x6/src/definition/background/flip-x.ts rename to packages/x6/src/registry/background/flip-x.ts diff --git a/packages/x6/src/definition/background/flip-xy.ts b/packages/x6/src/registry/background/flip-xy.ts similarity index 100% rename from packages/x6/src/definition/background/flip-xy.ts rename to packages/x6/src/registry/background/flip-xy.ts diff --git a/packages/x6/src/definition/background/flip-y.ts b/packages/x6/src/registry/background/flip-y.ts similarity index 100% rename from packages/x6/src/definition/background/flip-y.ts rename to packages/x6/src/registry/background/flip-y.ts diff --git a/packages/x6/src/definition/background/index.ts b/packages/x6/src/registry/background/index.ts similarity index 97% rename from packages/x6/src/definition/background/index.ts rename to packages/x6/src/registry/background/index.ts index 6d5fb6b504d..1dbf7756100 100644 --- a/packages/x6/src/definition/background/index.ts +++ b/packages/x6/src/registry/background/index.ts @@ -1,8 +1,9 @@ + import { ValuesType } from 'utility-types' import * as CSS from 'csstype' import * as patterns from './main' import { KeyValue } from '../../types' -import { Registry } from '../../common' +import { Registry } from '../registry' export namespace Background { export interface Options { diff --git a/packages/x6/src/definition/background/main.ts b/packages/x6/src/registry/background/main.ts similarity index 100% rename from packages/x6/src/definition/background/main.ts rename to packages/x6/src/registry/background/main.ts diff --git a/packages/x6/src/definition/background/watermark.ts b/packages/x6/src/registry/background/watermark.ts similarity index 100% rename from packages/x6/src/definition/background/watermark.ts rename to packages/x6/src/registry/background/watermark.ts diff --git a/packages/x6/src/connection/connection-point/anchor.ts b/packages/x6/src/registry/connection-point/anchor.ts similarity index 100% rename from packages/x6/src/connection/connection-point/anchor.ts rename to packages/x6/src/registry/connection-point/anchor.ts diff --git a/packages/x6/src/connection/connection-point/bbox.ts b/packages/x6/src/registry/connection-point/bbox.ts similarity index 100% rename from packages/x6/src/connection/connection-point/bbox.ts rename to packages/x6/src/registry/connection-point/bbox.ts diff --git a/packages/x6/src/connection/connection-point/boundary.ts b/packages/x6/src/registry/connection-point/boundary.ts similarity index 100% rename from packages/x6/src/connection/connection-point/boundary.ts rename to packages/x6/src/registry/connection-point/boundary.ts diff --git a/packages/x6/src/connection/connection-point/index.ts b/packages/x6/src/registry/connection-point/index.ts similarity index 97% rename from packages/x6/src/connection/connection-point/index.ts rename to packages/x6/src/registry/connection-point/index.ts index cd7faba0fc1..dc47d75b14f 100644 --- a/packages/x6/src/connection/connection-point/index.ts +++ b/packages/x6/src/registry/connection-point/index.ts @@ -1,7 +1,7 @@ import { KeyValue } from '../../types' -import { Registry } from '../../common' import { Point, Line } from '../../geometry' import { NodeView } from '../../view' +import { Registry } from '../registry' import * as connectionPoints from './main' export namespace ConnectionPoint { diff --git a/packages/x6/src/connection/connection-point/main.ts b/packages/x6/src/registry/connection-point/main.ts similarity index 100% rename from packages/x6/src/connection/connection-point/main.ts rename to packages/x6/src/registry/connection-point/main.ts diff --git a/packages/x6/src/connection/connection-point/rect.ts b/packages/x6/src/registry/connection-point/rect.ts similarity index 100% rename from packages/x6/src/connection/connection-point/rect.ts rename to packages/x6/src/registry/connection-point/rect.ts diff --git a/packages/x6/src/connection/connection-point/util.ts b/packages/x6/src/registry/connection-point/util.ts similarity index 100% rename from packages/x6/src/connection/connection-point/util.ts rename to packages/x6/src/registry/connection-point/util.ts diff --git a/packages/x6/src/connection/connector/index.ts b/packages/x6/src/registry/connector/index.ts similarity index 96% rename from packages/x6/src/connection/connector/index.ts rename to packages/x6/src/registry/connector/index.ts index 5f2eb185c90..aabae9c24a4 100644 --- a/packages/x6/src/connection/connector/index.ts +++ b/packages/x6/src/registry/connector/index.ts @@ -1,7 +1,7 @@ import { KeyValue } from '../../types' -import { Registry } from '../../common' import { Point, Path } from '../../geometry' import { EdgeView } from '../../view' +import { Registry } from '../registry' import * as connectors from './main' export namespace Connector { diff --git a/packages/x6/src/connection/connector/jumpover.ts b/packages/x6/src/registry/connector/jumpover.ts similarity index 100% rename from packages/x6/src/connection/connector/jumpover.ts rename to packages/x6/src/registry/connector/jumpover.ts diff --git a/packages/x6/src/connection/connector/main.ts b/packages/x6/src/registry/connector/main.ts similarity index 100% rename from packages/x6/src/connection/connector/main.ts rename to packages/x6/src/registry/connector/main.ts diff --git a/packages/x6/src/connection/connector/normal.ts b/packages/x6/src/registry/connector/normal.ts similarity index 100% rename from packages/x6/src/connection/connector/normal.ts rename to packages/x6/src/registry/connector/normal.ts diff --git a/packages/x6/src/connection/connector/rounded.ts b/packages/x6/src/registry/connector/rounded.ts similarity index 100% rename from packages/x6/src/connection/connector/rounded.ts rename to packages/x6/src/registry/connector/rounded.ts diff --git a/packages/x6/src/connection/connector/smooth.ts b/packages/x6/src/registry/connector/smooth.ts similarity index 100% rename from packages/x6/src/connection/connector/smooth.ts rename to packages/x6/src/registry/connector/smooth.ts diff --git a/packages/x6/src/connection/edge-anchor/closest.ts b/packages/x6/src/registry/edge-anchor/closest.ts similarity index 100% rename from packages/x6/src/connection/edge-anchor/closest.ts rename to packages/x6/src/registry/edge-anchor/closest.ts diff --git a/packages/x6/src/connection/edge-anchor/index.ts b/packages/x6/src/registry/edge-anchor/index.ts similarity index 96% rename from packages/x6/src/connection/edge-anchor/index.ts rename to packages/x6/src/registry/edge-anchor/index.ts index 78eb2ad1eae..c225c1065cf 100644 --- a/packages/x6/src/connection/edge-anchor/index.ts +++ b/packages/x6/src/registry/edge-anchor/index.ts @@ -1,7 +1,7 @@ -import { Registry } from '../../common' import { KeyValue } from '../../types' import { Point } from '../../geometry' import { EdgeView } from '../../view' +import { Registry } from '../registry' import * as anchors from './main' export namespace EdgeConnectionAnchor { diff --git a/packages/x6/src/connection/edge-anchor/length.ts b/packages/x6/src/registry/edge-anchor/length.ts similarity index 100% rename from packages/x6/src/connection/edge-anchor/length.ts rename to packages/x6/src/registry/edge-anchor/length.ts diff --git a/packages/x6/src/connection/edge-anchor/main.ts b/packages/x6/src/registry/edge-anchor/main.ts similarity index 100% rename from packages/x6/src/connection/edge-anchor/main.ts rename to packages/x6/src/registry/edge-anchor/main.ts diff --git a/packages/x6/src/connection/edge-anchor/orth.ts b/packages/x6/src/registry/edge-anchor/orth.ts similarity index 100% rename from packages/x6/src/connection/edge-anchor/orth.ts rename to packages/x6/src/registry/edge-anchor/orth.ts diff --git a/packages/x6/src/connection/edge-anchor/ratio.ts b/packages/x6/src/registry/edge-anchor/ratio.ts similarity index 100% rename from packages/x6/src/connection/edge-anchor/ratio.ts rename to packages/x6/src/registry/edge-anchor/ratio.ts diff --git a/packages/x6/src/definition/filter/blur.ts b/packages/x6/src/registry/filter/blur.ts similarity index 100% rename from packages/x6/src/definition/filter/blur.ts rename to packages/x6/src/registry/filter/blur.ts diff --git a/packages/x6/src/definition/filter/brightness.ts b/packages/x6/src/registry/filter/brightness.ts similarity index 100% rename from packages/x6/src/definition/filter/brightness.ts rename to packages/x6/src/registry/filter/brightness.ts diff --git a/packages/x6/src/definition/filter/contrast.ts b/packages/x6/src/registry/filter/contrast.ts similarity index 100% rename from packages/x6/src/definition/filter/contrast.ts rename to packages/x6/src/registry/filter/contrast.ts diff --git a/packages/x6/src/definition/filter/drop-shadow.ts b/packages/x6/src/registry/filter/drop-shadow.ts similarity index 100% rename from packages/x6/src/definition/filter/drop-shadow.ts rename to packages/x6/src/registry/filter/drop-shadow.ts diff --git a/packages/x6/src/definition/filter/gray-scale.ts b/packages/x6/src/registry/filter/gray-scale.ts similarity index 100% rename from packages/x6/src/definition/filter/gray-scale.ts rename to packages/x6/src/registry/filter/gray-scale.ts diff --git a/packages/x6/src/definition/filter/highlight.ts b/packages/x6/src/registry/filter/highlight.ts similarity index 100% rename from packages/x6/src/definition/filter/highlight.ts rename to packages/x6/src/registry/filter/highlight.ts diff --git a/packages/x6/src/definition/filter/hue-rotate.ts b/packages/x6/src/registry/filter/hue-rotate.ts similarity index 100% rename from packages/x6/src/definition/filter/hue-rotate.ts rename to packages/x6/src/registry/filter/hue-rotate.ts diff --git a/packages/x6/src/definition/filter/index.ts b/packages/x6/src/registry/filter/index.ts similarity index 95% rename from packages/x6/src/definition/filter/index.ts rename to packages/x6/src/registry/filter/index.ts index 8fea56b096a..dc69fca4f20 100644 --- a/packages/x6/src/definition/filter/index.ts +++ b/packages/x6/src/registry/filter/index.ts @@ -1,6 +1,6 @@ import { NonUndefined } from 'utility-types' import { KeyValue } from '../../types' -import { Registry } from '../../common' +import { Registry } from '../registry' import * as filters from './main' export namespace Filter { diff --git a/packages/x6/src/definition/filter/invert.ts b/packages/x6/src/registry/filter/invert.ts similarity index 100% rename from packages/x6/src/definition/filter/invert.ts rename to packages/x6/src/registry/filter/invert.ts diff --git a/packages/x6/src/definition/filter/main.ts b/packages/x6/src/registry/filter/main.ts similarity index 100% rename from packages/x6/src/definition/filter/main.ts rename to packages/x6/src/registry/filter/main.ts diff --git a/packages/x6/src/definition/filter/outline.ts b/packages/x6/src/registry/filter/outline.ts similarity index 100% rename from packages/x6/src/definition/filter/outline.ts rename to packages/x6/src/registry/filter/outline.ts diff --git a/packages/x6/src/definition/filter/saturate.ts b/packages/x6/src/registry/filter/saturate.ts similarity index 100% rename from packages/x6/src/definition/filter/saturate.ts rename to packages/x6/src/registry/filter/saturate.ts diff --git a/packages/x6/src/definition/filter/sepia.ts b/packages/x6/src/registry/filter/sepia.ts similarity index 100% rename from packages/x6/src/definition/filter/sepia.ts rename to packages/x6/src/registry/filter/sepia.ts diff --git a/packages/x6/src/definition/filter/util.ts b/packages/x6/src/registry/filter/util.ts similarity index 100% rename from packages/x6/src/definition/filter/util.ts rename to packages/x6/src/registry/filter/util.ts diff --git a/packages/x6/src/definition/grid/dot.ts b/packages/x6/src/registry/grid/dot.ts similarity index 100% rename from packages/x6/src/definition/grid/dot.ts rename to packages/x6/src/registry/grid/dot.ts diff --git a/packages/x6/src/definition/grid/double-mesh.ts b/packages/x6/src/registry/grid/double-mesh.ts similarity index 100% rename from packages/x6/src/definition/grid/double-mesh.ts rename to packages/x6/src/registry/grid/double-mesh.ts diff --git a/packages/x6/src/definition/grid/fixed-dot.ts b/packages/x6/src/registry/grid/fixed-dot.ts similarity index 100% rename from packages/x6/src/definition/grid/fixed-dot.ts rename to packages/x6/src/registry/grid/fixed-dot.ts diff --git a/packages/x6/src/definition/grid/index.ts b/packages/x6/src/registry/grid/index.ts similarity index 98% rename from packages/x6/src/definition/grid/index.ts rename to packages/x6/src/registry/grid/index.ts index 008a58c50f1..90286de5dcd 100644 --- a/packages/x6/src/definition/grid/index.ts +++ b/packages/x6/src/registry/grid/index.ts @@ -1,6 +1,6 @@ import { Dom } from '../../util' import { KeyValue } from '../../types' -import { Registry } from '../../common' +import { Registry } from '../registry' import * as patterns from './main' export class Grid { diff --git a/packages/x6/src/definition/grid/main.ts b/packages/x6/src/registry/grid/main.ts similarity index 100% rename from packages/x6/src/definition/grid/main.ts rename to packages/x6/src/registry/grid/main.ts diff --git a/packages/x6/src/definition/grid/mesh.ts b/packages/x6/src/registry/grid/mesh.ts similarity index 100% rename from packages/x6/src/definition/grid/mesh.ts rename to packages/x6/src/registry/grid/mesh.ts diff --git a/packages/x6/src/definition/highlighter/class.ts b/packages/x6/src/registry/highlighter/class.ts similarity index 100% rename from packages/x6/src/definition/highlighter/class.ts rename to packages/x6/src/registry/highlighter/class.ts diff --git a/packages/x6/src/definition/highlighter/index.ts b/packages/x6/src/registry/highlighter/index.ts similarity index 97% rename from packages/x6/src/definition/highlighter/index.ts rename to packages/x6/src/registry/highlighter/index.ts index 9184f762918..e4fa3e0333e 100644 --- a/packages/x6/src/definition/highlighter/index.ts +++ b/packages/x6/src/registry/highlighter/index.ts @@ -1,6 +1,6 @@ import { KeyValue } from '../../types' -import { Registry } from '../../common' import { CellView } from '../../view' +import { Registry } from '../registry' import * as highlighters from './main' export namespace Highlighter { diff --git a/packages/x6/src/definition/highlighter/main.ts b/packages/x6/src/registry/highlighter/main.ts similarity index 100% rename from packages/x6/src/definition/highlighter/main.ts rename to packages/x6/src/registry/highlighter/main.ts diff --git a/packages/x6/src/definition/highlighter/opacity.ts b/packages/x6/src/registry/highlighter/opacity.ts similarity index 100% rename from packages/x6/src/definition/highlighter/opacity.ts rename to packages/x6/src/registry/highlighter/opacity.ts diff --git a/packages/x6/src/definition/highlighter/stroke.ts b/packages/x6/src/registry/highlighter/stroke.ts similarity index 100% rename from packages/x6/src/definition/highlighter/stroke.ts rename to packages/x6/src/registry/highlighter/stroke.ts diff --git a/packages/x6/src/registry/index.ts b/packages/x6/src/registry/index.ts new file mode 100644 index 00000000000..d843e41ad26 --- /dev/null +++ b/packages/x6/src/registry/index.ts @@ -0,0 +1,19 @@ +export * from './registry' + +export * from './attr' +export * from './grid' +export * from './filter' +export * from './background' +export * from './highlighter' +export * from './port-layout' +export * from './port-label-layout' +export * from './tool' + +// connection +export * from './marker' +export * from './node-anchor' +export * from './edge-anchor' +export * from './connection-point' +export * from './router' +export * from './connector' +export * from './strategy' diff --git a/packages/x6/src/connection/marker/async.ts b/packages/x6/src/registry/marker/async.ts similarity index 100% rename from packages/x6/src/connection/marker/async.ts rename to packages/x6/src/registry/marker/async.ts diff --git a/packages/x6/src/connection/marker/circle.ts b/packages/x6/src/registry/marker/circle.ts similarity index 95% rename from packages/x6/src/connection/marker/circle.ts rename to packages/x6/src/registry/marker/circle.ts index e19e93d71e9..7e19861bef3 100644 --- a/packages/x6/src/connection/marker/circle.ts +++ b/packages/x6/src/registry/marker/circle.ts @@ -1,5 +1,5 @@ import { Path } from '../../geometry' -import { Attr } from '../../definition' +import { Attr } from '../attr' import { normalize } from './util' import { Marker } from './index' diff --git a/packages/x6/src/connection/marker/classic.ts b/packages/x6/src/registry/marker/classic.ts similarity index 100% rename from packages/x6/src/connection/marker/classic.ts rename to packages/x6/src/registry/marker/classic.ts diff --git a/packages/x6/src/connection/marker/cross.ts b/packages/x6/src/registry/marker/cross.ts similarity index 94% rename from packages/x6/src/connection/marker/cross.ts rename to packages/x6/src/registry/marker/cross.ts index b899a9f073e..15f98ad3290 100644 --- a/packages/x6/src/connection/marker/cross.ts +++ b/packages/x6/src/registry/marker/cross.ts @@ -1,5 +1,5 @@ -import { Attr } from '../../definition' import { Path } from '../../geometry' +import { Attr } from '../attr' import { normalize } from './util' import { Marker } from './index' diff --git a/packages/x6/src/connection/marker/diamond.ts b/packages/x6/src/registry/marker/diamond.ts similarity index 94% rename from packages/x6/src/connection/marker/diamond.ts rename to packages/x6/src/registry/marker/diamond.ts index e05a44adb1f..4e6de19057c 100644 --- a/packages/x6/src/connection/marker/diamond.ts +++ b/packages/x6/src/registry/marker/diamond.ts @@ -1,5 +1,5 @@ -import { Attr } from '../../definition' import { Path } from '../../geometry' +import { Attr } from '../attr' import { normalize } from './util' import { Marker } from './index' diff --git a/packages/x6/src/connection/marker/ellipse.ts b/packages/x6/src/registry/marker/ellipse.ts similarity index 90% rename from packages/x6/src/connection/marker/ellipse.ts rename to packages/x6/src/registry/marker/ellipse.ts index 93c3252d625..d367d536198 100644 --- a/packages/x6/src/connection/marker/ellipse.ts +++ b/packages/x6/src/registry/marker/ellipse.ts @@ -1,4 +1,4 @@ -import { Attr } from '../../definition' +import { Attr } from '../attr' import { Marker } from './index' export interface EllipseMarkerOptions extends Attr.SimpleAttrs { diff --git a/packages/x6/src/connection/marker/index.ts b/packages/x6/src/registry/marker/index.ts similarity index 93% rename from packages/x6/src/connection/marker/index.ts rename to packages/x6/src/registry/marker/index.ts index 28913d41bc4..ecf9d7f7c3e 100644 --- a/packages/x6/src/connection/marker/index.ts +++ b/packages/x6/src/registry/marker/index.ts @@ -1,6 +1,6 @@ import { KeyValue } from '../../types' -import { Registry } from '../../common' -import { Attr } from '../../definition' +import { Registry } from '../registry' +import { Attr } from '../attr' import * as markers from './main' import { normalize as normalizeMarker } from './util' diff --git a/packages/x6/src/connection/marker/main.ts b/packages/x6/src/registry/marker/main.ts similarity index 100% rename from packages/x6/src/connection/marker/main.ts rename to packages/x6/src/registry/marker/main.ts diff --git a/packages/x6/src/connection/marker/path.ts b/packages/x6/src/registry/marker/path.ts similarity index 90% rename from packages/x6/src/connection/marker/path.ts rename to packages/x6/src/registry/marker/path.ts index 83e8d70f319..626b203d833 100644 --- a/packages/x6/src/connection/marker/path.ts +++ b/packages/x6/src/registry/marker/path.ts @@ -1,4 +1,4 @@ -import { Attr } from '../../definition' +import { Attr } from '../attr' import { normalize } from './util' import { Marker } from './index' diff --git a/packages/x6/src/connection/marker/util.ts b/packages/x6/src/registry/marker/util.ts similarity index 100% rename from packages/x6/src/connection/marker/util.ts rename to packages/x6/src/registry/marker/util.ts diff --git a/packages/x6/src/connection/node-anchor/bbox.ts b/packages/x6/src/registry/node-anchor/bbox.ts similarity index 100% rename from packages/x6/src/connection/node-anchor/bbox.ts rename to packages/x6/src/registry/node-anchor/bbox.ts diff --git a/packages/x6/src/connection/node-anchor/index.ts b/packages/x6/src/registry/node-anchor/index.ts similarity index 97% rename from packages/x6/src/connection/node-anchor/index.ts rename to packages/x6/src/registry/node-anchor/index.ts index 1e7d6bd4b3d..25aea5de11d 100644 --- a/packages/x6/src/connection/node-anchor/index.ts +++ b/packages/x6/src/registry/node-anchor/index.ts @@ -1,8 +1,8 @@ import { KeyValue } from '../../types' -import { Registry } from '../../common' import { Point } from '../../geometry' import { Edge } from '../../model' import { EdgeView, NodeView } from '../../view' +import { Registry } from '../registry' import * as anchors from './main' export namespace NodeConnectionAnchor { diff --git a/packages/x6/src/connection/node-anchor/main.ts b/packages/x6/src/registry/node-anchor/main.ts similarity index 100% rename from packages/x6/src/connection/node-anchor/main.ts rename to packages/x6/src/registry/node-anchor/main.ts diff --git a/packages/x6/src/connection/node-anchor/middle-side.ts b/packages/x6/src/registry/node-anchor/middle-side.ts similarity index 100% rename from packages/x6/src/connection/node-anchor/middle-side.ts rename to packages/x6/src/registry/node-anchor/middle-side.ts diff --git a/packages/x6/src/connection/node-anchor/node-center.ts b/packages/x6/src/registry/node-anchor/node-center.ts similarity index 100% rename from packages/x6/src/connection/node-anchor/node-center.ts rename to packages/x6/src/registry/node-anchor/node-center.ts diff --git a/packages/x6/src/connection/node-anchor/orth.ts b/packages/x6/src/registry/node-anchor/orth.ts similarity index 100% rename from packages/x6/src/connection/node-anchor/orth.ts rename to packages/x6/src/registry/node-anchor/orth.ts diff --git a/packages/x6/src/connection/node-anchor/util.ts b/packages/x6/src/registry/node-anchor/util.ts similarity index 100% rename from packages/x6/src/connection/node-anchor/util.ts rename to packages/x6/src/registry/node-anchor/util.ts diff --git a/packages/x6/src/definition/port-label-layout/index.ts b/packages/x6/src/registry/port-label-layout/index.ts similarity index 93% rename from packages/x6/src/definition/port-label-layout/index.ts rename to packages/x6/src/registry/port-label-layout/index.ts index ac09338212b..8e4bf8167ce 100644 --- a/packages/x6/src/definition/port-label-layout/index.ts +++ b/packages/x6/src/registry/port-label-layout/index.ts @@ -1,7 +1,7 @@ -import { Attr } from '..' import { KeyValue } from '../../types' -import { Registry } from '../../common' import { Point, Rectangle } from '../../geometry' +import { Attr } from '../attr' +import { Registry } from '../registry' import * as layouts from './main' export namespace PortLabelLayout { diff --git a/packages/x6/src/definition/port-label-layout/inout.ts b/packages/x6/src/registry/port-label-layout/inout.ts similarity index 100% rename from packages/x6/src/definition/port-label-layout/inout.ts rename to packages/x6/src/registry/port-label-layout/inout.ts diff --git a/packages/x6/src/definition/port-label-layout/main.ts b/packages/x6/src/registry/port-label-layout/main.ts similarity index 100% rename from packages/x6/src/definition/port-label-layout/main.ts rename to packages/x6/src/registry/port-label-layout/main.ts diff --git a/packages/x6/src/definition/port-label-layout/radial.ts b/packages/x6/src/registry/port-label-layout/radial.ts similarity index 100% rename from packages/x6/src/definition/port-label-layout/radial.ts rename to packages/x6/src/registry/port-label-layout/radial.ts diff --git a/packages/x6/src/definition/port-label-layout/side.ts b/packages/x6/src/registry/port-label-layout/side.ts similarity index 100% rename from packages/x6/src/definition/port-label-layout/side.ts rename to packages/x6/src/registry/port-label-layout/side.ts diff --git a/packages/x6/src/definition/port-label-layout/util.ts b/packages/x6/src/registry/port-label-layout/util.ts similarity index 100% rename from packages/x6/src/definition/port-label-layout/util.ts rename to packages/x6/src/registry/port-label-layout/util.ts diff --git a/packages/x6/src/definition/port-layout/absolute.ts b/packages/x6/src/registry/port-layout/absolute.ts similarity index 100% rename from packages/x6/src/definition/port-layout/absolute.ts rename to packages/x6/src/registry/port-layout/absolute.ts diff --git a/packages/x6/src/definition/port-layout/ellipse.ts b/packages/x6/src/registry/port-layout/ellipse.ts similarity index 100% rename from packages/x6/src/definition/port-layout/ellipse.ts rename to packages/x6/src/registry/port-layout/ellipse.ts diff --git a/packages/x6/src/definition/port-layout/index.ts b/packages/x6/src/registry/port-layout/index.ts similarity index 96% rename from packages/x6/src/definition/port-layout/index.ts rename to packages/x6/src/registry/port-layout/index.ts index c0cd9ec9dd9..eef4f0e7be4 100644 --- a/packages/x6/src/definition/port-layout/index.ts +++ b/packages/x6/src/registry/port-layout/index.ts @@ -1,6 +1,6 @@ import { KeyValue } from '../../types' -import { Registry } from '../../common' import { Rectangle, Point } from '../../geometry' +import { Registry } from '../registry' import * as layouts from './main' export namespace PortLayout { diff --git a/packages/x6/src/definition/port-layout/line.ts b/packages/x6/src/registry/port-layout/line.ts similarity index 100% rename from packages/x6/src/definition/port-layout/line.ts rename to packages/x6/src/registry/port-layout/line.ts diff --git a/packages/x6/src/definition/port-layout/main.ts b/packages/x6/src/registry/port-layout/main.ts similarity index 100% rename from packages/x6/src/definition/port-layout/main.ts rename to packages/x6/src/registry/port-layout/main.ts diff --git a/packages/x6/src/definition/port-layout/util.ts b/packages/x6/src/registry/port-layout/util.ts similarity index 100% rename from packages/x6/src/definition/port-layout/util.ts rename to packages/x6/src/registry/port-layout/util.ts diff --git a/packages/x6/src/common/registry.ts b/packages/x6/src/registry/registry.ts similarity index 100% rename from packages/x6/src/common/registry.ts rename to packages/x6/src/registry/registry.ts diff --git a/packages/x6/src/connection/router/er.ts b/packages/x6/src/registry/router/er.ts similarity index 100% rename from packages/x6/src/connection/router/er.ts rename to packages/x6/src/registry/router/er.ts diff --git a/packages/x6/src/connection/router/index.ts b/packages/x6/src/registry/router/index.ts similarity index 96% rename from packages/x6/src/connection/router/index.ts rename to packages/x6/src/registry/router/index.ts index 1661ef7b7cc..01ae87a4666 100644 --- a/packages/x6/src/connection/router/index.ts +++ b/packages/x6/src/registry/router/index.ts @@ -1,7 +1,7 @@ import { KeyValue } from '../../types' -import { Registry } from '../../common' import { Point } from '../../geometry' import { EdgeView } from '../../view' +import { Registry } from '../registry' import * as routers from './main' export namespace Router { diff --git a/packages/x6/src/connection/router/main.ts b/packages/x6/src/registry/router/main.ts similarity index 100% rename from packages/x6/src/connection/router/main.ts rename to packages/x6/src/registry/router/main.ts diff --git a/packages/x6/src/connection/router/manhattan/index.ts b/packages/x6/src/registry/router/manhattan/index.ts similarity index 100% rename from packages/x6/src/connection/router/manhattan/index.ts rename to packages/x6/src/registry/router/manhattan/index.ts diff --git a/packages/x6/src/connection/router/manhattan/obstacle-map.ts b/packages/x6/src/registry/router/manhattan/obstacle-map.ts similarity index 100% rename from packages/x6/src/connection/router/manhattan/obstacle-map.ts rename to packages/x6/src/registry/router/manhattan/obstacle-map.ts diff --git a/packages/x6/src/connection/router/manhattan/options.ts b/packages/x6/src/registry/router/manhattan/options.ts similarity index 100% rename from packages/x6/src/connection/router/manhattan/options.ts rename to packages/x6/src/registry/router/manhattan/options.ts diff --git a/packages/x6/src/connection/router/manhattan/router.ts b/packages/x6/src/registry/router/manhattan/router.ts similarity index 100% rename from packages/x6/src/connection/router/manhattan/router.ts rename to packages/x6/src/registry/router/manhattan/router.ts diff --git a/packages/x6/src/connection/router/manhattan/sorted-set.ts b/packages/x6/src/registry/router/manhattan/sorted-set.ts similarity index 100% rename from packages/x6/src/connection/router/manhattan/sorted-set.ts rename to packages/x6/src/registry/router/manhattan/sorted-set.ts diff --git a/packages/x6/src/connection/router/manhattan/util.ts b/packages/x6/src/registry/router/manhattan/util.ts similarity index 100% rename from packages/x6/src/connection/router/manhattan/util.ts rename to packages/x6/src/registry/router/manhattan/util.ts diff --git a/packages/x6/src/connection/router/metro.ts b/packages/x6/src/registry/router/metro.ts similarity index 100% rename from packages/x6/src/connection/router/metro.ts rename to packages/x6/src/registry/router/metro.ts diff --git a/packages/x6/src/connection/router/normal.ts b/packages/x6/src/registry/router/normal.ts similarity index 100% rename from packages/x6/src/connection/router/normal.ts rename to packages/x6/src/registry/router/normal.ts diff --git a/packages/x6/src/connection/router/oneside.ts b/packages/x6/src/registry/router/oneside.ts similarity index 100% rename from packages/x6/src/connection/router/oneside.ts rename to packages/x6/src/registry/router/oneside.ts diff --git a/packages/x6/src/connection/router/orth.ts b/packages/x6/src/registry/router/orth.ts similarity index 100% rename from packages/x6/src/connection/router/orth.ts rename to packages/x6/src/registry/router/orth.ts diff --git a/packages/x6/src/connection/router/util.ts b/packages/x6/src/registry/router/util.ts similarity index 100% rename from packages/x6/src/connection/router/util.ts rename to packages/x6/src/registry/router/util.ts diff --git a/packages/x6/src/connection/strategy/index.ts b/packages/x6/src/registry/strategy/index.ts similarity index 96% rename from packages/x6/src/connection/strategy/index.ts rename to packages/x6/src/registry/strategy/index.ts index 2dbf6295bea..d35d217f178 100644 --- a/packages/x6/src/connection/strategy/index.ts +++ b/packages/x6/src/registry/strategy/index.ts @@ -1,9 +1,9 @@ -import { KeyValue } from '../../types' -import { Registry } from '../../common' import { Point } from '../../geometry' +import { KeyValue } from '../../types' import { Edge } from '../../model' import { Graph } from '../../graph' import { EdgeView, NodeView } from '../../view' +import { Registry } from '../registry' import * as strategies from './main' export namespace ConnectionStrategy { diff --git a/packages/x6/src/connection/strategy/main.ts b/packages/x6/src/registry/strategy/main.ts similarity index 100% rename from packages/x6/src/connection/strategy/main.ts rename to packages/x6/src/registry/strategy/main.ts diff --git a/packages/x6/src/connection/strategy/noop.ts b/packages/x6/src/registry/strategy/noop.ts similarity index 100% rename from packages/x6/src/connection/strategy/noop.ts rename to packages/x6/src/registry/strategy/noop.ts diff --git a/packages/x6/src/connection/strategy/pin.ts b/packages/x6/src/registry/strategy/pin.ts similarity index 100% rename from packages/x6/src/connection/strategy/pin.ts rename to packages/x6/src/registry/strategy/pin.ts diff --git a/packages/x6/src/definition/tool/anchor.ts b/packages/x6/src/registry/tool/anchor.ts similarity index 100% rename from packages/x6/src/definition/tool/anchor.ts rename to packages/x6/src/registry/tool/anchor.ts diff --git a/packages/x6/src/definition/tool/arrowhead.ts b/packages/x6/src/registry/tool/arrowhead.ts similarity index 100% rename from packages/x6/src/definition/tool/arrowhead.ts rename to packages/x6/src/registry/tool/arrowhead.ts diff --git a/packages/x6/src/definition/tool/boundary.ts b/packages/x6/src/registry/tool/boundary.ts similarity index 100% rename from packages/x6/src/definition/tool/boundary.ts rename to packages/x6/src/registry/tool/boundary.ts diff --git a/packages/x6/src/definition/tool/button.ts b/packages/x6/src/registry/tool/button.ts similarity index 100% rename from packages/x6/src/definition/tool/button.ts rename to packages/x6/src/registry/tool/button.ts diff --git a/packages/x6/src/definition/tool/index.ts b/packages/x6/src/registry/tool/index.ts similarity index 98% rename from packages/x6/src/definition/tool/index.ts rename to packages/x6/src/registry/tool/index.ts index 1629c775cfa..80c91a59a84 100644 --- a/packages/x6/src/definition/tool/index.ts +++ b/packages/x6/src/registry/tool/index.ts @@ -1,6 +1,6 @@ import { KeyValue } from '../../types' -import { Registry } from '../../common' import { ToolsView } from '../../view/tool' +import { Registry } from '../registry' import { Button } from './button' import { Boundary } from './boundary' import { Vertices } from './vertices' diff --git a/packages/x6/src/definition/tool/segments.ts b/packages/x6/src/registry/tool/segments.ts similarity index 100% rename from packages/x6/src/definition/tool/segments.ts rename to packages/x6/src/registry/tool/segments.ts diff --git a/packages/x6/src/definition/tool/util.ts b/packages/x6/src/registry/tool/util.ts similarity index 93% rename from packages/x6/src/definition/tool/util.ts rename to packages/x6/src/registry/tool/util.ts index 983516fad9d..b61e5beea63 100644 --- a/packages/x6/src/definition/tool/util.ts +++ b/packages/x6/src/registry/tool/util.ts @@ -2,7 +2,7 @@ import { Point } from '../../geometry' import { Edge } from '../../model/edge' import { CellView } from '../../view/cell' import { EdgeView } from '../../view/edge' -import { ConnectionStrategy } from '../../connection' +import { ConnectionStrategy } from '../strategy' export function getAnchor( pos: Point.PointLike, diff --git a/packages/x6/src/definition/tool/vertices.ts b/packages/x6/src/registry/tool/vertices.ts similarity index 100% rename from packages/x6/src/definition/tool/vertices.ts rename to packages/x6/src/registry/tool/vertices.ts diff --git a/packages/x6/src/shape/basic/text-block.ts b/packages/x6/src/shape/basic/text-block.ts index 0501795577e..f3905f06f69 100644 --- a/packages/x6/src/shape/basic/text-block.ts +++ b/packages/x6/src/shape/basic/text-block.ts @@ -1,6 +1,6 @@ import { Platform, StringExt, ObjectExt, Dom } from '../../util' import { Size } from '../../types' -import { Attr } from '../../definition' +import { Attr } from '../../registry' import { Node } from '../../model' import { Store } from '../../model/store' import { NodeView } from '../../view' diff --git a/packages/x6/src/shape/standard/html.ts b/packages/x6/src/shape/standard/html.ts index aca1bbee7f3..5755541d841 100644 --- a/packages/x6/src/shape/standard/html.ts +++ b/packages/x6/src/shape/standard/html.ts @@ -1,5 +1,5 @@ import { Dom } from '../../util' -import { Registry } from '../../common' +import { Registry } from '../../registry' import { Node } from '../../model/node' import { NodeView } from '../../view/node' import { Graph } from '../../graph/graph' diff --git a/packages/x6/src/shape/standard/text-block.ts b/packages/x6/src/shape/standard/text-block.ts index b200a7838a4..f2c971910c1 100644 --- a/packages/x6/src/shape/standard/text-block.ts +++ b/packages/x6/src/shape/standard/text-block.ts @@ -1,5 +1,5 @@ import { Platform, Dom } from '../../util' -import { Attr } from '../../definition' +import { Attr } from '../../registry' import { bodyAttr } from './util' import { Base } from '../base' diff --git a/packages/x6/src/view/attr.ts b/packages/x6/src/view/attr.ts index 8f0208270da..318c123ddcd 100644 --- a/packages/x6/src/view/attr.ts +++ b/packages/x6/src/view/attr.ts @@ -1,7 +1,7 @@ import { ObjectExt, ArrayExt, Dom } from '../util' import { Rectangle, Point } from '../geometry' import { Dictionary } from '../common' -import { Attr } from '../definition' +import { Attr } from '../registry' import { View } from './view' import { Markup } from './markup' import { CellView } from './cell' diff --git a/packages/x6/src/view/cell.ts b/packages/x6/src/view/cell.ts index 6a380aede4c..92680a9916f 100644 --- a/packages/x6/src/view/cell.ts +++ b/packages/x6/src/view/cell.ts @@ -1,9 +1,8 @@ -import { Registry } from '../common' import { Nilable, KeyValue } from '../types' import { Rectangle, Point } from '../geometry' import { ArrayExt, ObjectExt, Dom } from '../util' -import { ConnectionStrategy } from '../connection' -import { Attr } from '../definition/attr' +import { Registry, ConnectionStrategy } from '../registry' +import { Attr } from '../registry/attr' import { Cell } from '../model/cell' import { Edge } from '../model/edge' import { Node } from '../model/node' diff --git a/packages/x6/src/view/edge.ts b/packages/x6/src/view/edge.ts index 1cd65938b33..93026e6f482 100644 --- a/packages/x6/src/view/edge.ts +++ b/packages/x6/src/view/edge.ts @@ -1,14 +1,14 @@ import { KeyValue } from '../types' import { StringExt, ObjectExt, NumberExt, Dom, FunctionExt } from '../util' import { Rectangle, Polyline, Point, Angle, Path, Line } from '../geometry' -import { Attr } from '../definition' import { + Attr, Router, Connector, ConnectionPoint, NodeConnectionAnchor, EdgeConnectionAnchor, -} from '../connection' +} from '../registry' import { Edge } from '../model/edge' import { Markup } from './markup' import { CellView } from './cell' diff --git a/packages/x6/src/view/markup.ts b/packages/x6/src/view/markup.ts index 0df8fa64a43..85c307cf2d8 100644 --- a/packages/x6/src/view/markup.ts +++ b/packages/x6/src/view/markup.ts @@ -1,4 +1,4 @@ -import { Attr } from '../definition' +import { Attr } from '../registry' import { KeyValue, Nilable } from '../types' import { ObjectExt, StringExt, Dom, $ } from '../util' diff --git a/packages/x6/src/view/node.ts b/packages/x6/src/view/node.ts index 6fd536eca1c..9ca7c8944d9 100644 --- a/packages/x6/src/view/node.ts +++ b/packages/x6/src/view/node.ts @@ -1,7 +1,7 @@ import { Util, Config } from '../global' import { ArrayExt, Dom } from '../util' import { Rectangle, Point } from '../geometry' -import { Attr, PortLayout } from '../definition' +import { Attr, PortLayout } from '../registry' import { Cell } from '../model/cell' import { Node } from '../model/node' import { PortManager } from '../model/port' diff --git a/packages/x6/src/view/tool.ts b/packages/x6/src/view/tool.ts index 56118f624da..771b1abb4ea 100644 --- a/packages/x6/src/view/tool.ts +++ b/packages/x6/src/view/tool.ts @@ -1,6 +1,6 @@ import { KeyValue } from '../types' import { Dom, ObjectExt, StringExt } from '../util' -import { NodeTool, EdgeTool } from '../definition/tool' +import { NodeTool, EdgeTool } from '../registry/tool' import { View } from './view' import { CellView } from './cell' import { Markup } from './markup' diff --git a/packages/x6/src/view/view.ts b/packages/x6/src/view/view.ts index f121c739083..75311856048 100644 --- a/packages/x6/src/view/view.ts +++ b/packages/x6/src/view/view.ts @@ -1,6 +1,6 @@ import JQuery from 'jquery' import { Dom } from '../util' -import { Attr } from '../definition' +import { Attr } from '../registry' import { KeyValue } from '../types' import { Basecoat } from '../common' import { Util, Config } from '../global'