@amcharts/amcharts5 5.1.3 → 5.1.4

package/.internal/core/render/backend/CanvasRenderer.js

@@ -119,8 +119,12 @@ function eachTargets(hitTarget, f) {
  */
 function onPointerEvent(element, name, f) {
     return $utils.addEventListener(element, $utils.getRendererEvent(name), function (event) {
-        if (event.touches) {
-            $array.each(event.touches, function (touch) {
+        var touches = event.touches;
+        if (touches) {
+            if (touches.length == 0) {
+                touches = event.changedTouches;
+            }
+            $array.each(touches, function (touch) {
                 f(touch);
             });
         }
@@ -3624,7 +3628,7 @@ export { CanvasImage };
  * @ignore
  */
 var CanvasRendererEvent = /** @class */ (function () {
-    function CanvasRendererEvent(event, point) {
+    function CanvasRendererEvent(event, point, bbox) {
         Object.defineProperty(this, "event", {
             enumerable: true,
             configurable: true,
@@ -3637,6 +3641,12 @@ var CanvasRendererEvent = /** @class */ (function () {
             writable: true,
             value: point
         });
+        Object.defineProperty(this, "bbox", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: bbox
+        });
         Object.defineProperty(this, "id", {
             enumerable: true,
             configurable: true,
@@ -4026,6 +4036,8 @@ var CanvasRenderer = /** @class */ (function (_super) {
             this._ghostView.height = this._height;
             this._ghostView.style.width = width + "px";
             this._ghostView.style.height = height + "px";
+            this.view.style.width = width + "px";
+            this.view.style.height = height + "px";
         }
     });
     Object.defineProperty(CanvasRenderer.prototype, "createDetachedLayer", {
@@ -4193,28 +4205,28 @@ var CanvasRenderer = /** @class */ (function (_super) {
         writable: true,
         value: function (originalEvent, adjustPoint) {
             if (adjustPoint === void 0) { adjustPoint = true; }
-            var bbox = adjustPoint ? this.view.getBoundingClientRect() : { left: 0, top: 0 };
-            return new CanvasRendererEvent(originalEvent, originalEvent.clientX || originalEvent.clientY ? {
+            var bbox = adjustPoint ? this.view.getBoundingClientRect() : new DOMRect(0, 0, 0, 0);
+            return new CanvasRendererEvent(originalEvent, (originalEvent.clientX || originalEvent.clientY ? {
                 x: originalEvent.clientX - (originalEvent.clientX ? bbox.left : 0),
                 y: originalEvent.clientY - (originalEvent.clientY ? bbox.top : 0),
             } : {
                 x: 0,
                 y: 0
-            });
+            }), bbox);
         }
     });
     Object.defineProperty(CanvasRenderer.prototype, "_getHitTarget", {
         enumerable: false,
         configurable: true,
         writable: true,
-        value: function (point) {
-            if (point.x < 0 || point.x > this._width / this.resolution || point.y < 0 || point.y > this._height / this.resolution) {
+        value: function (point, bbox) {
+            if (point.x < 0 || point.x > bbox.width || point.y < 0 || point.y > bbox.height) {
                 return;
             }
             else {
                 var pixel = this._ghostContext.getImageData(
                 // TODO should this round ?
-                Math.round(point.x * this.resolution), Math.round(point.y * this.resolution), 1, 1);
+                Math.round((point.x / bbox.width) * this._width), Math.round((point.y / bbox.height) * this._height), 1, 1);
                 if (pixel.data[0] === 0 && pixel.data[1] === 0 && pixel.data[2] === 0) {
                     return false;
                 }
@@ -4295,12 +4307,12 @@ var CanvasRenderer = /** @class */ (function (_super) {
         value: function (originalEvent) {
             var _this = this;
             var button = originalEvent.button;
-            if (button != 0 && button != 2 && button != 1) {
+            if (button != 0 && button != 2 && button != 1 && button !== undefined) {
                 // Ignore non-primary mouse buttons
                 return;
             }
             var event = this.getEvent(originalEvent);
-            var target = this._getHitTarget(event.point);
+            var target = this._getHitTarget(event.point, event.bbox);
             if (target) {
                 var id_1 = event.id;
                 var dragged_1 = false;
@@ -4329,7 +4341,7 @@ var CanvasRenderer = /** @class */ (function (_super) {
         value: function (originalEvent, native) {
             var _this = this;
             var event = this.getEvent(originalEvent);
-            var target = this._getHitTarget(event.point);
+            var target = this._getHitTarget(event.point, event.bbox);
             event.native = native;
             if (target) {
                 this._hovering.forEach(function (obj) {
@@ -4404,7 +4416,7 @@ var CanvasRenderer = /** @class */ (function (_super) {
             var _this = this;
             var button = originalEvent.button;
             var clickevent;
-            if (button == 0) {
+            if (button == 0 || button === undefined) {
                 clickevent = "click";
             }
             else if (button == 2) {
@@ -4420,7 +4432,7 @@ var CanvasRenderer = /** @class */ (function (_super) {
             var event = this.getEvent(originalEvent);
             var id = event.id;
             if (this._mousedown.length !== 0) {
-                var target_1 = this._getHitTarget(event.point);
+                var target_1 = this._getHitTarget(event.point, event.bbox);
                 if (target_1) {
                     this._mousedown.forEach(function (obj) {
                         if (obj.id === id && obj.value.contains(target_1)) {
@@ -4447,7 +4459,7 @@ var CanvasRenderer = /** @class */ (function (_super) {
         value: function (originalEvent) {
             var _this = this;
             var event = this.getEvent(originalEvent);
-            var target = this._getHitTarget(event.point);
+            var target = this._getHitTarget(event.point, event.bbox);
             if (target) {
                 eachTargets(target, function (obj) {
                     if (_this._dispatchEvent("dblclick", obj, event)) {