Merge pull request #30150 from allroundexperts/fix-24296

Add popover anchor tooltip
Expensify · Oct 23, 2023 · 112061b · 112061b
2 parents 3d99502 + 6316669
commit 112061b
Show file tree

Hide file tree

Showing 11 changed files with 74 additions and 9 deletions.
diff --git a/src/components/AvatarWithImagePicker.js b/src/components/AvatarWithImagePicker.js
@@ -16,7 +16,7 @@ import withLocalize, {withLocalizePropTypes} from './withLocalize';
 import variables from '../styles/variables';
 import CONST from '../CONST';
 import SpinningIndicatorAnimation from '../styles/animation/SpinningIndicatorAnimation';
-import Tooltip from './Tooltip';
+import Tooltip from './Tooltip/PopoverAnchorTooltip';
 import stylePropTypes from '../styles/stylePropTypes';
 import * as FileUtils from '../libs/fileDownload/FileUtils';
 import getImageResolution from '../libs/fileDownload/getImageResolution';

diff --git a/src/components/BaseMiniContextMenuItem.js b/src/components/BaseMiniContextMenuItem.js
@@ -6,7 +6,7 @@ import styles from '../styles/styles';
 import * as StyleUtils from '../styles/StyleUtils';
 import getButtonState from '../libs/getButtonState';
 import variables from '../styles/variables';
-import Tooltip from './Tooltip';
+import Tooltip from './Tooltip/PopoverAnchorTooltip';
 import PressableWithoutFeedback from './Pressable/PressableWithoutFeedback';
 import ReportActionComposeFocusManager from '../libs/ReportActionComposeFocusManager';
 import DomUtils from '../libs/DomUtils';

diff --git a/src/components/EmojiPicker/EmojiPickerButton.js b/src/components/EmojiPicker/EmojiPickerButton.js
@@ -4,7 +4,7 @@ import styles from '../../styles/styles';
 import * as StyleUtils from '../../styles/StyleUtils';
 import getButtonState from '../../libs/getButtonState';
 import * as Expensicons from '../Icon/Expensicons';
-import Tooltip from '../Tooltip';
+import Tooltip from '../Tooltip/PopoverAnchorTooltip';
 import Icon from '../Icon';
 import withLocalize, {withLocalizePropTypes} from '../withLocalize';
 import * as EmojiPickerAction from '../../libs/actions/EmojiPickerAction';

diff --git a/src/components/FloatingActionButton.js b/src/components/FloatingActionButton.js
@@ -6,7 +6,7 @@ import * as Expensicons from './Icon/Expensicons';
 import styles from '../styles/styles';
 import * as StyleUtils from '../styles/StyleUtils';
 import themeColors from '../styles/themes/default';
-import Tooltip from './Tooltip';
+import Tooltip from './Tooltip/PopoverAnchorTooltip';
 import withLocalize, {withLocalizePropTypes} from './withLocalize';
 import PressableWithFeedback from './Pressable/PressableWithFeedback';
 import variables from '../styles/variables';

diff --git a/src/components/Reactions/AddReactionBubble.js b/src/components/Reactions/AddReactionBubble.js
@@ -1,7 +1,7 @@
 import React, {useRef, useEffect} from 'react';
 import {View} from 'react-native';
 import PropTypes from 'prop-types';
-import Tooltip from '../Tooltip';
+import Tooltip from '../Tooltip/PopoverAnchorTooltip';
 import styles from '../../styles/styles';
 import * as StyleUtils from '../../styles/StyleUtils';
 import Icon from '../Icon';

diff --git a/src/components/ThreeDotsMenu/index.js b/src/components/ThreeDotsMenu/index.js
@@ -6,7 +6,7 @@ import Icon from '../Icon';
 import PopoverMenu from '../PopoverMenu';
 import styles from '../../styles/styles';
 import useLocalize from '../../hooks/useLocalize';
-import Tooltip from '../Tooltip';
+import Tooltip from '../Tooltip/PopoverAnchorTooltip';
 import * as Expensicons from '../Icon/Expensicons';
 import ThreeDotsMenuItemPropTypes from './ThreeDotsMenuItemPropTypes';
 import CONST from '../../CONST';

diff --git a/src/components/Tooltip/BaseTooltip.js b/src/components/Tooltip/BaseTooltip.js
@@ -52,7 +52,7 @@ function chooseBoundingBox(target, clientX, clientY) {
     return target.getBoundingClientRect();
 }
 
-function Tooltip({children, numberOfLines, maxWidth, text, renderTooltipContent, renderTooltipContentKey, shouldHandleScroll, shiftHorizontal, shiftVertical}) {
+function Tooltip({children, numberOfLines, maxWidth, text, renderTooltipContent, renderTooltipContentKey, shouldHandleScroll, shiftHorizontal, shiftVertical, tooltipRef}) {
     const {preferredLocale} = useLocalize();
     const {windowWidth} = useWindowDimensions();
 
@@ -197,6 +197,7 @@ function Tooltip({children, numberOfLines, maxWidth, text, renderTooltipContent,
             <BoundsObserver
                 enabled={isVisible}
                 onBoundsChange={updateBounds}
+                ref={tooltipRef}
             >
                 <Hoverable
                     onMouseEnter={updateTargetAndMousePosition}

diff --git a/src/components/Tooltip/PopoverAnchorTooltip.js b/src/components/Tooltip/PopoverAnchorTooltip.js
@@ -0,0 +1,59 @@
+import React, {useContext, useRef, useMemo} from 'react';
+import PropTypes from 'prop-types';
+import {propTypes as tooltipPropTypes, defaultProps as tooltipDefaultProps} from './tooltipPropTypes';
+import BaseTooltip from './BaseTooltip';
+import {PopoverContext} from '../PopoverProvider';
+
+const propTypes = {
+    ...tooltipPropTypes,
+
+    /** Whether the actual Tooltip should be rendered. If false, it's just going to return the children */
+    shouldRender: PropTypes.bool,
+};
+
+const defaultProps = {
+    ...tooltipDefaultProps,
+    shouldRender: true,
+};
+
+function PopoverAnchorTooltip({shouldRender, children, ...props}) {
+    const {isOpen, popover} = useContext(PopoverContext);
+    const tooltipRef = useRef(null);
+
+    const isPopoverRelatedToTooltipOpen = useMemo(() => {
+        // eslint-disable-next-line
+        const tooltipNode = tooltipRef.current ? tooltipRef.current._childNode : null;
+        if (
+            isOpen &&
+            popover &&
+            popover.anchorRef &&
+            popover.anchorRef.current &&
+            tooltipNode &&
+            (tooltipNode.contains(popover.anchorRef.current) || tooltipNode === popover.anchorRef.current)
+        ) {
+            return true;
+        }
+
+        return false;
+    }, [isOpen, popover]);
+
+    if (!shouldRender || isPopoverRelatedToTooltipOpen) {
+        return children;
+    }
+
+    return (
+        <BaseTooltip
+            // eslint-disable-next-line react/jsx-props-no-spreading
+            {...props}
+            tooltipRef={tooltipRef}
+        >
+            {children}
+        </BaseTooltip>
+    );
+}
+
+PopoverAnchorTooltip.displayName = 'PopoverAnchorTooltip';
+PopoverAnchorTooltip.propTypes = propTypes;
+PopoverAnchorTooltip.defaultProps = defaultProps;
+
+export default PopoverAnchorTooltip;
diff --git a/src/components/Tooltip/tooltipPropTypes.js b/src/components/Tooltip/tooltipPropTypes.js
@@ -1,4 +1,5 @@
 import PropTypes from 'prop-types';
+import refPropTypes from '../refPropTypes';
 import variables from '../../styles/variables';
 import CONST from '../../CONST';
 
@@ -31,6 +32,9 @@ const propTypes = {
 
     /** passes this down to Hoverable component to decide whether to handle the scroll behaviour to show hover once the scroll ends */
     shouldHandleScroll: PropTypes.bool,
+
+    /** Reference to the tooltip container */
+    tooltipRef: refPropTypes,
 };
 
 const defaultProps = {
@@ -42,6 +46,7 @@ const defaultProps = {
     renderTooltipContent: undefined,
     renderTooltipContentKey: [],
     shouldHandleScroll: false,
+    tooltipRef: () => {},
 };
 
 export {propTypes, defaultProps};
diff --git a/src/components/VideoChatButtonAndMenu/BaseVideoChatButtonAndMenu.js b/src/components/VideoChatButtonAndMenu/BaseVideoChatButtonAndMenu.js
@@ -14,7 +14,7 @@ import themeColors from '../../styles/themes/default';
 import withWindowDimensions, {windowDimensionsPropTypes} from '../withWindowDimensions';
 import withLocalize, {withLocalizePropTypes} from '../withLocalize';
 import compose from '../../libs/compose';
-import Tooltip from '../Tooltip';
+import Tooltip from '../Tooltip/PopoverAnchorTooltip';
 import {propTypes as videoChatButtonAndMenuPropTypes, defaultProps} from './videoChatButtonAndMenuPropTypes';
 import * as Session from '../../libs/actions/Session';
 import PressableWithoutFeedback from '../Pressable/PressableWithoutFeedback';

diff --git a/src/pages/home/report/ReportActionCompose/AttachmentPickerWithMenuItems.js b/src/pages/home/report/ReportActionCompose/AttachmentPickerWithMenuItems.js
@@ -10,7 +10,7 @@ import AttachmentPicker from '../../../../components/AttachmentPicker';
 import * as Report from '../../../../libs/actions/Report';
 import PopoverMenu from '../../../../components/PopoverMenu';
 import CONST from '../../../../CONST';
-import Tooltip from '../../../../components/Tooltip';
+import Tooltip from '../../../../components/Tooltip/PopoverAnchorTooltip';
 import * as Browser from '../../../../libs/Browser';
 import PressableWithFeedback from '../../../../components/Pressable/PressableWithFeedback';
 import useLocalize from '../../../../hooks/useLocalize';