Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions packages/mui-material/src/Tooltip/Tooltip.js
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,10 @@ const Tooltip = React.forwardRef(function Tooltip(inProps, ref) {
});

let open = openState;
const openRef = React.useRef(open);
React.useLayoutEffect(() => {
openRef.current = open;
});

if (process.env.NODE_ENV !== 'production') {
// TODO: uncomment once we enable eslint-plugin-react-compiler // eslint-disable-next-line react-compiler/react-compiler
Expand Down Expand Up @@ -329,9 +333,11 @@ const Tooltip = React.forwardRef(function Tooltip(inProps, ref) {
// The mouseover event will trigger for every nested element in the tooltip.
// We can skip rerendering when the tooltip is already open.
// We are using the mouseover event instead of the mouseenter event to fix a hide/show issue.
const wasOpen = openRef.current;
openRef.current = true;
setOpenState(true);

if (onOpen && !open) {
if (onOpen && !wasOpen) {
onOpen(event);
}
};
Expand All @@ -341,12 +347,14 @@ const Tooltip = React.forwardRef(function Tooltip(inProps, ref) {
* @param {React.SyntheticEvent | Event} event
*/
(event) => {
const wasOpen = openRef.current;
hystersisTimer.start(800 + leaveDelay, () => {
hystersisOpen = false;
});
setOpenState(false);
openRef.current = false;

if (onClose && open) {
if (onClose && wasOpen) {
onClose(event);
}

Expand Down
32 changes: 32 additions & 0 deletions packages/mui-material/src/Tooltip/Tooltip.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -451,6 +451,38 @@ describe('<Tooltip />', () => {
expect(eventLog).to.deep.equal(['mouseover', 'open', 'mouseleave', 'close']);
});

it('should call onClose when controlled close follows a delayed open before rerender', () => {
const eventLog = [];
render(
<Tooltip
enterDelay={100}
title="Hello World"
onOpen={() => eventLog.push('open')}
onClose={() => eventLog.push('close')}
open={false}
>
<button
id="testChild"
onMouseLeave={() => eventLog.push('mouseleave')}
onMouseOver={() => eventLog.push('mouseover')}
type="submit"
>
Hello World
</button>
</Tooltip>,
);

fireEvent.mouseOver(screen.getByRole('button'));
clock.tick(100);

expect(eventLog).to.deep.equal(['mouseover', 'open']);

fireEvent.mouseLeave(screen.getByRole('button'));
clock.tick(0);

expect(eventLog).to.deep.equal(['mouseover', 'open', 'mouseleave', 'close']);
});

it('should not call onOpen again if already open', () => {
const eventLog = [];
render(
Expand Down
Loading