@amcharts/amcharts5 5.0.4 → 5.0.8

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

@@ -2341,8 +2341,8 @@ var CanvasText = /** @class */ (function (_super) {
             // Init
             var oversizedBehavior = this.style.oversizedBehavior;
             var maxWidth = this.style.maxWidth;
-            var truncate = maxWidth && oversizedBehavior == "truncate";
-            var wrap = maxWidth && oversizedBehavior == "wrap";
+            var truncate = $type.isNumber(maxWidth) && oversizedBehavior == "truncate";
+            var wrap = $type.isNumber(maxWidth) && oversizedBehavior == "wrap";
             // Pre-render
             context.save();
             ghostContext.save();
@@ -2441,7 +2441,7 @@ var CanvasText = /** @class */ (function (_super) {
                         // Text chunk
                         else if (chunk.type == "value" && !skipFurtherText) {
                             // Measure
-                            var metrics_2 = _this._measureText(chunk.text.replace(/ /g, "."), context);
+                            var metrics_2 = _this._measureText(chunk.text, context);
                             var chunkWidth = metrics_2.actualBoundingBoxLeft + metrics_2.actualBoundingBoxRight;
                             // Check for fit
                             if (truncate) {
@@ -2570,12 +2570,7 @@ var CanvasText = /** @class */ (function (_super) {
                 var currentChunkOffset = 0;
                 $array.each(lineInfo.textChunks, function (chunk) {
                     chunk.offsetX = currentChunkOffset + chunk.left - lineInfo.left;
-                    //chunk.offsetY += Math.round(lineInfo.ascent);
                     chunk.offsetY += lineInfo.height - lineInfo.height * (_this.style.baselineRatio || 0.19);
-                    //chunk.offsetY += Math.round(lineInfo.height / 2) + ((lineInfo.height - chunk.height) / 2);
-                    //console.log(chunk.text, chunk.ascent, lineInfo.ascent)
-                    //chunk.offsetY += Math.round((lineInfo.height - chunk.height + (lineInfo.ascent - chunk.ascent)) / 2);
-                    //chunk.offsetY -= Math.round((lineInfo.height - chunk.height + (lineInfo.ascent - chunk.ascent)) / 2) - lineInfo.ascent / 2;
                     currentChunkOffset += chunk.width;
                 });
             });
@@ -2683,6 +2678,7 @@ var CanvasText = /** @class */ (function (_super) {
         writable: true,
         value: function (text, context) {
             var metrics = context.measureText(text);
+            var fakeMetrics = {};
             if (metrics.actualBoundingBoxAscent == null) {
                 var div = document.createElement("div");
                 div.innerText = text;
@@ -2695,29 +2691,47 @@ var CanvasText = /** @class */ (function (_super) {
                 var bbox = div.getBoundingClientRect();
                 document.body.removeChild(div);
                 var h = bbox.height;
-                var w = metrics.width;
+                var w_1 = metrics.width;
                 var left = 0;
-                var right = w;
-                switch (this.style.textAlign) {
-                    case "right":
-                    case "end":
-                        left = -w;
-                        right = 0;
-                        break;
-                    case "center":
-                        left = -w / 2;
-                        right = w / 2;
-                }
-                var fake = {
+                var right = w_1;
+                fakeMetrics = {
                     actualBoundingBoxAscent: h,
                     actualBoundingBoxDescent: 0,
                     actualBoundingBoxLeft: left,
                     actualBoundingBoxRight: right,
-                    width: w
+                    fontBoundingBoxAscent: h,
+                    fontBoundingBoxDescent: 0,
+                    width: w_1
                 };
-                return fake;
+                //return fake;
+            }
+            else {
+                fakeMetrics = {
+                    actualBoundingBoxAscent: metrics.actualBoundingBoxAscent,
+                    actualBoundingBoxDescent: metrics.actualBoundingBoxDescent,
+                    actualBoundingBoxLeft: metrics.actualBoundingBoxLeft,
+                    actualBoundingBoxRight: metrics.actualBoundingBoxRight,
+                    fontBoundingBoxAscent: metrics.actualBoundingBoxAscent,
+                    fontBoundingBoxDescent: metrics.actualBoundingBoxDescent,
+                    width: metrics.width
+                };
+            }
+            var w = metrics.width;
+            switch (this.style.textAlign) {
+                case "right":
+                case "end":
+                    fakeMetrics.actualBoundingBoxLeft = w;
+                    fakeMetrics.actualBoundingBoxRight = 0;
+                    break;
+                case "center":
+                    fakeMetrics.actualBoundingBoxLeft = w / 2;
+                    fakeMetrics.actualBoundingBoxRight = w / 2;
+                    break;
+                default:
+                    fakeMetrics.actualBoundingBoxLeft = 0;
+                    fakeMetrics.actualBoundingBoxRight = w;
             }
-            return metrics;
+            return fakeMetrics;
         }
     });
     return CanvasText;
@@ -3204,7 +3218,7 @@ var CanvasRadialText = /** @class */ (function (_super) {
                         for (var i = 0; i < chunk.text.length; i++) {
                             var char = chunk.text[i];
                             // Measure
-                            var metrics = _this._measureText(char.replace(" ", "."), context);
+                            var metrics = _this._measureText(char, context);
                             var chunkWidth = metrics.width;
                             // Chunk width?
                             if (currentStyle && currentChunkWidth && (currentChunkWidth > chunkWidth)) {
@@ -4082,7 +4096,8 @@ var CanvasRenderer = /** @class */ (function (_super) {
         writable: true,
         value: function (originalEvent) {
             var _this = this;
-            if (originalEvent.button > 0) {
+            var button = originalEvent.button;
+            if (button != 0 && button != 2 && button != 1) {
                 // Ignore non-primary mouse buttons
                 return;
             }
@@ -4199,7 +4214,18 @@ var CanvasRenderer = /** @class */ (function (_super) {
         writable: true,
         value: function (originalEvent) {
             var _this = this;
-            if (originalEvent.button > 0) {
+            var button = originalEvent.button;
+            var clickevent;
+            if (button == 0) {
+                clickevent = "click";
+            }
+            else if (button == 2) {
+                clickevent = "rightclick";
+            }
+            else if (button == 1) {
+                clickevent = "middleclick";
+            }
+            else {
                 // Ignore non-primary mouse buttons
                 return;
             }
@@ -4210,7 +4236,7 @@ var CanvasRenderer = /** @class */ (function (_super) {
                 if (target_1) {
                     this._mousedown.forEach(function (obj) {
                         if (obj.id === id && obj.value.contains(target_1)) {
-                            _this._dispatchEvent("click", obj.value, event);
+                            _this._dispatchEvent(clickevent, obj.value, event);
                         }
                     });
                 }
@@ -4254,9 +4280,7 @@ var CanvasRenderer = /** @class */ (function (_super) {
             var _this = this;
             var event = this.getEvent(originalEvent);
             this._hovering.forEach(function (obj) {
-                if (obj.wheelable) {
-                    _this._dispatchEvent("wheel", obj, event);
-                }
+                _this._dispatchEvent("wheel", obj, event);
             });
         }
     });
@@ -4308,6 +4332,8 @@ var CanvasRenderer = /** @class */ (function (_super) {
                         });
                     });
                 case "click":
+                case "rightclick":
+                case "middleclick":
                 case "pointerdown":
                 case "pointermove":
                 case "pointerup":