From ae868ee8cd8e6d3db3f2bdab7b5613fbec75dcac Mon Sep 17 00:00:00 2001 From: Pontus Dreij Date: Mon, 9 Sep 2024 15:34:47 +0200 Subject: [PATCH] feat(SW-187): fixed bug where languageswitcher opened mobile menu --- components/Header/MainMenu/MobileMenu/index.tsx | 4 ++-- components/LanguageSwitcher/index.tsx | 15 +++++++-------- types/components/dropdown/dropdown.ts | 1 + 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/components/Header/MainMenu/MobileMenu/index.tsx b/components/Header/MainMenu/MobileMenu/index.tsx index 93be21713..ce390aa25 100644 --- a/components/Header/MainMenu/MobileMenu/index.tsx +++ b/components/Header/MainMenu/MobileMenu/index.tsx @@ -28,7 +28,7 @@ export default function MobileMenu({ const isMyPagesMobileMenuOpen = openDropdown === DropdownType.MyPagesMobileMenu const isHeaderLanguageSwitcherOpen = - openDropdown === DropdownType.HeaderLanguage + openDropdown === DropdownType.HeaderLanguageMobile useHandleKeyUp((event: KeyboardEvent) => { if (event.key === "Escape" && isHamburgerMenuOpen) { @@ -41,7 +41,7 @@ export default function MobileMenu({ toggleDropdown(DropdownType.MyPagesMobileMenu) } else { if (isHeaderLanguageSwitcherOpen) { - toggleDropdown(DropdownType.HeaderLanguage) + toggleDropdown(DropdownType.HeaderLanguageMobile) } toggleDropdown(DropdownType.HamburgerMenu) diff --git a/components/LanguageSwitcher/index.tsx b/components/LanguageSwitcher/index.tsx index 1e8ee4374..83ae77ce6 100644 --- a/components/LanguageSwitcher/index.tsx +++ b/components/LanguageSwitcher/index.tsx @@ -26,16 +26,15 @@ export default function LanguageSwitcher({ const { toggleDropdown, openDropdown } = useDropdownStore() const position = type === "footer" ? "footer" : "header" - const dropdownType = - type === "footer" - ? DropdownType.FooterLanguage - : DropdownType.HeaderLanguage const color = type === "footer" ? "pale" : "burgundy" - const isLanguageSwitcherOpen = - type === "footer" - ? openDropdown === DropdownType.FooterLanguage - : openDropdown === DropdownType.HeaderLanguage + const dropdownType = { + footer: DropdownType.FooterLanguage, + desktopHeader: DropdownType.HeaderLanguage, + mobileHeader: DropdownType.HeaderLanguageMobile, + }[type] + + const isLanguageSwitcherOpen = openDropdown === dropdownType useHandleKeyUp((event: KeyboardEvent) => { if (event.key === "Escape" && isLanguageSwitcherOpen) { diff --git a/types/components/dropdown/dropdown.ts b/types/components/dropdown/dropdown.ts index 26effb9ab..76f2e3a7c 100644 --- a/types/components/dropdown/dropdown.ts +++ b/types/components/dropdown/dropdown.ts @@ -3,6 +3,7 @@ export enum DropdownType { HeaderLanguage, + HeaderLanguageMobile, FooterLanguage, HamburgerMenu, MyPagesMenu,