@wcardinal/wcardinal-ui 0.307.0 → 0.309.0

package/dist/wcardinal-ui.cjs.js

@@ -1,5 +1,5 @@
 /*
- Winter Cardinal UI v0.307.0
+ Winter Cardinal UI v0.309.0
  Copyright (C) 2019 Toshiba Corporation
  SPDX-License-Identifier: Apache-2.0
 
@@ -48548,7 +48548,7 @@ var DThemeWhiteListItems = /** @class */ (function () {
         }
     };
     DThemeWhiteListItems.prototype.getHeight = function () {
-        return 40;
+        return 30;
     };
     DThemeWhiteListItems.prototype.getCornerMask = function () {
         return DCornerMask.ALL;
@@ -53717,7 +53717,7 @@ var DThemeWhiteTableBody = /** @class */ (function (_super) {
         return null;
     };
     DThemeWhiteTableBody.prototype.getRowHeight = function () {
-        return 35;
+        return 30;
     };
     DThemeWhiteTableBody.prototype.getInteractive = function () {
         return DBaseInteractive.BOTH;
@@ -54908,7 +54908,7 @@ var DThemeWhiteTableHeader = /** @class */ (function (_super) {
         return "100%";
     };
     DThemeWhiteTableHeader.prototype.getHeight = function () {
-        return 35;
+        return 30;
     };
     return DThemeWhiteTableHeader;
 }(DThemeWhiteTableRow));
@@ -57733,7 +57733,7 @@ var DThemeDarkListItems = /** @class */ (function () {
         }
     };
     DThemeDarkListItems.prototype.getHeight = function () {
-        return 40;
+        return 30;
     };
     DThemeDarkListItems.prototype.getCornerMask = function () {
         return DCornerMask.ALL;
@@ -62887,7 +62887,7 @@ var DThemeDarkTableBody = /** @class */ (function (_super) {
         return null;
     };
     DThemeDarkTableBody.prototype.getRowHeight = function () {
-        return 35;
+        return 30;
     };
     DThemeDarkTableBody.prototype.getInteractive = function () {
         return DBaseInteractive.BOTH;
@@ -64021,7 +64021,7 @@ var DThemeDarkTableHeader = /** @class */ (function (_super) {
         return "100%";
     };
     DThemeDarkTableHeader.prototype.getHeight = function () {
-        return 35;
+        return 30;
     };
     return DThemeDarkTableHeader;
 }(DThemeDarkTableRow));
@@ -73827,12 +73827,6 @@ var DChartAxisContainerImpl = /** @class */ (function () {
         this._plotArea = plotArea;
         this._container = new EShapeContainer();
         this._list = new Map();
-        var list = options && options.list;
-        if (list) {
-            for (var i = 0, imax = list.length; i < imax; ++i) {
-                this.add(list[i]);
-            }
-        }
     }
     Object.defineProperty(DChartAxisContainerImpl.prototype, "container", {
         get: function () {
@@ -75138,16 +75132,6 @@ var DChartSeriesContainerImpl = /** @class */ (function () {
         this._offset = new DChartSeriesPointImpl(options === null || options === void 0 ? void 0 : options.offset);
         this._padding = new DChartSeriesPaddingImpl(options === null || options === void 0 ? void 0 : options.padding);
         this._list = [];
-        var list = options && options.list;
-        if (list) {
-            var listLength = list.length;
-            if (0 < listLength) {
-                for (var i = 0; i < listLength; ++i) {
-                    this.add(list[i]);
-                }
-                this.update();
-            }
-        }
     }
     DChartSeriesContainerImpl.prototype.newFill = function (index, options) {
         return DChartSeriesFillComputedImpl.from(this._fill, index, options);
@@ -75340,24 +75324,30 @@ var DChartPlotAreaImpl = /** @class */ (function (_super) {
         var _this = this;
         var _a;
         _super.prototype.init.call(this, options);
+        this._isBoundsInContainerDirty = true;
+        this._boundsInContainer = new pixi_js.Rectangle();
+        this._workPoint = new pixi_js.Point();
+        // Container
         var container = new DChartPlotAreaContainer(function () {
             _this._isViewDirty = true;
             _this._isBoundsInContainerDirty = true;
             DApplications.update(_this);
         });
         this._container = container;
+        this.addChild(container);
+        // View
+        this._isViewDirty = true;
+        this._view = new DViewImpl(this, function () { return container; }, options === null || options === void 0 ? void 0 : options.view);
+        // Coordinate container
         this._coordinate = new DChartCoordinateContainerImpl(this, options === null || options === void 0 ? void 0 : options.coordinate);
+        // Series container
         var series = new DChartSeriesContainerImpl(this, options === null || options === void 0 ? void 0 : options.series);
         this._series = series;
+        // Axis container
         var axis = new DChartAxisContainerImpl(this, options === null || options === void 0 ? void 0 : options.axis);
         this._axis = axis;
-        this._isViewDirty = true;
-        this._isBoundsInContainerDirty = true;
-        this._boundsInContainer = new pixi_js.Rectangle();
-        this._workPoint = new pixi_js.Point();
-        this.addChild(container);
         this.addChild(axis.container);
-        this._view = new DViewImpl(this, function () { return container; }, options === null || options === void 0 ? void 0 : options.view);
+        // Selection
         var selection = series.selection;
         if (selection) {
             selection.bind(series);
@@ -75367,6 +75357,33 @@ var DChartPlotAreaImpl = /** @class */ (function (_super) {
         if (mask) {
             container.mask = this.getOverflowMask();
         }
+        // Add series and axes
+        if (options != null) {
+            // Series
+            var s = options.series;
+            if (s != null) {
+                var list = s.list;
+                if (list) {
+                    var listLength = list.length;
+                    if (0 < listLength) {
+                        for (var i = 0; i < listLength; ++i) {
+                            series.add(list[i]);
+                        }
+                        series.update();
+                    }
+                }
+            }
+            // Axes
+            var a = options.axis;
+            if (a != null) {
+                var list = a.list;
+                if (list) {
+                    for (var i = 0, imax = list.length; i < imax; ++i) {
+                        axis.add(list[i]);
+                    }
+                }
+            }
+        }
     };
     DChartPlotAreaImpl.prototype.onResize = function (newWidth, newHeight, oldWidth, oldHeight) {
         this._isViewDirty = true;
@@ -77338,8 +77355,6 @@ var DChartSeriesLinear = /** @class */ (function (_super) {
         var _this = _super.call(this, options) || this;
         _this._line = null;
         _this._options = options;
-        _this._plotAreaSizeXUpdated = NaN;
-        _this._plotAreaSizeYUpdated = NaN;
         _this._parameters = DChartSeriesExpressionParametersImpl.from(options);
         return _this;
     }
@@ -77355,9 +77370,6 @@ var DChartSeriesLinear = /** @class */ (function (_super) {
             this._line = line;
         }
         line.attach(container.plotArea.container, index);
-        this._parameters.toDirty();
-        this._plotAreaSizeXUpdated = NaN;
-        this._plotAreaSizeYUpdated = NaN;
         _super.prototype.bind.call(this, container, index);
         return this;
     };
@@ -77399,37 +77411,20 @@ var DChartSeriesLinear = /** @class */ (function (_super) {
         var line = this._line;
         var container = this._container;
         if (line && container) {
-            var plotArea = container.plotArea;
             var coordinate = this._coordinate;
             var coordinateX = coordinate.x;
             var coordinateY = coordinate.y;
             if (coordinateX && coordinateY) {
-                var plotAreaWidth = plotArea.width;
-                var plotAreaHeight = plotArea.height;
-                var parameters = this._parameters;
-                var isParametersChanged = parameters.isDirty();
-                var isCoordinateChanged = coordinate.isDirty(coordinateX, coordinateY);
-                var isCoordinateTransformChanged = coordinate.isTransformDirty(coordinateX, coordinateY);
-                var isPlotAreaSizeChagned = plotAreaWidth !== this._plotAreaSizeXUpdated ||
-                    plotAreaHeight !== this._plotAreaSizeYUpdated;
-                if (isParametersChanged ||
-                    isCoordinateChanged ||
-                    isCoordinateTransformChanged ||
-                    isPlotAreaSizeChagned) {
-                    parameters.toClean();
-                    this._plotAreaSizeXUpdated = plotAreaWidth;
-                    this._plotAreaSizeYUpdated = plotAreaHeight;
-                    this.doUpdateLine(line, coordinateX, coordinateY, plotAreaWidth, plotAreaHeight);
-                    if (render) {
-                        DApplications.update(line);
-                    }
-                    return true;
+                this.doUpdateLine(line, container, coordinateX, coordinateY);
+                if (render) {
+                    DApplications.update(line);
                 }
+                return true;
             }
         }
         return false;
     };
-    DChartSeriesLinear.prototype.doUpdateLine = function (line, xcoordinate, ycoordinate, plotAreaSizeX, plotAreaSizeY) {
+    DChartSeriesLinear.prototype.doUpdateLine = function (line, container, xcoordinate, ycoordinate) {
         var values = line.points.values;
         var segments = line.points.segments;
         var parameters = this._parameters;
@@ -77444,13 +77439,14 @@ var DChartSeriesLinear = /** @class */ (function (_super) {
         var p1x = NaN;
         var p1y = NaN;
         var threshold = 0.00001;
+        var bounds = container.plotArea.getBoundsInContainer();
         if (babs <= aabs) {
-            var xfrom = xcoordinate.unmap(xcoordinate.transform.unmap(0));
-            var xto = xcoordinate.unmap(xcoordinate.transform.unmap(plotAreaSizeX));
+            var xfrom = xcoordinate.unmap(xcoordinate.transform.unmap(bounds.x));
+            var xto = xcoordinate.unmap(xcoordinate.transform.unmap(bounds.x + bounds.width));
             p0x = Math.min(xfrom, xto);
             p1x = Math.max(xfrom, xto);
-            var yfrom = ycoordinate.unmap(ycoordinate.transform.unmap(0));
-            var yto = ycoordinate.unmap(ycoordinate.transform.unmap(plotAreaSizeY));
+            var yfrom = ycoordinate.unmap(ycoordinate.transform.unmap(bounds.y));
+            var yto = ycoordinate.unmap(ycoordinate.transform.unmap(bounds.y + bounds.height));
             p0y = Math.min(yfrom, yto);
             p1y = Math.max(yfrom, yto);
             if (threshold < babs) {
@@ -77471,12 +77467,12 @@ var DChartSeriesLinear = /** @class */ (function (_super) {
             }
         }
         else {
-            var yfrom = ycoordinate.unmap(ycoordinate.transform.unmap(0));
-            var yto = ycoordinate.unmap(ycoordinate.transform.unmap(plotAreaSizeY));
+            var yfrom = ycoordinate.unmap(ycoordinate.transform.unmap(bounds.y));
+            var yto = ycoordinate.unmap(ycoordinate.transform.unmap(bounds.y + bounds.height));
             p0y = Math.min(yfrom, yto);
             p1y = Math.max(yfrom, yto);
-            var xfrom = xcoordinate.unmap(xcoordinate.transform.unmap(0));
-            var xto = xcoordinate.unmap(xcoordinate.transform.unmap(plotAreaSizeX));
+            var xfrom = xcoordinate.unmap(xcoordinate.transform.unmap(bounds.x));
+            var xto = xcoordinate.unmap(xcoordinate.transform.unmap(bounds.x + bounds.width));
             p0x = Math.min(xfrom, xto);
             p1x = Math.max(xfrom, xto);
             if (threshold < aabs) {

package/dist/wcardinal-ui.js

@@ -1,5 +1,5 @@
 /*
- Winter Cardinal UI v0.307.0
+ Winter Cardinal UI v0.309.0
  Copyright (C) 2019 Toshiba Corporation
  SPDX-License-Identifier: Apache-2.0
 
@@ -55507,12 +55507,6 @@
             this._plotArea = plotArea;
             this._container = new EShapeContainer();
             this._list = new Map();
-            var list = options && options.list;
-            if (list) {
-                for (var i = 0, imax = list.length; i < imax; ++i) {
-                    this.add(list[i]);
-                }
-            }
         }
         Object.defineProperty(DChartAxisContainerImpl.prototype, "container", {
             get: function () {
@@ -56818,16 +56812,6 @@
             this._offset = new DChartSeriesPointImpl(options === null || options === void 0 ? void 0 : options.offset);
             this._padding = new DChartSeriesPaddingImpl(options === null || options === void 0 ? void 0 : options.padding);
             this._list = [];
-            var list = options && options.list;
-            if (list) {
-                var listLength = list.length;
-                if (0 < listLength) {
-                    for (var i = 0; i < listLength; ++i) {
-                        this.add(list[i]);
-                    }
-                    this.update();
-                }
-            }
         }
         DChartSeriesContainerImpl.prototype.newFill = function (index, options) {
             return DChartSeriesFillComputedImpl.from(this._fill, index, options);
@@ -57020,24 +57004,30 @@
             var _this = this;
             var _a;
             _super.prototype.init.call(this, options);
+            this._isBoundsInContainerDirty = true;
+            this._boundsInContainer = new pixi_js.Rectangle();
+            this._workPoint = new pixi_js.Point();
+            // Container
             var container = new DChartPlotAreaContainer(function () {
                 _this._isViewDirty = true;
                 _this._isBoundsInContainerDirty = true;
                 DApplications.update(_this);
             });
             this._container = container;
+            this.addChild(container);
+            // View
+            this._isViewDirty = true;
+            this._view = new DViewImpl(this, function () { return container; }, options === null || options === void 0 ? void 0 : options.view);
+            // Coordinate container
             this._coordinate = new DChartCoordinateContainerImpl(this, options === null || options === void 0 ? void 0 : options.coordinate);
+            // Series container
             var series = new DChartSeriesContainerImpl(this, options === null || options === void 0 ? void 0 : options.series);
             this._series = series;
+            // Axis container
             var axis = new DChartAxisContainerImpl(this, options === null || options === void 0 ? void 0 : options.axis);
             this._axis = axis;
-            this._isViewDirty = true;
-            this._isBoundsInContainerDirty = true;
-            this._boundsInContainer = new pixi_js.Rectangle();
-            this._workPoint = new pixi_js.Point();
-            this.addChild(container);
             this.addChild(axis.container);
-            this._view = new DViewImpl(this, function () { return container; }, options === null || options === void 0 ? void 0 : options.view);
+            // Selection
             var selection = series.selection;
             if (selection) {
                 selection.bind(series);
@@ -57047,6 +57037,33 @@
             if (mask) {
                 container.mask = this.getOverflowMask();
             }
+            // Add series and axes
+            if (options != null) {
+                // Series
+                var s = options.series;
+                if (s != null) {
+                    var list = s.list;
+                    if (list) {
+                        var listLength = list.length;
+                        if (0 < listLength) {
+                            for (var i = 0; i < listLength; ++i) {
+                                series.add(list[i]);
+                            }
+                            series.update();
+                        }
+                    }
+                }
+                // Axes
+                var a = options.axis;
+                if (a != null) {
+                    var list = a.list;
+                    if (list) {
+                        for (var i = 0, imax = list.length; i < imax; ++i) {
+                            axis.add(list[i]);
+                        }
+                    }
+                }
+            }
         };
         DChartPlotAreaImpl.prototype.onResize = function (newWidth, newHeight, oldWidth, oldHeight) {
             this._isViewDirty = true;
@@ -59018,8 +59035,6 @@
             var _this = _super.call(this, options) || this;
             _this._line = null;
             _this._options = options;
-            _this._plotAreaSizeXUpdated = NaN;
-            _this._plotAreaSizeYUpdated = NaN;
             _this._parameters = DChartSeriesExpressionParametersImpl.from(options);
             return _this;
         }
@@ -59035,9 +59050,6 @@
                 this._line = line;
             }
             line.attach(container.plotArea.container, index);
-            this._parameters.toDirty();
-            this._plotAreaSizeXUpdated = NaN;
-            this._plotAreaSizeYUpdated = NaN;
             _super.prototype.bind.call(this, container, index);
             return this;
         };
@@ -59079,37 +59091,20 @@
             var line = this._line;
             var container = this._container;
             if (line && container) {
-                var plotArea = container.plotArea;
                 var coordinate = this._coordinate;
                 var coordinateX = coordinate.x;
                 var coordinateY = coordinate.y;
                 if (coordinateX && coordinateY) {
-                    var plotAreaWidth = plotArea.width;
-                    var plotAreaHeight = plotArea.height;
-                    var parameters = this._parameters;
-                    var isParametersChanged = parameters.isDirty();
-                    var isCoordinateChanged = coordinate.isDirty(coordinateX, coordinateY);
-                    var isCoordinateTransformChanged = coordinate.isTransformDirty(coordinateX, coordinateY);
-                    var isPlotAreaSizeChagned = plotAreaWidth !== this._plotAreaSizeXUpdated ||
-                        plotAreaHeight !== this._plotAreaSizeYUpdated;
-                    if (isParametersChanged ||
-                        isCoordinateChanged ||
-                        isCoordinateTransformChanged ||
-                        isPlotAreaSizeChagned) {
-                        parameters.toClean();
-                        this._plotAreaSizeXUpdated = plotAreaWidth;
-                        this._plotAreaSizeYUpdated = plotAreaHeight;
-                        this.doUpdateLine(line, coordinateX, coordinateY, plotAreaWidth, plotAreaHeight);
-                        if (render) {
-                            DApplications.update(line);
-                        }
-                        return true;
+                    this.doUpdateLine(line, container, coordinateX, coordinateY);
+                    if (render) {
+                        DApplications.update(line);
                     }
+                    return true;
                 }
             }
             return false;
         };
-        DChartSeriesLinear.prototype.doUpdateLine = function (line, xcoordinate, ycoordinate, plotAreaSizeX, plotAreaSizeY) {
+        DChartSeriesLinear.prototype.doUpdateLine = function (line, container, xcoordinate, ycoordinate) {
             var values = line.points.values;
             var segments = line.points.segments;
             var parameters = this._parameters;
@@ -59124,13 +59119,14 @@
             var p1x = NaN;
             var p1y = NaN;
             var threshold = 0.00001;
+            var bounds = container.plotArea.getBoundsInContainer();
             if (babs <= aabs) {
-                var xfrom = xcoordinate.unmap(xcoordinate.transform.unmap(0));
-                var xto = xcoordinate.unmap(xcoordinate.transform.unmap(plotAreaSizeX));
+                var xfrom = xcoordinate.unmap(xcoordinate.transform.unmap(bounds.x));
+                var xto = xcoordinate.unmap(xcoordinate.transform.unmap(bounds.x + bounds.width));
                 p0x = Math.min(xfrom, xto);
                 p1x = Math.max(xfrom, xto);
-                var yfrom = ycoordinate.unmap(ycoordinate.transform.unmap(0));
-                var yto = ycoordinate.unmap(ycoordinate.transform.unmap(plotAreaSizeY));
+                var yfrom = ycoordinate.unmap(ycoordinate.transform.unmap(bounds.y));
+                var yto = ycoordinate.unmap(ycoordinate.transform.unmap(bounds.y + bounds.height));
                 p0y = Math.min(yfrom, yto);
                 p1y = Math.max(yfrom, yto);
                 if (threshold < babs) {
@@ -59151,12 +59147,12 @@
                 }
             }
             else {
-                var yfrom = ycoordinate.unmap(ycoordinate.transform.unmap(0));
-                var yto = ycoordinate.unmap(ycoordinate.transform.unmap(plotAreaSizeY));
+                var yfrom = ycoordinate.unmap(ycoordinate.transform.unmap(bounds.y));
+                var yto = ycoordinate.unmap(ycoordinate.transform.unmap(bounds.y + bounds.height));
                 p0y = Math.min(yfrom, yto);
                 p1y = Math.max(yfrom, yto);
-                var xfrom = xcoordinate.unmap(xcoordinate.transform.unmap(0));
-                var xto = xcoordinate.unmap(xcoordinate.transform.unmap(plotAreaSizeX));
+                var xfrom = xcoordinate.unmap(xcoordinate.transform.unmap(bounds.x));
+                var xto = xcoordinate.unmap(xcoordinate.transform.unmap(bounds.x + bounds.width));
                 p0x = Math.min(xfrom, xto);
                 p1x = Math.max(xfrom, xto);
                 if (threshold < aabs) {