@wcardinal/wcardinal-ui 0.296.0 → 0.298.0

package/dist/wcardinal-ui.js

@@ -1,5 +1,5 @@
 /*
- Winter Cardinal UI v0.296.0
+ Winter Cardinal UI v0.298.0
  Copyright (C) 2019 Toshiba Corporation
  SPDX-License-Identifier: Apache-2.0
 
@@ -55034,38 +55034,59 @@
                 var gridlineShapes = this._major.gridline.shapes;
                 var parser = this._parser;
                 var offset = parser.padding * this._index;
+                var work = this._work;
                 var coordinate = void 0;
                 switch (parser.position) {
                     case DChartAxisPosition.TOP:
                         coordinate = plotArea.coordinate.x.get(parser.coordinate);
                         if (coordinate) {
-                            var domain = this.getDomain(plotArea, coordinate, this._work);
+                            var domain = this.getDomain(plotArea, coordinate, work);
+                            var domainFrom = domain.from;
+                            var domainTo = domain.to;
+                            var domainVisible = this.getDomainVisible(plotArea, coordinate, work);
+                            var domainVisibleFrom = domainVisible.from;
+                            var domainVisibleTo = domainVisible.to;
                             var plotAreaHeight = plotArea.height;
-                            return this.updateX(domain.from, domain.to, coordinate, majorShapes, minorShapes, gridlineShapes, 0 - offset, transform, plotAreaHeight);
+                            return this.updateX(domainFrom, domainTo, domainVisibleFrom, domainVisibleTo, coordinate, majorShapes, minorShapes, gridlineShapes, 0 - offset, transform, plotAreaHeight);
                         }
                         break;
                     case DChartAxisPosition.BOTTOM:
                         coordinate = plotArea.coordinate.x.get(parser.coordinate);
                         if (coordinate) {
-                            var domain = this.getDomain(plotArea, coordinate, this._work);
+                            var domain = this.getDomain(plotArea, coordinate, work);
+                            var domainFrom = domain.from;
+                            var domainTo = domain.to;
+                            var domainVisible = this.getDomainVisible(plotArea, coordinate, work);
+                            var domainVisibleFrom = domainVisible.from;
+                            var domainVisibleTo = domainVisible.to;
                             var plotAreaHeight = plotArea.height;
-                            return this.updateX(domain.from, domain.to, coordinate, majorShapes, minorShapes, gridlineShapes, plotAreaHeight + offset, transform, plotAreaHeight);
+                            return this.updateX(domainFrom, domainTo, domainVisibleFrom, domainVisibleTo, coordinate, majorShapes, minorShapes, gridlineShapes, plotAreaHeight + offset, transform, plotAreaHeight);
                         }
                         break;
                     case DChartAxisPosition.LEFT:
                         coordinate = plotArea.coordinate.y.get(parser.coordinate);
                         if (coordinate) {
-                            var range = this.getRange(plotArea, coordinate, this._work);
+                            var range = this.getRange(plotArea, coordinate, work);
+                            var rangeFrom = range.from;
+                            var rangeTo = range.to;
+                            var rangeVisible = this.getRangeVisible(plotArea, coordinate, work);
+                            var rangeVisibleFrom = rangeVisible.from;
+                            var rangeVisibleTo = rangeVisible.to;
                             var plotAreaWidth = plotArea.width;
-                            return this.updateY(range.from, range.to, coordinate, majorShapes, minorShapes, gridlineShapes, 0 - offset, transform, plotAreaWidth);
+                            return this.updateY(rangeFrom, rangeTo, rangeVisibleFrom, rangeVisibleTo, coordinate, majorShapes, minorShapes, gridlineShapes, 0 - offset, transform, plotAreaWidth);
                         }
                         break;
                     case DChartAxisPosition.RIGHT:
                         coordinate = plotArea.coordinate.y.get(parser.coordinate);
                         if (coordinate) {
-                            var range = this.getRange(plotArea, coordinate, this._work);
+                            var range = this.getRange(plotArea, coordinate, work);
+                            var rangeFrom = range.from;
+                            var rangeTo = range.to;
+                            var rangeVisible = this.getRangeVisible(plotArea, coordinate, work);
+                            var rangeVisibleFrom = rangeVisible.from;
+                            var rangeVisibleTo = rangeVisible.to;
                             var plotAreaWidth = plotArea.width;
-                            return this.updateY(range.from, range.to, coordinate, majorShapes, minorShapes, gridlineShapes, plotAreaWidth + offset, transform, plotAreaWidth);
+                            return this.updateY(rangeFrom, rangeTo, rangeVisibleFrom, rangeVisibleTo, coordinate, majorShapes, minorShapes, gridlineShapes, plotAreaWidth + offset, transform, plotAreaWidth);
                         }
                         break;
                 }
@@ -55077,12 +55098,18 @@
             var transform = coordinate.transform;
             return result.set(coordinate.unmap(transform.unmap(bounds.x)), coordinate.unmap(transform.unmap(bounds.x + bounds.width)));
         };
+        DChartAxisBaseTickContainer.prototype.getDomainVisible = function (plotArea, coordinate, result) {
+            return result;
+        };
         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) {
+        DChartAxisBaseTickContainer.prototype.getRangeVisible = function (plotArea, coordinate, result) {
+            return result;
+        };
+        DChartAxisBaseTickContainer.prototype.updateX = function (domainFrom, domainTo, domainVisibleFrom, domainVisibleTo, coordinate, majorShapes, minorShapes, gridlineShapes, shapePositionY, transform, plotAreaHeight) {
             var tick = this._parser.tick;
             var majorTick = tick.major;
             var majorCount = majorTick.count;
@@ -55096,7 +55123,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, domainFrom, domainTo, domainVisibleFrom, domainVisibleTo, majorCount, majorCapacity, majorStep, minorCountPerMajor, minorCount, minorStep, majorTicks, minorTicks);
             var a = transform.a;
             var tx = transform.tx;
             for (var i = 0; i < majorCapacity; ++i) {
@@ -55135,7 +55162,7 @@
             }
             return true;
         };
-        DChartAxisBaseTickContainer.prototype.updateY = function (rangeMin, rangeMax, coordinate, majorShapes, minorShapes, gridlineShapes, shapePositionX, transform, plotAreaWidth) {
+        DChartAxisBaseTickContainer.prototype.updateY = function (rangeFrom, rangeTo, rangeVisibleFrom, rangeVisibleTo, coordinate, majorShapes, minorShapes, gridlineShapes, shapePositionX, transform, plotAreaWidth) {
             var tick = this._parser.tick;
             var majorTick = tick.major;
             var majorCount = majorTick.count;
@@ -55149,7 +55176,7 @@
             var minorFormatter = minorTick.formatter;
             var majorTicks = this._majorTicks;
             var minorTicks = this._minorTicks;
-            this.newTicks(coordinate, rangeMin, rangeMax, majorCount, majorCapacity, majorStep, minorCountPerMajor, minorCount, minorStep, majorTicks, minorTicks);
+            this.newTicks(coordinate, rangeFrom, rangeTo, rangeVisibleFrom, rangeVisibleTo, majorCount, majorCapacity, majorStep, minorCountPerMajor, minorCount, minorStep, majorTicks, minorTicks);
             var d = transform.d;
             var ty = transform.ty;
             for (var i = 0; i < majorCapacity; ++i) {
@@ -55218,8 +55245,8 @@
         DChartAxisBaseTickContainer.prototype.hideMinor = function (shape) {
             shape.visible = false;
         };
-        DChartAxisBaseTickContainer.prototype.newTicks = function (coordinate, domainMin, domainMax, majorCount, majorCapacity, majorStep, minorCountPerMajor, minorCount, minorStep, majorResult, minorResult) {
-            coordinate.ticks(domainMin, domainMax, majorCount, majorCapacity, majorStep, minorCountPerMajor, minorCount, minorStep, majorResult, minorResult);
+        DChartAxisBaseTickContainer.prototype.newTicks = function (coordinate, domainFrom, domainTo, domainVisibleFrom, domainVisibleTo, majorCount, majorCapacity, majorStep, minorCountPerMajor, minorCount, minorStep, majorResult, minorResult) {
+            coordinate.ticks(domainFrom, domainTo, domainVisibleFrom, domainVisibleTo, majorCount, majorCapacity, majorStep, minorCountPerMajor, minorCount, minorStep, majorResult, minorResult);
         };
         DChartAxisBaseTickContainer.prototype.destroy = function () {
             this._major.destroy();
@@ -55822,8 +55849,8 @@
         DChartCoordinateBase.prototype.unmapAll = function (values, ifrom, iend, stride, offset) {
             // DO NOTHING
         };
-        DChartCoordinateBase.prototype.ticks = function (domainFrom, domainTo, majorCount, majorCapacity, majorStep, minorCountPerMajor, minorCount, minorStep, majorResult, minorResult) {
-            this._tick.calculate(domainFrom, domainTo, majorCount, majorCapacity, majorStep, minorCountPerMajor, minorCount, minorStep, majorResult, minorResult, this);
+        DChartCoordinateBase.prototype.ticks = function (domainFrom, domainTo, domainVisibleFrom, domainVisibleTo, majorCount, majorCapacity, majorStep, minorCountPerMajor, minorCount, minorStep, majorResult, minorResult) {
+            this._tick.calculate(domainFrom, domainTo, domainVisibleFrom, domainVisibleTo, majorCount, majorCapacity, majorStep, minorCountPerMajor, minorCount, minorStep, majorResult, minorResult, this);
         };
         DChartCoordinateBase.prototype.toTheme = function (options) {
             var _a;
@@ -56060,65 +56087,63 @@
                 }
             }
         };
-        DChartCoordinateLinearTick.prototype.calculate = function (domainFrom, domainTo, majorCount, majorCapacity, majorStep, minorCountPerMajor, minorCount, minorStep, majorResult, minorResult, coordinate) {
+        DChartCoordinateLinearTick.prototype.calculate = function (domainFrom, domainTo, domainVisibleFrom, domainVisibleTo, majorCount, majorCapacity, majorStep, minorCountPerMajor, minorCount, minorStep, majorResult, minorResult, coordinate) {
             if (majorCount <= 0) {
                 return;
             }
             var transform = coordinate.transform;
             var domainMin = Math.min(domainFrom, domainTo);
             var domainMax = Math.max(domainFrom, domainTo);
-            var majorStepMapped = this.toMajorStep(domainMin, domainMax, majorCount, majorStep);
+            var domainVisibleMin = Math.min(domainVisibleFrom, domainVisibleTo);
+            var domainVisibleMax = Math.max(domainVisibleFrom, domainVisibleTo);
+            var domainVisibleMinMapped = coordinate.map(domainVisibleMin);
+            var domainVisibleMaxMapped = coordinate.map(domainVisibleMax);
+            var from0 = Math.min(domainVisibleMinMapped, domainVisibleMaxMapped);
+            var to0 = Math.max(domainVisibleMinMapped, domainVisibleMaxMapped);
+            var domainMinMapped = coordinate.map(domainMin);
+            var domainMaxMapped = coordinate.map(domainMax);
+            var from1 = Math.min(domainMinMapped, domainMaxMapped);
+            var to1 = Math.max(domainMinMapped, domainMaxMapped);
+            var from = Math.max(from0, from1);
+            var to = Math.min(to0, to1);
+            var imajor = 0;
+            var iminor = 0;
+            var majorStepMapped = this.toMajorStep(domainMinMapped, domainMaxMapped, majorCount, majorStep);
             if (majorStepMapped <= 0) {
-                majorResult[0] = domainMin;
-                majorResult[1] = transform.map(coordinate.map(domainMin));
-                majorResult[2] = 0;
-                for (var i = 1; i < majorCapacity; ++i) {
-                    var imajorResult = i * 3;
-                    majorResult[imajorResult + 0] = NaN;
-                    majorResult[imajorResult + 1] = NaN;
-                    majorResult[imajorResult + 2] = NaN;
-                }
-                for (var i = 0; i < minorCount; ++i) {
-                    var iminorResult = i * 3;
-                    minorResult[iminorResult + 0] = NaN;
-                    minorResult[iminorResult + 1] = NaN;
-                    minorResult[iminorResult + 2] = NaN;
+                if (from <= domainMinMapped && domainMinMapped <= to) {
+                    majorResult[0] = domainMin;
+                    majorResult[1] = transform.map(domainMinMapped);
+                    majorResult[2] = 0;
+                    imajor += 1;
                 }
-                return;
             }
-            // Major tick start position
-            var idomainStart = Math.floor(domainMin / majorStepMapped) - 1;
-            var idomainEnd = Math.ceil(domainMax / majorStepMapped) + 1;
-            var domainMinMapped = transform.map(coordinate.map(domainMin));
-            var domainMaxMapped = transform.map(coordinate.map(domainMax));
-            var from = Math.min(domainMinMapped, domainMaxMapped) - 0.5;
-            var to = Math.max(domainMinMapped, domainMaxMapped) + 0.5;
-            // Major / minor tick positions
-            var minorStepMapped = this.toMinorStep(majorStepMapped, minorCountPerMajor, minorStep);
-            var imajor = 0;
-            var iminor = 0;
-            for (var i = idomainStart; i <= idomainEnd; ++i) {
-                var majorPosition = i * majorStepMapped;
-                if (imajor < majorCapacity) {
-                    var majorPositionMapped = transform.map(coordinate.map(majorPosition));
-                    if (from <= majorPositionMapped && majorPositionMapped <= to) {
-                        var imajorResult = imajor * 3;
-                        majorResult[imajorResult + 0] = majorPosition;
-                        majorResult[imajorResult + 1] = majorPositionMapped;
-                        majorResult[imajorResult + 2] = majorStepMapped;
-                        imajor += 1;
-                    }
-                }
-                for (var j = 0; j < minorCountPerMajor; j += 1) {
-                    if (iminor < minorCount) {
-                        var minorPosition = majorPosition + (j + 1) * minorStepMapped;
-                        var minorPositionMapped = transform.map(coordinate.map(minorPosition));
-                        if (from <= minorPositionMapped && minorPositionMapped <= to) {
-                            var iminorResult = iminor * 3;
-                            minorResult[iminorResult + 0] = minorPosition;
-                            minorResult[iminorResult + 1] = minorPositionMapped;
-                            minorResult[iminorResult + 2] = minorStepMapped;
-                            iminor += 1;
+            else {
+                // Major tick start position
+                var idomainStartMapped = Math.floor(domainMinMapped / majorStepMapped) - 1;
+                var idomainEndMapped = Math.ceil(domainMaxMapped / majorStepMapped) + 1;
+                // Major / minor tick positions
+                var minorStepMapped = this.toMinorStep(majorStepMapped, minorCountPerMajor, minorStep);
+                for (var i = idomainStartMapped; i <= idomainEndMapped; ++i) {
+                    var majorPositionMapped = i * majorStepMapped;
+                    if (imajor < majorCapacity) {
+                        if (from <= majorPositionMapped && majorPositionMapped <= to) {
+                            var imajorResult = imajor * 3;
+                            majorResult[imajorResult + 0] = coordinate.unmap(majorPositionMapped);
+                            majorResult[imajorResult + 1] = transform.map(majorPositionMapped);
+                            majorResult[imajorResult + 2] = majorStepMapped;
+                            imajor += 1;
+                        }
+                    }
+                    for (var j = 0; j < minorCountPerMajor; j += 1) {
+                        if (iminor < minorCount) {
+                            var minorPositionMapped = majorPositionMapped + (j + 1) * minorStepMapped;
+                            if (from <= minorPositionMapped && minorPositionMapped <= to) {
+                                var iminorResult = iminor * 3;
+                                minorResult[iminorResult + 0] = coordinate.unmap(minorPositionMapped);
+                                minorResult[iminorResult + 1] = transform.map(minorPositionMapped);
+                                minorResult[iminorResult + 2] = minorStepMapped;
+                                iminor += 1;
+                            }
                         }
                     }
                 }
@@ -56211,64 +56236,63 @@
                 }
             }
         };
-        DChartCoordinateLogTick.prototype.calculate = function (domainFrom, domainTo, majorCount, majorCapacity, majorStep, minorCountPerMajor, minorCount, minorStep, majorResult, minorResult, coordinate) {
+        DChartCoordinateLogTick.prototype.calculate = function (domainFrom, domainTo, domainVisibleFrom, domainVisibleTo, majorCount, majorCapacity, majorStep, minorCountPerMajor, minorCount, minorStep, majorResult, minorResult, coordinate) {
             if (majorCount <= 0) {
                 return;
             }
             var transform = coordinate.transform;
-            var domainFromMapped = coordinate.map(domainFrom);
-            var domainToMapped = coordinate.map(domainTo);
-            var domainMinMapped = Math.min(domainFromMapped, domainToMapped);
-            var domainMaxMapped = Math.max(domainFromMapped, domainToMapped);
+            var domainMin = Math.min(domainFrom, domainTo);
+            var domainMax = Math.max(domainFrom, domainTo);
+            var domainVisibleMin = Math.min(domainVisibleFrom, domainVisibleTo);
+            var domainVisibleMax = Math.max(domainVisibleFrom, domainVisibleTo);
+            var domainVisibleMinMapped = coordinate.map(domainVisibleMin);
+            var domainVisibleMaxMapped = coordinate.map(domainVisibleMax);
+            var from0 = Math.min(domainVisibleMinMapped, domainVisibleMaxMapped);
+            var to0 = Math.max(domainVisibleMinMapped, domainVisibleMaxMapped);
+            var domainMinMapped = coordinate.map(domainMin);
+            var domainMaxMapped = coordinate.map(domainMax);
+            var from1 = Math.min(domainMinMapped, domainMaxMapped);
+            var to1 = Math.max(domainMinMapped, domainMaxMapped);
+            var from = Math.max(from0, from1);
+            var to = Math.min(to0, to1);
+            var imajor = 0;
+            var iminor = 0;
             var majorStepMapped = this.toMajorStep(domainMinMapped, domainMaxMapped, majorCount, majorStep);
             if (majorStepMapped <= 0) {
-                var domainMin = Math.min(domainFrom, domainTo);
-                majorResult[0] = domainMin;
-                majorResult[1] = transform.map(coordinate.map(domainMin));
-                majorResult[2] = 0;
-                for (var i = 1; i < majorCount; ++i) {
-                    var imajorResult = i * 3;
-                    majorResult[imajorResult + 0] = NaN;
-                    majorResult[imajorResult + 1] = NaN;
-                    majorResult[imajorResult + 2] = NaN;
-                }
-                for (var i = 0; i < minorCount; ++i) {
-                    var iminorResult = i * 3;
-                    minorResult[iminorResult + 0] = NaN;
-                    minorResult[iminorResult + 1] = NaN;
-                    minorResult[iminorResult + 2] = NaN;
+                if (from <= domainMinMapped && domainMinMapped <= to) {
+                    majorResult[0] = domainMin;
+                    majorResult[1] = transform.map(domainMinMapped);
+                    majorResult[2] = 0;
+                    imajor += 1;
                 }
-                return;
             }
-            // Major tick start position
-            var idomainStartMapped = Math.floor(domainMinMapped / majorStepMapped) - 1;
-            var idomainEndMapped = Math.ceil(domainMaxMapped / majorStepMapped) + 1;
-            // Major / minor tick positions
-            var minorStepMapped = this.toMinorStep(majorStepMapped, minorCountPerMajor, minorStep);
-            var imajor = 0;
-            var iminor = 0;
-            for (var i = idomainStartMapped; i <= idomainEndMapped; ++i) {
-                var majorPositionMapped = i * majorStepMapped;
-                if (imajor < majorCapacity) {
-                    if (domainMinMapped <= majorPositionMapped &&
-                        majorPositionMapped <= domainMaxMapped) {
-                        var imajorResult = imajor * 3;
-                        majorResult[imajorResult + 0] = coordinate.unmap(majorPositionMapped);
-                        majorResult[imajorResult + 1] = transform.map(majorPositionMapped);
-                        majorResult[imajorResult + 2] = coordinate.unmap(majorPositionMapped - 1);
-                        imajor += 1;
-                    }
-                }
-                for (var j = 0; j < minorCountPerMajor; j += 1) {
-                    if (iminor < minorCount) {
-                        var minorPositionMapped = majorPositionMapped + (j + 1) * minorStepMapped;
-                        if (domainMinMapped <= minorPositionMapped &&
-                            minorPositionMapped <= domainMaxMapped) {
-                            var iminorResult = iminor * 3;
-                            minorResult[iminorResult + 0] = coordinate.unmap(minorPositionMapped);
-                            minorResult[iminorResult + 1] = transform.map(minorPositionMapped);
-                            minorResult[iminorResult + 2] = coordinate.unmap(minorPositionMapped - 1);
-                            iminor += 1;
+            else {
+                // Major tick start position
+                var idomainStartMapped = Math.floor(domainMinMapped / majorStepMapped) - 1;
+                var idomainEndMapped = Math.ceil(domainMaxMapped / majorStepMapped) + 1;
+                // Major / minor tick positions
+                var minorStepMapped = this.toMinorStep(majorStepMapped, minorCountPerMajor, minorStep);
+                for (var i = idomainStartMapped; i <= idomainEndMapped; ++i) {
+                    var majorPositionMapped = i * majorStepMapped;
+                    if (imajor < majorCapacity) {
+                        if (from <= majorPositionMapped && majorPositionMapped <= to) {
+                            var imajorResult = imajor * 3;
+                            majorResult[imajorResult + 0] = coordinate.unmap(majorPositionMapped);
+                            majorResult[imajorResult + 1] = transform.map(majorPositionMapped);
+                            majorResult[imajorResult + 2] = coordinate.unmap(majorPositionMapped - 1);
+                            imajor += 1;
+                        }
+                    }
+                    for (var j = 0; j < minorCountPerMajor; j += 1) {
+                        if (iminor < minorCount) {
+                            var minorPositionMapped = majorPositionMapped + (j + 1) * minorStepMapped;
+                            if (from <= minorPositionMapped && minorPositionMapped <= to) {
+                                var iminorResult = iminor * 3;
+                                minorResult[iminorResult + 0] = coordinate.unmap(minorPositionMapped);
+                                minorResult[iminorResult + 1] = transform.map(minorPositionMapped);
+                                minorResult[iminorResult + 2] = coordinate.unmap(minorPositionMapped - 1);
+                                iminor += 1;
+                            }
                         }
                     }
                 }
@@ -57103,6 +57127,53 @@
         return DChartRegionImplObservable;
     }());
 
+    /*
+     * Copyright (C) 2019 Toshiba Corporation
+     * SPDX-License-Identifier: Apache-2.0
+     */
+    var DChartSelectionContainerImpl = /** @class */ (function () {
+        function DChartSelectionContainerImpl(x, y) {
+            this._x = x;
+            this._y = y;
+        }
+        Object.defineProperty(DChartSelectionContainerImpl.prototype, "x", {
+            get: function () {
+                return this._x;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(DChartSelectionContainerImpl.prototype, "y", {
+            get: function () {
+                return this._y;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        DChartSelectionContainerImpl.prototype.bind = function (container) {
+            this._x.bind(container);
+            this._y.bind(container);
+        };
+        DChartSelectionContainerImpl.prototype.unbind = function () {
+            this._x.unbind();
+            this._y.unbind();
+        };
+        DChartSelectionContainerImpl.prototype.set = function (container, position, mappedPosition, series) {
+            this._x.set(container, position, mappedPosition, series);
+            this._y.set(container, position, mappedPosition, series);
+        };
+        DChartSelectionContainerImpl.prototype.unset = function () {
+            this._x.unset();
+            this._y.unset();
+        };
+        DChartSelectionContainerImpl.prototype.update = function (container, position, mappedPosition) {
+            var isXUpdated = this._x.update(container, position, mappedPosition);
+            var isYUpdated = this._y.update(container, position, mappedPosition);
+            return isXUpdated || isYUpdated;
+        };
+        return DChartSelectionContainerImpl;
+    }());
+
     /*
      * Copyright (C) 2019 Toshiba Corporation
      * SPDX-License-Identifier: Apache-2.0
@@ -57115,12 +57186,32 @@
             var state = new DBaseStateSetImpl().add((_a = options === null || options === void 0 ? void 0 : options.state) !== null && _a !== void 0 ? _a : DBaseState.HOVERED);
             this._state = state;
             this._isEnabled = (_b = options === null || options === void 0 ? void 0 : options.enable) !== null && _b !== void 0 ? _b : theme.isEnabled(state);
-            this._shape = options === null || options === void 0 ? void 0 : options.shape;
+            if (options != null) {
+                var shape = options.shape;
+                if (shape != null) {
+                    if (isFunction(shape)) {
+                        this._newShape = shape;
+                    }
+                    else {
+                        this._shape = shape;
+                    }
+                }
+            }
             this._style = (_c = options === null || options === void 0 ? void 0 : options.style) !== null && _c !== void 0 ? _c : this.setStyle;
         }
         DChartSelectionShapeBase.prototype.bind = function (container) {
             if (this._isEnabled) {
-                var shape = this._shape || this.newShape(this._theme);
+                var shape = this._shape;
+                if (shape == null) {
+                    var state = this._state;
+                    var newShape = this._newShape;
+                    if (newShape != null) {
+                        shape = newShape(state);
+                    }
+                    else {
+                        shape = this.newShape(state, this._theme);
+                    }
+                }
                 this._shape = shape;
                 shape.attach(container.plotArea.axis.container);
                 shape.visible = false;
@@ -57132,21 +57223,18 @@
                 shape.detach();
             }
         };
-        DChartSelectionShapeBase.prototype.newShape = function (theme) {
-            return theme.newShape(this._state);
+        DChartSelectionShapeBase.prototype.newShape = function (state, theme) {
+            return theme.newShape(state);
         };
-        DChartSelectionShapeBase.prototype.set = function (container, mappedPosition, series) {
-            this.update(container, mappedPosition);
+        DChartSelectionShapeBase.prototype.set = function (container, position, mappedPosition, series) {
+            this.update(container, position, mappedPosition);
             var shape = this._shape;
             if (shape) {
                 this._style(shape, series);
             }
         };
         DChartSelectionShapeBase.prototype.setStyle = function (shape, series) {
-            var seriesShape = series.shape;
-            if (seriesShape) {
-                shape.stroke.color = seriesShape.stroke.color;
-            }
+            // DO NOTHING
         };
         DChartSelectionShapeBase.prototype.unset = function () {
             var shape = this._shape;
@@ -57181,20 +57269,21 @@
         function DChartSelectionGridlineX() {
             return _super !== null && _super.apply(this, arguments) || this;
         }
-        DChartSelectionGridlineX.prototype.update = function (container, mappedPosition) {
+        DChartSelectionGridlineX.prototype.update = function (container, position, mappedPosition) {
             var shape = this._shape;
             if (shape) {
                 var mappedX = mappedPosition.x;
                 var height = container.plotArea.height;
                 shape.transform.position.set(mappedX, height * 0.5);
                 shape.size.set(0, height);
-                shape.visible = this.isVisible(container, mappedX);
+                shape.visible = this.isVisible(container, position, mappedPosition);
                 return true;
             }
             return false;
         };
-        DChartSelectionGridlineX.prototype.isVisible = function (container, mappedX) {
-            return 0 <= mappedX && mappedX <= container.plotArea.width;
+        DChartSelectionGridlineX.prototype.isVisible = function (container, position, mappedPosition) {
+            var x = mappedPosition.x;
+            return 0 <= x && x <= container.plotArea.width;
         };
         DChartSelectionGridlineX.prototype.getType = function () {
             return "DChartSelectionGridlineX";
@@ -57211,20 +57300,21 @@
         function DChartSelectionGridlineY() {
             return _super !== null && _super.apply(this, arguments) || this;
         }
-        DChartSelectionGridlineY.prototype.update = function (container, mappedPosition) {
+        DChartSelectionGridlineY.prototype.update = function (container, position, mappedPosition) {
             var shape = this._shape;
             if (shape) {
                 var mappedY = mappedPosition.y;
                 var width = container.plotArea.width;
                 shape.transform.position.set(width * 0.5, mappedY);
                 shape.size.set(width, 0);
-                shape.visible = this.isVisible(container, mappedY);
+                shape.visible = this.isVisible(container, position, mappedPosition);
                 return true;
             }
             return false;
         };
-        DChartSelectionGridlineY.prototype.isVisible = function (container, mappedY) {
-            return 0 <= mappedY && mappedY <= container.plotArea.height;
+        DChartSelectionGridlineY.prototype.isVisible = function (container, position, mappedPosition) {
+            var y = mappedPosition.y;
+            return 0 <= y && y <= container.plotArea.height;
         };
         DChartSelectionGridlineY.prototype.getType = function () {
             return "DChartSelectionGridlineY";
@@ -57232,53 +57322,6 @@
         return DChartSelectionGridlineY;
     }(DChartSelectionShapeBase));
 
-    /*
-     * Copyright (C) 2019 Toshiba Corporation
-     * SPDX-License-Identifier: Apache-2.0
-     */
-    var DChartSelectionGridlineContainerImpl = /** @class */ (function () {
-        function DChartSelectionGridlineContainerImpl(options) {
-            this._x = new DChartSelectionGridlineX(options === null || options === void 0 ? void 0 : options.x);
-            this._y = new DChartSelectionGridlineY(options === null || options === void 0 ? void 0 : options.y);
-        }
-        Object.defineProperty(DChartSelectionGridlineContainerImpl.prototype, "x", {
-            get: function () {
-                return this._x;
-            },
-            enumerable: false,
-            configurable: true
-        });
-        Object.defineProperty(DChartSelectionGridlineContainerImpl.prototype, "y", {
-            get: function () {
-                return this._y;
-            },
-            enumerable: false,
-            configurable: true
-        });
-        DChartSelectionGridlineContainerImpl.prototype.bind = function (container) {
-            this._x.bind(container);
-            this._y.bind(container);
-        };
-        DChartSelectionGridlineContainerImpl.prototype.unbind = function () {
-            this._x.unbind();
-            this._y.unbind();
-        };
-        DChartSelectionGridlineContainerImpl.prototype.set = function (container, mappedPosition, series) {
-            this._x.set(container, mappedPosition, series);
-            this._y.set(container, mappedPosition, series);
-        };
-        DChartSelectionGridlineContainerImpl.prototype.unset = function () {
-            this._x.unset();
-            this._y.unset();
-        };
-        DChartSelectionGridlineContainerImpl.prototype.update = function (container, mappedPosition) {
-            var isXUpdated = this._x.update(container, mappedPosition);
-            var isYUpdated = this._y.update(container, mappedPosition);
-            return isXUpdated || isYUpdated;
-        };
-        return DChartSelectionGridlineContainerImpl;
-    }());
-
     /*
      * Copyright (C) 2019 Toshiba Corporation
      * SPDX-License-Identifier: Apache-2.0
@@ -57288,16 +57331,16 @@
         function DChartSelectionMarker() {
             return _super !== null && _super.apply(this, arguments) || this;
         }
-        DChartSelectionMarker.prototype.update = function (container, mappedPosition) {
+        DChartSelectionMarker.prototype.update = function (container, position, mappedPosition) {
             var shape = this._shape;
             if (shape) {
                 shape.transform.position.copyFrom(mappedPosition);
-                shape.visible = this.isVisible(container, mappedPosition);
+                shape.visible = this.isVisible(container, position, mappedPosition);
                 return true;
             }
             return false;
         };
-        DChartSelectionMarker.prototype.isVisible = function (container, mappedPosition) {
+        DChartSelectionMarker.prototype.isVisible = function (container, position, mappedPosition) {
             var x = mappedPosition.x;
             var y = mappedPosition.y;
             var plotArea = container.plotArea;
@@ -57328,18 +57371,18 @@
         __extends(DChartSelectionSubImpl, _super);
         function DChartSelectionSubImpl(options) {
             var _this = this;
-            var _a, _b, _c;
+            var _a, _b, _c, _d, _e;
             _this = _super.call(this) || this;
             _this._container = null;
             _this._series = null;
             _this._isEnabled = (_a = options.enable) !== null && _a !== void 0 ? _a : true;
-            _this._gridline = new DChartSelectionGridlineContainerImpl(options.gridline);
+            _this._gridline = new DChartSelectionContainerImpl(new DChartSelectionGridlineX((_b = options.gridline) === null || _b === void 0 ? void 0 : _b.x), new DChartSelectionGridlineY((_c = options.gridline) === null || _c === void 0 ? void 0 : _c.y));
             _this._marker = new DChartSelectionMarker(options.marker);
-            _this._state = (_b = options.state) !== null && _b !== void 0 ? _b : DBaseState.HOVERED;
+            _this._state = (_d = options.state) !== null && _d !== void 0 ? _d : DBaseState.HOVERED;
             _this._coordinateX = null;
             _this._coordinateY = null;
             _this._position = new pixi_js.Point();
-            _this._point = (_c = options.point) !== null && _c !== void 0 ? _c : DChartSelectionPoint.CLOSER;
+            _this._point = (_e = options.point) !== null && _e !== void 0 ? _e : DChartSelectionPoint.CLOSER;
             _this._work = new pixi_js.Point();
             // Events
             var on = options.on;
@@ -57434,8 +57477,8 @@
                     work.set(coordinateX.transform.map(coordinateX.map(position.x)), coordinateY.transform.map(coordinateY.map(position.y)));
                     transform.apply(work, work);
                 }
-                this._gridline.set(container, work, series);
-                this._marker.set(container, work, series);
+                this._gridline.set(container, position, work, series);
+                this._marker.set(container, position, work, series);
                 DApplications.update(container.plotArea);
             }
             var oldSeries = this._series;
@@ -57449,12 +57492,6 @@
             }
             this.emit("change", this);
         };
-        DChartSelectionSubImpl.prototype.setStyle = function (shape, series) {
-            var seriesShape = series.shape;
-            if (seriesShape) {
-                shape.stroke.color = seriesShape.stroke.color;
-            }
-        };
         DChartSelectionSubImpl.prototype.unset = function () {
             var series = this._series;
             if (series) {
@@ -57476,8 +57513,8 @@
                 var work = this._work;
                 work.set(coordinateX.transform.map(coordinateX.map(position.x)), coordinateY.transform.map(coordinateY.map(position.y)));
                 container.plotArea.container.localTransform.apply(work, work);
-                var isGridlineUpdated = this._gridline.update(container, work);
-                var isMarkerUpdated = this._marker.update(container, work);
+                var isGridlineUpdated = this._gridline.update(container, position, work);
+                var isMarkerUpdated = this._marker.update(container, position, work);
                 return isGridlineUpdated || isMarkerUpdated;
             }
             return false;
@@ -57519,12 +57556,19 @@
             return _this;
         }
         DChartSelectionSimple.prototype.newSelected = function (point, options) {
-            return new DChartSelectionSubImpl(this.toSubOptions(point, options, DBaseState.ACTIVE));
+            return new DChartSelectionSubImpl(this.toSelectedOptions(point, options));
         };
         DChartSelectionSimple.prototype.newHovered = function (point, options) {
-            return new DChartSelectionSubImpl(this.toSubOptions(point, options, DBaseState.HOVERED));
+            return new DChartSelectionSubImpl(this.toHoveredOptions(point, options));
+        };
+        DChartSelectionSimple.prototype.toSelectedOptions = function (point, options) {
+            return this.toSubOptions(point, options, DBaseState.ACTIVE);
+        };
+        DChartSelectionSimple.prototype.toHoveredOptions = function (point, options) {
+            return this.toSubOptions(point, options, DBaseState.HOVERED);
         };
         DChartSelectionSimple.prototype.toSubOptions = function (point, options, state) {
+            var _a, _b, _c, _d, _e, _f, _g;
             options = options || {};
             if (options.point == null) {
                 options.point = point;
@@ -57532,19 +57576,28 @@
             if (options.state == null) {
                 options.state = state;
             }
-            var gridline = options.gridline || {};
-            var gridlineX = gridline.x || {};
+            var gridline = ((_a = options.gridline) !== null && _a !== void 0 ? _a : (options.gridline = {}));
+            var gridlineX = ((_b = gridline.x) !== null && _b !== void 0 ? _b : (gridline.x = {}));
             if (gridlineX.state == null) {
                 gridlineX.state = state;
             }
-            var gridlineY = gridline.y || {};
+            var gridlineY = ((_c = gridline.y) !== null && _c !== void 0 ? _c : (gridline.y = {}));
             if (gridlineY.state == null) {
                 gridlineY.state = state;
             }
-            var marker = options.marker || {};
+            var marker = ((_d = options.marker) !== null && _d !== void 0 ? _d : (options.marker = {}));
             if (marker.state == null) {
                 marker.state = state;
             }
+            var label = ((_e = options.label) !== null && _e !== void 0 ? _e : (options.label = {}));
+            var labelX = ((_f = label.x) !== null && _f !== void 0 ? _f : (label.x = {}));
+            if (labelX.state == null) {
+                labelX.state = state;
+            }
+            var labelY = ((_g = label.y) !== null && _g !== void 0 ? _g : (label.y = {}));
+            if (labelY.state == null) {
+                labelY.state = state;
+            }
             return options;
         };
         DChartSelectionSimple.prototype.onClick = function (e) {
@@ -73897,7 +73950,7 @@
         DChartPlotAreaImpl: DChartPlotAreaImpl,
         DChartRegionImplObservable: DChartRegionImplObservable,
         DChartRegionImpl: DChartRegionImpl,
-        DChartSelectionGridlineContainerImpl: DChartSelectionGridlineContainerImpl,
+        DChartSelectionContainerImpl: DChartSelectionContainerImpl,
         DChartSelectionGridlineX: DChartSelectionGridlineX,
         DChartSelectionGridlineY: DChartSelectionGridlineY,
         DChartSelectionMarker: DChartSelectionMarker,