@loomhq/lens 10.54.0 → 10.54.2

package/dist/components/tooltip/tooltip.d.ts

@@ -2,7 +2,7 @@ import React from 'react';
 declare type DelaySpeed = 'immediate' | 'long';
 declare const TooltipBoxWrapper: import("@emotion/styled-base").StyledComponent<React.DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement>, TooltipBoxProps, object>;
 export declare const TooltipBox: ({ children, maxWidth, onMouseEnter, onMouseLeave, layerProps, zIndex, ...rest }: TooltipBoxProps & React.ComponentProps<typeof TooltipBoxWrapper>) => JSX.Element;
-declare const Tooltip: ({ children, content, placement, keepOpen, triggerOffset, maxWidth, isInline, isDisabled, container, zIndex, verticalAlign, delay, ...rest }: TooltipProps) => JSX.Element;
+declare const Tooltip: ({ children, content, placement, keepOpen, triggerOffset, maxWidth, isInline, isDisabled, container, tabIndex, zIndex, verticalAlign, delay, ...rest }: TooltipProps) => JSX.Element;
 export declare const availablePlacements: string[];
 declare type TooltipBoxProps = {
     children?: React.ReactNode;

package/dist/components/tooltip/tooltip.js

@@ -9,13 +9,12 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-import React, { useState, useRef } from 'react';
+import React, { useState, useRef, useEffect } from 'react';
 import { getColorValue, getFontWeight, getRadius, getShadow, getSize, getTextSize, u, } from '../../utilities';
 import { useHover, useLayer, mergeRefs } from 'react-laag';
 import ResizeObserver from 'resize-observer-polyfill';
 import styled from '@emotion/styled';
 import { textSizes } from '../../variables';
-import useFocusedElement from '../../hooks/use-focused-element';
 const placements = {
     topLeft: 'top-start',
     topCenter: 'top-center',
@@ -64,17 +63,60 @@ function getInitialDelaySpeed(delay) {
     }
 }
 const Tooltip = (_a) => {
-    var { children, content, placement = 'topCenter', keepOpen, triggerOffset = 4, maxWidth = 26, isInline = true, isDisabled, container, zIndex = 1100, verticalAlign = 'middle', delay = 'immediate' } = _a, rest = __rest(_a, ["children", "content", "placement", "keepOpen", "triggerOffset", "maxWidth", "isInline", "isDisabled", "container", "zIndex", "verticalAlign", "delay"]);
+    var { children, content, placement = 'topCenter', keepOpen, triggerOffset = 4, maxWidth = 26, isInline = true, isDisabled, container, tabIndex = 0, zIndex = 1100, verticalAlign = 'middle', delay = 'immediate' } = _a, rest = __rest(_a, ["children", "content", "placement", "keepOpen", "triggerOffset", "maxWidth", "isInline", "isDisabled", "container", "tabIndex", "zIndex", "verticalAlign", "delay"]);
     const [show, hoverProps] = useHover({
         delayEnter: getInitialDelaySpeed(delay),
         delayLeave: 100,
     });
     const [isOverTooltip, setIsOverTooltip] = useState(false);
+    const [isOpen, setIsOpen] = useState(false);
     const focusRef = useRef();
-    const isFocused = useFocusedElement(focusRef);
+    const isTooltipDisabled = !content || isDisabled;
     // show the tooltip if a user has focused or hovered on it AND it is not disabled
-    const isOpen = (content && (show || (isOverTooltip && keepOpen)) && !isDisabled) ||
-        (content && isFocused && !isDisabled);
+    useEffect(() => {
+        const keepTooltipOpenOnHover = isOverTooltip && keepOpen;
+        if (isTooltipDisabled) {
+            return;
+        }
+        if (show || keepTooltipOpenOnHover) {
+            setIsOpen(true);
+        }
+        // We have to watch this separately since hover and focus are managed separately. So, an element can be keyboard focused while another element is mouse hovered.
+        if (!show) {
+            setIsOpen(false);
+        }
+    }, [
+        content,
+        isDisabled,
+        isOverTooltip,
+        isTooltipDisabled,
+        keepOpen,
+        setIsOpen,
+        show,
+    ]);
+    const handleFocus = () => {
+        if (!isTooltipDisabled) {
+            setIsOpen(true);
+        }
+    };
+    const handleBlur = () => {
+        setIsOpen(false);
+    };
+    useEffect(() => {
+        if (!isOpen) {
+            return;
+        }
+        const keyListener = e => {
+            if (e.key === 'Escape') {
+                e.preventDefault();
+                handleBlur();
+            }
+        };
+        window.addEventListener('keydown', keyListener);
+        return () => {
+            window.removeEventListener('keydown', keyListener);
+        };
+    }, [isOpen, setIsOpen]);
     const { layerProps, triggerProps, renderLayer } = useLayer({
         isOpen,
         placement: placements[placement],
@@ -84,7 +126,7 @@ const Tooltip = (_a) => {
         auto: true,
     });
     return (React.createElement(React.Fragment, null,
-        React.createElement(TooltipChildren, Object.assign({}, triggerProps, hoverProps, { isInline: isInline, verticalAlign: verticalAlign, tabIndex: isDisabled ? -1 : 0, ref: mergeRefs(triggerProps.ref, focusRef) }), children),
+        React.createElement(TooltipChildren, Object.assign({}, triggerProps, hoverProps, { onFocus: handleFocus, onBlur: handleBlur, isInline: isInline, verticalAlign: verticalAlign, tabIndex: isTooltipDisabled ? -1 : tabIndex, ref: mergeRefs(triggerProps.ref, focusRef) }), children),
         isOpen &&
             renderLayer(React.createElement("div", Object.assign({}, layerProps, { style: Object.assign(Object.assign({}, layerProps.style), { zIndex }) }),
                 React.createElement(TooltipBox, Object.assign({ maxWidth: maxWidth, onMouseEnter: () => setIsOverTooltip(true), onMouseLeave: () => setIsOverTooltip(false) }, rest), content)))));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loomhq/lens",
-  "version": "10.54.0",
+  "version": "10.54.2",
   "scripts": {
     "dev": "next",
     "build:next": "next build",