Skip to content
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.

Sign up for GitHub

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

Jump to bottom

[Popper][Base] Fix Tooltip Anchor Element Setter #35469

Merged
merged 2 commits into from Dec 20, 2022
Merged

[Popper][Base] Fix Tooltip Anchor Element Setter #35469

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
05b1f86
[PopperUnstyled] Call resolveAnchorEl on anchorEl before setting tool…
sydneyjodon-wk Dec 13, 2022
c7ab9d2
rename to resolvedAnchorElement
siriwatknp Dec 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 9 additions & 9 deletions packages/mui-base/src/PopperUnstyled/PopperUnstyled.js
View file
Open in desktop
Expand Up @@ -84,7 +84,9 @@ const PopperTooltip = React.forwardRef(function PopperTooltip(props, ref) {
* modifiers.flip is essentially a flip for controlled/uncontrolled behavior
*/
const [placement, setPlacement] = React.useState(rtlPlacement);
const [tooltipAnchorEl, setTooltipAnchorEl] = React.useState(anchorEl);
const [resolvedAnchorElement, setResolvedAnchorElement] = React.useState(
resolveAnchorEl(anchorEl),
);

React.useEffect(() => {
if (popperRef.current) {
Expand All @@ -94,24 +96,22 @@ const PopperTooltip = React.forwardRef(function PopperTooltip(props, ref) {

React.useEffect(() => {
if (anchorEl) {
setTooltipAnchorEl(anchorEl);
setResolvedAnchorElement(resolveAnchorEl(anchorEl));
}
}, [anchorEl]);

useEnhancedEffect(() => {
if (!tooltipAnchorEl || !open) {
if (!resolvedAnchorElement || !open) {
return undefined;
}

const handlePopperUpdate = (data) => {
setPlacement(data.placement);
};

const resolvedAnchorEl = resolveAnchorEl(tooltipAnchorEl);

if (process.env.NODE_ENV !== 'production') {
if (resolvedAnchorEl && resolvedAnchorEl.nodeType === 1) {
const box = resolvedAnchorEl.getBoundingClientRect();
if (resolvedAnchorElement && resolvedAnchorElement.nodeType === 1) {
const box = resolvedAnchorElement.getBoundingClientRect();

if (
process.env.NODE_ENV !== 'test' &&
Expand Down Expand Up @@ -161,7 +161,7 @@ const PopperTooltip = React.forwardRef(function PopperTooltip(props, ref) {
popperModifiers = popperModifiers.concat(popperOptions.modifiers);
}

const popper = createPopper(resolveAnchorEl(tooltipAnchorEl), tooltipRef.current, {
const popper = createPopper(resolvedAnchorElement, tooltipRef.current, {
placement: rtlPlacement,
...popperOptions,
modifiers: popperModifiers,
Expand All @@ -173,7 +173,7 @@ const PopperTooltip = React.forwardRef(function PopperTooltip(props, ref) {
popper.destroy();
handlePopperRefRef.current(null);
};
}, [tooltipAnchorEl, disablePortal, modifiers, open, popperOptions, rtlPlacement]);
}, [resolvedAnchorElement, disablePortal, modifiers, open, popperOptions, rtlPlacement]);

const childProps = { placement };

Expand Down