Another tooltip fix

microbit-foundation · Nov 19, 2024 · 15465f8 · 15465f8
1 parent c90d20a
commit 15465f8
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/components/ClickableTooltip.tsx b/src/components/ClickableTooltip.tsx
@@ -18,10 +18,12 @@ const ClickableTooltip = ({
   const label = useDisclosure();
   const ref = useRef<HTMLDivElement>(null);
   const handleMouseEnter = useCallback(() => {
-    const openTooltips = document.querySelectorAll(
-      '[role="tooltip"]:not([hidden])'
+    const focussedTooltips = Array.from(
+      document.querySelectorAll(".focusable-tooltip")
     );
-    if (!openTooltips.length) {
+    if (
+      focussedTooltips.every((tooltip) => tooltip !== document.activeElement)
+    ) {
       label.onOpen();
     }
   }, [label]);
@@ -44,6 +46,7 @@ const ClickableTooltip = ({
   return (
     <Tooltip isOpen={label.isOpen} {...rest} closeOnEsc={true}>
       <Flex
+        className={isFocusable ? "focusable-tooltip" : undefined}
         onKeyDown={handleKeydown}
         ref={ref}
         onMouseEnter={handleMouseEnter}