From 49290818b53a6b9db35b37eecf13354b1e7aeafc Mon Sep 17 00:00:00 2001 From: Brooke Yalof Date: Tue, 5 May 2020 14:19:09 -0400 Subject: [PATCH 1/3] lil fixer --- packages/menu/src/Menu.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/menu/src/Menu.tsx b/packages/menu/src/Menu.tsx index 0668077d7d..9e689edad8 100644 --- a/packages/menu/src/Menu.tsx +++ b/packages/menu/src/Menu.tsx @@ -240,7 +240,7 @@ function Menu({ }; useMemo(() => { - if (open === false) { + if (open === true) { hasSetInitialFocus.current = false; hasSetInitialOpen.current = false; } From dbf5cc1ee0900ff56581121bcf99df98cce29021 Mon Sep 17 00:00:00 2001 From: Brooke Yalof Date: Tue, 5 May 2020 14:21:34 -0400 Subject: [PATCH 2/3] menu fix --- .changeset/thirty-taxis-arrive.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/thirty-taxis-arrive.md diff --git a/.changeset/thirty-taxis-arrive.md b/.changeset/thirty-taxis-arrive.md new file mode 100644 index 0000000000..3fca123082 --- /dev/null +++ b/.changeset/thirty-taxis-arrive.md @@ -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 From f3a9f8da7dc1980cb39241fb3f5b977a0271a7b2 Mon Sep 17 00:00:00 2001 From: Brooke Yalof Date: Tue, 5 May 2020 15:05:55 -0400 Subject: [PATCH 3/3] add test to mongonav --- packages/mongo-nav/src/MongoNav.spec.tsx | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/packages/mongo-nav/src/MongoNav.spec.tsx b/packages/mongo-nav/src/MongoNav.spec.tsx index 1c311de1b2..1fdce268d3 100644 --- a/packages/mongo-nav/src/MongoNav.spec.tsx +++ b/packages/mongo-nav/src/MongoNav.spec.tsx @@ -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'); @@ -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(