@amcharts/amcharts5 5.4.1 → 5.4.3

package/.internal/charts/xy/XYChart.js

@@ -1,3 +1,4 @@
+;
 import { XYChartDefaultTheme } from "./XYChartDefaultTheme";
 import { Container } from "../../core/render/Container";
 import { Rectangle } from "../../core/render/Rectangle";
@@ -279,13 +280,13 @@ export class XYChart extends SerialChart {
             fillOpacity: 0
         }));
         this._disposers.push(plotContainer.events.on("pointerdown", (event) => {
-            this._handlePlotDown(event.originalEvent);
+            this._handlePlotDown(event);
         }));
         this._disposers.push(plotContainer.events.on("globalpointerup", (event) => {
-            this._handlePlotUp(event.originalEvent);
+            this._handlePlotUp(event);
         }));
         this._disposers.push(plotContainer.events.on("globalpointermove", (event) => {
-            this._handlePlotMove(event.originalEvent);
+            this._handlePlotMove(event);
         }));
         this._maskGrid();
         this._setUpTouch();
@@ -353,7 +354,7 @@ export class XYChart extends SerialChart {
         else {
             return;
         }
-        const plotPoint = plotContainer.toLocal(this._root.documentPointToRoot({ x: wheelEvent.clientX, y: wheelEvent.clientY }));
+        const plotPoint = plotContainer.toLocal(event.point);
         const wheelStep = this.get("wheelStep", 0.2);
         const shiftY = wheelEvent.deltaY / 100;
         const shiftX = wheelEvent.deltaX / 100;
@@ -524,14 +525,14 @@ export class XYChart extends SerialChart {
         return [start, end];
     }
     _handlePlotDown(event) {
-        if (event.button == 2) {
+        const originalEvent = event.originalEvent;
+        if (originalEvent.button == 2) {
             return;
         }
         const plotContainer = this.plotContainer;
-        let local = plotContainer.toLocal(this._root.documentPointToRoot({ x: event.clientX, y: event.clientY }));
+        let local = plotContainer.toLocal(event.point);
         if (this.get("pinchZoomX") || this.get("pinchZoomY")) {
-            const touchEvent = event;
-            const pointerId = touchEvent.pointerId;
+            const pointerId = originalEvent.pointerId;
             if (pointerId) {
                 if ($object.keys(plotContainer._downPoints).length > 0) {
                     const xAxis = this.xAxes.getIndex(0);
@@ -550,7 +551,7 @@ export class XYChart extends SerialChart {
         if (this.get("panX") || this.get("panY")) {
             if (local.x >= 0 && local.y >= 0 && local.x <= plotContainer.width() && local.y <= this.height()) {
                 //this._downPoint = local;
-                this._downPoint = { x: event.clientX, y: event.clientY };
+                this._downPoint = { x: originalEvent.clientX, y: originalEvent.clientY };
                 const panX = this.get("panX");
                 const panY = this.get("panY");
                 if (panX) {
@@ -567,7 +568,7 @@ export class XYChart extends SerialChart {
                 }
                 const eventType = "panstarted";
                 if (this.events.isEnabled(eventType)) {
-                    this.events.dispatch(eventType, { type: eventType, target: this, originalEvent: event });
+                    this.events.dispatch(eventType, { type: eventType, target: this, originalEvent: event.originalEvent });
                 }
             }
         }
@@ -592,16 +593,16 @@ export class XYChart extends SerialChart {
         const downPoint = this._downPoint;
         if (downPoint) {
             if (this.get("panX") || this.get("panY")) {
-                let local = this.plotContainer.toLocal(this._root.documentPointToRoot({ x: event.clientX, y: event.clientY }));
+                let local = this.plotContainer.toLocal(event.point);
                 if (local.x == downPoint.x && local.y == downPoint.y) {
                     const eventType = "pancancelled";
                     if (this.events.isEnabled(eventType)) {
-                        this.events.dispatch(eventType, { type: eventType, target: this, originalEvent: event });
+                        this.events.dispatch(eventType, { type: eventType, target: this, originalEvent: event.originalEvent });
                     }
                 }
                 const eventType = "panended";
                 if (this.events.isEnabled(eventType)) {
-                    this.events.dispatch(eventType, { type: eventType, target: this, originalEvent: event });
+                    this.events.dispatch(eventType, { type: eventType, target: this, originalEvent: event.originalEvent });
                 }
             }
         }
@@ -620,7 +621,7 @@ export class XYChart extends SerialChart {
             const touchEvent = event;
             const pointerId = touchEvent.pointerId;
             if (pointerId) {
-                this._movePoints[pointerId] = this._root.documentPointToRoot({ x: event.clientX, y: event.clientY });
+                this._movePoints[pointerId] = event.point;
                 if ($object.keys(plotContainer._downPoints).length > 1) {
                     this._handlePinch();
                     return;
@@ -630,7 +631,7 @@ export class XYChart extends SerialChart {
         let downPoint = this._downPoint;
         if (downPoint) {
             downPoint = plotContainer.toLocal(this._root.documentPointToRoot(downPoint));
-            let local = plotContainer.toLocal(this._root.documentPointToRoot({ x: event.clientX, y: event.clientY }));
+            let local = plotContainer.toLocal(event.point);
             const panX = this.get("panX");
             const panY = this.get("panY");
             if (panX) {