@wcardinal/wcardinal-ui 0.294.0 → 0.296.0

package/dist/wcardinal-ui.js

@@ -1,5 +1,5 @@
 /*
- Winter Cardinal UI v0.294.0
+ Winter Cardinal UI v0.296.0
  Copyright (C) 2019 Toshiba Corporation
  SPDX-License-Identifier: Apache-2.0
 
@@ -54947,6 +54947,41 @@
         return DChartAxisBaseTickMinor;
     }());
 
+    /*
+     * Copyright (C) 2019 Toshiba Corporation
+     * SPDX-License-Identifier: Apache-2.0
+     */
+    var DChartRegionImpl = /** @class */ (function () {
+        function DChartRegionImpl(from, to) {
+            this.from = from;
+            this.to = to;
+        }
+        DChartRegionImpl.prototype.set = function (from, to) {
+            if (from != null) {
+                this.from = from;
+            }
+            if (to != null) {
+                this.to = to;
+            }
+            return this;
+        };
+        DChartRegionImpl.prototype.add = function (from, to) {
+            if (!isNaN$1(from)) {
+                this.from = isNaN$1(this.from) ? from : Math.min(this.from, from);
+            }
+            if (!isNaN$1(to)) {
+                this.to = isNaN$1(this.to) ? to : Math.max(this.to, to);
+            }
+            return this;
+        };
+        DChartRegionImpl.prototype.clear = function () {
+            this.from = NaN;
+            this.to = NaN;
+            return this;
+        };
+        return DChartRegionImpl;
+    }());
+
     var DChartAxisBaseTickContainer = /** @class */ (function () {
         function DChartAxisBaseTickContainer(parser, options) {
             this._parser = parser;
@@ -54955,6 +54990,7 @@
             this._minor = this.newMinor(parser, options);
             this._majorTicks = [];
             this._minorTicks = [];
+            this._work = new DChartRegionImpl(0, 0);
         }
         Object.defineProperty(DChartAxisBaseTickContainer.prototype, "major", {
             get: function () {
@@ -54994,7 +55030,6 @@
             var minorShapes = this._minor.shapes;
             if (container != null && majorShapes && minorShapes) {
                 var plotArea = container.plotArea;
-                var bounds = plotArea.getBoundsInContainer();
                 var transform = plotArea.container.transform.localTransform;
                 var gridlineShapes = this._major.gridline.shapes;
                 var parser = this._parser;
@@ -55004,43 +55039,49 @@
                     case DChartAxisPosition.TOP:
                         coordinate = plotArea.coordinate.x.get(parser.coordinate);
                         if (coordinate) {
-                            var domainFrom = coordinate.unmap(coordinate.transform.unmap(bounds.x));
-                            var domainTo = coordinate.unmap(coordinate.transform.unmap(bounds.x + bounds.width));
+                            var domain = this.getDomain(plotArea, coordinate, this._work);
                             var plotAreaHeight = plotArea.height;
-                            return this.updateX(domainFrom, domainTo, coordinate, majorShapes, minorShapes, gridlineShapes, 0 - offset, transform, plotAreaHeight);
+                            return this.updateX(domain.from, domain.to, coordinate, majorShapes, minorShapes, gridlineShapes, 0 - offset, transform, plotAreaHeight);
                         }
                         break;
                     case DChartAxisPosition.BOTTOM:
                         coordinate = plotArea.coordinate.x.get(parser.coordinate);
                         if (coordinate) {
-                            var domainFrom = coordinate.unmap(coordinate.transform.unmap(bounds.x));
-                            var domainTo = coordinate.unmap(coordinate.transform.unmap(bounds.x + bounds.width));
+                            var domain = this.getDomain(plotArea, coordinate, this._work);
                             var plotAreaHeight = plotArea.height;
-                            return this.updateX(domainFrom, domainTo, coordinate, majorShapes, minorShapes, gridlineShapes, plotAreaHeight + offset, transform, plotAreaHeight);
+                            return this.updateX(domain.from, domain.to, coordinate, majorShapes, minorShapes, gridlineShapes, plotAreaHeight + offset, transform, plotAreaHeight);
                         }
                         break;
                     case DChartAxisPosition.LEFT:
                         coordinate = plotArea.coordinate.y.get(parser.coordinate);
                         if (coordinate) {
-                            var domainFrom = coordinate.unmap(coordinate.transform.unmap(bounds.y));
-                            var domainTo = coordinate.unmap(coordinate.transform.unmap(bounds.y + bounds.height));
+                            var range = this.getRange(plotArea, coordinate, this._work);
                             var plotAreaWidth = plotArea.width;
-                            return this.updateY(domainFrom, domainTo, coordinate, majorShapes, minorShapes, gridlineShapes, 0 - offset, transform, plotAreaWidth);
+                            return this.updateY(range.from, range.to, coordinate, majorShapes, minorShapes, gridlineShapes, 0 - offset, transform, plotAreaWidth);
                         }
                         break;
                     case DChartAxisPosition.RIGHT:
                         coordinate = plotArea.coordinate.y.get(parser.coordinate);
                         if (coordinate) {
-                            var domainFrom = coordinate.unmap(coordinate.transform.unmap(bounds.y));
-                            var domainTo = coordinate.unmap(coordinate.transform.unmap(bounds.y + bounds.height));
+                            var range = this.getRange(plotArea, coordinate, this._work);
                             var plotAreaWidth = plotArea.width;
-                            return this.updateY(domainFrom, domainTo, coordinate, majorShapes, minorShapes, gridlineShapes, plotAreaWidth + offset, transform, plotAreaWidth);
+                            return this.updateY(range.from, range.to, coordinate, majorShapes, minorShapes, gridlineShapes, plotAreaWidth + offset, transform, plotAreaWidth);
                         }
                         break;
                 }
             }
             return false;
         };
+        DChartAxisBaseTickContainer.prototype.getDomain = function (plotArea, coordinate, result) {
+            var bounds = plotArea.getBoundsInContainer();
+            var transform = coordinate.transform;
+            return result.set(coordinate.unmap(transform.unmap(bounds.x)), coordinate.unmap(transform.unmap(bounds.x + bounds.width)));
+        };
+        DChartAxisBaseTickContainer.prototype.getRange = function (plotArea, coordinate, result) {
+            var bounds = plotArea.getBoundsInContainer();
+            var transform = coordinate.transform;
+            return result.set(coordinate.unmap(transform.unmap(bounds.y)), coordinate.unmap(transform.unmap(bounds.y + bounds.height)));
+        };
         DChartAxisBaseTickContainer.prototype.updateX = function (domainMin, domainMax, coordinate, majorShapes, minorShapes, gridlineShapes, shapePositionY, transform, plotAreaHeight) {
             var tick = this._parser.tick;
             var majorTick = tick.major;
@@ -55094,7 +55135,7 @@
             }
             return true;
         };
-        DChartAxisBaseTickContainer.prototype.updateY = function (domainMin, domainMax, coordinate, majorShapes, minorShapes, gridlineShapes, shapePositionX, transform, plotAreaWidth) {
+        DChartAxisBaseTickContainer.prototype.updateY = function (rangeMin, rangeMax, coordinate, majorShapes, minorShapes, gridlineShapes, shapePositionX, transform, plotAreaWidth) {
             var tick = this._parser.tick;
             var majorTick = tick.major;
             var majorCount = majorTick.count;
@@ -55108,7 +55149,7 @@
             var minorFormatter = minorTick.formatter;
             var majorTicks = this._majorTicks;
             var minorTicks = this._minorTicks;
-            this.newTicks(coordinate, domainMin, domainMax, majorCount, majorCapacity, majorStep, minorCountPerMajor, minorCount, minorStep, majorTicks, minorTicks);
+            this.newTicks(coordinate, rangeMin, rangeMax, majorCount, majorCapacity, majorStep, minorCountPerMajor, minorCount, minorStep, majorTicks, minorTicks);
             var d = transform.d;
             var ty = transform.ty;
             for (var i = 0; i < majorCapacity; ++i) {
@@ -55609,41 +55650,6 @@
         return DChartCoordinateTransformMarkImpl;
     }());
 
-    /*
-     * Copyright (C) 2019 Toshiba Corporation
-     * SPDX-License-Identifier: Apache-2.0
-     */
-    var DChartRegionImpl = /** @class */ (function () {
-        function DChartRegionImpl(from, to) {
-            this.from = from;
-            this.to = to;
-        }
-        DChartRegionImpl.prototype.set = function (from, to) {
-            if (from != null) {
-                this.from = from;
-            }
-            if (to != null) {
-                this.to = to;
-            }
-            return this;
-        };
-        DChartRegionImpl.prototype.add = function (from, to) {
-            if (!isNaN$1(from)) {
-                this.from = isNaN$1(this.from) ? from : Math.min(this.from, from);
-            }
-            if (!isNaN$1(to)) {
-                this.to = isNaN$1(this.to) ? to : Math.max(this.to, to);
-            }
-            return this;
-        };
-        DChartRegionImpl.prototype.clear = function () {
-            this.from = NaN;
-            this.to = NaN;
-            return this;
-        };
-        return DChartRegionImpl;
-    }());
-
     /*
      * Copyright (C) 2019 Toshiba Corporation
      * SPDX-License-Identifier: Apache-2.0
@@ -55715,18 +55721,27 @@
             var container = this._container;
             if (container) {
                 var plotArea = container.container.plotArea;
-                var padding = plotArea.padding;
                 var work = this._work;
                 switch (this._direction) {
                     case DChartCoordinateDirection.X:
-                        this.doFit_(padding.getLeft(), plotArea.width - padding.getRight(), this.toFitDomain(from, to, plotArea, work), result);
+                        this.getPixelDomain(plotArea, work);
+                        this.doFit_(work.from, work.to, this.toFitDomain(from, to, plotArea, work), result);
                         break;
                     case DChartCoordinateDirection.Y:
-                        this.doFit_(plotArea.height - padding.getBottom(), padding.getTop(), this.toFitRange(from, to, plotArea, work), result);
+                        this.getPixelRange(plotArea, work);
+                        this.doFit_(work.from, work.to, this.toFitRange(from, to, plotArea, work), result);
                         break;
                 }
             }
         };
+        DChartCoordinateBase.prototype.getPixelDomain = function (plotArea, result) {
+            var padding = plotArea.padding;
+            return result.set(padding.getLeft(), plotArea.width - padding.getRight());
+        };
+        DChartCoordinateBase.prototype.getPixelRange = function (plotArea, result) {
+            var padding = plotArea.padding;
+            return result.set(plotArea.height - padding.getBottom(), padding.getTop());
+        };
         DChartCoordinateBase.prototype.toFitDomain = function (from, to, plotArea, result) {
             if (from == null) {
                 from = this._from;
@@ -69661,43 +69676,47 @@
             }
         };
         DTableDataTreeFilter.prototype.hasFiltered = function (parent, nodes, filter) {
-            var toChildren = this._parent.accessor.toChildren;
+            var accessor = this._parent.accessor;
+            var toChildren = accessor.toChildren;
+            var hasChildren = accessor.hasChildren;
             for (var i = 0, imax = nodes.length; i < imax; ++i) {
                 var node = nodes[i];
                 if (this.isFiltered(node, -1, filter)) {
                     return true;
                 }
                 var children = toChildren(node);
-                if (children != null &&
-                    0 < children.length &&
-                    this.hasFiltered(parent, children, filter)) {
+                if (hasChildren(node, children) && this.hasFiltered(parent, children, filter)) {
                     return true;
                 }
             }
             return false;
         };
         DTableDataTreeFilter.prototype.addAllToFiltered = function (parent, nodes, filtered, cursor) {
-            var toChildren = this._parent.accessor.toChildren;
+            var accessor = this._parent.accessor;
+            var toChildren = accessor.toChildren;
+            var hasChildren = accessor.hasChildren;
             for (var i = 0, imax = nodes.length; i < imax; ++i) {
                 var node = nodes[i];
                 filtered.push(cursor[0]);
                 cursor[0] += 1;
                 var children = toChildren(node);
-                if (children != null && 0 < children.length && parent.isOpened(node)) {
+                if (hasChildren(node, children) && parent.isOpened(node)) {
                     this.addAllToFiltered(parent, children, filtered, cursor);
                 }
             }
         };
         DTableDataTreeFilter.prototype.newFilteredSub = function (parent, nodes, filter, filtered, cursor) {
             var result = false;
-            var toChildren = this._parent.accessor.toChildren;
+            var accessor = this._parent.accessor;
+            var toChildren = accessor.toChildren;
+            var hasChildren = accessor.hasChildren;
             for (var i = 0, imax = nodes.length; i < imax; ++i) {
                 var node = nodes[i];
                 var index = cursor[0];
                 cursor[0] += 1;
                 var isFiltered = this.isFiltered(node, index, filter);
                 var children = toChildren(node);
-                if (children != null && 0 < children.length) {
+                if (hasChildren(node, children)) {
                     if (parent.isOpened(node)) {
                         if (isFiltered) {
                             filtered.push(index);
@@ -69805,11 +69824,21 @@
     var toChildren$1 = function (node) {
         return node.children;
     };
+    var hasChildren = function (node, children) {
+        return children != null && 0 < children.length;
+    };
     var DTableDataTreeItemAccessor = /** @class */ (function () {
         function DTableDataTreeItemAccessor(options) {
-            var _a, _b;
-            this.toParent = (_a = options === null || options === void 0 ? void 0 : options.toParent) !== null && _a !== void 0 ? _a : toParent;
-            this.toChildren = (_b = options === null || options === void 0 ? void 0 : options.toChildren) !== null && _b !== void 0 ? _b : toChildren$1;
+            if (options != null) {
+                this.toParent = options.toParent || toParent;
+                this.toChildren = options.toChildren || toChildren$1;
+                this.hasChildren = options.hasChildren || hasChildren;
+            }
+            else {
+                this.toParent = toParent;
+                this.toChildren = toChildren$1;
+                this.hasChildren = hasChildren;
+            }
         }
         return DTableDataTreeItemAccessor;
     }());
@@ -69851,9 +69880,11 @@
         });
         DTableDataTreeSelectionImpl.prototype.onNodeChange = function (nodes) {
             if (nodes != null) {
-                var toChildren = this._parent.accessor.toChildren;
+                var accessor = this._parent.accessor;
+                var toChildren = accessor.toChildren;
+                var hasChildren = accessor.hasChildren;
                 var oldRows = this._rows;
-                var newRows = this.newRows(nodes, toChildren, oldRows, new Set());
+                var newRows = this.newRows(nodes, toChildren, hasChildren, oldRows, new Set());
                 if (oldRows.size !== newRows.size) {
                     this._rows = newRows;
                     this.onChange();
@@ -69867,15 +69898,15 @@
                 }
             }
         };
-        DTableDataTreeSelectionImpl.prototype.newRows = function (nodes, toChildren, rows, result) {
+        DTableDataTreeSelectionImpl.prototype.newRows = function (nodes, toChildren, hasChildren, rows, result) {
             for (var i = 0, imax = nodes.length; i < imax; ++i) {
                 var node = nodes[i];
                 if (rows.has(node)) {
                     result.add(node);
                 }
                 var children = toChildren(node);
-                if (children != null) {
-                    this.newRows(children, toChildren, rows, result);
+                if (hasChildren(node, children)) {
+                    this.newRows(children, toChildren, hasChildren, rows, result);
                 }
             }
             return result;
@@ -70314,7 +70345,8 @@
             var supplimentals = this._supplimentals;
             var flags = this._flags;
             if (nodes != null) {
-                var irows = this.newRows(nodes, 0, 0, rows, supplimentals, flags, this._reverse, this._accessor.toChildren);
+                var accessor = this._accessor;
+                var irows = this.newRows(nodes, 0, 0, rows, supplimentals, flags, this._reverse, accessor.toChildren, accessor.hasChildren);
                 if (irows !== rows.length) {
                     rows.length = irows;
                     supplimentals.length = irows;
@@ -70328,7 +70360,7 @@
         DTableDataTree.prototype.toSupplimental = function (ilevel, hasChildren, isOpened) {
             return (ilevel << 2) | (hasChildren ? 2 : 0) | (isOpened ? 1 : 0);
         };
-        DTableDataTree.prototype.newRows = function (nodes, irows, ilevel, rows, supplimentals, flags, reverse, toChildren) {
+        DTableDataTree.prototype.newRows = function (nodes, irows, ilevel, rows, supplimentals, flags, reverse, toChildren, hasChildren) {
             var nodesLength = nodes.length;
             var istart = reverse ? nodesLength - 1 : 0;
             var idelta = reverse ? -1 : +1;
@@ -70336,7 +70368,7 @@
                 var node = nodes[i];
                 var children = toChildren(node);
                 var isOpened = flags.has(node);
-                var supplimental = this.toSupplimental(ilevel, !!(children && 0 < children.length), isOpened);
+                var supplimental = this.toSupplimental(ilevel, hasChildren(node, children), isOpened);
                 if (irows < rows.length) {
                     rows[irows] = node;
                     supplimentals[irows] = supplimental;
@@ -70347,7 +70379,7 @@
                 }
                 irows += 1;
                 if (isOpened && children) {
-                    irows = this.newRows(children, irows, ilevel + 1, rows, supplimentals, flags, reverse, toChildren);
+                    irows = this.newRows(children, irows, ilevel + 1, rows, supplimentals, flags, reverse, toChildren, hasChildren);
                 }
             }
             return irows;