@wcardinal/wcardinal-ui 0.331.0 → 0.332.0

package/dist/wcardinal-ui.js

@@ -1,5 +1,5 @@
 /*
- Winter Cardinal UI v0.331.0
+ Winter Cardinal UI v0.332.0
  Copyright (C) 2019 Toshiba Corporation
  SPDX-License-Identifier: Apache-2.0
 
@@ -17960,6 +17960,9 @@
             this._parent = parent;
             this._onChange = onChange;
             this._acceptor = new EShapeConnectorEdgeAcceptorImpl(this);
+            this._acceptorTransformNew = new pixi_js.Matrix();
+            this._acceptorTransformOld = new pixi_js.Matrix();
+            this._hasAcceptorTransformOld = false;
             this._local = new pixi_js.ObservablePoint(function () {
                 _this.onLocalChange();
             }, undefined);
@@ -17972,6 +17975,7 @@
             this._normalId = 0;
             this._side = EShapeAcceptorEdgeSide.TOP;
             this._margin = 0;
+            this._other = null;
             this._lockCount = 0;
             this._isAcceptorChanged = false;
             this._isLocalChanged = false;
@@ -18005,6 +18009,7 @@
                     isChanged = true;
                 }
                 if (this._isAcceptorChanged) {
+                    this._hasAcceptorTransformOld = false;
                     if (!this._isLocalChanged) {
                         this._localIdRequired += 1;
                     }
@@ -18088,6 +18093,16 @@
             enumerable: false,
             configurable: true
         });
+        Object.defineProperty(EShapeConnectorEdgeImpl.prototype, "other", {
+            get: function () {
+                return this._other;
+            },
+            set: function (other) {
+                this._other = other;
+            },
+            enumerable: false,
+            configurable: true
+        });
         EShapeConnectorEdgeImpl.prototype.set = function (acceptorShape, acceptorEdge, acceptorX, acceptorY, margin, x, y, nx, ny, side) {
             this.lock();
             this._acceptor.set(acceptorShape, acceptorEdge, acceptorX, acceptorY);
@@ -18189,7 +18204,7 @@
             return this;
         };
         EShapeConnectorEdgeImpl.prototype.doFit = function () {
-            var _a, _b;
+            var _a, _b, _c;
             var localIdRequired = this._localIdRequired;
             var isLocalDirty = this._localId !== localIdRequired;
             var normalIdRequired = this._normalIdRequired;
@@ -18203,35 +18218,82 @@
                 if (acceptorShape != null && acceptorEdge != null) {
                     var edge = EShapeAcceptors.get(acceptorShape.type).get(acceptorShape, acceptorEdge);
                     if (edge) {
-                        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;
+                        var oat = this._acceptorTransformOld;
+                        var nat = this._acceptorTransformNew;
+                        this.toAcceptorTransform(acceptorShape, nat);
+                        var other = this._other;
+                        var isOtherDangling = this._hasAcceptorTransformOld &&
+                            other != null &&
+                            other.acceptor.shape == null;
+                        var work = ((_a = EShapeConnectorEdgeImpl.WORK_MATRIX) !== null && _a !== void 0 ? _a : (EShapeConnectorEdgeImpl.WORK_MATRIX = new pixi_js.Matrix()));
+                        if (isOtherDangling) {
+                            oat.copyTo(work).invert().prepend(nat);
+                        }
+                        this._acceptorTransformNew = oat;
+                        this._acceptorTransformOld = nat;
+                        this._hasAcceptorTransformOld = true;
                         this.lock();
                         if (isLocalDirty) {
+                            var l = this._local;
+                            var olx = l.x;
+                            var oly = l.y;
                             var size = acceptorShape.size;
                             var pivot = acceptorShape.transform.pivot;
-                            var lx = pivot.x + size.x * ((_a = acceptor.x) !== null && _a !== void 0 ? _a : edge.x);
-                            var ly = pivot.y + size.y * ((_b = acceptor.y) !== null && _b !== void 0 ? _b : edge.y);
-                            this._local.set(a * lx + c * ly + tx, b * lx + d * ly + ty);
+                            var x = pivot.x + size.x * ((_b = acceptor.x) !== null && _b !== void 0 ? _b : edge.x);
+                            var y = pivot.y + size.y * ((_c = acceptor.y) !== null && _c !== void 0 ? _c : edge.y);
+                            var nlx = nat.a * x + nat.c * y + nat.tx;
+                            var nly = nat.b * x + nat.d * y + nat.ty;
+                            l.set(nlx, nly);
+                            if (isOtherDangling) {
+                                var ol = other.local;
+                                var oolx = ol.x;
+                                var ooly = ol.y;
+                                var nolx = work.a * oolx + work.c * ooly + work.tx;
+                                var noly = work.b * oolx + work.d * ooly + work.ty;
+                                var odx = oolx - olx;
+                                var ody = ooly - oly;
+                                var ndx = nolx - nlx;
+                                var ndy = noly - nly;
+                                var od = odx * odx + ody * ody;
+                                var nd = ndx * ndx + ndy * ndy;
+                                if (0.000001 < nd) {
+                                    var f = Math.sqrt(od / nd);
+                                    ol.set(nlx + ndx * f, nly + ndy * f);
+                                }
+                                else {
+                                    ol.set(nolx, noly);
+                                }
+                            }
                         }
                         if (isNormalDirty) {
-                            var edgeNormal = edge.normal;
-                            var nx = edgeNormal.x;
-                            var ny = edgeNormal.y;
-                            var x = a * nx + c * ny;
-                            var y = b * nx + d * ny;
-                            var l = x * x + y * y;
-                            var normal = this._normal;
-                            if (0.000001 < l) {
-                                var f = 1 / Math.sqrt(l);
-                                normal.set(x * f, y * f);
+                            var en = edge.normal;
+                            var enx = en.x;
+                            var eny = en.y;
+                            var nx = nat.a * enx + nat.c * eny;
+                            var ny = nat.b * enx + nat.d * eny;
+                            var sd = nx * nx + ny * ny;
+                            var n = this._normal;
+                            if (0.000001 < sd) {
+                                var f = 1 / Math.sqrt(sd);
+                                n.set(nx * f, ny * f);
                             }
                             else {
-                                normal.set(nx, ny);
+                                n.set(enx, eny);
+                            }
+                            if (isOtherDangling) {
+                                var on = other.normal;
+                                var oonx = on.x;
+                                var oony = on.y;
+                                var nonx = work.a * oonx + work.c * oony;
+                                var nony = work.b * oonx + work.d * oony;
+                                var osd = nonx * nonx + nony * nony;
+                                if (0.000001 < osd) {
+                                    var f = 1 / Math.sqrt(osd);
+                                    on.set(nonx * f, nony * f);
+                                }
+                                else {
+                                    on.set(oonx, oony);
+                                }
                             }
                         }
                         var result = this._isLocalChanged || this._isNormalChanged;
@@ -18242,20 +18304,19 @@
             }
             return false;
         };
-        EShapeConnectorEdgeImpl.prototype.toAcceptorTransform = function (shape) {
-            var _a;
+        EShapeConnectorEdgeImpl.prototype.toAcceptorTransform = function (shape, result) {
             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 pixi_js.Matrix()))
+                return result
                     .copyFrom(parentParent.transform.worldTransform)
                     .invert()
                     .append(shape.transform.worldTransform);
             }
             else {
-                return shape.transform.worldTransform;
+                return result.copyFrom(shape.transform.worldTransform);
             }
         };
         EShapeConnectorEdgeImpl.prototype.onAcceptorChange = function () {
@@ -18265,6 +18326,7 @@
                 this._isAcceptorChanged = true;
                 return;
             }
+            this._hasAcceptorTransformOld = false;
             this.fit(true);
         };
         EShapeConnectorEdgeImpl.prototype.onLocalChange = function () {
@@ -18323,8 +18385,12 @@
             var onChangeBound = function () {
                 _this.onChange();
             };
-            this._tail = new EShapeConnectorEdgeImpl(parent, onChangeBound);
-            this._head = new EShapeConnectorEdgeImpl(parent, onChangeBound);
+            var tail = new EShapeConnectorEdgeImpl(parent, onChangeBound);
+            var head = new EShapeConnectorEdgeImpl(parent, onChangeBound);
+            tail.other = head;
+            head.other = tail;
+            this._tail = tail;
+            this._head = head;
         }
         EShapeConnectorEdgeContainerImpl.prototype.lock = function () {
             this._lockCount += 1;