@amcharts/amcharts5 5.0.13 → 5.0.17

package/.internal/charts/xy/series/XYSeries.js

@@ -285,6 +285,18 @@ var XYSeries = /** @class */ (function (_super) {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(_this, "_tooltipFieldX", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(_this, "_tooltipFieldY", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         return _this;
     }
     Object.defineProperty(XYSeries.prototype, "_afterNew", {
@@ -324,6 +336,9 @@ var XYSeries = /** @class */ (function (_super) {
                 else if (change.type === "removeIndex") {
                     _this._removeAxisRange(change.oldValue);
                 }
+                else if (change.type === "moveIndex") {
+                    _this._processAxisRange(change.value);
+                }
                 else {
                     throw new Error("Unknown IStreamEvent type");
                 }
@@ -356,7 +371,6 @@ var XYSeries = /** @class */ (function (_super) {
             var axis = axisDataItem.component;
             if (axis) {
                 axis._processAxisRange(axisDataItem, ["range", "series"]);
-                var axisFill = axisDataItem.get("axisFill");
                 var bullet = axisDataItem.get("bullet");
                 if (bullet) {
                     var sprite = bullet.get("sprite");
@@ -364,8 +378,8 @@ var XYSeries = /** @class */ (function (_super) {
                         sprite.setPrivate("visible", false);
                     }
                 }
+                var axisFill = axisDataItem.get("axisFill");
                 if (axisFill) {
-                    this.children.push(axisFill);
                     container.set("mask", axisFill);
                 }
                 axis._seriesAxisRanges.push(axisDataItem);
@@ -377,11 +391,14 @@ var XYSeries = /** @class */ (function (_super) {
         configurable: true,
         writable: true,
         value: function (axisRange) {
+            var axisDataItem = axisRange.axisDataItem;
+            var axis = axisDataItem.component;
+            axis.disposeDataItem(axisDataItem);
+            $array.remove(axis._seriesAxisRanges, axisDataItem);
             var container = axisRange.container;
             if (container) {
                 container.dispose();
             }
-            axisRange.axisDataItem.dispose();
         }
     });
     Object.defineProperty(XYSeries.prototype, "_updateFields", {
@@ -466,6 +483,9 @@ var XYSeries = /** @class */ (function (_super) {
         configurable: true,
         writable: true,
         value: function (dataItem) {
+            if (!this.get("xAxis").inited || !this.get("yAxis").inited) {
+                return false;
+            }
             if (dataItem.get(this._xField) != null && dataItem.get(this._yField) != null) {
                 return true;
             }
@@ -566,6 +586,38 @@ var XYSeries = /** @class */ (function (_super) {
             var xAxis = this.get("xAxis");
             var yAxis = this.get("yAxis");
             var baseAxis = this.get("baseAxis");
+            var tooltipPositionX = this.get("tooltipPositionX");
+            var tooltipFieldX;
+            switch (tooltipPositionX) {
+                case "open":
+                    tooltipFieldX = this._xOpenField;
+                    break;
+                case "low":
+                    tooltipFieldX = this._xLowField;
+                    break;
+                case "high":
+                    tooltipFieldX = this._xHighField;
+                    break;
+                default:
+                    tooltipFieldX = this._xField;
+            }
+            this._tooltipFieldX = tooltipFieldX;
+            var tooltipPositionY = this.get("tooltipPositionY");
+            var tooltipFieldY;
+            switch (tooltipPositionY) {
+                case "open":
+                    tooltipFieldY = this._yOpenField;
+                    break;
+                case "low":
+                    tooltipFieldY = this._yLowField;
+                    break;
+                case "high":
+                    tooltipFieldY = this._yHighField;
+                    break;
+                default:
+                    tooltipFieldY = this._yField;
+            }
+            this._tooltipFieldY = tooltipFieldY;
             if (this.isDirty("baseAxis")) {
                 this._fixVC();
             }
@@ -640,8 +692,8 @@ var XYSeries = /** @class */ (function (_super) {
                 this._dataGrouped = true;
             }
             if ((this._valuesDirty || this.isPrivateDirty("startIndex") || this.isPrivateDirty("endIndex") || this.isDirty("vcx") || this.isDirty("vcy") || this._stackDirty)) {
-                var startIndex = this.getPrivate("startIndex", 0);
-                var endIndex = this.getPrivate("endIndex", this.dataItems.length);
+                var startIndex = this.startIndex();
+                var endIndex = this.endIndex();
                 var minBulletDistance = this.get("minBulletDistance", 0);
                 if (minBulletDistance > 0 && baseAxis) {
                     if (baseAxis.get("renderer").axisLength() / (endIndex - startIndex) > minBulletDistance) {
@@ -704,10 +756,11 @@ var XYSeries = /** @class */ (function (_super) {
         value: function () {
             var _this = this;
             if (this.axisRanges.length > 0) {
-                if (!this._mainContainerMask) {
-                    var mainContainerMask_1 = this.children.push(Graphics.new(this._root, {}));
+                var mainContainerMask_1 = this._mainContainerMask;
+                if (mainContainerMask_1 == null) {
+                    mainContainerMask_1 = this.children.push(Graphics.new(this._root, {}));
                     this._mainContainerMask = mainContainerMask_1;
-                    mainContainerMask_1.set("draw", function (display) {
+                    mainContainerMask_1.set("draw", function (display, target) {
                         var parent = _this.parent;
                         if (parent) {
                             var w = _this._root.container.width();
@@ -723,7 +776,7 @@ var XYSeries = /** @class */ (function (_super) {
                                     if (fill) {
                                         var draw = fill.get("draw");
                                         if (draw) {
-                                            draw(mainContainerMask_1._display, mainContainerMask_1);
+                                            draw(display, target);
                                         }
                                     }
                                 }
@@ -732,8 +785,11 @@ var XYSeries = /** @class */ (function (_super) {
                         _this.mainContainer._display.mask = mainContainerMask_1._display;
                     });
                 }
-                this._mainContainerMask.markDirty();
-                this._mainContainerMask._markDirtyKey("fill");
+                mainContainerMask_1.markDirty();
+                mainContainerMask_1._markDirtyKey("fill");
+            }
+            else {
+                this.mainContainer._display.mask = null;
             }
         }
     });
@@ -749,23 +805,6 @@ var XYSeries = /** @class */ (function (_super) {
             this._makeRangeMask();
         }
     });
-    Object.defineProperty(XYSeries.prototype, "_maskBaseDraw", {
-        enumerable: false,
-        configurable: true,
-        writable: true,
-        value: function () {
-            var _this = this;
-            var mainContainerMask = this._mainContainerMask;
-            mainContainerMask.set("draw", function (display) {
-                var parent = _this.parent;
-                if (parent) {
-                    var w = parent.width();
-                    var h = parent.height();
-                    display.drawRect(0, 0, w, h);
-                }
-            });
-        }
-    });
     Object.defineProperty(XYSeries.prototype, "_stack", {
         enumerable: false,
         configurable: true,
@@ -1331,8 +1370,8 @@ var XYSeries = /** @class */ (function (_super) {
                             var yAxis = this.get("yAxis");
                             var vcx = this.get("vcx", 1);
                             var vcy = this.get("vcy", 1);
-                            var xPos = xAxis.getDataItemPositionX(dataItem, this._xField, this._aLocationX0 + (this._aLocationX1 - this._aLocationX0) * itemLocationX, vcx);
-                            var yPos = yAxis.getDataItemPositionY(dataItem, this._yField, this._aLocationY0 + (this._aLocationY1 - this._aLocationY0) * itemLocationY, vcy);
+                            var xPos = xAxis.getDataItemPositionX(dataItem, this._tooltipFieldX, this._aLocationX0 + (this._aLocationX1 - this._aLocationX0) * itemLocationX, vcx);
+                            var yPos = yAxis.getDataItemPositionY(dataItem, this._tooltipFieldY, this._aLocationY0 + (this._aLocationY1 - this._aLocationY0) * itemLocationY, vcy);
                             var point = this.getPoint(xPos, yPos);
                             var show_1 = true;
                             $array.each(this._valueFields, function (field) {
@@ -1477,9 +1516,6 @@ var XYSeries = /** @class */ (function (_super) {
         writable: true,
         value: function () {
             _super.prototype._afterDataChange.call(this);
-            // this causes unneeded animation on live demo and it shouldn't be needed
-            //this.setPrivate("startIndex", 0);
-            //this.setPrivate("endIndex", this.dataItems.length);
             this.resetExtremes();
         }
     });