@wcardinal/wcardinal-ui 0.320.0 → 0.322.0

package/dist/wcardinal-ui.cjs.js

@@ -1,5 +1,5 @@
 /*
- Winter Cardinal UI v0.320.0
+ Winter Cardinal UI v0.322.0
  Copyright (C) 2019 Toshiba Corporation
  SPDX-License-Identifier: Apache-2.0
 
@@ -17614,6 +17614,19 @@ var EShapeEmbeddedDatum = /** @class */ (function () {
     return EShapeEmbeddedDatum;
 }());
 
+/*
+ * Copyright (C) 2019 Toshiba Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+var EShapeAcceptorEdgeSide = {
+    NONE: 0,
+    TOP: 1,
+    RIGHT: 2,
+    BOTTOM: 4,
+    LEFT: 8,
+    ALL: 15
+};
+
 /*
  * Copyright (C) 2019 Toshiba Corporation
  * SPDX-License-Identifier: Apache-2.0
@@ -17622,7 +17635,7 @@ var EShapeAcceptorImpl = /** @class */ (function () {
     function EShapeAcceptorImpl() {
         this._edges = new Map();
     }
-    EShapeAcceptorImpl.prototype.add = function (id, type, x, y, nx, ny, sx, sy) {
+    EShapeAcceptorImpl.prototype.add = function (id, type, x, y, nx, ny, sx, sy, side) {
         this._edges.set(id, {
             type: type,
             x: x,
@@ -17631,7 +17644,8 @@ var EShapeAcceptorImpl = /** @class */ (function () {
             size: {
                 x: sx !== null && sx !== void 0 ? sx : 0,
                 y: sy !== null && sy !== void 0 ? sy : 0
-            }
+            },
+            side: side !== null && side !== void 0 ? side : EShapeAcceptorEdgeSide.TOP
         });
         return true;
     };
@@ -17847,6 +17861,7 @@ var EShapeConnectorEdgeImpl = /** @class */ (function () {
         }, undefined);
         this._normalIdRequired = 0;
         this._normalId = 0;
+        this._side = EShapeAcceptorEdgeSide.TOP;
         this._margin = 0;
         this._lockCount = 0;
         this._isAcceptorChanged = false;
@@ -17938,6 +17953,19 @@ var EShapeConnectorEdgeImpl = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
+    Object.defineProperty(EShapeConnectorEdgeImpl.prototype, "side", {
+        get: function () {
+            return this._side;
+        },
+        set: function (side) {
+            if (this._side !== side) {
+                this._side = side;
+                this.onOtherChange();
+            }
+        },
+        enumerable: false,
+        configurable: true
+    });
     Object.defineProperty(EShapeConnectorEdgeImpl.prototype, "margin", {
         get: function () {
             return this._margin;
@@ -17951,7 +17979,7 @@ var EShapeConnectorEdgeImpl = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
-    EShapeConnectorEdgeImpl.prototype.set = function (acceptorShape, acceptorEdge, acceptorX, acceptorY, margin, x, y, nx, ny) {
+    EShapeConnectorEdgeImpl.prototype.set = function (acceptorShape, acceptorEdge, acceptorX, acceptorY, margin, x, y, nx, ny, side) {
         this.lock();
         this._acceptor.set(acceptorShape, acceptorEdge, acceptorX, acceptorY);
         var local = this._local;
@@ -17974,6 +18002,9 @@ var EShapeConnectorEdgeImpl = /** @class */ (function () {
         else if (ny != null) {
             normal.y = ny;
         }
+        if (side != null) {
+            this.side = side;
+        }
         if (margin != null) {
             this.margin = margin;
         }
@@ -17985,6 +18016,7 @@ var EShapeConnectorEdgeImpl = /** @class */ (function () {
         this._acceptor.copy(source.acceptor);
         this._local.copyFrom(source.local);
         this._normal.copyFrom(source.normal);
+        this.side = source.side;
         this.margin = source.margin;
         this.unlock();
         return this;
@@ -17997,10 +18029,11 @@ var EShapeConnectorEdgeImpl = /** @class */ (function () {
         var edgeId = edge != null ? manager.addResource(edge) : -1;
         var local = this._local;
         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, ",").concat(acceptor.x, ",").concat(acceptor.y, "]"));
+        var side = this._side;
+        return manager.addResource("[".concat(shapeUuid, ",").concat(edgeId, ",").concat(local.x, ",").concat(local.y, ",").concat(this._margin, ",").concat(normal.x, ",").concat(normal.y, ",").concat(acceptor.x, ",").concat(acceptor.y, ",").concat(side, "]"));
     };
     EShapeConnectorEdgeImpl.prototype.deserialize = function (resourceId, mapping, manager) {
-        var _a, _b;
+        var _a, _b, _c;
         var resources = manager.resources;
         if (0 <= resourceId && resourceId < resources.length) {
             var parsed = manager.getExtension(resourceId);
@@ -18030,6 +18063,7 @@ var EShapeConnectorEdgeImpl = /** @class */ (function () {
             else {
                 normal.set(1, 0);
             }
+            this.side = (_c = parsed[9]) !== null && _c !== void 0 ? _c : EShapeAcceptorEdgeSide.TOP;
             this.margin = parsed[4] || 0;
             this.unlock();
             if (shape) {
@@ -30233,7 +30267,7 @@ var DButtonGroup = /** @class */ (function (_super) {
         set: function (newActive) {
             if ((newActive == null || newActive.isToggle) && this._active !== newActive) {
                 var oldActive = this._active;
-                this._active = null;
+                this._active = newActive;
                 var buttons = this._buttons;
                 for (var i = 0, imax = buttons.length; i < imax; ++i) {
                     var button = buttons[i];
@@ -37790,103 +37824,94 @@ var EShapeConnectorElbowPointsFiller = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
-    EShapeConnectorElbowPointsFiller.prototype.toAxis = function (dx, dy, nx, ny) {
+    EShapeConnectorElbowPointsFiller.prototype.toSide = function (x, y) {
+        // y = +x => 0 = x - y
+        // y = -x => 0 = x + y
+        if (0 <= x - y) {
+            if (0 <= x + y) {
+                return EShapeAcceptorEdgeSide.RIGHT;
+            }
+            else {
+                return EShapeAcceptorEdgeSide.BOTTOM;
+            }
+        }
+        else {
+            if (0 <= x + y) {
+                return EShapeAcceptorEdgeSide.TOP;
+            }
+            else {
+                return EShapeAcceptorEdgeSide.LEFT;
+            }
+        }
+    };
+    EShapeConnectorElbowPointsFiller.prototype.toAxis = function (dx, dy, nx, ny, side) {
+        // When (nx, ny) === (0, 0), treat as if side === EShapeAcceptorEdgeSide.ALL.
         var anx = Math.abs(nx);
         var any = Math.abs(ny);
         var threshold = this._threshold;
         if (anx < threshold && any < threshold) {
             if (Math.abs(dx) < Math.abs(dy)) {
                 if (0 <= dy) {
-                    return 2;
+                    return 2; // Bottom
                 }
                 else {
-                    return 0;
+                    return 0; // Top
                 }
             }
             else {
                 if (0 <= dx) {
-                    return 1;
-                }
-                else {
-                    return 3;
-                }
-            }
-        }
-        var s = 0.2;
-        if (0 <= nx) {
-            if (0 <= ny) {
-                if (s < anx && s < any) {
-                    if (dx < dy) {
-                        return 2;
-                    }
-                    else {
-                        return 1;
-                    }
-                }
-                else if (s < anx) {
-                    return 1;
-                }
-                else {
-                    return 2;
-                }
-            }
-            else {
-                if (s < anx && s < any) {
-                    if (dx < -dy) {
-                        return 0;
-                    }
-                    else {
-                        return 1;
-                    }
-                }
-                else if (s < anx) {
-                    return 1;
+                    return 1; // Right
                 }
                 else {
-                    return 0;
+                    return 3; // Left
                 }
             }
         }
-        else {
-            if (0 <= ny) {
-                if (s < anx && s < any) {
-                    if (-dx < dy) {
-                        return 2;
-                    }
-                    else {
-                        return 3;
-                    }
-                }
-                else if (s < anx) {
-                    return 3;
-                }
-                else {
-                    return 2;
-                }
-            }
-            else {
-                if (s < anx && s < any) {
-                    if (dy < dx) {
-                        return 0;
-                    }
-                    else {
-                        return 3;
-                    }
-                }
-                else if (s < anx) {
-                    return 3;
-                }
-                else {
-                    return 0;
-                }
+        var d = null;
+        var result = 0;
+        // 0 := (0, -1)
+        // | ny,  nx |  0 |
+        // | nx, -ny | -1 |
+        if (side & this.toSide(-nx, ny)) {
+            if (d == null || d < -dy) {
+                d = -dy;
+                result = 0;
+            }
+        }
+        // 1 := (1, 0)
+        // | ny,  nx | 1 |
+        // | nx, -ny | 0 |
+        if (side & this.toSide(ny, nx)) {
+            if (d == null || d < dx) {
+                d = dx;
+                result = 1;
+            }
+        }
+        // 2 := (0, 1)
+        // | ny,  nx | 0 |
+        // | nx, -ny | 1 |
+        if (side & this.toSide(nx, -ny)) {
+            if (d == null || d < dy) {
+                d = dy;
+                result = 2;
+            }
+        }
+        // 3 := (-1, 0)
+        // | ny,  nx | -1 |
+        // | nx, -ny |  0 |
+        if (side & this.toSide(-ny, -nx)) {
+            if (d == null || d < -dx) {
+                d = -dx;
+                result = 3;
             }
         }
+        return result;
     };
-    EShapeConnectorElbowPointsFiller.prototype.toTailAxis = function (x, y, nx, ny) {
-        return this.toAxis(x - this.x, y - this.y, nx, ny);
+    EShapeConnectorElbowPointsFiller.prototype.toTailAxis = function (x, y, nx, ny, side) {
+        return this.toAxis(x - this.x, y - this.y, nx, ny, side);
     };
-    EShapeConnectorElbowPointsFiller.prototype.tail = function (x, y, nx, ny, sxh, syh, margin) {
-        switch (this.toTailAxis(x, y, nx, ny)) {
+    EShapeConnectorElbowPointsFiller.prototype.tail = function (x, y, nx, ny, sxh, syh, margin, side) {
+        switch (this.toTailAxis(x, y, nx, ny, side)) {
             case 0:
                 if (this.y - margin <= y) {
                     this.y -= Math.max(margin, syh);
@@ -37935,11 +37960,11 @@ var EShapeConnectorElbowPointsFiller = /** @class */ (function () {
             this.x = x;
         }
     };
-    EShapeConnectorElbowPointsFiller.prototype.toHeadAxis = function (x, y, nx, ny) {
-        return this.toAxis(this.x - x, this.y - y, nx, ny);
+    EShapeConnectorElbowPointsFiller.prototype.toHeadAxis = function (x, y, nx, ny, side) {
+        return this.toAxis(this.x - x, this.y - y, nx, ny, side);
     };
-    EShapeConnectorElbowPointsFiller.prototype.head = function (x, y, nx, ny, sxh, syh, margin) {
-        switch (this.toHeadAxis(x, y, nx, ny)) {
+    EShapeConnectorElbowPointsFiller.prototype.head = function (x, y, nx, ny, sxh, syh, margin, side) {
+        switch (this.toHeadAxis(x, y, nx, ny, side)) {
             case 0:
                 if (y - margin <= this.y) {
                     this.y = y - Math.max(margin, syh);
@@ -38036,6 +38061,7 @@ var EShapeConnectorElbow = /** @class */ (function (_super) {
         var tailNormal = tail.normal;
         var tailNormalX = tailNormal.x;
         var tailNormalY = tailNormal.y;
+        var tailSide = tail.side;
         // Head
         var headLocal = head.local;
         var headLocalX = headLocal.x;
@@ -38043,6 +38069,7 @@ var EShapeConnectorElbow = /** @class */ (function (_super) {
         var headNormal = head.normal;
         var headNormalX = headNormal.x;
         var headNormalY = headNormal.y;
+        var headSide = head.side;
         // Body
         var bodyValues = body.values;
         var bodyValuesLength = bodyValues.length;
@@ -38076,7 +38103,7 @@ var EShapeConnectorElbow = /** @class */ (function (_super) {
                 var y3 = bodyValues[1];
                 var x4 = cx + c * x3 - s * y3;
                 var y4 = cy + c * y3 + s * x3;
-                filler.tail(x4, y4, tailNormalX, tailNormalY, sxh, syh, tailMargin);
+                filler.tail(x4, y4, tailNormalX, tailNormalY, sxh, syh, tailMargin, tailSide);
                 for (var i = 2; i < bodyValuesLength; i += 2) {
                     var x = bodyValues[i + 0];
                     var y = bodyValues[i + 1];
@@ -38084,11 +38111,11 @@ var EShapeConnectorElbow = /** @class */ (function (_super) {
                     var y5 = cy + c * y + s * x;
                     filler.middle(x5, y5);
                 }
-                filler.head(x1, y1, headNormalX, headNormalY, sxh, syh, headMargin);
+                filler.head(x1, y1, headNormalX, headNormalY, sxh, syh, headMargin, headSide);
             }
             else {
-                filler.tail(cx, cy, tailNormalX, tailNormalY, sxh, syh, tailMargin);
-                filler.head(x1, y1, headNormalX, headNormalY, sxh, syh, headMargin);
+                filler.tail(cx, cy, tailNormalX, tailNormalY, sxh, syh, tailMargin, tailSide);
+                filler.head(x1, y1, headNormalX, headNormalY, sxh, syh, headMargin, headSide);
             }
             filler.margin(tailMargin, headMargin);
         }
@@ -93745,6 +93772,7 @@ exports.DynamicFontAtlases = DynamicFontAtlases;
 exports.DynamicSDFFontAtlas = DynamicSDFFontAtlas;
 exports.DynamicSDFFontAtlases = DynamicSDFFontAtlases;
 exports.DynamicSDFFontGenerator = DynamicSDFFontGenerator;
+exports.EShapeAcceptorEdgeSide = EShapeAcceptorEdgeSide;
 exports.EShapeAcceptorImpl = EShapeAcceptorImpl;
 exports.EShapeAcceptorType = EShapeAcceptorType;
 exports.EShapeAcceptors = EShapeAcceptors;