@wcardinal/wcardinal-ui 0.313.0 → 0.315.0

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

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

package/dist/wcardinal-ui.cjs.js

@@ -1,5 +1,5 @@
 /*
- Winter Cardinal UI v0.313.0
+ Winter Cardinal UI v0.315.0
  Copyright (C) 2019 Toshiba Corporation
  SPDX-License-Identifier: Apache-2.0
 
@@ -1997,6 +1997,9 @@ var EShapeBarPoints = /** @class */ (function () {
             return 0;
         }
     };
+    EShapeBarPoints.prototype.onSizeChange = function () {
+        this.update();
+    };
     EShapeBarPoints.prototype.update = function () {
         var parentSize = this._parent.size;
         var parentSizeX = parentSize.x;
@@ -4660,6 +4663,10 @@ var EShapeBase = /** @class */ (function (_super) {
         this._boundsInternalTransformId = NaN;
         this._boundsLocalTransformId = NaN;
         this.onTransformChange_();
+        var points = this._points;
+        if (points != null) {
+            points.onSizeChange();
+        }
         this.updateUploaded();
         var connector = this._connector;
         if (connector != null) {
@@ -19070,96 +19077,60 @@ var EShapeLinePoints = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
-    EShapeLinePoints.prototype.toFitted = function () {
+    EShapeLinePoints.prototype.toFitted = function (x, y) {
         this._valuesBase = undefined;
-        var parentSize = this._parent.size;
-        this._parentSizeFitted.copyFrom(parentSize);
-        this._parentSizeBase.copyFrom(parentSize);
+        this._parentSizeFitted.set(x, y);
+        this._parentSizeBase.set(x, y);
+    };
+    EShapeLinePoints.prototype.onSizeChange = function () {
+        this.fit();
     };
     EShapeLinePoints.prototype.fit = function () {
+        var parent = this._parent;
         var psizef = this._parentSizeFitted;
-        var psize = this._parent.size;
+        var psize = parent.size;
         var psizeX = psize.x;
         var psizeY = psize.y;
         var threshold = 0.00001;
-        if (threshold < Math.abs(psizeX - psizef.x) || threshold < Math.abs(psizeY - psizef.y)) {
-            psizef.set(psizeX, psizeY);
-            var psizeBase = this._parentSizeBase;
-            var isValidX = threshold < Math.abs(psizeBase.x);
-            var isValidY = threshold < Math.abs(psizeBase.y);
-            if (isValidX || isValidY) {
-                var scaleX = isValidX ? psizeX / psizeBase.x : 1;
-                var scaleY = isValidY ? psizeY / psizeBase.y : 1;
-                // Values
-                var values = this._values;
-                var valuesBase = this._valuesBase;
-                if (valuesBase == null) {
-                    valuesBase = [];
-                    this._valuesBase = valuesBase;
-                    for (var i = 0, imax = values.length; i < imax; i += 2) {
-                        var x = values[i];
-                        var y = values[i + 1];
-                        values[i] = x * scaleX;
-                        values[i + 1] = y * scaleY;
-                        valuesBase.push(x, y);
-                    }
-                }
-                else {
-                    for (var i = 0, imax = values.length; i < imax; i += 2) {
-                        values[i] = valuesBase[i] * scaleX;
-                        values[i + 1] = valuesBase[i + 1] * scaleY;
-                    }
-                }
-                // Formatted ID, values and boundary
-                if (this._id === this._formattedId) {
-                    var formatted = this._formatted;
-                    if (formatted != null) {
-                        // Formatted values
-                        var formattedValues = formatted.values;
-                        var formattedValuesBase = this._formattedValuesBase;
-                        if (formattedValuesBase == null) {
-                            formattedValuesBase = [];
-                            this._formattedValuesBase = formattedValuesBase;
-                            for (var i = 0, imax = formattedValues.length; i < imax; i += 2) {
-                                var x = formattedValues[i];
-                                var y = formattedValues[i + 1];
-                                formattedValues[i] = x * scaleX;
-                                formattedValues[i + 1] = y * scaleY;
-                                formattedValuesBase.push(x, y);
-                            }
-                        }
-                        else {
-                            for (var i = 0, imax = formattedValues.length; i < imax; i += 2) {
-                                formattedValues[i] = formattedValuesBase[i] * scaleX;
-                                formattedValues[i + 1] = formattedValuesBase[i + 1] * scaleY;
-                            }
-                        }
-                        // Formatted boundary
-                        var formattedBoundary = formatted.boundary;
-                        var formattedBoundaryBase = this._formattedBoundaryBase;
-                        if (formattedBoundaryBase == null) {
-                            formattedBoundaryBase = [0, 0, 0, 0];
-                            this._formattedBoundaryBase = formattedBoundaryBase;
-                            for (var i = 0, imax = formattedBoundary.length; i < imax; i += 2) {
-                                var x = formattedBoundary[i];
-                                var y = formattedBoundary[i + 1];
-                                formattedBoundary[i] = x * scaleX;
-                                formattedBoundary[i + 1] = y * scaleY;
-                                formattedBoundaryBase[i] = x;
-                                formattedBoundaryBase[i + 1] = y;
-                            }
-                        }
-                        else {
-                            for (var i = 0, imax = formattedBoundary.length; i < imax; i += 2) {
-                                formattedBoundary[i] = formattedBoundaryBase[i] * scaleX;
-                                formattedBoundary[i + 1] = formattedBoundaryBase[i + 1] * scaleY;
-                            }
-                        }
-                        // Formatted ID
-                        this._formattedId += 1;
-                    }
-                }
-                this._id += 1;
+        if (Math.abs(psizeX - psizef.x) <= threshold && Math.abs(psizeY - psizef.y) <= threshold) {
+            return;
+        }
+        psizef.set(psizeX, psizeY);
+        var psizeBase = this._parentSizeBase;
+        var isValidX = threshold < Math.abs(psizeBase.x);
+        var isValidY = threshold < Math.abs(psizeBase.y);
+        if (!isValidX && !isValidY) {
+            return;
+        }
+        var scaleX = isValidX ? psizeX / psizeBase.x : 1;
+        var scaleY = isValidY ? psizeY / psizeBase.y : 1;
+        // Values
+        var values = this._values;
+        var valuesBase = this._valuesBase;
+        if (valuesBase == null) {
+            valuesBase = [];
+            this._valuesBase = valuesBase;
+            for (var i = 0, imax = values.length; i < imax; i += 2) {
+                var x = values[i];
+                var y = values[i + 1];
+                values[i] = x * scaleX;
+                values[i + 1] = y * scaleY;
+                valuesBase.push(x, y);
+            }
+        }
+        else {
+            for (var i = 0, imax = values.length; i < imax; i += 2) {
+                values[i] = valuesBase[i] * scaleX;
+                values[i + 1] = valuesBase[i + 1] * scaleY;
+            }
+        }
+        // Invalidate
+        this._id += 1;
+        if (this._formatter || this._style & EShapePointsStyle.FORMATTER_MASK) {
+            var uploaded = parent.uploaded;
+            if (uploaded && !uploaded.isCompatible(parent)) {
+                parent.uploaded = undefined;
+                parent.toDirty();
             }
         }
     };
@@ -19268,38 +19239,14 @@ var EShapeLinePoints = /** @class */ (function () {
                             style: EShapePointsStyle.NONE
                         };
                     }
-                    var valuesBase = this._valuesBase;
+                    var values = this._values;
                     var segments = this._segments;
-                    if (valuesBase != null) {
-                        var length_1 = valuesBase.length >> 1;
-                        formatter(length_1, valuesBase, segments, style, result);
-                        toPointsBoundary(result.values, result.boundary);
-                        var formattedValues = result.values;
-                        var formattedValuesBase = formattedValues.splice(0);
-                        this._formattedValuesBase = formattedValuesBase;
-                        var formattedBoundary = result.boundary;
-                        var formattedBoundaryBase = [
-                            formattedBoundary[0],
-                            formattedBoundary[1],
-                            formattedBoundary[2],
-                            formattedBoundary[3]
-                        ];
-                        this._formattedBoundaryBase = formattedBoundaryBase;
-                        this.toScaled(formattedValues, formattedValuesBase, formattedBoundary, formattedBoundaryBase);
-                    }
-                    else {
-                        var values = this._values;
-                        var length_2 = values.length >> 1;
-                        formatter(length_2, values, segments, style, result);
-                        toPointsBoundary(result.values, result.boundary);
-                        this._formattedValuesBase = undefined;
-                        this._formattedBoundaryBase = undefined;
-                    }
+                    var length_1 = values.length >> 1;
+                    formatter(length_1, values, segments, style, result);
+                    toPointsBoundary(result.values, result.boundary);
                 }
                 else {
                     result = undefined;
-                    this._formattedValuesBase = undefined;
-                    this._formattedBoundaryBase = undefined;
                 }
                 this._formatted = result;
             }
@@ -19348,7 +19295,8 @@ var EShapeLinePoints = /** @class */ (function () {
             var valuesBaseLength = this._valuesBaseLength;
             var newValuesLength = newValues.length;
             var iupdate = Math.min(newValuesLength, valuesBaseLength);
-            this.toFitted();
+            var parentSize = this._parent.size;
+            this.toFitted(parentSize.x, parentSize.y);
             if (values !== newValues) {
                 for (var i = 0; i < iupdate; ++i) {
                     values[i] = newValues[i];
@@ -19764,8 +19712,8 @@ var EShapeConnectorLine = /** @class */ (function (_super) {
             transform.scale.set(1, 1);
             transform.rotation = 0;
             transform.skew.set(0, 0);
+            points.toFitted(sx, sy);
             this.size.set(sx, sy);
-            points.toFitted();
             points.set(values);
             this.allowUploadedUpdate();
         }
@@ -38725,6 +38673,9 @@ var EShapeGroupPoints = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
+    EShapeGroupPoints.prototype.onSizeChange = function () {
+        // DO NOTHING
+    };
     EShapeGroupPoints.prototype.copy = function (source) {
         var children = this._parent.children;
         for (var i = 0, imax = children.length; i < imax; ++i) {
@@ -40555,6 +40506,9 @@ var EShapeLineOfAnyPointsImpl = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
+    EShapeLineOfAnyPointsImpl.prototype.onSizeChange = function () {
+        // DO NOTHING
+    };
     EShapeLineOfAnyPointsImpl.prototype.copy = function (source) {
         return this.set(source.values, source.segments, source.style);
     };
@@ -78690,8 +78644,8 @@ var DChartSeriesLinear = /** @class */ (function (_super) {
         }
         line.disallowUploadedUpdate();
         line.points.set(values, segments);
+        line.points.toFitted(sx, sy);
         line.size.set(sx, sy);
-        line.points.toFitted();
         line.transform.position.set(cx, cy);
         line.allowUploadedUpdate();
     };

package/dist/wcardinal-ui.js

@@ -1,5 +1,5 @@
 /*
- Winter Cardinal UI v0.313.0
+ Winter Cardinal UI v0.315.0
  Copyright (C) 2019 Toshiba Corporation
  SPDX-License-Identifier: Apache-2.0
 
@@ -1994,6 +1994,9 @@
                 return 0;
             }
         };
+        EShapeBarPoints.prototype.onSizeChange = function () {
+            this.update();
+        };
         EShapeBarPoints.prototype.update = function () {
             var parentSize = this._parent.size;
             var parentSizeX = parentSize.x;
@@ -4657,6 +4660,10 @@
             this._boundsInternalTransformId = NaN;
             this._boundsLocalTransformId = NaN;
             this.onTransformChange_();
+            var points = this._points;
+            if (points != null) {
+                points.onSizeChange();
+            }
             this.updateUploaded();
             var connector = this._connector;
             if (connector != null) {
@@ -19067,96 +19074,60 @@
             enumerable: false,
             configurable: true
         });
-        EShapeLinePoints.prototype.toFitted = function () {
+        EShapeLinePoints.prototype.toFitted = function (x, y) {
             this._valuesBase = undefined;
-            var parentSize = this._parent.size;
-            this._parentSizeFitted.copyFrom(parentSize);
-            this._parentSizeBase.copyFrom(parentSize);
+            this._parentSizeFitted.set(x, y);
+            this._parentSizeBase.set(x, y);
+        };
+        EShapeLinePoints.prototype.onSizeChange = function () {
+            this.fit();
         };
         EShapeLinePoints.prototype.fit = function () {
+            var parent = this._parent;
             var psizef = this._parentSizeFitted;
-            var psize = this._parent.size;
+            var psize = parent.size;
             var psizeX = psize.x;
             var psizeY = psize.y;
             var threshold = 0.00001;
-            if (threshold < Math.abs(psizeX - psizef.x) || threshold < Math.abs(psizeY - psizef.y)) {
-                psizef.set(psizeX, psizeY);
-                var psizeBase = this._parentSizeBase;
-                var isValidX = threshold < Math.abs(psizeBase.x);
-                var isValidY = threshold < Math.abs(psizeBase.y);
-                if (isValidX || isValidY) {
-                    var scaleX = isValidX ? psizeX / psizeBase.x : 1;
-                    var scaleY = isValidY ? psizeY / psizeBase.y : 1;
-                    // Values
-                    var values = this._values;
-                    var valuesBase = this._valuesBase;
-                    if (valuesBase == null) {
-                        valuesBase = [];
-                        this._valuesBase = valuesBase;
-                        for (var i = 0, imax = values.length; i < imax; i += 2) {
-                            var x = values[i];
-                            var y = values[i + 1];
-                            values[i] = x * scaleX;
-                            values[i + 1] = y * scaleY;
-                            valuesBase.push(x, y);
-                        }
-                    }
-                    else {
-                        for (var i = 0, imax = values.length; i < imax; i += 2) {
-                            values[i] = valuesBase[i] * scaleX;
-                            values[i + 1] = valuesBase[i + 1] * scaleY;
-                        }
-                    }
-                    // Formatted ID, values and boundary
-                    if (this._id === this._formattedId) {
-                        var formatted = this._formatted;
-                        if (formatted != null) {
-                            // Formatted values
-                            var formattedValues = formatted.values;
-                            var formattedValuesBase = this._formattedValuesBase;
-                            if (formattedValuesBase == null) {
-                                formattedValuesBase = [];
-                                this._formattedValuesBase = formattedValuesBase;
-                                for (var i = 0, imax = formattedValues.length; i < imax; i += 2) {
-                                    var x = formattedValues[i];
-                                    var y = formattedValues[i + 1];
-                                    formattedValues[i] = x * scaleX;
-                                    formattedValues[i + 1] = y * scaleY;
-                                    formattedValuesBase.push(x, y);
-                                }
-                            }
-                            else {
-                                for (var i = 0, imax = formattedValues.length; i < imax; i += 2) {
-                                    formattedValues[i] = formattedValuesBase[i] * scaleX;
-                                    formattedValues[i + 1] = formattedValuesBase[i + 1] * scaleY;
-                                }
-                            }
-                            // Formatted boundary
-                            var formattedBoundary = formatted.boundary;
-                            var formattedBoundaryBase = this._formattedBoundaryBase;
-                            if (formattedBoundaryBase == null) {
-                                formattedBoundaryBase = [0, 0, 0, 0];
-                                this._formattedBoundaryBase = formattedBoundaryBase;
-                                for (var i = 0, imax = formattedBoundary.length; i < imax; i += 2) {
-                                    var x = formattedBoundary[i];
-                                    var y = formattedBoundary[i + 1];
-                                    formattedBoundary[i] = x * scaleX;
-                                    formattedBoundary[i + 1] = y * scaleY;
-                                    formattedBoundaryBase[i] = x;
-                                    formattedBoundaryBase[i + 1] = y;
-                                }
-                            }
-                            else {
-                                for (var i = 0, imax = formattedBoundary.length; i < imax; i += 2) {
-                                    formattedBoundary[i] = formattedBoundaryBase[i] * scaleX;
-                                    formattedBoundary[i + 1] = formattedBoundaryBase[i + 1] * scaleY;
-                                }
-                            }
-                            // Formatted ID
-                            this._formattedId += 1;
-                        }
-                    }
-                    this._id += 1;
+            if (Math.abs(psizeX - psizef.x) <= threshold && Math.abs(psizeY - psizef.y) <= threshold) {
+                return;
+            }
+            psizef.set(psizeX, psizeY);
+            var psizeBase = this._parentSizeBase;
+            var isValidX = threshold < Math.abs(psizeBase.x);
+            var isValidY = threshold < Math.abs(psizeBase.y);
+            if (!isValidX && !isValidY) {
+                return;
+            }
+            var scaleX = isValidX ? psizeX / psizeBase.x : 1;
+            var scaleY = isValidY ? psizeY / psizeBase.y : 1;
+            // Values
+            var values = this._values;
+            var valuesBase = this._valuesBase;
+            if (valuesBase == null) {
+                valuesBase = [];
+                this._valuesBase = valuesBase;
+                for (var i = 0, imax = values.length; i < imax; i += 2) {
+                    var x = values[i];
+                    var y = values[i + 1];
+                    values[i] = x * scaleX;
+                    values[i + 1] = y * scaleY;
+                    valuesBase.push(x, y);
+                }
+            }
+            else {
+                for (var i = 0, imax = values.length; i < imax; i += 2) {
+                    values[i] = valuesBase[i] * scaleX;
+                    values[i + 1] = valuesBase[i + 1] * scaleY;
+                }
+            }
+            // Invalidate
+            this._id += 1;
+            if (this._formatter || this._style & EShapePointsStyle.FORMATTER_MASK) {
+                var uploaded = parent.uploaded;
+                if (uploaded && !uploaded.isCompatible(parent)) {
+                    parent.uploaded = undefined;
+                    parent.toDirty();
                 }
             }
         };
@@ -19265,38 +19236,14 @@
                                 style: EShapePointsStyle.NONE
                             };
                         }
-                        var valuesBase = this._valuesBase;
+                        var values = this._values;
                         var segments = this._segments;
-                        if (valuesBase != null) {
-                            var length_1 = valuesBase.length >> 1;
-                            formatter(length_1, valuesBase, segments, style, result);
-                            toPointsBoundary(result.values, result.boundary);
-                            var formattedValues = result.values;
-                            var formattedValuesBase = formattedValues.splice(0);
-                            this._formattedValuesBase = formattedValuesBase;
-                            var formattedBoundary = result.boundary;
-                            var formattedBoundaryBase = [
-                                formattedBoundary[0],
-                                formattedBoundary[1],
-                                formattedBoundary[2],
-                                formattedBoundary[3]
-                            ];
-                            this._formattedBoundaryBase = formattedBoundaryBase;
-                            this.toScaled(formattedValues, formattedValuesBase, formattedBoundary, formattedBoundaryBase);
-                        }
-                        else {
-                            var values = this._values;
-                            var length_2 = values.length >> 1;
-                            formatter(length_2, values, segments, style, result);
-                            toPointsBoundary(result.values, result.boundary);
-                            this._formattedValuesBase = undefined;
-                            this._formattedBoundaryBase = undefined;
-                        }
+                        var length_1 = values.length >> 1;
+                        formatter(length_1, values, segments, style, result);
+                        toPointsBoundary(result.values, result.boundary);
                     }
                     else {
                         result = undefined;
-                        this._formattedValuesBase = undefined;
-                        this._formattedBoundaryBase = undefined;
                     }
                     this._formatted = result;
                 }
@@ -19345,7 +19292,8 @@
                 var valuesBaseLength = this._valuesBaseLength;
                 var newValuesLength = newValues.length;
                 var iupdate = Math.min(newValuesLength, valuesBaseLength);
-                this.toFitted();
+                var parentSize = this._parent.size;
+                this.toFitted(parentSize.x, parentSize.y);
                 if (values !== newValues) {
                     for (var i = 0; i < iupdate; ++i) {
                         values[i] = newValues[i];
@@ -19761,8 +19709,8 @@
                 transform.scale.set(1, 1);
                 transform.rotation = 0;
                 transform.skew.set(0, 0);
+                points.toFitted(sx, sy);
                 this.size.set(sx, sy);
-                points.toFitted();
                 points.set(values);
                 this.allowUploadedUpdate();
             }
@@ -38722,6 +38670,9 @@
             enumerable: false,
             configurable: true
         });
+        EShapeGroupPoints.prototype.onSizeChange = function () {
+            // DO NOTHING
+        };
         EShapeGroupPoints.prototype.copy = function (source) {
             var children = this._parent.children;
             for (var i = 0, imax = children.length; i < imax; ++i) {
@@ -40552,6 +40503,9 @@
             enumerable: false,
             configurable: true
         });
+        EShapeLineOfAnyPointsImpl.prototype.onSizeChange = function () {
+            // DO NOTHING
+        };
         EShapeLineOfAnyPointsImpl.prototype.copy = function (source) {
             return this.set(source.values, source.segments, source.style);
         };
@@ -60364,8 +60318,8 @@
             }
             line.disallowUploadedUpdate();
             line.points.set(values, segments);
+            line.points.toFitted(sx, sy);
             line.size.set(sx, sy);
-            line.points.toFitted();
             line.transform.position.set(cx, cy);
             line.allowUploadedUpdate();
         };