Skip to content

Fixes issue with SubMenu, setting open when Menu is open not closed. #406

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

Merged
merged 3 commits into from
May 5, 2020
Merged

Fixes issue with SubMenu, setting open when Menu is open not closed. #406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4929081
lil fixer
bruugey May 5, 2020
dbf5cc1
menu fix
bruugey May 5, 2020
f3a9f8d
add test to mongonav
bruugey May 5, 2020
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
5 changes: 5 additions & 0 deletions .changeset/thirty-taxis-arrive.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@leafygreen-ui/menu': patch
---

Fixes issue with SubMenu, such that open is now set by Menu when the Menu itself is open
2 changes: 1 addition & 1 deletion packages/menu/src/Menu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ function Menu({
};

useMemo(() => {
if (open === false) {
if (open === true) {
hasSetInitialFocus.current = false;
hasSetInitialOpen.current = false;
}
Expand Down
17 changes: 17 additions & 0 deletions packages/mongo-nav/src/MongoNav.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ describe('packages/mongo-nav', () => {
);
expectedElements.allProjects = queryByTestId('project-select-project-list');
expectedElements.userMenu = queryByTestId('user-menu-trigger');
expectedElements.userMenuCloudItem = queryByTestId(
'user-menuitem-cloud-user-preferences',
);
expectedElements.userMenuLogout = queryByTestId('user-menuitem-logout');
expectedElements.onPremUserMenu = queryByTestId('om-user-menu-trigger');
expectedElements.onPremLogout = queryByTestId('om-user-menuitem-sign-out');
Expand Down Expand Up @@ -297,6 +300,20 @@ describe('packages/mongo-nav', () => {
});
});

describe('UserMenu behaves as expected when cloud is the active platform', () => {
beforeEach(
async () =>
await renderComponent({ mode: 'dev', activePlatform: 'cloud' }),
);

test('when the user menu opens, the cloud menu items are displayed', () => {
fireEvent.click(expectedElements.userMenu as HTMLElement);
setExpectedElements();

expect(expectedElements.userMenuCloudItem).toBeInTheDocument();
});
});

describe('when user passes host override', () => {
const cloudHost = 'https://cloud-dev.mongodb.com';
beforeEach(
Expand Down