@amcharts/amcharts5 5.2.10 → 5.2.13

package/.internal/core/render/Sprite.js

@@ -673,19 +673,22 @@ var Sprite = /** @class */ (function (_super) {
                 }
                 display.cancelTouch = draggable ? true : false;
             }
-            if (this.isDirty("tooltipText")) {
+            if (this.isDirty("tooltipText") || this.isDirty("tooltipHTML")) {
                 var tooltipText = this.get("tooltipText");
-                if (tooltipText) {
-                    this._tooltipDp = new MultiDisposer([
-                        events.on("pointerover", function () {
-                            _this.showTooltip();
-                        }),
-                        events.on("pointerout", function () {
-                            if (_this.get("showTooltipOn") != "always") {
-                                _this.hideTooltip();
-                            }
-                        })
-                    ]);
+                var tooltipHTML = this.get("tooltipHTML");
+                if (tooltipText || tooltipHTML) {
+                    if (!this._tooltipDp) {
+                        this._tooltipDp = new MultiDisposer([
+                            events.on("pointerover", function () {
+                                _this.showTooltip();
+                            }),
+                            events.on("pointerout", function () {
+                                if (_this.get("showTooltipOn") != "always") {
+                                    _this.hideTooltip();
+                                }
+                            })
+                        ]);
+                    }
                 }
                 else {
                     if (this._tooltipDp) {
@@ -750,7 +753,7 @@ var Sprite = /** @class */ (function (_super) {
                 }
                 this._sizeDirty = true;
             }
-            if (this.isDirty("maxWidth") || this.isDirty("maxHeight") || this.isPrivateDirty("width") || this.isPrivateDirty("height") || this.isDirty("minWidth") || this.isDirty("minHeight") || this.isPrivateDirty("maxWidth") || this.isPrivateDirty("maxHeight")) {
+            if (this.isDirty("maxWidth") || this.isDirty("maxHeight") || this.isPrivateDirty("width") || this.isPrivateDirty("height") || this.isDirty("minWidth") || this.isDirty("minHeight") || this.isPrivateDirty("maxWidth") || this.isPrivateDirty("maxHeight") || this.isPrivateDirty("minWidth") || this.isPrivateDirty("minHeight")) {
                 this.markDirtyBounds();
                 this._sizeDirty = true;
             }
@@ -826,7 +829,7 @@ var Sprite = /** @class */ (function (_super) {
                                 if (!_this.getPrivate("touchHovering")) {
                                     _this.setTimeout(function () {
                                         _this._handleOver();
-                                        if (_this.get("tooltipText")) {
+                                        if (_this.get("tooltipText") || _this.get("tooltipHTML")) {
                                             _this.showTooltip();
                                         }
                                         _this.setPrivateRaw("touchHovering", true);
@@ -845,7 +848,7 @@ var Sprite = /** @class */ (function (_super) {
                             if ($utils.isTouchEvent(ev.originalEvent)) {
                                 if (_this.getPrivate("touchHovering")) {
                                     _this._handleOut();
-                                    if (_this.get("tooltipText")) {
+                                    if (_this.get("tooltipText") || _this.get("tooltipHTML")) {
                                         _this.hideTooltip();
                                     }
                                 }
@@ -1285,8 +1288,8 @@ var Sprite = /** @class */ (function (_super) {
         configurable: true,
         writable: true,
         value: function (bounds) {
-            var minWidth = this.get("minWidth");
-            var minHeight = this.get("minHeight");
+            var minWidth = this.get("minWidth", this.getPrivate("minWidth"));
+            var minHeight = this.get("minHeight", this.getPrivate("minHeight"));
             if ($type.isNumber(minWidth)) {
                 if (bounds.right - bounds.left < minWidth) {
                     bounds.right = bounds.left + minWidth;
@@ -1363,7 +1366,8 @@ var Sprite = /** @class */ (function (_super) {
         value: function (point) {
             var tooltip = this.getTooltip();
             var tooltipText = this.get("tooltipText");
-            if (tooltipText && tooltip) {
+            var tooltipHTML = this.get("tooltipHTML");
+            if ((tooltipText || tooltipHTML) && tooltip) {
                 var tooltipPosition = this.get("tooltipPosition");
                 var tooltipTarget = this.getPrivate("tooltipTarget", this);
                 if (tooltipPosition == "fixed" || !point) {
@@ -1378,7 +1382,12 @@ var Sprite = /** @class */ (function (_super) {
                 if (!tooltip.get("y")) {
                     tooltip.set("y", point.y);
                 }
-                tooltip.label.set("text", tooltipText);
+                if (tooltipText) {
+                    tooltip.label.set("text", tooltipText);
+                }
+                if (tooltipHTML) {
+                    tooltip.label.set("html", tooltipHTML);
+                }
                 var dataItem = this.dataItem;
                 if (dataItem) {
                     tooltip.label._setDataItem(dataItem);
@@ -1939,6 +1948,21 @@ var Sprite = /** @class */ (function (_super) {
             return this._parent ? (this._parent.isVisibleDeep() && this.isVisible()) : this.isVisible();
         }
     });
+    /**
+     * Returns an actual opacity of the element, taking into account all parents.
+     *
+     * @return Opacity
+     * @since 5.2.11
+     */
+    Object.defineProperty(Sprite.prototype, "compositeOpacity", {
+        enumerable: false,
+        configurable: true,
+        writable: true,
+        value: function () {
+            var opacity = this.get("opacity", 1);
+            return this._parent ? (this._parent.compositeOpacity() * opacity) : opacity;
+        }
+    });
     /**
      * Returns width of this element in pixels.
      *
@@ -1951,7 +1975,7 @@ var Sprite = /** @class */ (function (_super) {
         value: function () {
             var width = this.get("width");
             var maxWidth = this.get("maxWidth", this.getPrivate("maxWidth"));
-            var minWidth = this.get("minWidth");
+            var minWidth = this.get("minWidth", this.getPrivate("minWidth"));
             var privateWidth = this.getPrivate("width");
             var w = 0;
             if ($type.isNumber(privateWidth)) {
@@ -2053,7 +2077,7 @@ var Sprite = /** @class */ (function (_super) {
         value: function () {
             var height = this.get("height");
             var maxHeight = this.get("maxHeight", this.getPrivate("maxHeight"));
-            var minHeight = this.get("minHeight");
+            var minHeight = this.get("minHeight", this.getPrivate("minHeight"));
             var privateHeight = this.getPrivate("height");
             var h = 0;
             if ($type.isNumber(privateHeight)) {