npm - @wcardinal/wcardinal-ui - Versions diffs - 0.456.0 → 0.457.1 - Mend

@wcardinal/wcardinal-ui 0.456.0 → 0.457.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (26) hide show

package/dist/types/wcardinal/ui/shape/variant/e-shape-embedded.d.ts CHANGED Viewed

@@ -1,3 +1,4 @@
+import { Matrix } from "pixi.js";
 import { DDiagramSerializedItem } from "../../d-diagram-serialized";
 import { EShapeAcceptorEdge } from "../e-shape-acceptor-edge";
 import { EShapeAcceptorEdgeNormal } from "../e-shape-acceptor-edge-normal";
@@ -7,13 +8,15 @@ import { EShapeType } from "../e-shape-type";
 import { EShapeGroupSize } from "./e-shape-group-size";
 import { EShapeGroupViewer } from "./e-shape-group-viewer";
 export declare class EShapeEmbedded extends EShapeGroupViewer {
+    protected static WORK_NEW_EDGE1?: Matrix;
+    protected static WORK_NEW_EDGE2?: Matrix;
     protected _name: string;
     protected _edges?: Map<string, EShapeAcceptorEdge>;
     constructor(name: string, mode: EShapeResourceManagerDeserializationMode, depth: number, type?: EShapeType);
     get name(): string;
     get edges(): Map<string, EShapeAcceptorEdge>;
     protected newEdges(): Map<string, EShapeAcceptorEdge>;
-    protected toEdgePosition(lp: number, cp: number, sh: number, s: number): number;
+    protected toEdgePosition(cp: number, s: number): number;
     protected toEdgeNormal(x: number, y: number): EShapeAcceptorEdgeNormal;
     protected isGroupSizeFittable(): boolean;
     protected newGroupSize(mode: EShapeResourceManagerDeserializationMode, depth: number): EShapeGroupSize;

package/dist/wcardinal/ui/shape/e-shape-points-marker-base.js CHANGED Viewed

@@ -145,8 +145,12 @@ var EShapePointsMarkerBase = /** @class */ (function () {
         this.onFillChange();
     };
     EShapePointsMarkerBase.prototype.copy = function (source) {
+        this.lock();
+        this.type = source.type;
         var size = source.size;
-        this.set(source.type, size.x, size.y);
+        this.size.set(size.x, size.y);
+        this.fill.copy(source.fill);
+        this.unlock();
         return this;
     };
     EShapePointsMarkerBase.prototype.set = function (type, sizeX, sizeY) {

package/dist/wcardinal/ui/shape/e-shape-points-marker-base.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"e-shape-points-marker-base.js","sourceRoot":"","sources":["../../../../src/main/typescript/wcardinal/ui/shape/e-shape-points-marker-base.ts"],"names":[],"mappings":"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","sourcesContent":["/\n Copyright (C) 2019 Toshiba Corporation\n * SPDX-License-Identifier: Apache-2.0\n /\n\nimport { IPoint, Matrix, ObservablePoint } from \"pixi.js\";\nimport { EShapeDefaults } from \"./e-shape-defaults\";\nimport { EShapeFill } from \"./e-shape-fill\";\nimport { EShapePointsFormatted } from \"./e-shape-points-formatted\";\nimport { EShapePointsMarker, EShapePointsMarkerSerizlized } from \"./e-shape-points-marker\";\nimport { EShapePointsMarkerType } from \"./e-shape-points-marker-type\";\nimport { EShapeResourceManagerDeserialization } from \"./e-shape-resource-manager-deserialization\";\nimport { EShapeResourceManagerSerialization } from \"./e-shape-resource-manager-serialization\";\nimport { EShapeFillImpl } from \"./variant/e-shape-fill-impl\";\n\nexport interface EShapePointsMarkerBaseParentParent {\n\treadonly id: number;\n\treadonly formatted: EShapePointsFormatted;\n}\n\nexport interface EShapePointsMarkerBaseParent {\n\treadonly parent: EShapePointsMarkerBaseParentParent;\n\tonTypeChange(): void;\n\tonSizeChange(): void;\n\tonFillChange(): void;\n}\n\nexport abstract class EShapePointsMarkerBase implements EShapePointsMarker {\n\tprotected _parent: EShapePointsMarkerBaseParent;\n\tprotected _lockCount: number;\n\tprotected _isTypeChanged: boolean;\n\tprotected _isSizeChanged: boolean;\n\tprotected _isFillChanged: boolean;\n\tprotected _type: EShapePointsMarkerType;\n\tprotected _size: IPoint;\n\tprotected _transform?: Matrix;\n\tprotected _transformId: number;\n\tprotected _fill: EShapeFill;\n\n\tconstructor(parent: EShapePointsMarkerBaseParent) {\n\t\tthis._parent = parent;\n\t\tthis._lockCount = 0;\n\t\tthis._isTypeChanged = false;\n\t\tthis._isSizeChanged = false;\n\t\tthis._isFillChanged = false;\n\t\tthis._type = EShapePointsMarkerType.NONE;\n\t\tthis._size = new ObservablePoint(\n\t\t\t(): void => {\n\t\t\t\tthis.onSizeChange();\n\t\t\t},\n\t\t\tundefined,\n\t\t\tEShapeDefaults.SIZE_X 0.15,\n\t\t\tEShapeDefaults.SIZE_Y * 0.15\n\t\t);\n\t\tthis._fill = this.newFill();\n\t\tthis._transformId = 0;\n\t}\n\n\tprotected newFill(): EShapeFill {\n\t\treturn new EShapeFillImpl(this, true, EShapeDefaults.FILL_COLOR, 1);\n\t}\n\n\tlock(): this {\n\t\tthis._lockCount += 1;\n\t\tif (this._lockCount === 1) {\n\t\t\tthis._isTypeChanged = false;\n\t\t\tthis._isSizeChanged = false;\n\t\t\tthis._isFillChanged = false;\n\t\t}\n\t\treturn this;\n\t}\n\n\tunlock(): this {\n\t\tthis._lockCount -= 1;\n\t\tif (this._lockCount === 0) {\n\t\t\tif (this._isTypeChanged) {\n\t\t\t\tthis.onTypeChange();\n\t\t\t} else if (this._isSizeChanged) {\n\t\t\t\tthis.onSizeChange();\n\t\t\t} else if (this._isFillChanged) {\n\t\t\t\tthis.onFillChange();\n\t\t\t}\n\t\t\tthis._isTypeChanged = false;\n\t\t\tthis._isSizeChanged = false;\n\t\t\tthis._isFillChanged = false;\n\t\t}\n\t\treturn this;\n\t}\n\n\tget type(): EShapePointsMarkerType {\n\t\treturn this._type;\n\t}\n\n\tset type(type: EShapePointsMarkerType) {\n\t\tif (this._type !== type) {\n\t\t\tthis._type = type;\n\t\t\tthis.onTypeChange();\n\t\t}\n\t}\n\n\tprotected onTypeChange(): void {\n\t\tif (0 < this._lockCount) {\n\t\t\tthis._isTypeChanged = true;\n\t\t\treturn;\n\t\t}\n\t\tthis._parent.onTypeChange();\n\t}\n\n\tget size(): IPoint {\n\t\treturn this._size;\n\t}\n\n\tprotected onSizeChange(): void {\n\t\tif (0 < this._lockCount) {\n\t\t\tthis._isSizeChanged = true;\n\t\t\treturn;\n\t\t}\n\t\tthis._parent.onSizeChange();\n\t}\n\n\tget transform(): Matrix {\n\t\treturn this.updateTransform();\n\t}\n\n\tprotected updateTransform(): Matrix {\n\t\tlet result = this._transform;\n\t\tif (result == null) {\n\t\t\tresult = new Matrix();\n\t\t\tthis._transform = result;\n\t\t}\n\t\tconst parentParent = this._parent.parent;\n\t\tconst id = parentParent.id;\n\t\tif (this._transformId !== id) {\n\t\t\tthis._transformId = id;\n\t\t\tconst formatted = parentParent.formatted;\n\t\t\tif (2 <= formatted.length) {\n\t\t\t\tthis.toTransform(formatted.values, result);\n\t\t\t} else {\n\t\t\t\tresult.identity();\n\t\t\t}\n\t\t}\n\t\treturn result;\n\t}\n\n\tprotected abstract toTransform(values: number[], result: Matrix): Matrix;\n\n\tprotected toTransformMatrix(\n\t\tx0: number,\n\t\ty0: number,\n\t\tx1: number,\n\t\ty1: number,\n\t\tresult: Matrix\n\t): Matrix {\n\t\tconst dx = x0 - x1;\n\t\tconst dy = y0 - y1;\n\t\tconst n = dx * dx + dy * dy;\n\t\tif (0.00001 < n) {\n\t\t\tconst f = 1 / Math.sqrt(n);\n\t\t\tconst nx = dx * f;\n\t\t\tconst ny = dy * f;\n\t\t\tresult.set(ny, -nx, -nx, -ny, x0, y0);\n\t\t} else {\n\t\t\tresult.set(1, 0, 0, 1, x0, y0);\n\t\t}\n\t\treturn result;\n\t}\n\n\tget fill(): EShapeFill {\n\t\treturn this._fill;\n\t}\n\n\tprotected onFillChange(): void {\n\t\tif (0 < this._lockCount) {\n\t\t\tthis._isFillChanged = true;\n\t\t\treturn;\n\t\t}\n\t\tthis._parent.onFillChange();\n\t}\n\n\tupdateUploaded(): void {\n\t\tthis.onFillChange();\n\t}\n\n\tcopy(source: EShapePointsMarker): this {\n\t\tconst size = source.size;\n\t\tthis.set(source.type, size.x, size.y);\n\t\treturn this;\n\t}\n\n\tset(type?: EShapePointsMarkerType, sizeX?: number, sizeY?: number): this {\n\t\tthis.lock();\n\n\t\tif (type != null) {\n\t\t\tthis.type = type;\n\t\t}\n\n\t\tthis.size.set(sizeX, sizeY);\n\n\t\tthis.unlock();\n\t\treturn this;\n\t}\n\n\tserialize(manager: EShapeResourceManagerSerialization): number {\n\t\tconst size = this._size;\n\t\tconst fillId = this._fill.serialize(manager);\n\t\treturn manager.addResource(`[${this._type},${size.x},${size.y},${fillId}]`);\n\t}\n\n\tdeserialize(resourceId: number, manager: EShapeResourceManagerDeserialization): void {\n\t\tconst resources = manager.resources;\n\t\tif (0 <= resourceId && resourceId < resources.length) {\n\t\t\tlet parsed = manager.getExtension<EShapePointsMarkerSerizlized>(resourceId);\n\t\t\tif (parsed == null) {\n\t\t\t\tparsed = JSON.parse(resources[resourceId]) as EShapePointsMarkerSerizlized;\n\t\t\t\tmanager.setExtension(resourceId, parsed);\n\t\t\t}\n\t\t\tthis.lock();\n\t\t\tthis.type = parsed[0];\n\t\t\tthis._size.set(parsed[1], parsed[2]);\n\t\t\tthis._fill.deserialize(parsed[3], manager);\n\t\t\tthis.unlock();\n\t\t}\n\t}\n}\n"]}
1	+ {"version":3,"file":"e-shape-points-marker-base.js","sourceRoot":"","sources":["../../../../src/main/typescript/wcardinal/ui/shape/e-shape-points-marker-base.ts"],"names":[],"mappings":"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","sourcesContent":["/\n Copyright (C) 2019 Toshiba Corporation\n * SPDX-License-Identifier: Apache-2.0\n /\n\nimport { IPoint, Matrix, ObservablePoint } from \"pixi.js\";\nimport { EShapeDefaults } from \"./e-shape-defaults\";\nimport { EShapeFill } from \"./e-shape-fill\";\nimport { EShapePointsFormatted } from \"./e-shape-points-formatted\";\nimport { EShapePointsMarker, EShapePointsMarkerSerizlized } from \"./e-shape-points-marker\";\nimport { EShapePointsMarkerType } from \"./e-shape-points-marker-type\";\nimport { EShapeResourceManagerDeserialization } from \"./e-shape-resource-manager-deserialization\";\nimport { EShapeResourceManagerSerialization } from \"./e-shape-resource-manager-serialization\";\nimport { EShapeFillImpl } from \"./variant/e-shape-fill-impl\";\n\nexport interface EShapePointsMarkerBaseParentParent {\n\treadonly id: number;\n\treadonly formatted: EShapePointsFormatted;\n}\n\nexport interface EShapePointsMarkerBaseParent {\n\treadonly parent: EShapePointsMarkerBaseParentParent;\n\tonTypeChange(): void;\n\tonSizeChange(): void;\n\tonFillChange(): void;\n}\n\nexport abstract class EShapePointsMarkerBase implements EShapePointsMarker {\n\tprotected _parent: EShapePointsMarkerBaseParent;\n\tprotected _lockCount: number;\n\tprotected _isTypeChanged: boolean;\n\tprotected _isSizeChanged: boolean;\n\tprotected _isFillChanged: boolean;\n\tprotected _type: EShapePointsMarkerType;\n\tprotected _size: IPoint;\n\tprotected _transform?: Matrix;\n\tprotected _transformId: number;\n\tprotected _fill: EShapeFill;\n\n\tconstructor(parent: EShapePointsMarkerBaseParent) {\n\t\tthis._parent = parent;\n\t\tthis._lockCount = 0;\n\t\tthis._isTypeChanged = false;\n\t\tthis._isSizeChanged = false;\n\t\tthis._isFillChanged = false;\n\t\tthis._type = EShapePointsMarkerType.NONE;\n\t\tthis._size = new ObservablePoint(\n\t\t\t(): void => {\n\t\t\t\tthis.onSizeChange();\n\t\t\t},\n\t\t\tundefined,\n\t\t\tEShapeDefaults.SIZE_X 0.15,\n\t\t\tEShapeDefaults.SIZE_Y * 0.15\n\t\t);\n\t\tthis._fill = this.newFill();\n\t\tthis._transformId = 0;\n\t}\n\n\tprotected newFill(): EShapeFill {\n\t\treturn new EShapeFillImpl(this, true, EShapeDefaults.FILL_COLOR, 1);\n\t}\n\n\tlock(): this {\n\t\tthis._lockCount += 1;\n\t\tif (this._lockCount === 1) {\n\t\t\tthis._isTypeChanged = false;\n\t\t\tthis._isSizeChanged = false;\n\t\t\tthis._isFillChanged = false;\n\t\t}\n\t\treturn this;\n\t}\n\n\tunlock(): this {\n\t\tthis._lockCount -= 1;\n\t\tif (this._lockCount === 0) {\n\t\t\tif (this._isTypeChanged) {\n\t\t\t\tthis.onTypeChange();\n\t\t\t} else if (this._isSizeChanged) {\n\t\t\t\tthis.onSizeChange();\n\t\t\t} else if (this._isFillChanged) {\n\t\t\t\tthis.onFillChange();\n\t\t\t}\n\t\t\tthis._isTypeChanged = false;\n\t\t\tthis._isSizeChanged = false;\n\t\t\tthis._isFillChanged = false;\n\t\t}\n\t\treturn this;\n\t}\n\n\tget type(): EShapePointsMarkerType {\n\t\treturn this._type;\n\t}\n\n\tset type(type: EShapePointsMarkerType) {\n\t\tif (this._type !== type) {\n\t\t\tthis._type = type;\n\t\t\tthis.onTypeChange();\n\t\t}\n\t}\n\n\tprotected onTypeChange(): void {\n\t\tif (0 < this._lockCount) {\n\t\t\tthis._isTypeChanged = true;\n\t\t\treturn;\n\t\t}\n\t\tthis._parent.onTypeChange();\n\t}\n\n\tget size(): IPoint {\n\t\treturn this._size;\n\t}\n\n\tprotected onSizeChange(): void {\n\t\tif (0 < this._lockCount) {\n\t\t\tthis._isSizeChanged = true;\n\t\t\treturn;\n\t\t}\n\t\tthis._parent.onSizeChange();\n\t}\n\n\tget transform(): Matrix {\n\t\treturn this.updateTransform();\n\t}\n\n\tprotected updateTransform(): Matrix {\n\t\tlet result = this._transform;\n\t\tif (result == null) {\n\t\t\tresult = new Matrix();\n\t\t\tthis._transform = result;\n\t\t}\n\t\tconst parentParent = this._parent.parent;\n\t\tconst id = parentParent.id;\n\t\tif (this._transformId !== id) {\n\t\t\tthis._transformId = id;\n\t\t\tconst formatted = parentParent.formatted;\n\t\t\tif (2 <= formatted.length) {\n\t\t\t\tthis.toTransform(formatted.values, result);\n\t\t\t} else {\n\t\t\t\tresult.identity();\n\t\t\t}\n\t\t}\n\t\treturn result;\n\t}\n\n\tprotected abstract toTransform(values: number[], result: Matrix): Matrix;\n\n\tprotected toTransformMatrix(\n\t\tx0: number,\n\t\ty0: number,\n\t\tx1: number,\n\t\ty1: number,\n\t\tresult: Matrix\n\t): Matrix {\n\t\tconst dx = x0 - x1;\n\t\tconst dy = y0 - y1;\n\t\tconst n = dx * dx + dy * dy;\n\t\tif (0.00001 < n) {\n\t\t\tconst f = 1 / Math.sqrt(n);\n\t\t\tconst nx = dx * f;\n\t\t\tconst ny = dy * f;\n\t\t\tresult.set(ny, -nx, -nx, -ny, x0, y0);\n\t\t} else {\n\t\t\tresult.set(1, 0, 0, 1, x0, y0);\n\t\t}\n\t\treturn result;\n\t}\n\n\tget fill(): EShapeFill {\n\t\treturn this._fill;\n\t}\n\n\tprotected onFillChange(): void {\n\t\tif (0 < this._lockCount) {\n\t\t\tthis._isFillChanged = true;\n\t\t\treturn;\n\t\t}\n\t\tthis._parent.onFillChange();\n\t}\n\n\tupdateUploaded(): void {\n\t\tthis.onFillChange();\n\t}\n\n\tcopy(source: EShapePointsMarker): this {\n\t\tthis.lock();\n\t\tthis.type = source.type;\n\t\tconst size = source.size;\n\t\tthis.size.set(size.x, size.y);\n\t\tthis.fill.copy(source.fill);\n\t\tthis.unlock();\n\t\treturn this;\n\t}\n\n\tset(type?: EShapePointsMarkerType, sizeX?: number, sizeY?: number): this {\n\t\tthis.lock();\n\n\t\tif (type != null) {\n\t\t\tthis.type = type;\n\t\t}\n\n\t\tthis.size.set(sizeX, sizeY);\n\n\t\tthis.unlock();\n\t\treturn this;\n\t}\n\n\tserialize(manager: EShapeResourceManagerSerialization): number {\n\t\tconst size = this._size;\n\t\tconst fillId = this._fill.serialize(manager);\n\t\treturn manager.addResource(`[${this._type},${size.x},${size.y},${fillId}]`);\n\t}\n\n\tdeserialize(resourceId: number, manager: EShapeResourceManagerDeserialization): void {\n\t\tconst resources = manager.resources;\n\t\tif (0 <= resourceId && resourceId < resources.length) {\n\t\t\tlet parsed = manager.getExtension<EShapePointsMarkerSerizlized>(resourceId);\n\t\t\tif (parsed == null) {\n\t\t\t\tparsed = JSON.parse(resources[resourceId]) as EShapePointsMarkerSerizlized;\n\t\t\t\tmanager.setExtension(resourceId, parsed);\n\t\t\t}\n\t\t\tthis.lock();\n\t\t\tthis.type = parsed[0];\n\t\t\tthis._size.set(parsed[1], parsed[2]);\n\t\t\tthis._fill.deserialize(parsed[3], manager);\n\t\t\tthis.unlock();\n\t\t}\n\t}\n}\n"]}

package/dist/wcardinal/ui/shape/variant/e-shape-embedded-layer.js CHANGED Viewed

@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { __extends } from "tslib";
+import { EShapeConnectors } from "../e-shape-connectors";
 import { EShapeDefaults } from "../e-shape-defaults";
 import { EShapeType } from "../e-shape-type";
 import { EShapeFillImpl } from "./e-shape-fill-impl";
@@ -42,6 +43,7 @@ var EShapeEmbeddedLayer = /** @class */ (function (_super) {
             clone.parent = result;
             result.children.push(clone);
         }
+        EShapeConnectors.move(this, result);
         result.onChildTransformChange();
         result.toDirty();
         var size = this.size;

package/dist/wcardinal/ui/shape/variant/e-shape-embedded-layer.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"e-shape-embedded-layer.js","sourceRoot":"","sources":["../../../../../src/main/typescript/wcardinal/ui/shape/variant/e-shape-embedded-layer.ts"],"names":[],"mappings":"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~~AAtED~~,CAAyC,iBAAiB,~~GAsEzD~~","sourcesContent":["/\n Copyright (C) 2019 Toshiba Corporation\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport { DDiagramSerializedItem } from \"../../d-diagram-serialized\";\nimport { EShapeDefaults } from \"../e-shape-defaults\";\nimport { EShapeFill } from \"../e-shape-fill\";\nimport { EShapeLayer } from \"../e-shape-layer\";\nimport { EShapeResourceManagerDeserializationMode } from \"../e-shape-resource-manager-deserialization-mode\";\nimport { EShapeResourceManagerSerialization } from \"../e-shape-resource-manager-serialization\";\nimport { EShapeType } from \"../e-shape-type\";\nimport { EShapeFillImpl } from \"./e-shape-fill-impl\";\nimport { EShapeGroupSize } from \"./e-shape-group-size\";\nimport { EShapeGroupSizeViewer } from \"./e-shape-group-size-viewer\";\nimport { EShapeGroupViewer } from \"./e-shape-group-viewer\";\n\nexport class EShapeEmbeddedLayer extends EShapeGroupViewer implements EShapeLayer {\n\tprotected _name: string;\n\n\tconstructor(\n\t\tname: string,\n\t\tmode: EShapeResourceManagerDeserializationMode,\n\t\tdepth: number,\n\t\ttype: EShapeType = EShapeType.EMBEDDED_LAYER\n\t) {\n\t\tsuper(mode, depth, type);\n\t\tthis._name = name;\n\t}\n\n\tget name(): string {\n\t\treturn this._name;\n\t}\n\n\tprotected newGroupFill(): EShapeFill {\n\t\treturn new EShapeFillImpl(this, false, 0xffffff, 1);\n\t}\n\n\tprotected isGroupSizeFittable(): boolean {\n\t\treturn false;\n\t}\n\n\tprotected newGroupSize(\n\t\tmode: EShapeResourceManagerDeserializationMode,\n\t\tdepth: number\n\t): EShapeGroupSize {\n\t\tconst sizeX = EShapeDefaults.SIZE_X;\n\t\tconst sizeY = EShapeDefaults.SIZE_Y;\n\t\treturn new EShapeGroupSizeViewer(this, sizeX, sizeY, sizeX, sizeY);\n\t}\n\n\tclone(): EShapeEmbeddedLayer {\n\t\tconst result = this.newClone().copy(this);\n\t\tconst children = this.children;\n\t\tfor (let i = 0, imax = children.length; i < imax; ++i) {\n\t\t\tconst clone = children[i].clone();\n\t\t\tclone.parent = result;\n\t\t\tresult.children.push(clone);\n\t\t}\n\t\tresult.onChildTransformChange();\n\t\tresult.toDirty();\n\t\tconst size = this.size;\n\t\tif (size instanceof EShapeGroupSizeViewer) {\n\t\t\tconst base = size.base;\n\t\t\tresult.size.set(base.x, base.y).init().set(size.x, size.y);\n\t\t} else {\n\t\t\tresult.size.init();\n\t\t}\n\t\treturn result;\n\t}\n\n\tprotected newClone(): EShapeEmbeddedLayer {\n\t\tconst constructor = this.constructor as typeof EShapeEmbeddedLayer;\n\t\treturn new constructor(this._name, this._mode, this._depth, this.type);\n\t}\n\n\tserializeChildren(manager: EShapeResourceManagerSerialization): DDiagramSerializedItem[] {\n\t\treturn [];\n\t}\n\n\tserializeImage(manager: EShapeResourceManagerSerialization): number {\n\t\treturn -1;\n\t}\n\n\tserializeGradient(manager: EShapeResourceManagerSerialization): number {\n\t\treturn -1;\n\t}\n}\n"]}
1	+ {"version":3,"file":"e-shape-embedded-layer.js","sourceRoot":"","sources":["../../../../../src/main/typescript/wcardinal/ui/shape/variant/e-shape-embedded-layer.ts"],"names":[],"mappings":"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","sourcesContent":["/\n Copyright (C) 2019 Toshiba Corporation\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport { DDiagramSerializedItem } from \"../../d-diagram-serialized\";\nimport { EShapeConnectors } from \"../e-shape-connectors\";\nimport { EShapeDefaults } from \"../e-shape-defaults\";\nimport { EShapeFill } from \"../e-shape-fill\";\nimport { EShapeLayer } from \"../e-shape-layer\";\nimport { EShapeResourceManagerDeserializationMode } from \"../e-shape-resource-manager-deserialization-mode\";\nimport { EShapeResourceManagerSerialization } from \"../e-shape-resource-manager-serialization\";\nimport { EShapeType } from \"../e-shape-type\";\nimport { EShapeFillImpl } from \"./e-shape-fill-impl\";\nimport { EShapeGroupSize } from \"./e-shape-group-size\";\nimport { EShapeGroupSizeViewer } from \"./e-shape-group-size-viewer\";\nimport { EShapeGroupViewer } from \"./e-shape-group-viewer\";\n\nexport class EShapeEmbeddedLayer extends EShapeGroupViewer implements EShapeLayer {\n\tprotected _name: string;\n\n\tconstructor(\n\t\tname: string,\n\t\tmode: EShapeResourceManagerDeserializationMode,\n\t\tdepth: number,\n\t\ttype: EShapeType = EShapeType.EMBEDDED_LAYER\n\t) {\n\t\tsuper(mode, depth, type);\n\t\tthis._name = name;\n\t}\n\n\tget name(): string {\n\t\treturn this._name;\n\t}\n\n\tprotected newGroupFill(): EShapeFill {\n\t\treturn new EShapeFillImpl(this, false, 0xffffff, 1);\n\t}\n\n\tprotected isGroupSizeFittable(): boolean {\n\t\treturn false;\n\t}\n\n\tprotected newGroupSize(\n\t\tmode: EShapeResourceManagerDeserializationMode,\n\t\tdepth: number\n\t): EShapeGroupSize {\n\t\tconst sizeX = EShapeDefaults.SIZE_X;\n\t\tconst sizeY = EShapeDefaults.SIZE_Y;\n\t\treturn new EShapeGroupSizeViewer(this, sizeX, sizeY, sizeX, sizeY);\n\t}\n\n\tclone(): EShapeEmbeddedLayer {\n\t\tconst result = this.newClone().copy(this);\n\t\tconst children = this.children;\n\t\tfor (let i = 0, imax = children.length; i < imax; ++i) {\n\t\t\tconst clone = children[i].clone();\n\t\t\tclone.parent = result;\n\t\t\tresult.children.push(clone);\n\t\t}\n\t\tEShapeConnectors.move(this, result);\n\t\tresult.onChildTransformChange();\n\t\tresult.toDirty();\n\t\tconst size = this.size;\n\t\tif (size instanceof EShapeGroupSizeViewer) {\n\t\t\tconst base = size.base;\n\t\t\tresult.size.set(base.x, base.y).init().set(size.x, size.y);\n\t\t} else {\n\t\t\tresult.size.init();\n\t\t}\n\t\treturn result;\n\t}\n\n\tprotected newClone(): EShapeEmbeddedLayer {\n\t\tconst constructor = this.constructor as typeof EShapeEmbeddedLayer;\n\t\treturn new constructor(this._name, this._mode, this._depth, this.type);\n\t}\n\n\tserializeChildren(manager: EShapeResourceManagerSerialization): DDiagramSerializedItem[] {\n\t\treturn [];\n\t}\n\n\tserializeImage(manager: EShapeResourceManagerSerialization): number {\n\t\treturn -1;\n\t}\n\n\tserializeGradient(manager: EShapeResourceManagerSerialization): number {\n\t\treturn -1;\n\t}\n}\n"]}

package/dist/wcardinal/ui/shape/variant/e-shape-embedded.js CHANGED Viewed

@@ -1,4 +1,5 @@
 import { __extends } from "tslib";
+import { Matrix } from "pixi.js";
 import { EShapeDefaults } from "../e-shape-defaults";
 import { EShapeResourceManagerDeserializationMode } from "../e-shape-resource-manager-deserialization-mode";
 import { EShapeType } from "../e-shape-type";
@@ -31,30 +32,36 @@ var EShapeEmbedded = /** @class */ (function (_super) {
         configurable: true
     });
     EShapeEmbedded.prototype.newEdges = function () {
+        var _a, _b;
         var result = new Map();
         var layers = this.children;
         if (layers != null) {
             var s = this.size;
             var sx = s.x;
             var sy = s.y;
-            var sxh = sx * 0.5;
-            var syh = sy * 0.5;
+            var work1 = void 0;
+            var work2 = void 0;
             for (var i = 0, imax = layers.length; i < imax; ++i) {
                 var layer = layers[i];
-                var lp = layer.transform.position;
-                var lpx = lp.x + sxh;
-                var lpy = lp.y + syh;
                 var children = layer.children;
                 for (var j = 0, jmax = children.length; j < jmax; ++j) {
                     var child = children[j];
                     if (child instanceof EShapeEmbeddedAcceptorEdge) {
-                        child.transform.updateLocalTransform();
-                        var clt = child.transform.localTransform;
+                        child.updateTransform();
+                        if (work1 == null) {
+                            work1 = ((_a = EShapeEmbedded.WORK_NEW_EDGE1) !== null && _a !== void 0 ? _a : (EShapeEmbedded.WORK_NEW_EDGE1 = new Matrix()))
+                                .copyFrom(this.transform.internalTransform)
+                                .invert();
+                        }
+                        if (work2 == null) {
+                            work2 = (_b = EShapeEmbedded.WORK_NEW_EDGE2) !== null && _b !== void 0 ? _b : (EShapeEmbedded.WORK_NEW_EDGE2 = new Matrix());
+                        }
+                        work2.copyFrom(work1).append(child.transform.internalTransform);
                         result.set(child.id, {
                             type: child.subtype,
-                            x: this.toEdgePosition(lpx, clt.tx, sxh, sx),
-                            y: this.toEdgePosition(lpy, clt.ty, syh, sy),
-                            normal: this.toEdgeNormal(-clt.c, -clt.d),
+                            x: this.toEdgePosition(work2.tx, sx),
+                            y: this.toEdgePosition(work2.ty, sy),
+                            normal: this.toEdgeNormal(-work2.c, -work2.d),
                             size: {
                                 x: 0,
                                 y: 0
@@ -67,16 +74,16 @@ var EShapeEmbedded = /** @class */ (function (_super) {
         }
         return result;
     };
-    EShapeEmbedded.prototype.toEdgePosition = function (lp, cp, sh, s) {
+    EShapeEmbedded.prototype.toEdgePosition = function (cp, s) {
         if (0.00001 < Math.abs(s)) {
-            return (lp + cp - sh) / s;
+            return cp / s;
         }
         return 0;
     };
     EShapeEmbedded.prototype.toEdgeNormal = function (x, y) {
         var d = x * x + y * y;
         if (0.00001 < d) {
-            var f = 1 / d;
+            var f = 1 / Math.sqrt(d);
             return {
                 x: x * f,
                 y: y * f

package/dist/wcardinal/ui/shape/variant/e-shape-embedded.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"e-shape-embedded.js","sourceRoot":"","sources":["../../../../../src/main/typescript/wcardinal/ui/shape/variant/e-shape-embedded.ts"],"names":[],"mappings":"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","sourcesContent":["import { DDiagramSerializedItem } from \"../../d-diagram-serialized\";\nimport { EShapeAcceptorEdge } from \"../e-shape-acceptor-edge\";\nimport { EShapeAcceptorEdgeNormal } from \"../e-shape-acceptor-edge-normal\";\nimport { EShapeDefaults } from \"../e-shape-defaults\";\nimport { EShapeResourceManagerDeserializationMode } from \"../e-shape-resource-manager-deserialization-mode\";\nimport { EShapeResourceManagerSerialization } from \"../e-shape-resource-manager-serialization\";\nimport { EShapeType } from \"../e-shape-type\";\nimport { EShapeEmbeddedAcceptorEdge } from \"./e-shape-embedded-acceptor-edge\";\nimport { EShapeGroupSize } from \"./e-shape-group-size\";\nimport { EShapeGroupSizeEditor } from \"./e-shape-group-size-editor\";\nimport { EShapeGroupSizeViewer } from \"./e-shape-group-size-viewer\";\nimport { EShapeGroupViewer } from \"./e-shape-group-viewer\";\n\nexport class EShapeEmbedded extends EShapeGroupViewer {\n\tprotected _name: string;\n\tprotected _edges?: Map<string, EShapeAcceptorEdge>;\n\n\tconstructor(\n\t\tname: string,\n\t\tmode: EShapeResourceManagerDeserializationMode,\n\t\tdepth: number,\n\t\ttype: EShapeType = EShapeType.EMBEDDED\n\t) {\n\t\tsuper(mode, depth, type);\n\t\tthis._name = name;\n\t\tthis._depth = depth;\n\t}\n\n\tget name(): string {\n\t\treturn this._name;\n\t}\n\n\tget edges(): Map<string, EShapeAcceptorEdge> {\n\t\treturn (this._edges ??= this.newEdges());\n\t}\n\n\tprotected newEdges(): Map<string, EShapeAcceptorEdge> {\n\t\tconst result = new Map<string, EShapeAcceptorEdge>();\n\t\tconst layers = this.children;\n\t\tif (layers != null) {\n\t\t\tconst s = this.size;\n\t\t\tconst sx = s.x;\n\t\t\tconst sy = s.y;\n\t\t\tconst sxh = sx * 0.5;\n\t\t\tconst syh = sy * 0.5;\n\t\t\tfor (let i = 0, imax = layers.length; i < imax; ++i) {\n\t\t\t\tconst layer = layers[i];\n\t\t\t\tconst lp = layer.transform.position;\n\t\t\t\tconst lpx = lp.x + sxh;\n\t\t\t\tconst lpy = lp.y + syh;\n\t\t\t\tconst children = layer.children;\n\t\t\t\tfor (let j = 0, jmax = children.length; j < jmax; ++j) {\n\t\t\t\t\tconst child = children[j];\n\t\t\t\t\tif (child instanceof EShapeEmbeddedAcceptorEdge) {\n\t\t\t\t\t\tchild.transform.updateLocalTransform();\n\t\t\t\t\t\tconst clt = child.transform.localTransform;\n\t\t\t\t\t\tresult.set(child.id, {\n\t\t\t\t\t\t\ttype: child.subtype,\n\t\t\t\t\t\t\tx: this.toEdgePosition(lpx, clt.tx, sxh, sx),\n\t\t\t\t\t\t\ty: this.toEdgePosition(lpy, clt.ty, syh, sy),\n\t\t\t\t\t\t\tnormal: this.toEdgeNormal(-clt.c, -clt.d),\n\t\t\t\t\t\t\tsize: {\n\t\t\t\t\t\t\t\tx: 0,\n\t\t\t\t\t\t\t\ty: 0\n\t\t\t\t\t\t\t},\n\t\t\t\t\t\t\tside: child.side\n\t\t\t\t\t\t});\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t\treturn result;\n\t}\n\n\tprotected toEdgePosition(lp: number, cp: number, sh: number, s: number): number {\n\t\tif (0.00001 < Math.abs(s)) {\n\t\t\treturn (lp + cp - sh) / s;\n\t\t}\n\t\treturn 0;\n\t}\n\n\tprotected toEdgeNormal(x: number, y: number): EShapeAcceptorEdgeNormal {\n\t\tconst d = x * x + y * y;\n\t\tif (0.00001 < d) {\n\t\t\tconst f = 1 / d;\n\t\t\treturn {\n\t\t\t\tx: x * f,\n\t\t\t\ty: y * f\n\t\t\t};\n\t\t}\n\t\treturn {\n\t\t\tx: 0,\n\t\t\ty: -1\n\t\t};\n\t}\n\n\tprotected isGroupSizeFittable(): boolean {\n\t\treturn false;\n\t}\n\n\tprotected newGroupSize(\n\t\tmode: EShapeResourceManagerDeserializationMode,\n\t\tdepth: number\n\t): EShapeGroupSize {\n\t\tconst sizeX = EShapeDefaults.SIZE_X;\n\t\tconst sizeY = EShapeDefaults.SIZE_Y;\n\t\tif (mode !== EShapeResourceManagerDeserializationMode.VIEWER && depth <= 0) {\n\t\t\treturn new EShapeGroupSizeEditor(this, sizeX, sizeY, this.isGroupSizeFittable());\n\t\t} else {\n\t\t\treturn new EShapeGroupSizeViewer(this, sizeX, sizeY, sizeX, sizeY);\n\t\t}\n\t}\n\n\tclone(): EShapeEmbedded {\n\t\tconst result = this.newClone().copy(this);\n\t\tconst children = this.children;\n\t\tfor (let i = 0, imax = children.length; i < imax; ++i) {\n\t\t\tconst clone = children[i].clone();\n\t\t\tclone.parent = result;\n\t\t\tresult.children.push(clone);\n\t\t}\n\t\tresult.onChildTransformChange();\n\t\tresult.toDirty();\n\t\treturn result;\n\t}\n\n\tprotected newClone(): EShapeEmbedded {\n\t\tconst constructor = this.constructor as typeof EShapeEmbedded;\n\t\treturn new constructor(this._name, this._mode, this._depth, this.type);\n\t}\n\n\tserializeChildren(manager: EShapeResourceManagerSerialization): DDiagramSerializedItem[] {\n\t\treturn [];\n\t}\n\n\tserializeImage(manager: EShapeResourceManagerSerialization): number {\n\t\treturn -1;\n\t}\n\n\tserializeGradient(manager: EShapeResourceManagerSerialization): number {\n\t\treturn -1;\n\t}\n\n\tserialize(manager: EShapeResourceManagerSerialization): DDiagramSerializedItem {\n\t\tconst result = super.serialize(manager);\n\t\tresult[15] = manager.addPiece(this._name);\n\t\treturn result;\n\t}\n\n\taddUuid(manager: EShapeResourceManagerSerialization): void {\n\t\tthis.uuid = manager.addUuid(this.uuid);\n\t}\n\n\tupdateUuid(manager: EShapeResourceManagerSerialization): void {\n\t\tthis.uuid = manager.updateUuid(this.uuid);\n\t}\n}\n"]}
1	+ {"version":3,"file":"e-shape-embedded.js","sourceRoot":"","sources":["../../../../../src/main/typescript/wcardinal/ui/shape/variant/e-shape-embedded.ts"],"names":[],"mappings":"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","sourcesContent":["import { Matrix } from \"pixi.js\";\nimport { DDiagramSerializedItem } from \"../../d-diagram-serialized\";\nimport { EShapeAcceptorEdge } from \"../e-shape-acceptor-edge\";\nimport { EShapeAcceptorEdgeNormal } from \"../e-shape-acceptor-edge-normal\";\nimport { EShapeDefaults } from \"../e-shape-defaults\";\nimport { EShapeResourceManagerDeserializationMode } from \"../e-shape-resource-manager-deserialization-mode\";\nimport { EShapeResourceManagerSerialization } from \"../e-shape-resource-manager-serialization\";\nimport { EShapeType } from \"../e-shape-type\";\nimport { EShapeEmbeddedAcceptorEdge } from \"./e-shape-embedded-acceptor-edge\";\nimport { EShapeGroupSize } from \"./e-shape-group-size\";\nimport { EShapeGroupSizeEditor } from \"./e-shape-group-size-editor\";\nimport { EShapeGroupSizeViewer } from \"./e-shape-group-size-viewer\";\nimport { EShapeGroupViewer } from \"./e-shape-group-viewer\";\n\nexport class EShapeEmbedded extends EShapeGroupViewer {\n\tprotected static WORK_NEW_EDGE1?: Matrix;\n\tprotected static WORK_NEW_EDGE2?: Matrix;\n\tprotected _name: string;\n\tprotected _edges?: Map<string, EShapeAcceptorEdge>;\n\n\tconstructor(\n\t\tname: string,\n\t\tmode: EShapeResourceManagerDeserializationMode,\n\t\tdepth: number,\n\t\ttype: EShapeType = EShapeType.EMBEDDED\n\t) {\n\t\tsuper(mode, depth, type);\n\t\tthis._name = name;\n\t\tthis._depth = depth;\n\t}\n\n\tget name(): string {\n\t\treturn this._name;\n\t}\n\n\tget edges(): Map<string, EShapeAcceptorEdge> {\n\t\treturn (this._edges ??= this.newEdges());\n\t}\n\n\tprotected newEdges(): Map<string, EShapeAcceptorEdge> {\n\t\tconst result = new Map<string, EShapeAcceptorEdge>();\n\t\tconst layers = this.children;\n\t\tif (layers != null) {\n\t\t\tconst s = this.size;\n\t\t\tconst sx = s.x;\n\t\t\tconst sy = s.y;\n\t\t\tlet work1: Matrix \| undefined;\n\t\t\tlet work2: Matrix \| undefined;\n\t\t\tfor (let i = 0, imax = layers.length; i < imax; ++i) {\n\t\t\t\tconst layer = layers[i];\n\t\t\t\tconst children = layer.children;\n\t\t\t\tfor (let j = 0, jmax = children.length; j < jmax; ++j) {\n\t\t\t\t\tconst child = children[j];\n\t\t\t\t\tif (child instanceof EShapeEmbeddedAcceptorEdge) {\n\t\t\t\t\t\tchild.updateTransform();\n\t\t\t\t\t\tif (work1 == null) {\n\t\t\t\t\t\t\twork1 = (EShapeEmbedded.WORK_NEW_EDGE1 ??= new Matrix())\n\t\t\t\t\t\t\t\t.copyFrom(this.transform.internalTransform)\n\t\t\t\t\t\t\t\t.invert();\n\t\t\t\t\t\t}\n\t\t\t\t\t\tif (work2 == null) {\n\t\t\t\t\t\t\twork2 = EShapeEmbedded.WORK_NEW_EDGE2 ??= new Matrix();\n\t\t\t\t\t\t}\n\t\t\t\t\t\twork2.copyFrom(work1).append(child.transform.internalTransform);\n\t\t\t\t\t\tresult.set(child.id, {\n\t\t\t\t\t\t\ttype: child.subtype,\n\t\t\t\t\t\t\tx: this.toEdgePosition(work2.tx, sx),\n\t\t\t\t\t\t\ty: this.toEdgePosition(work2.ty, sy),\n\t\t\t\t\t\t\tnormal: this.toEdgeNormal(-work2.c, -work2.d),\n\t\t\t\t\t\t\tsize: {\n\t\t\t\t\t\t\t\tx: 0,\n\t\t\t\t\t\t\t\ty: 0\n\t\t\t\t\t\t\t},\n\t\t\t\t\t\t\tside: child.side\n\t\t\t\t\t\t});\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t\treturn result;\n\t}\n\n\tprotected toEdgePosition(cp: number, s: number): number {\n\t\tif (0.00001 < Math.abs(s)) {\n\t\t\treturn cp / s;\n\t\t}\n\t\treturn 0;\n\t}\n\n\tprotected toEdgeNormal(x: number, y: number): EShapeAcceptorEdgeNormal {\n\t\tconst d = x * x + y * y;\n\t\tif (0.00001 < d) {\n\t\t\tconst f = 1 / Math.sqrt(d);\n\t\t\treturn {\n\t\t\t\tx: x * f,\n\t\t\t\ty: y * f\n\t\t\t};\n\t\t}\n\t\treturn {\n\t\t\tx: 0,\n\t\t\ty: -1\n\t\t};\n\t}\n\n\tprotected isGroupSizeFittable(): boolean {\n\t\treturn false;\n\t}\n\n\tprotected newGroupSize(\n\t\tmode: EShapeResourceManagerDeserializationMode,\n\t\tdepth: number\n\t): EShapeGroupSize {\n\t\tconst sizeX = EShapeDefaults.SIZE_X;\n\t\tconst sizeY = EShapeDefaults.SIZE_Y;\n\t\tif (mode !== EShapeResourceManagerDeserializationMode.VIEWER && depth <= 0) {\n\t\t\treturn new EShapeGroupSizeEditor(this, sizeX, sizeY, this.isGroupSizeFittable());\n\t\t} else {\n\t\t\treturn new EShapeGroupSizeViewer(this, sizeX, sizeY, sizeX, sizeY);\n\t\t}\n\t}\n\n\tclone(): EShapeEmbedded {\n\t\tconst result = this.newClone().copy(this);\n\t\tconst children = this.children;\n\t\tfor (let i = 0, imax = children.length; i < imax; ++i) {\n\t\t\tconst clone = children[i].clone();\n\t\t\tclone.parent = result;\n\t\t\tresult.children.push(clone);\n\t\t}\n\t\tresult.onChildTransformChange();\n\t\tresult.toDirty();\n\t\treturn result;\n\t}\n\n\tprotected newClone(): EShapeEmbedded {\n\t\tconst constructor = this.constructor as typeof EShapeEmbedded;\n\t\treturn new constructor(this._name, this._mode, this._depth, this.type);\n\t}\n\n\tserializeChildren(manager: EShapeResourceManagerSerialization): DDiagramSerializedItem[] {\n\t\treturn [];\n\t}\n\n\tserializeImage(manager: EShapeResourceManagerSerialization): number {\n\t\treturn -1;\n\t}\n\n\tserializeGradient(manager: EShapeResourceManagerSerialization): number {\n\t\treturn -1;\n\t}\n\n\tserialize(manager: EShapeResourceManagerSerialization): DDiagramSerializedItem {\n\t\tconst result = super.serialize(manager);\n\t\tresult[15] = manager.addPiece(this._name);\n\t\treturn result;\n\t}\n\n\taddUuid(manager: EShapeResourceManagerSerialization): void {\n\t\tthis.uuid = manager.addUuid(this.uuid);\n\t}\n\n\tupdateUuid(manager: EShapeResourceManagerSerialization): void {\n\t\tthis.uuid = manager.updateUuid(this.uuid);\n\t}\n}\n"]}

package/dist/wcardinal/ui/shape/variant/e-shape-group.js CHANGED Viewed

@@ -182,7 +182,7 @@ var EShapeGroup = /** @class */ (function (_super) {
             clone.parent = result;
             result.children.push(clone);
         }
-        EShapeConnectors.moveAll(children, result.children, children, result.children);
+        EShapeConnectors.move(this, result);
         result.onChildTransformChange();
         result.toDirty();
         return result;

package/dist/wcardinal/ui/shape/variant/e-shape-group.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"e-shape-group.js","sourceRoot":"","sources":["../../../../../src/main/typescript/wcardinal/ui/shape/variant/e-shape-group.ts"],"names":[],"mappings":"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","sourcesContent":["/\n Copyright (C) 2019 Toshiba Corporation\n * SPDX-License-Identifier: Apache-2.0\n /\n\nimport { IPoint } from \"pixi.js\";\nimport { EShapeCorner } from \"../e-shape-corner\";\nimport { EShapeDefaults } from \"../e-shape-defaults\";\nimport { EShapeFill } from \"../e-shape-fill\";\nimport { EShapeGradientLike } from \"../e-shape-gradient\";\nimport { EShapePoints } from \"../e-shape-points\";\nimport { EShapeStroke } from \"../e-shape-stroke\";\nimport { EShapeData } from \"../e-shape-data\";\nimport { EShapeText } from \"../e-shape-text\";\nimport { EShapeType } from \"../e-shape-type\";\nimport { EShapeBase } from \"./e-shape-base\";\nimport { EShapeGroupFillEditor } from \"./e-shape-group-fill-editor\";\nimport { EShapeGroupPoints } from \"./e-shape-group-points\";\nimport { EShapeGroupPropertyParent } from \"./e-shape-group-property-parent\";\nimport { EShapeGroupSize } from \"./e-shape-group-size\";\nimport { EShapeGroupSizeEditor } from \"./e-shape-group-size-editor\";\nimport { EShapeGroupSizeViewer } from \"./e-shape-group-size-viewer\";\nimport { EShapeGroupStrokeEditor } from \"./e-shape-group-stroke-editor\";\nimport { EShapeDataImpl } from \"../e-shape-data-impl\";\nimport { EShapeTextImpl } from \"./e-shape-text-impl\";\nimport { EShapeResourceManagerDeserializationMode } from \"../e-shape-resource-manager-deserialization-mode\";\nimport { EShapeConnectors } from \"../e-shape-connectors\";\nimport { EShapeImageLike } from \"../e-shape-image-like\";\nimport { EShapeResourceManagerSerialization } from \"../e-shape-resource-manager-serialization\";\n\nexport class EShapeGroup extends EShapeBase implements EShapeGroupPropertyParent {\n\tsize: EShapeGroupSize;\n\tfill: EShapeFill;\n\tstroke: EShapeStroke;\n\t/* @deprecated in favor of {@link data} */\n\ttag: EShapeData;\n\tdata: EShapeData;\n\ttext: EShapeText;\n\n\tprotected _mode: EShapeResourceManagerDeserializationMode;\n\tprotected _points?: EShapePoints;\n\n\tconstructor(\n\t\tmode: EShapeResourceManagerDeserializationMode,\n\t\ttype: EShapeType = EShapeType.GROUP\n\t) {\n\t\tsuper(type);\n\t\tthis._mode = mode;\n\t\tconst data = new EShapeDataImpl();\n\t\tthis.data = data;\n\t\tthis.tag = data;\n\t\tthis.size = this.newGroupSize(mode);\n\t\tthis.fill = this.newGroupFill();\n\t\tthis.stroke = this.newGroupStroke();\n\t\tthis.text = this.newGroupText();\n\t\tthis._points = this.newGroupPoints();\n\t}\n\n\tget mode(): EShapeResourceManagerDeserializationMode {\n\t\treturn this._mode;\n\t}\n\n\tprotected newGroupSize(mode: EShapeResourceManagerDeserializationMode): EShapeGroupSize {\n\t\tconst sizeX = EShapeDefaults.SIZE_X;\n\t\tconst sizeY = EShapeDefaults.SIZE_Y;\n\t\tif (mode !== EShapeResourceManagerDeserializationMode.VIEWER) {\n\t\t\treturn new EShapeGroupSizeEditor(this, sizeX, sizeY, this.isGroupSizeFittable());\n\t\t} else {\n\t\t\treturn new EShapeGroupSizeViewer(this, sizeX, sizeY, sizeX, sizeY);\n\t\t}\n\t}\n\n\tprotected isGroupSizeFittable(): boolean {\n\t\treturn true;\n\t}\n\n\tprotected newGroupFill(): EShapeFill {\n\t\treturn new EShapeGroupFillEditor(this);\n\t}\n\n\tprotected newGroupStroke(): EShapeStroke {\n\t\treturn new EShapeGroupStrokeEditor(this);\n\t}\n\n\tprotected newGroupText(): EShapeText {\n\t\treturn new EShapeTextImpl(\n\t\t\tthis,\n\t\t\tEShapeDefaults.TEXT_VALUE,\n\t\t\tEShapeDefaults.TEXT_COLOR,\n\t\t\tEShapeDefaults.TEXT_ALPHA,\n\t\t\tEShapeDefaults.TEXT_FAMILY,\n\t\t\tEShapeDefaults.TEXT_SIZE\n\t\t);\n\t}\n\n\tprotected newGroupPoints(): EShapePoints \| undefined {\n\t\treturn new EShapeGroupPoints(this);\n\t}\n\n\tprotected getBoundsSize(): IPoint {\n\t\tconst size = this.size;\n\t\tif (size instanceof EShapeGroupSizeViewer) {\n\t\t\treturn size.base;\n\t\t} else {\n\t\t\treturn size;\n\t\t}\n\t}\n\n\tonChildTransformChange(): void {\n\t\tsuper.onChildTransformChange();\n\t\tthis.size.fit();\n\t}\n\n\tget corner(): EShapeCorner {\n\t\tconst children = this.children;\n\t\tif (0 < children.length) {\n\t\t\treturn children[children.length - 1].corner;\n\t\t}\n\t\treturn EShapeCorner.ALL;\n\t}\n\n\tset corner(corner: EShapeCorner) {\n\t\tconst children = this.children;\n\t\tfor (let i = 0, imax = children.length; i < imax; ++i) {\n\t\t\tchildren[i].corner = corner;\n\t\t}\n\t}\n\n\tget gradient(): EShapeGradientLike \| undefined {\n\t\tconst children = this.children;\n\t\tfor (let i = children.length - 1; 0 <= i; --i) {\n\t\t\tconst gradient = children[i].gradient;\n\t\t\tif (gradient != null) {\n\t\t\t\treturn gradient;\n\t\t\t}\n\t\t}\n\t\treturn undefined;\n\t}\n\n\tset gradient(gradient: EShapeGradientLike \| undefined) {\n\t\tconst children = this.children;\n\t\tfor (let i = 0, imax = children.length; i < imax; ++i) {\n\t\t\tchildren[i].gradient = gradient;\n\t\t}\n\t}\n\n\toverride serializeGradient(manager: EShapeResourceManagerSerialization): number {\n\t\treturn -1;\n\t}\n\n\tget radius(): number {\n\t\tconst children = this.children;\n\t\tif (0 < children.length) {\n\t\t\treturn children[children.length - 1].radius;\n\t\t}\n\t\treturn 0.5;\n\t}\n\n\tset radius(radius: number) {\n\t\tconst children = this.children;\n\t\tfor (let i = 0, imax = children.length; i < imax; ++i) {\n\t\t\tchildren[i].radius = radius;\n\t\t}\n\t}\n\n\tget image(): EShapeImageLike \| undefined {\n\t\tconst children = this.children;\n\t\tfor (let i = children.length - 1; 0 <= i; --i) {\n\t\t\tconst image = children[i].image;\n\t\t\tif (image != null) {\n\t\t\t\treturn image;\n\t\t\t}\n\t\t}\n\t\treturn undefined;\n\t}\n\n\tset image(image: EShapeImageLike \| undefined) {\n\t\tconst children = this.children;\n\t\tfor (let i = 0, imax = children.length; i < imax; ++i) {\n\t\t\tchildren[i].image = image;\n\t\t}\n\t}\n\n\toverride serializeImage(manager: EShapeResourceManagerSerialization): number {\n\t\treturn -1;\n\t}\n\n\tget points(): EShapePoints \| undefined {\n\t\tconst children = this.children;\n\t\tfor (let i = children.length - 1; 0 <= i; --i) {\n\t\t\tconst points = children[i].points;\n\t\t\tif (points != null) {\n\t\t\t\treturn this._points;\n\t\t\t}\n\t\t}\n\t\treturn undefined;\n\t}\n\n\tset points(points: EShapePoints \| undefined) {\n\t\t// DO NOTHING\n\t}\n\n\tclone(): EShapeGroup {\n\t\tconst result = this.newClone().copy(this);\n\t\tconst children = this.children;\n\t\tfor (let i = 0, imax = children.length; i < imax; ++i) {\n\t\t\tconst clone = children[i].clone();\n\t\t\tclone.parent = result;\n\t\t\tresult.children.push(clone);\n\t\t}\n\t\tEShapeConnectors.moveAll(children, result.children, children, result.children);\n\t\tresult.onChildTransformChange();\n\t\tresult.toDirty();\n\t\treturn result;\n\t}\n\n\tprotected newClone(): EShapeGroup {\n\t\tconst constructor = this.constructor as typeof EShapeGroup;\n\t\treturn new constructor(this._mode, this.type);\n\t}\n\n\tcontainsAbs(\n\t\tx: number,\n\t\ty: number,\n\t\tax: number,\n\t\tay: number,\n\t\tsw: number,\n\t\tss: number,\n\t\tsa: number\n\t): boolean {\n\t\treturn false;\n\t}\n}\n"]}
1	+ {"version":3,"file":"e-shape-group.js","sourceRoot":"","sources":["../../../../../src/main/typescript/wcardinal/ui/shape/variant/e-shape-group.ts"],"names":[],"mappings":"AAAA;;;GAGG;;AAGH,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAOrD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AACpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAG3D,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AACpE,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AACxE,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,wCAAwC,EAAE,MAAM,kDAAkD,CAAC;AAC5G,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAIzD;IAAiC,+BAAU;IAY1C,qBACC,IAA8C,EAC9C,IAAmC;QAAnC,qBAAA,EAAA,OAAmB,UAAU,CAAC,KAAK;QAEnC,YAAA,MAAK,YAAC,IAAI,CAAC,SAAC;QACZ,KAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAM,IAAI,GAAG,IAAI,cAAc,EAAE,CAAC;QAClC,KAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,KAAI,CAAC,GAAG,GAAG,IAAI,CAAC;QAChB,KAAI,CAAC,IAAI,GAAG,KAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QACpC,KAAI,CAAC,IAAI,GAAG,KAAI,CAAC,YAAY,EAAE,CAAC;QAChC,KAAI,CAAC,MAAM,GAAG,KAAI,CAAC,cAAc,EAAE,CAAC;QACpC,KAAI,CAAC,IAAI,GAAG,KAAI,CAAC,YAAY,EAAE,CAAC;QAChC,KAAI,CAAC,OAAO,GAAG,KAAI,CAAC,cAAc,EAAE,CAAC;;IACtC,CAAC;IAED,sBAAI,6BAAI;aAAR;YACC,OAAO,IAAI,CAAC,KAAK,CAAC;QACnB,CAAC;;;OAAA;IAES,kCAAY,GAAtB,UAAuB,IAA8C;QACpE,IAAM,KAAK,GAAG,cAAc,CAAC,MAAM,CAAC;QACpC,IAAM,KAAK,GAAG,cAAc,CAAC,MAAM,CAAC;QACpC,IAAI,IAAI,KAAK,wCAAwC,CAAC,MAAM,EAAE,CAAC;YAC9D,OAAO,IAAI,qBAAqB,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,mBAAmB,EAAE,CAAC,CAAC;QAClF,CAAC;aAAM,CAAC;YACP,OAAO,IAAI,qBAAqB,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;QACpE,CAAC;IACF,CAAC;IAES,yCAAmB,GAA7B;QACC,OAAO,IAAI,CAAC;IACb,CAAC;IAES,kCAAY,GAAtB;QACC,OAAO,IAAI,qBAAqB,CAAC,IAAI,CAAC,CAAC;IACxC,CAAC;IAES,oCAAc,GAAxB;QACC,OAAO,IAAI,uBAAuB,CAAC,IAAI,CAAC,CAAC;IAC1C,CAAC;IAES,kCAAY,GAAtB;QACC,OAAO,IAAI,cAAc,CACxB,IAAI,EACJ,cAAc,CAAC,UAAU,EACzB,cAAc,CAAC,UAAU,EACzB,cAAc,CAAC,UAAU,EACzB,cAAc,CAAC,WAAW,EAC1B,cAAc,CAAC,SAAS,CACxB,CAAC;IACH,CAAC;IAES,oCAAc,GAAxB;QACC,OAAO,IAAI,iBAAiB,CAAC,IAAI,CAAC,CAAC;IACpC,CAAC;IAES,mCAAa,GAAvB;QACC,IAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;QACvB,IAAI,IAAI,YAAY,qBAAqB,EAAE,CAAC;YAC3C,OAAO,IAAI,CAAC,IAAI,CAAC;QAClB,CAAC;aAAM,CAAC;YACP,OAAO,IAAI,CAAC;QACb,CAAC;IACF,CAAC;IAED,4CAAsB,GAAtB;QACC,gBAAK,CAAC,sBAAsB,WAAE,CAAC;QAC/B,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;IACjB,CAAC;IAED,sBAAI,+BAAM;aAAV;YACC,IAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;YAC/B,IAAI,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC;gBACzB,OAAO,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC;YAC7C,CAAC;YACD,OAAO,YAAY,CAAC,GAAG,CAAC;QACzB,CAAC;aAED,UAAW,MAAoB;YAC9B,IAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;YAC/B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC;gBACvD,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,MAAM,CAAC;YAC7B,CAAC;QACF,CAAC;;;OAPA;IASD,sBAAI,iCAAQ;aAAZ;YACC,IAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;YAC/B,KAAK,IAAI,CAAC,GAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC;gBAC/C,IAAM,QAAQ,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;gBACtC,IAAI,QAAQ,IAAI,IAAI,EAAE,CAAC;oBACtB,OAAO,QAAQ,CAAC;gBACjB,CAAC;YACF,CAAC;YACD,OAAO,SAAS,CAAC;QAClB,CAAC;aAED,UAAa,QAAwC;YACpD,IAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;YAC/B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC;gBACvD,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,GAAG,QAAQ,CAAC;YACjC,CAAC;QACF,CAAC;;;OAPA;IASQ,uCAAiB,GAA1B,UAA2B,OAA2C;QACrE,OAAO,CAAC,CAAC,CAAC;IACX,CAAC;IAED,sBAAI,+BAAM;aAAV;YACC,IAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;YAC/B,IAAI,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC;gBACzB,OAAO,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC;YAC7C,CAAC;YACD,OAAO,GAAG,CAAC;QACZ,CAAC;aAED,UAAW,MAAc;YACxB,IAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;YAC/B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC;gBACvD,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,MAAM,CAAC;YAC7B,CAAC;QACF,CAAC;;;OAPA;IASD,sBAAI,8BAAK;aAAT;YACC,IAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;YAC/B,KAAK,IAAI,CAAC,GAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC;gBAC/C,IAAM,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;gBAChC,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;oBACnB,OAAO,KAAK,CAAC;gBACd,CAAC;YACF,CAAC;YACD,OAAO,SAAS,CAAC;QAClB,CAAC;aAED,UAAU,KAAkC;YAC3C,IAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;YAC/B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC;gBACvD,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,KAAK,CAAC;YAC3B,CAAC;QACF,CAAC;;;OAPA;IASQ,oCAAc,GAAvB,UAAwB,OAA2C;QAClE,OAAO,CAAC,CAAC,CAAC;IACX,CAAC;IAED,sBAAI,+BAAM;aAAV;YACC,IAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;YAC/B,KAAK,IAAI,CAAC,GAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC;gBAC/C,IAAM,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;gBAClC,IAAI,MAAM,IAAI,IAAI,EAAE,CAAC;oBACpB,OAAO,IAAI,CAAC,OAAO,CAAC;gBACrB,CAAC;YACF,CAAC;YACD,OAAO,SAAS,CAAC;QAClB,CAAC;aAED,UAAW,MAAgC;YAC1C,aAAa;QACd,CAAC;;;OAJA;IAMD,2BAAK,GAAL;QACC,IAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC1C,IAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC/B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC;YACvD,IAAM,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;YAClC,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC;YACtB,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC7B,CAAC;QACD,gBAAgB,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACpC,MAAM,CAAC,sBAAsB,EAAE,CAAC;QAChC,MAAM,CAAC,OAAO,EAAE,CAAC;QACjB,OAAO,MAAM,CAAC;IACf,CAAC;IAES,8BAAQ,GAAlB;QACC,IAAM,WAAW,GAAG,IAAI,CAAC,WAAiC,CAAC;QAC3D,OAAO,IAAI,WAAW,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;IAC/C,CAAC;IAED,iCAAW,GAAX,UACC,CAAS,EACT,CAAS,EACT,EAAU,EACV,EAAU,EACV,EAAU,EACV,EAAU,EACV,EAAU;QAEV,OAAO,KAAK,CAAC;IACd,CAAC;IACF,kBAAC;AAAD,CAAC,AA1MD,CAAiC,UAAU,GA0M1C","sourcesContent":["/\n Copyright (C) 2019 Toshiba Corporation\n * SPDX-License-Identifier: Apache-2.0\n /\n\nimport { IPoint } from \"pixi.js\";\nimport { EShapeCorner } from \"../e-shape-corner\";\nimport { EShapeDefaults } from \"../e-shape-defaults\";\nimport { EShapeFill } from \"../e-shape-fill\";\nimport { EShapeGradientLike } from \"../e-shape-gradient\";\nimport { EShapePoints } from \"../e-shape-points\";\nimport { EShapeStroke } from \"../e-shape-stroke\";\nimport { EShapeData } from \"../e-shape-data\";\nimport { EShapeText } from \"../e-shape-text\";\nimport { EShapeType } from \"../e-shape-type\";\nimport { EShapeBase } from \"./e-shape-base\";\nimport { EShapeGroupFillEditor } from \"./e-shape-group-fill-editor\";\nimport { EShapeGroupPoints } from \"./e-shape-group-points\";\nimport { EShapeGroupPropertyParent } from \"./e-shape-group-property-parent\";\nimport { EShapeGroupSize } from \"./e-shape-group-size\";\nimport { EShapeGroupSizeEditor } from \"./e-shape-group-size-editor\";\nimport { EShapeGroupSizeViewer } from \"./e-shape-group-size-viewer\";\nimport { EShapeGroupStrokeEditor } from \"./e-shape-group-stroke-editor\";\nimport { EShapeDataImpl } from \"../e-shape-data-impl\";\nimport { EShapeTextImpl } from \"./e-shape-text-impl\";\nimport { EShapeResourceManagerDeserializationMode } from \"../e-shape-resource-manager-deserialization-mode\";\nimport { EShapeConnectors } from \"../e-shape-connectors\";\nimport { EShapeImageLike } from \"../e-shape-image-like\";\nimport { EShapeResourceManagerSerialization } from \"../e-shape-resource-manager-serialization\";\n\nexport class EShapeGroup extends EShapeBase implements EShapeGroupPropertyParent {\n\tsize: EShapeGroupSize;\n\tfill: EShapeFill;\n\tstroke: EShapeStroke;\n\t/* @deprecated in favor of {@link data} */\n\ttag: EShapeData;\n\tdata: EShapeData;\n\ttext: EShapeText;\n\n\tprotected _mode: EShapeResourceManagerDeserializationMode;\n\tprotected _points?: EShapePoints;\n\n\tconstructor(\n\t\tmode: EShapeResourceManagerDeserializationMode,\n\t\ttype: EShapeType = EShapeType.GROUP\n\t) {\n\t\tsuper(type);\n\t\tthis._mode = mode;\n\t\tconst data = new EShapeDataImpl();\n\t\tthis.data = data;\n\t\tthis.tag = data;\n\t\tthis.size = this.newGroupSize(mode);\n\t\tthis.fill = this.newGroupFill();\n\t\tthis.stroke = this.newGroupStroke();\n\t\tthis.text = this.newGroupText();\n\t\tthis._points = this.newGroupPoints();\n\t}\n\n\tget mode(): EShapeResourceManagerDeserializationMode {\n\t\treturn this._mode;\n\t}\n\n\tprotected newGroupSize(mode: EShapeResourceManagerDeserializationMode): EShapeGroupSize {\n\t\tconst sizeX = EShapeDefaults.SIZE_X;\n\t\tconst sizeY = EShapeDefaults.SIZE_Y;\n\t\tif (mode !== EShapeResourceManagerDeserializationMode.VIEWER) {\n\t\t\treturn new EShapeGroupSizeEditor(this, sizeX, sizeY, this.isGroupSizeFittable());\n\t\t} else {\n\t\t\treturn new EShapeGroupSizeViewer(this, sizeX, sizeY, sizeX, sizeY);\n\t\t}\n\t}\n\n\tprotected isGroupSizeFittable(): boolean {\n\t\treturn true;\n\t}\n\n\tprotected newGroupFill(): EShapeFill {\n\t\treturn new EShapeGroupFillEditor(this);\n\t}\n\n\tprotected newGroupStroke(): EShapeStroke {\n\t\treturn new EShapeGroupStrokeEditor(this);\n\t}\n\n\tprotected newGroupText(): EShapeText {\n\t\treturn new EShapeTextImpl(\n\t\t\tthis,\n\t\t\tEShapeDefaults.TEXT_VALUE,\n\t\t\tEShapeDefaults.TEXT_COLOR,\n\t\t\tEShapeDefaults.TEXT_ALPHA,\n\t\t\tEShapeDefaults.TEXT_FAMILY,\n\t\t\tEShapeDefaults.TEXT_SIZE\n\t\t);\n\t}\n\n\tprotected newGroupPoints(): EShapePoints \| undefined {\n\t\treturn new EShapeGroupPoints(this);\n\t}\n\n\tprotected getBoundsSize(): IPoint {\n\t\tconst size = this.size;\n\t\tif (size instanceof EShapeGroupSizeViewer) {\n\t\t\treturn size.base;\n\t\t} else {\n\t\t\treturn size;\n\t\t}\n\t}\n\n\tonChildTransformChange(): void {\n\t\tsuper.onChildTransformChange();\n\t\tthis.size.fit();\n\t}\n\n\tget corner(): EShapeCorner {\n\t\tconst children = this.children;\n\t\tif (0 < children.length) {\n\t\t\treturn children[children.length - 1].corner;\n\t\t}\n\t\treturn EShapeCorner.ALL;\n\t}\n\n\tset corner(corner: EShapeCorner) {\n\t\tconst children = this.children;\n\t\tfor (let i = 0, imax = children.length; i < imax; ++i) {\n\t\t\tchildren[i].corner = corner;\n\t\t}\n\t}\n\n\tget gradient(): EShapeGradientLike \| undefined {\n\t\tconst children = this.children;\n\t\tfor (let i = children.length - 1; 0 <= i; --i) {\n\t\t\tconst gradient = children[i].gradient;\n\t\t\tif (gradient != null) {\n\t\t\t\treturn gradient;\n\t\t\t}\n\t\t}\n\t\treturn undefined;\n\t}\n\n\tset gradient(gradient: EShapeGradientLike \| undefined) {\n\t\tconst children = this.children;\n\t\tfor (let i = 0, imax = children.length; i < imax; ++i) {\n\t\t\tchildren[i].gradient = gradient;\n\t\t}\n\t}\n\n\toverride serializeGradient(manager: EShapeResourceManagerSerialization): number {\n\t\treturn -1;\n\t}\n\n\tget radius(): number {\n\t\tconst children = this.children;\n\t\tif (0 < children.length) {\n\t\t\treturn children[children.length - 1].radius;\n\t\t}\n\t\treturn 0.5;\n\t}\n\n\tset radius(radius: number) {\n\t\tconst children = this.children;\n\t\tfor (let i = 0, imax = children.length; i < imax; ++i) {\n\t\t\tchildren[i].radius = radius;\n\t\t}\n\t}\n\n\tget image(): EShapeImageLike \| undefined {\n\t\tconst children = this.children;\n\t\tfor (let i = children.length - 1; 0 <= i; --i) {\n\t\t\tconst image = children[i].image;\n\t\t\tif (image != null) {\n\t\t\t\treturn image;\n\t\t\t}\n\t\t}\n\t\treturn undefined;\n\t}\n\n\tset image(image: EShapeImageLike \| undefined) {\n\t\tconst children = this.children;\n\t\tfor (let i = 0, imax = children.length; i < imax; ++i) {\n\t\t\tchildren[i].image = image;\n\t\t}\n\t}\n\n\toverride serializeImage(manager: EShapeResourceManagerSerialization): number {\n\t\treturn -1;\n\t}\n\n\tget points(): EShapePoints \| undefined {\n\t\tconst children = this.children;\n\t\tfor (let i = children.length - 1; 0 <= i; --i) {\n\t\t\tconst points = children[i].points;\n\t\t\tif (points != null) {\n\t\t\t\treturn this._points;\n\t\t\t}\n\t\t}\n\t\treturn undefined;\n\t}\n\n\tset points(points: EShapePoints \| undefined) {\n\t\t// DO NOTHING\n\t}\n\n\tclone(): EShapeGroup {\n\t\tconst result = this.newClone().copy(this);\n\t\tconst children = this.children;\n\t\tfor (let i = 0, imax = children.length; i < imax; ++i) {\n\t\t\tconst clone = children[i].clone();\n\t\t\tclone.parent = result;\n\t\t\tresult.children.push(clone);\n\t\t}\n\t\tEShapeConnectors.move(this, result);\n\t\tresult.onChildTransformChange();\n\t\tresult.toDirty();\n\t\treturn result;\n\t}\n\n\tprotected newClone(): EShapeGroup {\n\t\tconst constructor = this.constructor as typeof EShapeGroup;\n\t\treturn new constructor(this._mode, this.type);\n\t}\n\n\tcontainsAbs(\n\t\tx: number,\n\t\ty: number,\n\t\tax: number,\n\t\tay: number,\n\t\tsw: number,\n\t\tss: number,\n\t\tsa: number\n\t): boolean {\n\t\treturn false;\n\t}\n}\n"]}

package/dist/wcardinal-ui-theme-dark-en-us.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /*
- Winter Cardinal UI v0.456.0
+ Winter Cardinal UI v0.457.1
  Copyright (C) 2019 Toshiba Corporation
  SPDX-License-Identifier: Apache-2.0

package/dist/wcardinal-ui-theme-dark-en-us.min.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /*
- Winter Cardinal UI v0.456.0
+ Winter Cardinal UI v0.457.1
  Copyright (C) 2019 Toshiba Corporation
  SPDX-License-Identifier: Apache-2.0

package/dist/wcardinal-ui-theme-dark-ja-jp.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /*
- Winter Cardinal UI v0.456.0
+ Winter Cardinal UI v0.457.1
  Copyright (C) 2019 Toshiba Corporation
  SPDX-License-Identifier: Apache-2.0

package/dist/wcardinal-ui-theme-dark-ja-jp.min.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /*
- Winter Cardinal UI v0.456.0
+ Winter Cardinal UI v0.457.1
  Copyright (C) 2019 Toshiba Corporation
  SPDX-License-Identifier: Apache-2.0

package/dist/wcardinal-ui-theme-dark.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /*
- Winter Cardinal UI v0.456.0
+ Winter Cardinal UI v0.457.1
  Copyright (C) 2019 Toshiba Corporation
  SPDX-License-Identifier: Apache-2.0

package/dist/wcardinal-ui-theme-dark.min.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /*
- Winter Cardinal UI v0.456.0
+ Winter Cardinal UI v0.457.1
  Copyright (C) 2019 Toshiba Corporation
  SPDX-License-Identifier: Apache-2.0

package/dist/wcardinal-ui-theme-white-en-us.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /*
- Winter Cardinal UI v0.456.0
+ Winter Cardinal UI v0.457.1
  Copyright (C) 2019 Toshiba Corporation
  SPDX-License-Identifier: Apache-2.0

package/dist/wcardinal-ui-theme-white-en-us.min.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /*
- Winter Cardinal UI v0.456.0
+ Winter Cardinal UI v0.457.1
  Copyright (C) 2019 Toshiba Corporation
  SPDX-License-Identifier: Apache-2.0

package/dist/wcardinal-ui-theme-white-ja-jp.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /*
- Winter Cardinal UI v0.456.0
+ Winter Cardinal UI v0.457.1
  Copyright (C) 2019 Toshiba Corporation
  SPDX-License-Identifier: Apache-2.0

package/dist/wcardinal-ui-theme-white-ja-jp.min.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /*
- Winter Cardinal UI v0.456.0
+ Winter Cardinal UI v0.457.1
  Copyright (C) 2019 Toshiba Corporation
  SPDX-License-Identifier: Apache-2.0

package/dist/wcardinal-ui-theme-white.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /*
- Winter Cardinal UI v0.456.0
+ Winter Cardinal UI v0.457.1
  Copyright (C) 2019 Toshiba Corporation
  SPDX-License-Identifier: Apache-2.0

package/dist/wcardinal-ui-theme-white.min.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /*
- Winter Cardinal UI v0.456.0
+ Winter Cardinal UI v0.457.1
  Copyright (C) 2019 Toshiba Corporation
  SPDX-License-Identifier: Apache-2.0

package/dist/wcardinal-ui.cjs.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /*
- Winter Cardinal UI v0.456.0
+ Winter Cardinal UI v0.457.1
  Copyright (C) 2019 Toshiba Corporation
  SPDX-License-Identifier: Apache-2.0
@@ -12175,30 +12175,36 @@ var EShapeEmbedded = /** @class */ (function (_super) {
         configurable: true
     });
     EShapeEmbedded.prototype.newEdges = function () {
+        var _a, _b;
         var result = new Map();
         var layers = this.children;
         if (layers != null) {
             var s = this.size;
             var sx = s.x;
             var sy = s.y;
-            var sxh = sx * 0.5;
-            var syh = sy * 0.5;
+            var work1 = void 0;
+            var work2 = void 0;
             for (var i = 0, imax = layers.length; i < imax; ++i) {
                 var layer = layers[i];
-                var lp = layer.transform.position;
-                var lpx = lp.x + sxh;
-                var lpy = lp.y + syh;
                 var children = layer.children;
                 for (var j = 0, jmax = children.length; j < jmax; ++j) {
                     var child = children[j];
                     if (child instanceof EShapeEmbeddedAcceptorEdge) {
-                        child.transform.updateLocalTransform();
-                        var clt = child.transform.localTransform;
+                        child.updateTransform();
+                        if (work1 == null) {
+                            work1 = ((_a = EShapeEmbedded.WORK_NEW_EDGE1) !== null && _a !== void 0 ? _a : (EShapeEmbedded.WORK_NEW_EDGE1 = new pixi_js.Matrix()))
+                                .copyFrom(this.transform.internalTransform)
+                                .invert();
+                        }
+                        if (work2 == null) {
+                            work2 = (_b = EShapeEmbedded.WORK_NEW_EDGE2) !== null && _b !== void 0 ? _b : (EShapeEmbedded.WORK_NEW_EDGE2 = new pixi_js.Matrix());
+                        }
+                        work2.copyFrom(work1).append(child.transform.internalTransform);
                         result.set(child.id, {
                             type: child.subtype,
-                            x: this.toEdgePosition(lpx, clt.tx, sxh, sx),
-                            y: this.toEdgePosition(lpy, clt.ty, syh, sy),
-                            normal: this.toEdgeNormal(-clt.c, -clt.d),
+                            x: this.toEdgePosition(work2.tx, sx),
+                            y: this.toEdgePosition(work2.ty, sy),
+                            normal: this.toEdgeNormal(-work2.c, -work2.d),
                             size: {
                                 x: 0,
                                 y: 0
@@ -12211,16 +12217,16 @@ var EShapeEmbedded = /** @class */ (function (_super) {
         }
         return result;
     };
-    EShapeEmbedded.prototype.toEdgePosition = function (lp, cp, sh, s) {
+    EShapeEmbedded.prototype.toEdgePosition = function (cp, s) {
         if (0.00001 < Math.abs(s)) {
-            return (lp + cp - sh) / s;
+            return cp / s;
         }
         return 0;
     };
     EShapeEmbedded.prototype.toEdgeNormal = function (x, y) {
         var d = x * x + y * y;
         if (0.00001 < d) {
-            var f = 1 / d;
+            var f = 1 / Math.sqrt(d);
             return {
                 x: x * f,
                 y: y * f
@@ -13407,8 +13413,12 @@ var EShapePointsMarkerBase = /** @class */ (function () {
         this.onFillChange();
     };
     EShapePointsMarkerBase.prototype.copy = function (source) {
+        this.lock();
+        this.type = source.type;
         var size = source.size;
-        this.set(source.type, size.x, size.y);
+        this.size.set(size.x, size.y);
+        this.fill.copy(source.fill);
+        this.unlock();
         return this;
     };
     EShapePointsMarkerBase.prototype.set = function (type, sizeX, sizeY) {
@@ -16822,6 +16832,7 @@ var EShapeEmbeddedLayer = /** @class */ (function (_super) {
             clone.parent = result;
             result.children.push(clone);
         }
+        EShapeConnectors.move(this, result);
         result.onChildTransformChange();
         result.toDirty();
         var size = this.size;
@@ -44745,7 +44756,7 @@ var EShapeGroup = /** @class */ (function (_super) {
             clone.parent = result;
             result.children.push(clone);
         }
-        EShapeConnectors.moveAll(children, result.children, children, result.children);
+        EShapeConnectors.move(this, result);
         result.onChildTransformChange();
         result.toDirty();
         return result;