Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 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
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,41 @@ describe('MenuTrigger', () => {
);
cy.get(menuTriggerSelector).should('not.be.focused');
});

it('should not focus itself after re-render', () => {
const Example = () => {
const [count, setCount] = React.useState(0);

React.useEffect(() => {
// trigger 2 re-renders to make sure that the focus effect has finished running
// after first re-render
if (count < 2) {
setCount(c => c + 1);
}
}, [count]);

return (
<>
<Menu>
<MenuTrigger disableButtonEnhancement>
<button data-status={count < 2 ? 'incomplete' : 'complete'} id={menuTriggerId}>
Menu
</button>
</MenuTrigger>
<MenuPopover>
<MenuList>
<MenuItem>Item</MenuItem>
</MenuList>
</MenuPopover>
</Menu>
<input type="text" />
</>
);
};

mount(<Example />);
cy.get(menuTriggerSelector).should('have.attr', 'data-status', 'complete').should('not.be.focused');
});
});

describe('Custom Trigger', () => {
Expand Down Expand Up @@ -391,7 +426,7 @@ describe('MenuItemRadio', () => {
});

describe('Menu', () => {
it('should not focus trigger on dismiss if another elemnt is focused', () => {
it('should not focus trigger on dismiss if another element is focused', () => {
mount(
<>
<Menu>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,9 @@ const useMenuOpenState = (
}
}
}
}, [state.triggerRef, state.isSubmenu, open, focusFirst, firstMount, targetDocument, state.menuPopoverRef]);
// firstMount change should not re-run this effect
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [state.triggerRef, state.isSubmenu, open, focusFirst, targetDocument, state.menuPopoverRef]);

return [open, setOpen] as const;
};