@amcharts/amcharts5 5.9.0 → 5.9.2

package/.internal/core/Root.js

@@ -881,7 +881,7 @@ export class Root {
                                     // Find next item in focusable group
                                     const group = focusedSprite.get("focusableGroup");
                                     const items = this._tabindexes.filter((item) => {
-                                        return item.get("focusableGroup") == group && item.getPrivate("focusable") !== false ? true : false;
+                                        return item.get("focusableGroup") == group && item.getPrivate("focusable") !== false && item.isVisibleDeep() ? true : false;
                                     });
                                     let index = items.indexOf(focusedSprite);
                                     const lastIndex = items.length - 1;
@@ -1485,12 +1485,10 @@ export class Root {
         });
         this._decorateFocusElement(target);
         disposers.push($utils.addEventListener(focusElement, "focus", (ev) => {
-            const index = Array.prototype.indexOf.call(this._focusElementContainer.children, ev.target);
-            this._handleFocus(ev, index);
+            this._handleFocus(ev);
         }));
         disposers.push($utils.addEventListener(focusElement, "blur", (ev) => {
-            const index = Array.prototype.indexOf.call(this._focusElementContainer.children, ev.target);
-            this._handleBlur(ev, index);
+            this._handleBlur(ev);
         }));
         this._moveFocusElement(index, target);
     }
@@ -1558,12 +1556,27 @@ export class Root {
         focusElement.style.width = (width + padding * 2) + "px";
         focusElement.style.height = (height + padding * 2) + "px";
     }
-    _handleFocus(ev, index) {
+    _getSpriteByFocusElement(target) {
+        let found;
+        $array.eachContinue(this._tabindexes, (item, _index) => {
+            if (item.getPrivate("focusElement").dom === target) {
+                found = item;
+                return false;
+            }
+            return true;
+        });
+        return found;
+    }
+    _handleFocus(ev) {
         if (this._a11yD == true) {
             return;
         }
         // Get element
-        const focused = this._tabindexes[index];
+        //const focused = this._tabindexes[index];
+        const focused = this._getSpriteByFocusElement(ev.target);
+        if (!focused) {
+            return;
+        }
         // Jump over hidden elements
         if (!focused.isVisibleDeep()) {
             this._focusNext(ev.target, this._isShift ? -1 : 1);
@@ -1609,7 +1622,7 @@ export class Root {
         }
         focusableElements[index].focus();
     }
-    _handleBlur(ev, _index) {
+    _handleBlur(ev) {
         if (this._a11yD == true) {
             return;
         }
@@ -1639,6 +1652,7 @@ export class Root {
             if (tooltipElement.innerHTML != text) {
                 tooltipElement.innerHTML = text;
             }
+            tooltipElement.setAttribute("aria-hidden", target.isVisibleDeep() ? "false" : "true");
         }
         else if (tooltipElement) {
             tooltipElement.remove();
@@ -1892,6 +1906,10 @@ export class Root {
                     htmlElement.style[setting] = "";
                 }
             });
+            // Init and reset scale
+            const scale = target.compositeScale() || 1;
+            htmlElement.style.transform = "";
+            htmlElement.style.transformOrigin = "";
             // Deal with opacity
             const opacity = target.compositeOpacity();
             setTimeout(() => {
@@ -1922,11 +1940,13 @@ export class Root {
                 htmlElement.style.height = "";
                 const bbox = htmlElement.getBoundingClientRect();
                 htmlElement.style.position = "absolute";
-                w = bbox.width;
-                h = bbox.height;
+                if (!width)
+                    w = bbox.width;
+                if (!height)
+                    h = bbox.height;
                 target._adjustedLocalBounds = { left: 0, right: 0, top: 0, bottom: 0 };
-                target.setPrivate("minWidth", w);
-                target.setPrivate("minHeight", h);
+                target.setPrivate("minWidth", w / scale);
+                target.setPrivate("minHeight", h / scale);
             }
             else {
                 target.removePrivate("minWidth");
@@ -1942,6 +1962,11 @@ export class Root {
             if (!visible || opacity == 0) {
                 htmlElement.style.display = "none";
             }
+            // Deal with scale
+            if (scale != 1) {
+                htmlElement.style.transform = "scale(" + scale + ")";
+                htmlElement.style.transformOrigin = "top left";
+            }
         }
     }
     _setHTMLContent(target, html) {