@wcardinal/wcardinal-ui 0.301.0 → 0.303.0

package/dist/wcardinal-ui.cjs.js

@@ -1,5 +1,5 @@
 /*
- Winter Cardinal UI v0.301.0
+ Winter Cardinal UI v0.303.0
  Copyright (C) 2019 Toshiba Corporation
  SPDX-License-Identifier: Apache-2.0
 
@@ -16289,7 +16289,7 @@ var EShapeTransforms = /** @class */ (function () {
     EShapeTransforms.finalize = function (shape) {
         shape.allowOnTransformChange(true);
     };
-    EShapeTransforms.apply = function (shape, transform, keepSize) {
+    EShapeTransforms.apply = function (shape, transform, capability) {
         var editor = shape.editor;
         if (editor != null) {
             var newLocalTransform = editor.localTransform;
@@ -16297,16 +16297,10 @@ var EShapeTransforms = /** @class */ (function () {
                 .copyTo(newLocalTransform)
                 .append(transform)
                 .append(editor.internalTransform);
-            if (keepSize) {
-                this.applyLocal(shape, newLocalTransform);
-            }
-            else {
-                var size = editor.size;
-                this.applyLocal(shape, newLocalTransform, size.x, size.y);
-            }
+            this.applyLocal(shape, newLocalTransform, capability, editor.size);
         }
     };
-    EShapeTransforms.applyLocal = function (shape, localTransform, bx, by) {
+    EShapeTransforms.applyLocal = function (shape, localTransform, capability, size) {
         shape.disallowUploadedUpdate();
         // Reconstruct the position, the rotation and the size
         var a = localTransform.a;
@@ -16315,30 +16309,56 @@ var EShapeTransforms = /** @class */ (function () {
         var d = localTransform.d;
         var tx = localTransform.tx;
         var ty = localTransform.ty;
-        // Rotation
+        // Transform
         var transform = shape.transform;
-        var rx = Math.atan2(-c, d); // rotation - skewX
-        var ry = Math.atan2(+b, a); // rotation + skewY
-        transform.rotation = (rx + ry) * 0.5; // Here, assumes `skewX` === `skewY`
-        // Skew
-        var skew = (ry - rx) * 0.5;
-        transform.skew.set(skew, skew);
-        // Position: Assumes the pivot is invariant.
-        // tx = position.x - (a * px + c * py)
-        // ty = position.y - (b * px + d * py)
-        //
-        // Thus,
-        // position.x = tx + (a * px + c * py)
-        // position.y = ty + (b * px + d * py)
-        var pivot = transform.pivot;
-        var px = pivot.x;
-        var py = pivot.y;
-        transform.position.set(tx + (a * px + c * py), ty + (b * px + d * py));
+        // Capability
+        var cposition = !!(capability & EShapeCapability.POSITION);
+        var crotation = !!(capability & EShapeCapability.ROTATION);
+        var cskew = !!(capability & EShapeCapability.SKEW);
+        var cwidth = !!(capability & EShapeCapability.WIDTH);
+        var cheight = !!(capability & EShapeCapability.HEIGHT);
+        // Rotation and skew
+        if (crotation || cskew) {
+            // Rotation
+            var rx = Math.atan2(-c, d); // rotation - skewX
+            var ry = Math.atan2(+b, a); // rotation + skewY
+            if (crotation) {
+                transform.rotation = (rx + ry) * 0.5; // Here, assumes `skewX` === `skewY`
+            }
+            // Skew
+            if (cskew) {
+                var skew = (ry - rx) * 0.5;
+                transform.skew.set(skew, skew);
+            }
+        }
+        // Position
+        if (cposition) {
+            // Assumes the pivot is invariant.
+            // tx = position.x - (a * px + c * py)
+            // ty = position.y - (b * px + d * py)
+            //
+            // Thus,
+            // position.x = tx + (a * px + c * py)
+            // position.y = ty + (b * px + d * py)
+            var pivot = transform.pivot;
+            var px = pivot.x;
+            var py = pivot.y;
+            transform.position.set(tx + (a * px + c * py), ty + (b * px + d * py));
+        }
         // Scale
-        if (bx != null && by != null) {
-            var sx = Math.sqrt(a * a + b * b);
-            var sy = Math.sqrt(c * c + d * d);
-            shape.size.set(toSizeNormalized(bx * sx), toSizeNormalized(by * sy));
+        if (cwidth || cheight) {
+            var w = toSizeNormalized(size.x * Math.sqrt(a * a + b * b));
+            var h = toSizeNormalized(size.y * Math.sqrt(c * c + d * d));
+            var s = shape.size;
+            if (cwidth && cheight) {
+                s.set(w, h);
+            }
+            else if (cwidth) {
+                s.x = w;
+            }
+            else {
+                s.y = h;
+            }
         }
         //
         shape.allowUploadedUpdate();
@@ -16396,7 +16416,7 @@ var EShapeGroupSizeLayout = /** @class */ (function () {
             .scale(sx, sy)
             .translate(+pivotX, +pivotY);
         shape.disallowOnTransformChange();
-        EShapeTransforms.applyLocal(shape, transform, childBase.x, childBase.y);
+        EShapeTransforms.applyLocal(shape, transform, EShapeCapability.ALL, childBase);
         shape.allowOnTransformChange(false);
     };
     EShapeGroupSizeLayout.WORK_TRANSFORM = new pixi_js.Matrix();
@@ -49374,7 +49394,7 @@ var DThemeWhiteChartSelectionGridlineX = /** @class */ (function (_super) {
         var result = new EShapeBar();
         result.points.position = EShapeBarPosition.TOP;
         result.stroke.style = EShapeStrokeStyle.DASHED;
-        result.stroke.alpha = 0.25;
+        result.stroke.alpha = 0.75;
         return result;
     };
     return DThemeWhiteChartSelectionGridlineX;
@@ -49396,7 +49416,7 @@ var DThemeWhiteChartSelectionGridlineY = /** @class */ (function (_super) {
         var result = new EShapeBar();
         result.points.position = EShapeBarPosition.LEFT;
         result.stroke.style = EShapeStrokeStyle.DASHED;
-        result.stroke.alpha = 0.25;
+        result.stroke.alpha = 0.75;
         return result;
     };
     return DThemeWhiteChartSelectionGridlineY;
@@ -49417,6 +49437,8 @@ var DThemeWhiteChartSelectionMarker = /** @class */ (function (_super) {
     DThemeWhiteChartSelectionMarker.prototype.newShape = function (state) {
         var result = new EShapeCircle();
         result.size.set(14, 14);
+        result.fill.enable = false;
+        result.stroke.alpha = 0.75;
         return result;
     };
     return DThemeWhiteChartSelectionMarker;
@@ -58536,6 +58558,7 @@ var DThemeDarkChartSelectionGridlineX = /** @class */ (function (_super) {
         var result = new EShapeBar();
         result.points.position = EShapeBarPosition.TOP;
         result.stroke.style = EShapeStrokeStyle.DASHED;
+        result.stroke.alpha = 0.75;
         return result;
     };
     return DThemeDarkChartSelectionGridlineX;
@@ -58557,6 +58580,7 @@ var DThemeDarkChartSelectionGridlineY = /** @class */ (function (_super) {
         var result = new EShapeBar();
         result.points.position = EShapeBarPosition.LEFT;
         result.stroke.style = EShapeStrokeStyle.DASHED;
+        result.stroke.alpha = 0.75;
         return result;
     };
     return DThemeDarkChartSelectionGridlineY;
@@ -58577,6 +58601,8 @@ var DThemeDarkChartSelectionMarker = /** @class */ (function (_super) {
     DThemeDarkChartSelectionMarker.prototype.newShape = function (state) {
         var result = new EShapeCircle();
         result.size.set(14, 14);
+        result.fill.enable = false;
+        result.stroke.alpha = 0.75;
         return result;
     };
     return DThemeDarkChartSelectionMarker;

package/dist/wcardinal-ui.js

@@ -1,5 +1,5 @@
 /*
- Winter Cardinal UI v0.301.0
+ Winter Cardinal UI v0.303.0
  Copyright (C) 2019 Toshiba Corporation
  SPDX-License-Identifier: Apache-2.0
 
@@ -16286,7 +16286,7 @@
         EShapeTransforms.finalize = function (shape) {
             shape.allowOnTransformChange(true);
         };
-        EShapeTransforms.apply = function (shape, transform, keepSize) {
+        EShapeTransforms.apply = function (shape, transform, capability) {
             var editor = shape.editor;
             if (editor != null) {
                 var newLocalTransform = editor.localTransform;
@@ -16294,16 +16294,10 @@
                     .copyTo(newLocalTransform)
                     .append(transform)
                     .append(editor.internalTransform);
-                if (keepSize) {
-                    this.applyLocal(shape, newLocalTransform);
-                }
-                else {
-                    var size = editor.size;
-                    this.applyLocal(shape, newLocalTransform, size.x, size.y);
-                }
+                this.applyLocal(shape, newLocalTransform, capability, editor.size);
             }
         };
-        EShapeTransforms.applyLocal = function (shape, localTransform, bx, by) {
+        EShapeTransforms.applyLocal = function (shape, localTransform, capability, size) {
             shape.disallowUploadedUpdate();
             // Reconstruct the position, the rotation and the size
             var a = localTransform.a;
@@ -16312,30 +16306,56 @@
             var d = localTransform.d;
             var tx = localTransform.tx;
             var ty = localTransform.ty;
-            // Rotation
+            // Transform
             var transform = shape.transform;
-            var rx = Math.atan2(-c, d); // rotation - skewX
-            var ry = Math.atan2(+b, a); // rotation + skewY
-            transform.rotation = (rx + ry) * 0.5; // Here, assumes `skewX` === `skewY`
-            // Skew
-            var skew = (ry - rx) * 0.5;
-            transform.skew.set(skew, skew);
-            // Position: Assumes the pivot is invariant.
-            // tx = position.x - (a * px + c * py)
-            // ty = position.y - (b * px + d * py)
-            //
-            // Thus,
-            // position.x = tx + (a * px + c * py)
-            // position.y = ty + (b * px + d * py)
-            var pivot = transform.pivot;
-            var px = pivot.x;
-            var py = pivot.y;
-            transform.position.set(tx + (a * px + c * py), ty + (b * px + d * py));
+            // Capability
+            var cposition = !!(capability & EShapeCapability.POSITION);
+            var crotation = !!(capability & EShapeCapability.ROTATION);
+            var cskew = !!(capability & EShapeCapability.SKEW);
+            var cwidth = !!(capability & EShapeCapability.WIDTH);
+            var cheight = !!(capability & EShapeCapability.HEIGHT);
+            // Rotation and skew
+            if (crotation || cskew) {
+                // Rotation
+                var rx = Math.atan2(-c, d); // rotation - skewX
+                var ry = Math.atan2(+b, a); // rotation + skewY
+                if (crotation) {
+                    transform.rotation = (rx + ry) * 0.5; // Here, assumes `skewX` === `skewY`
+                }
+                // Skew
+                if (cskew) {
+                    var skew = (ry - rx) * 0.5;
+                    transform.skew.set(skew, skew);
+                }
+            }
+            // Position
+            if (cposition) {
+                // Assumes the pivot is invariant.
+                // tx = position.x - (a * px + c * py)
+                // ty = position.y - (b * px + d * py)
+                //
+                // Thus,
+                // position.x = tx + (a * px + c * py)
+                // position.y = ty + (b * px + d * py)
+                var pivot = transform.pivot;
+                var px = pivot.x;
+                var py = pivot.y;
+                transform.position.set(tx + (a * px + c * py), ty + (b * px + d * py));
+            }
             // Scale
-            if (bx != null && by != null) {
-                var sx = Math.sqrt(a * a + b * b);
-                var sy = Math.sqrt(c * c + d * d);
-                shape.size.set(toSizeNormalized(bx * sx), toSizeNormalized(by * sy));
+            if (cwidth || cheight) {
+                var w = toSizeNormalized(size.x * Math.sqrt(a * a + b * b));
+                var h = toSizeNormalized(size.y * Math.sqrt(c * c + d * d));
+                var s = shape.size;
+                if (cwidth && cheight) {
+                    s.set(w, h);
+                }
+                else if (cwidth) {
+                    s.x = w;
+                }
+                else {
+                    s.y = h;
+                }
             }
             //
             shape.allowUploadedUpdate();
@@ -16393,7 +16413,7 @@
                 .scale(sx, sy)
                 .translate(+pivotX, +pivotY);
             shape.disallowOnTransformChange();
-            EShapeTransforms.applyLocal(shape, transform, childBase.x, childBase.y);
+            EShapeTransforms.applyLocal(shape, transform, EShapeCapability.ALL, childBase);
             shape.allowOnTransformChange(false);
         };
         EShapeGroupSizeLayout.WORK_TRANSFORM = new pixi_js.Matrix();