@amcharts/amcharts5 5.0.15 → 5.0.19

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

@@ -592,19 +592,21 @@ var CanvasDisplayObject = /** @class */ (function (_super) {
                 if (mask_1) {
                     mask_1._setMatrix();
                 }
+                // TODO improve this
                 $array.each(layers, function (layer) {
                     if (layer) {
-                        layer.context.save();
+                        var context = layer.context;
+                        context.save();
                         // We must apply the mask before we transform the element
                         if (mask_1) {
-                            mask_1._transform(layer.context, layer.scale || resolution_1);
-                            mask_1._runPath(layer.context);
-                            layer.context.clip();
+                            mask_1._transform(context, layer.scale || resolution_1);
+                            mask_1._runPath(context);
+                            context.clip();
                         }
-                        layer.context.globalAlpha = _this.compoundAlpha * _this.alpha;
-                        _this._transform(layer.context, layer.scale || resolution_1);
+                        context.globalAlpha = _this.compoundAlpha * _this.alpha;
+                        _this._transform(context, layer.scale || resolution_1);
                         if (_this.filter) {
-                            layer.context.filter = _this.filter;
+                            context.filter = _this.filter;
                         }
                     }
                 });
@@ -2005,9 +2007,6 @@ var CanvasGraphics = /** @class */ (function (_super) {
             var layer = this._layer || parentLayer;
             var layerDirty = layer.dirty;
             var interactive = this._isInteractive();
-            // if (this.targetLayer) {
-            // 	console.log(this._operations, layer)
-            // }
             if (layerDirty || interactive) {
                 var context_1 = layer.context;
                 var ghostContext_1 = this._renderer._ghostContext;
@@ -2297,6 +2296,16 @@ var CanvasText = /** @class */ (function (_super) {
                             var thickness = 1;
                             var offset = 1;
                             var fontSize = chunk.height;
+                            var offsetX = chunk.offsetX;
+                            switch (_this.style.textAlign) {
+                                case "right":
+                                case "end":
+                                    offsetX -= chunk.width;
+                                    break;
+                                case "center":
+                                    offsetX -= chunk.width / 2;
+                                    break;
+                            }
                             if (chunk.style) {
                                 var format = TextFormatter.getTextStyle(chunk.style);
                                 switch (format.fontWeight) {
@@ -2318,9 +2327,12 @@ var CanvasText = /** @class */ (function (_super) {
                             if (chunk.fill) {
                                 context_2.strokeStyle = chunk.fill.toCSS();
                             }
+                            else if (_this.style.fill && _this.style.fill instanceof Color) {
+                                context_2.strokeStyle = _this.style.fill.toCSS();
+                            }
                             context_2.lineWidth = thickness * offset;
-                            context_2.moveTo(chunk.offsetX, y);
-                            context_2.lineTo(chunk.offsetX + chunk.width, y);
+                            context_2.moveTo(offsetX, y);
+                            context_2.lineTo(offsetX + chunk.width, y);
                             context_2.stroke();
                             context_2.restore();
                         }
@@ -2702,7 +2714,7 @@ var CanvasText = /** @class */ (function (_super) {
                     text = text.slice(0, -1);
                 }
                 else {
-                    var tmp = text.replace(/[^,;:!?\\\/\.\s]+[,;:!?\\\/\.\s]*$/g, "");
+                    var tmp = text.replace(/[^,;:!?\\\/\s]+[,;:!?\\\/\s]*$/g, "");
                     if (tmp == "" && fallbackBreakWords) {
                         breakWords = true;
                     }
@@ -4000,9 +4012,10 @@ var CanvasRenderer = /** @class */ (function (_super) {
             $array.each(this.layers, function (layer) {
                 if (layer) {
                     if (layer.dirty && layer.visible) {
+                        var context = layer.context;
                         _this._dirtyLayers.push(layer);
-                        layer.context.save();
-                        layer.context.clearRect(0, 0, _this._width, _this._height);
+                        context.save();
+                        context.clearRect(0, 0, _this._width, _this._height);
                     }
                 }
             });
@@ -4014,6 +4027,16 @@ var CanvasRenderer = /** @class */ (function (_super) {
             root.render(this.defaultLayer);
             this._ghostContext.restore();
             //setTimeout(() => {
+            // Remove this after the Chrome bug is fixed:
+            // https://bugs.chromium.org/p/chromium/issues/detail?id=1279394
+            $array.each(this.layers, function (layer) {
+                if (layer) {
+                    var context = layer.context;
+                    context.beginPath();
+                    context.moveTo(0, 0);
+                    context.stroke();
+                }
+            });
             $array.each(this._dirtyLayers, function (layer) {
                 layer.context.restore();
                 layer.dirty = false;
@@ -4388,6 +4411,7 @@ var CanvasRenderer = /** @class */ (function (_super) {
                         return onPointerEvent(window, "pointerup", function (ev) {
                             //throttler.throttle(() => {
                             _this._dispatchGlobalMouseup(ev);
+                            _this._lastPointerMoveEvent = ev;
                             //});
                         });
                     });