-
Notifications
You must be signed in to change notification settings - Fork 3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add popover anchor tooltip #30150
Merged
Merged
Add popover anchor tooltip #30150
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
7c35385
fix: popover interaction with tooltip
allroundexperts 582ae7b
merge with main
allroundexperts 0486567
fix: re-add tooltip logic
allroundexperts 19ac134
fix: add missing condition for tooltip popover
allroundexperts a9f4d5c
Merge branch 'main' into fix-24296
allroundexperts 824f7ea
feat: popover anchor tooltip component
allroundexperts 85aed6f
feat: use correct prop type
allroundexperts 21cca81
feat: use plural name for ref prop types
allroundexperts 6316669
fix: add check to see if ref is defined
allroundexperts File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This conditional render caused regression.
More details: #31155 (comment)