@amcharts/amcharts5 5.5.7 → 5.6.0

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

@@ -140,6 +140,12 @@ export class XYSeries extends Series {
             writable: true,
             value: 0
         });
+        Object.defineProperty(this, "_bullets", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: {}
+        });
         /**
          * A [[Container]] that us used to put series' elements in.
          *
@@ -438,6 +444,7 @@ export class XYSeries extends Series {
     }
     _dispose() {
         super._dispose();
+        this._bullets = {};
         const chart = this.chart;
         if (chart) {
             chart.series.removeValue(this);
@@ -559,6 +566,7 @@ export class XYSeries extends Series {
     }
     _prepareChildren() {
         super._prepareChildren();
+        this._bullets = {};
         if (this.isDirty("valueYShow") || this.isDirty("valueXShow") || this.isDirty("openValueYShow") || this.isDirty("openValueXShow") || this.isDirty("lowValueYShow") || this.isDirty("lowValueXShow") || this.isDirty("highValueYShow") || this.isDirty("highValueXShow")) {
             this._updateFields();
             this._makeFieldNames();
@@ -990,30 +998,115 @@ export class XYSeries extends Series {
             let locationY = bullet.get("locationY", dataItem.get("locationY", 0.5));
             let xAxis = this.get("xAxis");
             let yAxis = this.get("yAxis");
-            const positionX = xAxis.getDataItemPositionX(dataItem, this._xField, locationX, this.get("vcx", 1));
-            const positionY = yAxis.getDataItemPositionY(dataItem, this._yField, locationY, this.get("vcy", 1));
+            let positionX = xAxis.getDataItemPositionX(dataItem, this._xField, locationX, this.get("vcx", 1));
+            let positionY = yAxis.getDataItemPositionY(dataItem, this._yField, locationY, this.get("vcy", 1));
             let point = this.getPoint(positionX, positionY);
             let left = dataItem.get("left", point.x);
             let right = dataItem.get("right", point.x);
             let top = dataItem.get("top", point.y);
             let bottom = dataItem.get("bottom", point.y);
+            let x = 0;
+            let y = 0;
+            let w = right - left;
+            let h = bottom - top;
             if (this._shouldShowBullet(positionX, positionY)) {
-                if (!bullet.getPrivate("hidden")) {
-                    sprite.setPrivate("visible", true);
+                sprite.setPrivate("visible", !bullet.getPrivate("hidden"));
+                let field = bullet.get("field");
+                const baseAxis = this.get("baseAxis");
+                const xAxis = this.get("xAxis");
+                const yAxis = this.get("yAxis");
+                if (field != undefined) {
+                    let realField;
+                    if (baseAxis == xAxis) {
+                        if (field == "value") {
+                            realField = this._yField;
+                        }
+                        else if (field == "open") {
+                            realField = this._yOpenField;
+                        }
+                        else if (field == "high") {
+                            realField = this._yHighField;
+                        }
+                        else if (field == "low") {
+                            realField = this._yLowField;
+                        }
+                        if (realField) {
+                            positionY = yAxis.getDataItemPositionY(dataItem, realField, 0, this.get("vcy", 1));
+                            point = yAxis.get("renderer").positionToPoint(positionY);
+                            y = point.y;
+                            x = left + w * locationX;
+                        }
+                    }
+                    else {
+                        if (field == "value") {
+                            realField = this._xField;
+                        }
+                        else if (field == "open") {
+                            realField = this._xOpenField;
+                        }
+                        else if (field == "high") {
+                            realField = this._xHighField;
+                        }
+                        else if (field == "low") {
+                            realField = this._xLowField;
+                        }
+                        if (realField) {
+                            positionX = xAxis.getDataItemPositionX(dataItem, realField, 0, this.get("vcx", 1));
+                            point = xAxis.get("renderer").positionToPoint(positionX);
+                            x = point.x;
+                            y = bottom - h * locationY;
+                        }
+                    }
                 }
                 else {
-                    sprite.setPrivate("visible", false);
+                    x = left + w * locationX;
+                    y = bottom - h * locationY;
+                }
+                const stacked = bullet.get("stacked");
+                if (stacked) {
+                    const chart = this.chart;
+                    if (baseAxis == xAxis) {
+                        let previousBullet = this._bullets[positionX + "_" + positionY];
+                        let d = -1;
+                        if (stacked == "down") {
+                            d = 1;
+                        }
+                        else if (stacked == "auto") {
+                            if (chart) {
+                                if (y < chart.plotContainer.height() / 2) {
+                                    d = 1;
+                                }
+                            }
+                        }
+                        if (previousBullet) {
+                            y = previousBullet.y() + previousBullet.height() * d;
+                        }
+                        this._bullets[positionX + "_" + positionY] = sprite;
+                    }
+                    else {
+                        let previousBullet = this._bullets[positionX + "_" + positionY];
+                        let d = -1;
+                        if (stacked == "down") {
+                            d = 1;
+                        }
+                        else if (stacked == "auto") {
+                            if (chart) {
+                                if (x < chart.plotContainer.width() / 2) {
+                                    d = 1;
+                                }
+                            }
+                        }
+                        if (previousBullet) {
+                            x = previousBullet.x() + previousBullet.width() * d;
+                        }
+                        this._bullets[positionX + "_" + positionY] = sprite;
+                    }
                 }
-                let w = right - left;
-                let h = bottom - top;
                 if (sprite.isType("Label")) {
                     sprite.setPrivate("maxWidth", Math.abs(w));
                     sprite.setPrivate("maxHeight", Math.abs(h));
                 }
-                let x = left + w * locationX;
-                let y = bottom - h * locationY;
-                sprite.set("x", x);
-                sprite.set("y", y);
+                sprite.setAll({ x, y });
             }
             else {
                 sprite.setPrivate("visible", false);
@@ -1053,21 +1146,19 @@ export class XYSeries extends Series {
         this._dataItems = this.mainDataItems;
     }
     _handleDataSetChange() {
-        if (this.bullets.length > 0) {
-            $array.each(this._dataItems, (dataItem) => {
-                let bullets = dataItem.bullets;
-                if (bullets) {
-                    $array.each(bullets, (bullet) => {
-                        if (bullet) {
-                            let sprite = bullet.get("sprite");
-                            if (sprite) {
-                                sprite.setPrivate("visible", false);
-                            }
+        $array.each(this._dataItems, (dataItem) => {
+            let bullets = dataItem.bullets;
+            if (bullets) {
+                $array.each(bullets, (bullet) => {
+                    if (bullet) {
+                        let sprite = bullet.get("sprite");
+                        if (sprite) {
+                            sprite.setPrivate("visible", false);
                         }
-                    });
-                }
-            });
-        }
+                    }
+                });
+            }
+        });
         this._selectionProcessed = false; // for totals to be calculated
     }
     /**