@wcardinal/wcardinal-ui 0.204.3 → 0.205.2

package/dist/types/wcardinal/ui/shape/e-shape-acceptor-impl.d.ts

@@ -1,9 +1,11 @@
-import { EShapeAcceptor, EShapeAcceptorEdge } from "./e-shape-acceptor";
+import { EShapeAcceptor, EShapeAcceptorEdge, EShapeAcceptorEdgeNormal } from "./e-shape-acceptor";
 import { EShapeAcceptorType } from "./e-shape-acceptor-type";
 export declare class EShapeAcceptorImpl implements EShapeAcceptor {
     protected _edges: Map<string, EShapeAcceptorEdge>;
     constructor();
     add(id: string, type: EShapeAcceptorType, x: number, y: number): boolean;
+    add(id: string, type: EShapeAcceptorType, x: number, y: number, nx: number, ny: number): boolean;
+    protected toNormal(x: number, y: number, nx?: number, ny?: number): EShapeAcceptorEdgeNormal;
     remove(id: string): EShapeAcceptorEdge | null;
     size(): number;
     get(id: string): EShapeAcceptorEdge | null;

package/dist/types/wcardinal/ui/shape/e-shape-acceptor.d.ts

@@ -1,12 +1,18 @@
 import { EShapeAcceptorType } from "./e-shape-acceptor-type";
+export interface EShapeAcceptorEdgeNormal {
+    x: number;
+    y: number;
+}
 export interface EShapeAcceptorEdge {
     type: EShapeAcceptorType;
     x: number;
     y: number;
+    normal: EShapeAcceptorEdgeNormal;
 }
 export interface EShapeAcceptor {
     size(): number;
     add(id: string, type: EShapeAcceptorType, x: number, y: number): boolean;
+    add(id: string, type: EShapeAcceptorType, x: number, y: number, nx: number, ny: number): boolean;
     remove(id: string): EShapeAcceptorEdge | null;
     get(id: string): EShapeAcceptorEdge | null;
     each(iteratee: (edge: EShapeAcceptorEdge, id: string) => void): this;

package/dist/types/wcardinal/ui/shape/e-shape-connector-edge-impl.d.ts

@@ -1,4 +1,4 @@
-import { IPoint, Point } from "pixi.js";
+import { IPoint, Matrix } from "pixi.js";
 import { EShape } from "./e-shape";
 import { EShapeConnector } from "./e-shape-connector";
 import { EShapeConnectorEdge } from "./e-shape-connector-edge";
@@ -7,17 +7,21 @@ import { EShapeResourceManagerDeserialization } from "./e-shape-resource-manager
 import { EShapeResourceManagerSerialization } from "./e-shape-resource-manager-serialization";
 import { EShapeUuidMapping } from "./e-shape-uuid-mapping";
 export declare class EShapeConnectorEdgeImpl implements EShapeConnectorEdge {
-    protected static WORK_UPDATE_LOCAL?: Point;
+    protected static WORK_MATRIX?: Matrix;
     protected _parent: EShapeConnector;
     protected _onChange: () => void;
     protected _acceptor: EShapeConnectorEdgeAcceptor;
     protected _localIdRequired: number;
     protected _localId: number;
     protected _local: IPoint;
+    protected _normalIdRequired: number;
+    protected _normalId: number;
+    protected _normal: IPoint;
     protected _margin: number;
     protected _lockCount: number;
     protected _isAcceptorChanged: boolean;
     protected _isLocalChanged: boolean;
+    protected _isNormalChanged: boolean;
     protected _isOtherChanged: boolean;
     constructor(parent: EShapeConnector, onChange: () => void);
     lock(): void;
@@ -25,15 +29,20 @@ export declare class EShapeConnectorEdgeImpl implements EShapeConnectorEdge {
     get acceptor(): EShapeConnectorEdgeAcceptor;
     get local(): IPoint;
     get localId(): number;
+    get normal(): IPoint;
+    get normalId(): number;
     get margin(): number;
     set margin(margin: number);
-    set(shape?: EShape | null, edge?: string | null, margin?: number, localX?: number, localY?: number): this;
+    set(shape?: EShape | null, edge?: string | null, margin?: number, x?: number, y?: number, nx?: number, ny?: number): this;
     copy(source: EShapeConnectorEdge): this;
     serialize(manager: EShapeResourceManagerSerialization): number;
     deserialize(resourceId: number, mapping: EShapeUuidMapping, manager: EShapeResourceManagerDeserialization): void;
     fit(forcibly?: boolean): this;
+    protected doFit(): boolean;
+    protected toAcceptorTransform(shape: EShape): Matrix;
     onAcceptorChange(): void;
     protected onLocalChange(): void;
+    protected onNormalChange(): void;
     protected onOtherChange(): void;
     attach(): this;
     detach(): this;

package/dist/types/wcardinal/ui/shape/e-shape-connector-edge.d.ts

@@ -4,15 +4,25 @@ import { EShapeConnectorEdgeAcceptor } from "./e-shape-connector-edge-acceptor";
 import { EShapeResourceManagerDeserialization } from "./e-shape-resource-manager-deserialization";
 import { EShapeResourceManagerSerialization } from "./e-shape-resource-manager-serialization";
 import { EShapeUuidMapping } from "./e-shape-uuid-mapping";
-export declare type EShapeConnectorEdgeSerialized = [number | null, number, number, number, number];
+export declare type EShapeConnectorEdgeSerialized = [
+    number | null,
+    number,
+    number,
+    number,
+    number,
+    number?,
+    number?
+];
 export interface EShapeConnectorEdge {
     readonly acceptor: EShapeConnectorEdgeAcceptor;
     readonly local: IPoint;
-    localId: number;
+    readonly localId: number;
+    readonly normal: IPoint;
+    readonly normalId: number;
     margin: number;
     lock(): void;
     unlock(): void;
-    set(shape?: EShape | null, edge?: string | null, margin?: number, localX?: number, localY?: number): this;
+    set(shape?: EShape | null, edge?: string | null, margin?: number, x?: number, y?: number, nx?: number, ny?: number): this;
     copy(source: EShapeConnectorEdge): this;
     fit(forcibly?: boolean): this;
     serialize(manager: EShapeResourceManagerSerialization): number;

package/dist/types/wcardinal/ui/shape/e-shape-type.d.ts

@@ -22,6 +22,7 @@ export declare const EShapeType: {
     readonly BUTTON: 20;
     readonly RECTANGLE_PIVOTED: 21;
     readonly CONNECTOR_LINE: 22;
+    readonly CONNECTOR_ELBOW: 23;
     readonly EXTENSION: 1000;
 };
 export declare type EShapeType = number;

package/dist/types/wcardinal/ui/shape/load/index.d.ts

@@ -3,6 +3,7 @@ export * from "./load-shape-bar";
 export * from "./load-shape-button";
 export * from "./load-shape-circle";
 export * from "./load-shape-clipper-ex";
+export * from "./load-shape-connector-elbow";
 export * from "./load-shape-connector-line";
 export * from "./load-shape-embedded";
 export * from "./load-shape-group-shadowed";

package/dist/types/wcardinal/ui/shape/load/load-shape-connector-elbow.d.ts

@@ -0,0 +1 @@
+export declare const loadShapeConnectorElbow: () => void;

package/dist/types/wcardinal/ui/shape/variant/deserialize-connector-elbow.d.ts

@@ -0,0 +1,4 @@
+import { DDiagramSerializedItem } from "../../d-diagram-serialized";
+import { EShapeResourceManagerDeserialization } from "../e-shape-resource-manager-deserialization";
+import { EShapeConnectorLine } from "./e-shape-connector-line";
+export declare const deserializeConnectorElbow: (item: DDiagramSerializedItem, manager: EShapeResourceManagerDeserialization, shape?: EShapeConnectorLine | undefined) => Promise<EShapeConnectorLine> | EShapeConnectorLine;

package/dist/types/wcardinal/ui/shape/variant/e-shape-connector-elbow-points-fillter.d.ts

@@ -0,0 +1,17 @@
+export declare class EShapeConnectorElbowPointsFillter {
+    protected _x: number;
+    protected _y: number;
+    protected _z: number;
+    protected _values: number[];
+    index: number;
+    protected _threshold: number;
+    constructor(x: number, y: number, values: number[]);
+    get x(): number;
+    set x(x: number);
+    get y(): number;
+    set y(y: number);
+    tail(x: number, y: number, nx: number, ny: number, sxh: number, syh: number, margin: number): void;
+    middle(x: number, y: number): void;
+    head(x: number, y: number, nx: number, ny: number, sxh: number, syh: number, margin: number): void;
+    margin(tail: number, head: number): void;
+}

package/dist/types/wcardinal/ui/shape/variant/e-shape-connector-elbow.d.ts

@@ -0,0 +1,8 @@
+import { EShapeType } from "../e-shape-type";
+import { EShapeConnectorBody } from "../e-shape-connector-body";
+import { EShapeConnectorLine } from "./e-shape-connector-line";
+import { EShapeConnectorEdge } from "../e-shape-connector-edge";
+export declare class EShapeConnectorElbow extends EShapeConnectorLine {
+    constructor(type?: EShapeType);
+    protected fillPoints(tail: EShapeConnectorEdge, tailMargin: number, head: EShapeConnectorEdge, headMargin: number, body: EShapeConnectorBody, px: number, py: number, values: number[]): void;
+}

package/dist/types/wcardinal/ui/shape/variant/e-shape-connector-line.d.ts

@@ -8,14 +8,17 @@ import { DDiagramSerializedItem } from "../../d-diagram-serialized";
 import { EShapeResourceManagerSerialization } from "../e-shape-resource-manager-serialization";
 import { EShape } from "../e-shape";
 import { EShapeConnectorBody } from "../e-shape-connector-body";
+import { EShapeConnectorEdge } from "../e-shape-connector-edge";
 export declare class EShapeConnectorLine extends EShapeLineBase implements EShapeConnector {
     protected static WORK_BOUNDARY: [number, number, number, number];
     protected _edge: EShapeConnectorEdgeContainer;
     protected _body: EShapeConnectorBody;
     protected _points: EShapeLinePoints;
     protected _tailLocalId: number;
+    protected _tailNormalId: number;
     protected _tailMargin: number;
     protected _headLocalId: number;
+    protected _headNormalId: number;
     protected _headMargin: number;
     protected _bodyId: number;
     protected _lockCount: number;
@@ -29,6 +32,7 @@ export declare class EShapeConnectorLine extends EShapeLineBase implements EShap
     onAttach(): void;
     onDetach(): void;
     protected onChange(): void;
+    protected fillPoints(tail: EShapeConnectorEdge, tailMargin: number, head: EShapeConnectorEdge, headMargin: number, body: EShapeConnectorBody, px: number, py: number, values: number[]): void;
     copy(source: EShape, part?: EShapeCopyPart): this;
     clone(): EShapeConnectorLine;
     serialize(manager: EShapeResourceManagerSerialization): DDiagramSerializedItem;

package/dist/types/wcardinal/ui/shape/variant/index.d.ts

@@ -72,6 +72,7 @@ export * from "./deserialize-bar";
 export * from "./deserialize-base";
 export * from "./deserialize-button";
 export * from "./deserialize-circle";
+export * from "./deserialize-connector-elbow";
 export * from "./deserialize-connector-line";
 export * from "./deserialize-embedded";
 export * from "./deserialize-embedded-layer";
@@ -104,6 +105,8 @@ export * from "./e-shape-button-runtime-action";
 export * from "./e-shape-button-runtime";
 export * from "./e-shape-button";
 export * from "./e-shape-circle";
+export * from "./e-shape-connector-elbow-points-fillter";
+export * from "./e-shape-connector-elbow";
 export * from "./e-shape-connector-line";
 export * from "./e-shape-embedded-datum";
 export * from "./e-shape-embedded-layer-container";

package/dist/wcardinal/ui/shape/e-shape-acceptor-impl.js

@@ -6,14 +6,39 @@ var EShapeAcceptorImpl = /** @class */ (function () {
     function EShapeAcceptorImpl() {
         this._edges = new Map();
     }
-    EShapeAcceptorImpl.prototype.add = function (id, type, x, y) {
+    EShapeAcceptorImpl.prototype.add = function (id, type, x, y, nx, ny) {
         this._edges.set(id, {
             type: type,
             x: x,
-            y: y
+            y: y,
+            normal: this.toNormal(x, y, nx, ny)
         });
         return true;
     };
+    EShapeAcceptorImpl.prototype.toNormal = function (x, y, nx, ny) {
+        if (nx != null && ny != null) {
+            return {
+                x: nx,
+                y: ny
+            };
+        }
+        else {
+            var d = x * x + y * y;
+            if (0.00001 < d) {
+                var m = 1 / Math.sqrt(d);
+                return {
+                    x: x * m,
+                    y: y * m
+                };
+            }
+            else {
+                return {
+                    x: 1,
+                    y: 0
+                };
+            }
+        }
+    };
     EShapeAcceptorImpl.prototype.remove = function (id) {
         var edges = this._edges;
         var result = edges.get(id);

package/dist/wcardinal/ui/shape/e-shape-acceptor-impl.js.map

@@ -1 +1 @@
-{"version":3,"file":"e-shape-acceptor-impl.js","sourceRoot":"","sources":["../../../../src/main/typescript/wcardinal/ui/shape/e-shape-acceptor-impl.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAKH;IAGC;QACC,IAAI,CAAC,MAAM,GAAG,IAAI,GAAG,EAA8B,CAAC;IACrD,CAAC;IAED,gCAAG,GAAH,UAAI,EAAU,EAAE,IAAwB,EAAE,CAAS,EAAE,CAAS;QAC7D,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,EAAE;YACnB,IAAI,MAAA;YACJ,CAAC,GAAA;YACD,CAAC,GAAA;SACD,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IACb,CAAC;IAED,mCAAM,GAAN,UAAO,EAAU;QAChB,IAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC;QAC1B,IAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAC7B,IAAI,MAAM,IAAI,IAAI,EAAE;YACnB,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YACjB,OAAO,MAAM,CAAC;SACd;QACD,OAAO,IAAI,CAAC;IACb,CAAC;IAED,iCAAI,GAAJ;QACC,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;IACzB,CAAC;IAED,gCAAG,GAAH,UAAI,EAAU;QACb,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC;IACpC,CAAC;IAED,iCAAI,GAAJ,UAAK,QAAwD;QAC5D,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAC9B,OAAO,IAAI,CAAC;IACb,CAAC;IAED,qCAAQ,GAAR,UAAS,EAAU;QAClB,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAC5B,CAAC;IAED,kCAAK,GAAL;QACC,IAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC;QAC1B,IAAI,CAAC,GAAG,KAAK,CAAC,IAAI,EAAE;YACnB,KAAK,CAAC,KAAK,EAAE,CAAC;YACd,OAAO,IAAI,CAAC;SACZ;QACD,OAAO,KAAK,CAAC;IACd,CAAC;IACF,yBAAC;AAAD,CAAC,AAnDD,IAmDC","sourcesContent":["/*\n * Copyright (C) 2019 Toshiba Corporation\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport { EShapeAcceptor, EShapeAcceptorEdge } from \"./e-shape-acceptor\";\nimport { EShapeAcceptorType } from \"./e-shape-acceptor-type\";\n\nexport class EShapeAcceptorImpl implements EShapeAcceptor {\n\tprotected _edges: Map<string, EShapeAcceptorEdge>;\n\n\tconstructor() {\n\t\tthis._edges = new Map<string, EShapeAcceptorEdge>();\n\t}\n\n\tadd(id: string, type: EShapeAcceptorType, x: number, y: number): boolean {\n\t\tthis._edges.set(id, {\n\t\t\ttype,\n\t\t\tx,\n\t\t\ty\n\t\t});\n\t\treturn true;\n\t}\n\n\tremove(id: string): EShapeAcceptorEdge | null {\n\t\tconst edges = this._edges;\n\t\tconst result = edges.get(id);\n\t\tif (result != null) {\n\t\t\tedges.delete(id);\n\t\t\treturn result;\n\t\t}\n\t\treturn null;\n\t}\n\n\tsize(): number {\n\t\treturn this._edges.size;\n\t}\n\n\tget(id: string): EShapeAcceptorEdge | null {\n\t\treturn this._edges.get(id) || null;\n\t}\n\n\teach(iteratee: (edge: EShapeAcceptorEdge, id: string) => void): this {\n\t\tthis._edges.forEach(iteratee);\n\t\treturn this;\n\t}\n\n\tcontains(id: string): boolean {\n\t\treturn this._edges.has(id);\n\t}\n\n\tclear(): boolean {\n\t\tconst edges = this._edges;\n\t\tif (0 < edges.size) {\n\t\t\tedges.clear();\n\t\t\treturn true;\n\t\t}\n\t\treturn false;\n\t}\n}\n"]}
+{"version":3,"file":"e-shape-acceptor-impl.js","sourceRoot":"","sources":["../../../../src/main/typescript/wcardinal/ui/shape/e-shape-acceptor-impl.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAKH;IAGC;QACC,IAAI,CAAC,MAAM,GAAG,IAAI,GAAG,EAA8B,CAAC;IACrD,CAAC;IAWD,gCAAG,GAAH,UACC,EAAU,EACV,IAAwB,EACxB,CAAS,EACT,CAAS,EACT,EAAW,EACX,EAAW;QAEX,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,EAAE;YACnB,IAAI,MAAA;YACJ,CAAC,GAAA;YACD,CAAC,GAAA;YACD,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC;SACnC,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IACb,CAAC;IAES,qCAAQ,GAAlB,UAAmB,CAAS,EAAE,CAAS,EAAE,EAAW,EAAE,EAAW;QAChE,IAAI,EAAE,IAAI,IAAI,IAAI,EAAE,IAAI,IAAI,EAAE;YAC7B,OAAO;gBACN,CAAC,EAAE,EAAE;gBACL,CAAC,EAAE,EAAE;aACL,CAAC;SACF;aAAM;YACN,IAAM,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACxB,IAAI,OAAO,GAAG,CAAC,EAAE;gBAChB,IAAM,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBAC3B,OAAO;oBACN,CAAC,EAAE,CAAC,GAAG,CAAC;oBACR,CAAC,EAAE,CAAC,GAAG,CAAC;iBACR,CAAC;aACF;iBAAM;gBACN,OAAO;oBACN,CAAC,EAAE,CAAC;oBACJ,CAAC,EAAE,CAAC;iBACJ,CAAC;aACF;SACD;IACF,CAAC;IAED,mCAAM,GAAN,UAAO,EAAU;QAChB,IAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC;QAC1B,IAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAC7B,IAAI,MAAM,IAAI,IAAI,EAAE;YACnB,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YACjB,OAAO,MAAM,CAAC;SACd;QACD,OAAO,IAAI,CAAC;IACb,CAAC;IAED,iCAAI,GAAJ;QACC,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;IACzB,CAAC;IAED,gCAAG,GAAH,UAAI,EAAU;QACb,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC;IACpC,CAAC;IAED,iCAAI,GAAJ,UAAK,QAAwD;QAC5D,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAC9B,OAAO,IAAI,CAAC;IACb,CAAC;IAED,qCAAQ,GAAR,UAAS,EAAU;QAClB,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAC5B,CAAC;IAED,kCAAK,GAAL;QACC,IAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC;QAC1B,IAAI,CAAC,GAAG,KAAK,CAAC,IAAI,EAAE;YACnB,KAAK,CAAC,KAAK,EAAE,CAAC;YACd,OAAO,IAAI,CAAC;SACZ;QACD,OAAO,KAAK,CAAC;IACd,CAAC;IACF,yBAAC;AAAD,CAAC,AA3FD,IA2FC","sourcesContent":["/*\n * Copyright (C) 2019 Toshiba Corporation\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport { EShapeAcceptor, EShapeAcceptorEdge, EShapeAcceptorEdgeNormal } from \"./e-shape-acceptor\";\nimport { EShapeAcceptorType } from \"./e-shape-acceptor-type\";\n\nexport class EShapeAcceptorImpl implements EShapeAcceptor {\n\tprotected _edges: Map<string, EShapeAcceptorEdge>;\n\n\tconstructor() {\n\t\tthis._edges = new Map<string, EShapeAcceptorEdge>();\n\t}\n\n\tadd(id: string, type: EShapeAcceptorType, x: number, y: number): boolean;\n\tadd(\n\t\tid: string,\n\t\ttype: EShapeAcceptorType,\n\t\tx: number,\n\t\ty: number,\n\t\tnx: number,\n\t\tny: number\n\t): boolean;\n\tadd(\n\t\tid: string,\n\t\ttype: EShapeAcceptorType,\n\t\tx: number,\n\t\ty: number,\n\t\tnx?: number,\n\t\tny?: number\n\t): boolean {\n\t\tthis._edges.set(id, {\n\t\t\ttype,\n\t\t\tx,\n\t\t\ty,\n\t\t\tnormal: this.toNormal(x, y, nx, ny)\n\t\t});\n\t\treturn true;\n\t}\n\n\tprotected toNormal(x: number, y: number, nx?: number, ny?: number): EShapeAcceptorEdgeNormal {\n\t\tif (nx != null && ny != null) {\n\t\t\treturn {\n\t\t\t\tx: nx,\n\t\t\t\ty: ny\n\t\t\t};\n\t\t} else {\n\t\t\tconst d = x * x + y * y;\n\t\t\tif (0.00001 < d) {\n\t\t\t\tconst m = 1 / Math.sqrt(d);\n\t\t\t\treturn {\n\t\t\t\t\tx: x * m,\n\t\t\t\t\ty: y * m\n\t\t\t\t};\n\t\t\t} else {\n\t\t\t\treturn {\n\t\t\t\t\tx: 1,\n\t\t\t\t\ty: 0\n\t\t\t\t};\n\t\t\t}\n\t\t}\n\t}\n\n\tremove(id: string): EShapeAcceptorEdge | null {\n\t\tconst edges = this._edges;\n\t\tconst result = edges.get(id);\n\t\tif (result != null) {\n\t\t\tedges.delete(id);\n\t\t\treturn result;\n\t\t}\n\t\treturn null;\n\t}\n\n\tsize(): number {\n\t\treturn this._edges.size;\n\t}\n\n\tget(id: string): EShapeAcceptorEdge | null {\n\t\treturn this._edges.get(id) || null;\n\t}\n\n\teach(iteratee: (edge: EShapeAcceptorEdge, id: string) => void): this {\n\t\tthis._edges.forEach(iteratee);\n\t\treturn this;\n\t}\n\n\tcontains(id: string): boolean {\n\t\treturn this._edges.has(id);\n\t}\n\n\tclear(): boolean {\n\t\tconst edges = this._edges;\n\t\tif (0 < edges.size) {\n\t\t\tedges.clear();\n\t\t\treturn true;\n\t\t}\n\t\treturn false;\n\t}\n}\n"]}

package/dist/wcardinal/ui/shape/e-shape-acceptor.js.map

@@ -1 +1 @@
-{"version":3,"file":"e-shape-acceptor.js","sourceRoot":"","sources":["../../../../src/main/typescript/wcardinal/ui/shape/e-shape-acceptor.ts"],"names":[],"mappings":"AAAA;;;GAGG","sourcesContent":["/*\n * Copyright (C) 2019 Toshiba Corporation\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport { EShapeAcceptorType } from \"./e-shape-acceptor-type\";\n\nexport interface EShapeAcceptorEdge {\n\ttype: EShapeAcceptorType;\n\tx: number;\n\ty: number;\n}\n\nexport interface EShapeAcceptor {\n\tsize(): number;\n\tadd(id: string, type: EShapeAcceptorType, x: number, y: number): boolean;\n\tremove(id: string): EShapeAcceptorEdge | null;\n\tget(id: string): EShapeAcceptorEdge | null;\n\teach(iteratee: (edge: EShapeAcceptorEdge, id: string) => void): this;\n\tcontains(id: string): boolean;\n\tclear(): boolean;\n}\n"]}
+{"version":3,"file":"e-shape-acceptor.js","sourceRoot":"","sources":["../../../../src/main/typescript/wcardinal/ui/shape/e-shape-acceptor.ts"],"names":[],"mappings":"AAAA;;;GAGG","sourcesContent":["/*\n * Copyright (C) 2019 Toshiba Corporation\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport { EShapeAcceptorType } from \"./e-shape-acceptor-type\";\n\nexport interface EShapeAcceptorEdgeNormal {\n\tx: number;\n\ty: number;\n}\n\nexport interface EShapeAcceptorEdge {\n\ttype: EShapeAcceptorType;\n\tx: number;\n\ty: number;\n\tnormal: EShapeAcceptorEdgeNormal;\n}\n\nexport interface EShapeAcceptor {\n\tsize(): number;\n\tadd(id: string, type: EShapeAcceptorType, x: number, y: number): boolean;\n\tadd(\n\t\tid: string,\n\t\ttype: EShapeAcceptorType,\n\t\tx: number,\n\t\ty: number,\n\t\tnx: number,\n\t\tny: number\n\t): boolean;\n\tremove(id: string): EShapeAcceptorEdge | null;\n\tget(id: string): EShapeAcceptorEdge | null;\n\teach(iteratee: (edge: EShapeAcceptorEdge, id: string) => void): this;\n\tcontains(id: string): boolean;\n\tclear(): boolean;\n}\n"]}

package/dist/wcardinal/ui/shape/e-shape-acceptors.js

@@ -29,15 +29,15 @@ var EShapeAcceptors = /** @class */ (function () {
     };
     EShapeAcceptors.newDefault = function () {
         var result = new EShapeAcceptorImpl();
-        result.add("TOP", EShapeAcceptorType.ALL, 0, -0.5);
-        result.add("LEFT", EShapeAcceptorType.ALL, -0.5, 0);
-        result.add("RIGHT", EShapeAcceptorType.ALL, 0.5, 0);
-        result.add("BOTTOM", EShapeAcceptorType.ALL, 0, 0.5);
-        result.add("CENTER", EShapeAcceptorType.ALL, 0, 0);
-        result.add("TOP_LEFT", EShapeAcceptorType.ALL, -0.5, -0.5);
-        result.add("TOP_RIGHT", EShapeAcceptorType.ALL, 0.5, -0.5);
-        result.add("BOTTOM_LEFT", EShapeAcceptorType.ALL, -0.5, 0.5);
-        result.add("BOTTOM_RIGHT", EShapeAcceptorType.ALL, 0.5, 0.5);
+        result.add("TOP", EShapeAcceptorType.ALL, 0, -0.5, 0, -1);
+        result.add("LEFT", EShapeAcceptorType.ALL, -0.5, 0, -1, 0);
+        result.add("RIGHT", EShapeAcceptorType.ALL, 0.5, 0, 1, 0);
+        result.add("BOTTOM", EShapeAcceptorType.ALL, 0, 0.5, 0, 1);
+        result.add("CENTER", EShapeAcceptorType.ALL, 0, 0, -1, 0);
+        result.add("TOP_LEFT", EShapeAcceptorType.ALL, -0.5, -0.5, -1, 0);
+        result.add("TOP_RIGHT", EShapeAcceptorType.ALL, 0.5, -0.5, 1, 0);
+        result.add("BOTTOM_LEFT", EShapeAcceptorType.ALL, -0.5, 0.5, -1, 0);
+        result.add("BOTTOM_RIGHT", EShapeAcceptorType.ALL, 0.5, 0.5, 1, 0);
         return result;
     };
     return EShapeAcceptors;

package/dist/wcardinal/ui/shape/e-shape-acceptors.js.map

@@ -1 +1 @@
-{"version":3,"file":"e-shape-acceptors.js","sourceRoot":"","sources":["../../../../src/main/typescript/wcardinal/ui/shape/e-shape-acceptors.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAG7D;IAAA;IAuCA,CAAC;IAnCO,mBAAG,GAAV,UAAW,IAAgB,EAAE,QAAwB;QACpD,IAAI,cAAc,GAAG,IAAI,CAAC,eAAe,CAAC;QAC1C,IAAI,cAAc,IAAI,IAAI,EAAE;YAC3B,cAAc,GAAG,IAAI,GAAG,EAA8B,CAAC;YACvD,IAAI,CAAC,eAAe,GAAG,cAAc,CAAC;SACtC;QACD,cAAc,CAAC,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IACpC,CAAC;IAEM,mBAAG,GAAV,UAAW,IAAgB;;QAC1B,OAAO,CAAA,MAAA,IAAI,CAAC,eAAe,0CAAE,GAAG,CAAC,IAAI,CAAC,KAAI,IAAI,CAAC,UAAU,EAAE,CAAC;IAC7D,CAAC;IAEgB,0BAAU,GAA3B;QACC,IAAI,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC3B,IAAI,MAAM,IAAI,IAAI,EAAE;YACnB,MAAM,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;YAC3B,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC;SACvB;QACD,OAAO,MAAM,CAAC;IACf,CAAC;IAEgB,0BAAU,GAA3B;QACC,IAAM,MAAM,GAAG,IAAI,kBAAkB,EAAE,CAAC;QACxC,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,kBAAkB,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;QACnD,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;QACpD,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,kBAAkB,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;QACpD,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,kBAAkB,CAAC,GAAG,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC;QACrD,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,kBAAkB,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QACnD,MAAM,CAAC,GAAG,CAAC,UAAU,EAAE,kBAAkB,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC;QAC3D,MAAM,CAAC,GAAG,CAAC,WAAW,EAAE,kBAAkB,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC;QAC3D,MAAM,CAAC,GAAG,CAAC,aAAa,EAAE,kBAAkB,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QAC7D,MAAM,CAAC,GAAG,CAAC,cAAc,EAAE,kBAAkB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QAC7D,OAAO,MAAM,CAAC;IACf,CAAC;IACF,sBAAC;AAAD,CAAC,AAvCD,IAuCC","sourcesContent":["/*\n * Copyright (C) 2019 Toshiba Corporation\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport { EShapeAcceptor } from \"./e-shape-acceptor\";\nimport { EShapeAcceptorImpl } from \"./e-shape-acceptor-impl\";\nimport { EShapeAcceptorType } from \"./e-shape-acceptor-type\";\nimport { EShapeType } from \"./e-shape-type\";\n\nexport class EShapeAcceptors {\n\tprotected static _default?: EShapeAcceptor;\n\tprotected static _typeToAcceptor?: Map<EShapeType, EShapeAcceptor>;\n\n\tstatic set(type: EShapeType, acceptor: EShapeAcceptor): void {\n\t\tlet typeToAcceptor = this._typeToAcceptor;\n\t\tif (typeToAcceptor == null) {\n\t\t\ttypeToAcceptor = new Map<EShapeType, EShapeAcceptor>();\n\t\t\tthis._typeToAcceptor = typeToAcceptor;\n\t\t}\n\t\ttypeToAcceptor.set(type, acceptor);\n\t}\n\n\tstatic get(type: EShapeType): EShapeAcceptor {\n\t\treturn this._typeToAcceptor?.get(type) || this.getDefault();\n\t}\n\n\tprotected static getDefault(): EShapeAcceptor {\n\t\tlet result = this._default;\n\t\tif (result == null) {\n\t\t\tresult = this.newDefault();\n\t\t\tthis._default = result;\n\t\t}\n\t\treturn result;\n\t}\n\n\tprotected static newDefault(): EShapeAcceptor {\n\t\tconst result = new EShapeAcceptorImpl();\n\t\tresult.add(\"TOP\", EShapeAcceptorType.ALL, 0, -0.5);\n\t\tresult.add(\"LEFT\", EShapeAcceptorType.ALL, -0.5, 0);\n\t\tresult.add(\"RIGHT\", EShapeAcceptorType.ALL, 0.5, 0);\n\t\tresult.add(\"BOTTOM\", EShapeAcceptorType.ALL, 0, 0.5);\n\t\tresult.add(\"CENTER\", EShapeAcceptorType.ALL, 0, 0);\n\t\tresult.add(\"TOP_LEFT\", EShapeAcceptorType.ALL, -0.5, -0.5);\n\t\tresult.add(\"TOP_RIGHT\", EShapeAcceptorType.ALL, 0.5, -0.5);\n\t\tresult.add(\"BOTTOM_LEFT\", EShapeAcceptorType.ALL, -0.5, 0.5);\n\t\tresult.add(\"BOTTOM_RIGHT\", EShapeAcceptorType.ALL, 0.5, 0.5);\n\t\treturn result;\n\t}\n}\n"]}
+{"version":3,"file":"e-shape-acceptors.js","sourceRoot":"","sources":["../../../../src/main/typescript/wcardinal/ui/shape/e-shape-acceptors.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAG7D;IAAA;IAuCA,CAAC;IAnCO,mBAAG,GAAV,UAAW,IAAgB,EAAE,QAAwB;QACpD,IAAI,cAAc,GAAG,IAAI,CAAC,eAAe,CAAC;QAC1C,IAAI,cAAc,IAAI,IAAI,EAAE;YAC3B,cAAc,GAAG,IAAI,GAAG,EAA8B,CAAC;YACvD,IAAI,CAAC,eAAe,GAAG,cAAc,CAAC;SACtC;QACD,cAAc,CAAC,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IACpC,CAAC;IAEM,mBAAG,GAAV,UAAW,IAAgB;;QAC1B,OAAO,CAAA,MAAA,IAAI,CAAC,eAAe,0CAAE,GAAG,CAAC,IAAI,CAAC,KAAI,IAAI,CAAC,UAAU,EAAE,CAAC;IAC7D,CAAC;IAEgB,0BAAU,GAA3B;QACC,IAAI,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC3B,IAAI,MAAM,IAAI,IAAI,EAAE;YACnB,MAAM,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;YAC3B,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC;SACvB;QACD,OAAO,MAAM,CAAC;IACf,CAAC;IAEgB,0BAAU,GAA3B;QACC,IAAM,MAAM,GAAG,IAAI,kBAAkB,EAAE,CAAC;QACxC,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,kBAAkB,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAC1D,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAC3D,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,kBAAkB,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QAC1D,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,kBAAkB,CAAC,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QAC3D,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,kBAAkB,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAC1D,MAAM,CAAC,GAAG,CAAC,UAAU,EAAE,kBAAkB,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAClE,MAAM,CAAC,GAAG,CAAC,WAAW,EAAE,kBAAkB,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QACjE,MAAM,CAAC,GAAG,CAAC,aAAa,EAAE,kBAAkB,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QACpE,MAAM,CAAC,GAAG,CAAC,cAAc,EAAE,kBAAkB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QACnE,OAAO,MAAM,CAAC;IACf,CAAC;IACF,sBAAC;AAAD,CAAC,AAvCD,IAuCC","sourcesContent":["/*\n * Copyright (C) 2019 Toshiba Corporation\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport { EShapeAcceptor } from \"./e-shape-acceptor\";\nimport { EShapeAcceptorImpl } from \"./e-shape-acceptor-impl\";\nimport { EShapeAcceptorType } from \"./e-shape-acceptor-type\";\nimport { EShapeType } from \"./e-shape-type\";\n\nexport class EShapeAcceptors {\n\tprotected static _default?: EShapeAcceptor;\n\tprotected static _typeToAcceptor?: Map<EShapeType, EShapeAcceptor>;\n\n\tstatic set(type: EShapeType, acceptor: EShapeAcceptor): void {\n\t\tlet typeToAcceptor = this._typeToAcceptor;\n\t\tif (typeToAcceptor == null) {\n\t\t\ttypeToAcceptor = new Map<EShapeType, EShapeAcceptor>();\n\t\t\tthis._typeToAcceptor = typeToAcceptor;\n\t\t}\n\t\ttypeToAcceptor.set(type, acceptor);\n\t}\n\n\tstatic get(type: EShapeType): EShapeAcceptor {\n\t\treturn this._typeToAcceptor?.get(type) || this.getDefault();\n\t}\n\n\tprotected static getDefault(): EShapeAcceptor {\n\t\tlet result = this._default;\n\t\tif (result == null) {\n\t\t\tresult = this.newDefault();\n\t\t\tthis._default = result;\n\t\t}\n\t\treturn result;\n\t}\n\n\tprotected static newDefault(): EShapeAcceptor {\n\t\tconst result = new EShapeAcceptorImpl();\n\t\tresult.add(\"TOP\", EShapeAcceptorType.ALL, 0, -0.5, 0, -1);\n\t\tresult.add(\"LEFT\", EShapeAcceptorType.ALL, -0.5, 0, -1, 0);\n\t\tresult.add(\"RIGHT\", EShapeAcceptorType.ALL, 0.5, 0, 1, 0);\n\t\tresult.add(\"BOTTOM\", EShapeAcceptorType.ALL, 0, 0.5, 0, 1);\n\t\tresult.add(\"CENTER\", EShapeAcceptorType.ALL, 0, 0, -1, 0);\n\t\tresult.add(\"TOP_LEFT\", EShapeAcceptorType.ALL, -0.5, -0.5, -1, 0);\n\t\tresult.add(\"TOP_RIGHT\", EShapeAcceptorType.ALL, 0.5, -0.5, 1, 0);\n\t\tresult.add(\"BOTTOM_LEFT\", EShapeAcceptorType.ALL, -0.5, 0.5, -1, 0);\n\t\tresult.add(\"BOTTOM_RIGHT\", EShapeAcceptorType.ALL, 0.5, 0.5, 1, 0);\n\t\treturn result;\n\t}\n}\n"]}

package/dist/wcardinal/ui/shape/e-shape-connector-edge-impl.js

@@ -2,7 +2,7 @@
  * Copyright (C) 2019 Toshiba Corporation
  * SPDX-License-Identifier: Apache-2.0
  */
-import { ObservablePoint, Point } from "pixi.js";
+import { Matrix, ObservablePoint } from "pixi.js";
 import { EShapeAcceptors } from "./e-shape-acceptors";
 import { EShapeConnectorEdgeAcceptorImpl } from "./e-shape-connector-edge-acceptor-impl";
 var EShapeConnectorEdgeImpl = /** @class */ (function () {
@@ -16,10 +16,16 @@ var EShapeConnectorEdgeImpl = /** @class */ (function () {
         }, undefined);
         this._localIdRequired = 0;
         this._localId = 0;
+        this._normal = new ObservablePoint(function () {
+            _this.onNormalChange();
+        }, undefined);
+        this._normalIdRequired = 0;
+        this._normalId = 0;
         this._margin = 0;
         this._lockCount = 0;
         this._isAcceptorChanged = false;
         this._isLocalChanged = false;
+        this._isNormalChanged = false;
         this._isOtherChanged = false;
     }
     EShapeConnectorEdgeImpl.prototype.lock = function () {
@@ -27,20 +33,40 @@ var EShapeConnectorEdgeImpl = /** @class */ (function () {
         if (this._lockCount === 1) {
             this._isAcceptorChanged = false;
             this._isLocalChanged = false;
+            this._isNormalChanged = false;
             this._isOtherChanged = false;
         }
     };
     EShapeConnectorEdgeImpl.prototype.unlock = function () {
         this._lockCount -= 1;
         if (this._lockCount === 0) {
+            var isChanged = false;
             if (this._isLocalChanged) {
-                this.onLocalChange();
+                this._localIdRequired += 1;
+                this._localId = this._localIdRequired;
+                isChanged = true;
             }
-            else if (this._isAcceptorChanged) {
-                this.onAcceptorChange();
+            if (this._isNormalChanged) {
+                this._normalIdRequired += 1;
+                this._normalId = this._normalIdRequired;
+                isChanged = true;
             }
-            else if (this._isOtherChanged) {
-                this.onOtherChange();
+            if (this._isOtherChanged) {
+                isChanged = true;
+            }
+            if (this._isAcceptorChanged) {
+                if (!this._isLocalChanged) {
+                    this._localIdRequired += 1;
+                }
+                if (!this._isNormalChanged) {
+                    this._normalIdRequired += 1;
+                }
+                if (this.doFit()) {
+                    isChanged = false;
+                }
+            }
+            if (isChanged) {
+                this._onChange();
             }
         }
     };
@@ -65,6 +91,20 @@ var EShapeConnectorEdgeImpl = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
+    Object.defineProperty(EShapeConnectorEdgeImpl.prototype, "normal", {
+        get: function () {
+            return this._normal;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(EShapeConnectorEdgeImpl.prototype, "normalId", {
+        get: function () {
+            return this._normalId;
+        },
+        enumerable: false,
+        configurable: true
+    });
     Object.defineProperty(EShapeConnectorEdgeImpl.prototype, "margin", {
         get: function () {
             return this._margin;
@@ -78,14 +118,28 @@ var EShapeConnectorEdgeImpl = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
-    EShapeConnectorEdgeImpl.prototype.set = function (shape, edge, margin, localX, localY) {
+    EShapeConnectorEdgeImpl.prototype.set = function (shape, edge, margin, x, y, nx, ny) {
         this.lock();
         this._acceptor.set(shape, edge);
-        if (localX != null) {
-            this._local.x = localX;
+        var local = this._local;
+        if (x != null && y != null) {
+            local.set(x, y);
+        }
+        else if (x != null) {
+            local.x = x;
+        }
+        else if (y != null) {
+            local.y = y;
         }
-        if (localY != null) {
-            this._local.y = localY;
+        var normal = this._normal;
+        if (nx != null && ny != null) {
+            normal.set(nx, ny);
+        }
+        else if (nx != null) {
+            normal.x = nx;
+        }
+        else if (ny != null) {
+            normal.y = ny;
         }
         if (margin != null) {
             this.margin = margin;
@@ -97,6 +151,7 @@ var EShapeConnectorEdgeImpl = /** @class */ (function () {
         this.lock();
         this._acceptor.copy(source.acceptor);
         this._local.copyFrom(source.local);
+        this._normal.copyFrom(source.normal);
         this.margin = source.margin;
         this.unlock();
         return this;
@@ -108,7 +163,8 @@ var EShapeConnectorEdgeImpl = /** @class */ (function () {
         var edge = acceptor.edge;
         var edgeId = edge != null ? manager.addResource(edge) : -1;
         var local = this._local;
-        return manager.addResource("[".concat(shapeUuid, ",").concat(edgeId, ",").concat(local.x, ",").concat(local.y, ",").concat(this._margin, "]"));
+        var normal = this._normal;
+        return manager.addResource("[".concat(shapeUuid, ",").concat(edgeId, ",").concat(local.x, ",").concat(local.y, ",").concat(this._margin, ",").concat(normal.x, ",").concat(normal.y, "]"));
     };
     EShapeConnectorEdgeImpl.prototype.deserialize = function (resourceId, mapping, manager) {
         var resources = manager.resources;
@@ -129,6 +185,15 @@ var EShapeConnectorEdgeImpl = /** @class */ (function () {
             var edgeId = parsed[1];
             acceptor.edge = 0 <= edgeId && edgeId < resources.length ? resources[edgeId] : null;
             this._local.set(parsed[2], parsed[3]);
+            var normalX = parsed[5];
+            var normalY = parsed[6];
+            var normal = this._normal;
+            if (normalX != null && normalY != null) {
+                normal.set(normalX, normalY);
+            }
+            else {
+                normal.set(1, 0);
+            }
             this.margin = parsed[4] || 0;
             this.unlock();
             if (shape) {
@@ -137,43 +202,80 @@ var EShapeConnectorEdgeImpl = /** @class */ (function () {
         }
     };
     EShapeConnectorEdgeImpl.prototype.fit = function (forcibly) {
-        var _a;
         if (forcibly) {
             this._localIdRequired += 1;
+            this._normalIdRequired += 1;
         }
+        this.doFit();
+        return this;
+    };
+    EShapeConnectorEdgeImpl.prototype.doFit = function () {
         var localIdRequired = this._localIdRequired;
-        if (this._localId !== localIdRequired) {
+        var isLocalDirty = this._localId !== localIdRequired;
+        var normalIdRequired = this._normalIdRequired;
+        var isNormalDirty = this._normalId !== normalIdRequired;
+        if (isLocalDirty || isNormalDirty) {
             this._localId = localIdRequired;
+            this._normalId = normalIdRequired;
             var acceptor = this._acceptor;
             var acceptorShape = acceptor.shape;
             var acceptorEdge = acceptor.edge;
             if (acceptorShape != null && acceptorEdge != null) {
                 var edge = EShapeAcceptors.get(acceptorShape.type).get(acceptorEdge);
                 if (edge) {
-                    var work = ((_a = EShapeConnectorEdgeImpl.WORK_UPDATE_LOCAL) !== null && _a !== void 0 ? _a : (EShapeConnectorEdgeImpl.WORK_UPDATE_LOCAL = new Point()));
-                    var size = acceptorShape.size;
-                    var pivot = acceptorShape.transform.pivot;
-                    work.set(pivot.x + size.x * edge.x, pivot.y + size.y * edge.y);
-                    acceptorShape.toGlobal(work, work);
-                    var parent_1 = this._parent;
-                    var parentParent = parent_1.parent;
-                    if (parentParent) {
-                        parent_1.updateTransform();
-                        parentParent.toLocal(work, undefined, work, true);
+                    var transform = this.toAcceptorTransform(acceptorShape);
+                    var a = transform.a;
+                    var b = transform.b;
+                    var c = transform.c;
+                    var d = transform.d;
+                    var tx = transform.tx;
+                    var ty = transform.ty;
+                    this.lock();
+                    if (isLocalDirty) {
+                        var size = acceptorShape.size;
+                        var pivot = acceptorShape.transform.pivot;
+                        var lx = pivot.x + size.x * edge.x;
+                        var ly = pivot.y + size.y * edge.y;
+                        this._local.set(a * lx + c * ly + tx, b * lx + d * ly + ty);
+                    }
+                    if (isNormalDirty) {
+                        var edgeNormal = edge.normal;
+                        var nx = edgeNormal.x;
+                        var ny = edgeNormal.y;
+                        this._normal.set(a * nx + c * ny, b * nx + d * ny);
                     }
-                    this._local.copyFrom(work);
+                    var result = this._isLocalChanged || this._isNormalChanged;
+                    this.unlock();
+                    return result;
                 }
             }
         }
-        return this;
+        return false;
+    };
+    EShapeConnectorEdgeImpl.prototype.toAcceptorTransform = function (shape) {
+        var _a;
+        shape.updateTransform();
+        var parent = this._parent;
+        var parentParent = parent.parent;
+        if (parentParent) {
+            parent.updateTransform();
+            return ((_a = EShapeConnectorEdgeImpl.WORK_MATRIX) !== null && _a !== void 0 ? _a : (EShapeConnectorEdgeImpl.WORK_MATRIX = new Matrix()))
+                .copyFrom(parentParent.transform.worldTransform)
+                .invert()
+                .append(shape.transform.worldTransform);
+        }
+        else {
+            return shape.transform.worldTransform;
+        }
     };
     EShapeConnectorEdgeImpl.prototype.onAcceptorChange = function () {
         if (0 < this._lockCount) {
+            this._isLocalChanged = false;
+            this._isNormalChanged = false;
             this._isAcceptorChanged = true;
             return;
         }
-        this._localIdRequired += 1;
-        this.fit();
+        this.fit(true);
     };
     EShapeConnectorEdgeImpl.prototype.onLocalChange = function () {
         if (0 < this._lockCount) {
@@ -184,6 +286,15 @@ var EShapeConnectorEdgeImpl = /** @class */ (function () {
         this._localId = this._localIdRequired;
         this._onChange();
     };
+    EShapeConnectorEdgeImpl.prototype.onNormalChange = function () {
+        if (0 < this._lockCount) {
+            this._isNormalChanged = true;
+            return;
+        }
+        this._normalIdRequired += 1;
+        this._normalId = this._normalIdRequired;
+        this._onChange();
+    };
     EShapeConnectorEdgeImpl.prototype.onOtherChange = function () {
         if (0 < this._lockCount) {
             this._isOtherChanged = true;