scandic/web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(SW-187): fixed bug where languageswitcher opened mobile menu

Browse Source
This commit is contained in:
Pontus Dreij
2024-09-09 15:34:47 +02:00
parent 07eb0401bb
commit ae868ee8cd
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/Header/MainMenu/MobileMenu/index.tsx
View File

@@ -28,7 +28,7 @@ export default function MobileMenu({
const isMyPagesMobileMenuOpen = const isMyPagesMobileMenuOpen =
openDropdown === DropdownType.MyPagesMobileMenu openDropdown === DropdownType.MyPagesMobileMenu
const isHeaderLanguageSwitcherOpen = const isHeaderLanguageSwitcherOpen =
openDropdown === DropdownType.HeaderLanguage openDropdown === DropdownType.HeaderLanguageMobile
useHandleKeyUp((event: KeyboardEvent) => { useHandleKeyUp((event: KeyboardEvent) => {
if (event.key === "Escape" && isHamburgerMenuOpen) { if (event.key === "Escape" && isHamburgerMenuOpen) {
@@ -41,7 +41,7 @@ export default function MobileMenu({
toggleDropdown(DropdownType.MyPagesMobileMenu) toggleDropdown(DropdownType.MyPagesMobileMenu)
} else { } else {
if (isHeaderLanguageSwitcherOpen) { if (isHeaderLanguageSwitcherOpen) {
toggleDropdown(DropdownType.HeaderLanguage) toggleDropdown(DropdownType.HeaderLanguageMobile)
} }
toggleDropdown(DropdownType.HamburgerMenu) toggleDropdown(DropdownType.HamburgerMenu)

15
components/LanguageSwitcher/index.tsx
View File

@@ -26,16 +26,15 @@ export default function LanguageSwitcher({
const { toggleDropdown, openDropdown } = useDropdownStore() const { toggleDropdown, openDropdown } = useDropdownStore()
const position = type === "footer" ? "footer" : "header" const position = type === "footer" ? "footer" : "header"
const dropdownType =
type === "footer"
? DropdownType.FooterLanguage
: DropdownType.HeaderLanguage
const color = type === "footer" ? "pale" : "burgundy" const color = type === "footer" ? "pale" : "burgundy"
const isLanguageSwitcherOpen = const dropdownType = {
type === "footer" footer: DropdownType.FooterLanguage,
? openDropdown === DropdownType.FooterLanguage desktopHeader: DropdownType.HeaderLanguage,
: openDropdown === DropdownType.HeaderLanguage mobileHeader: DropdownType.HeaderLanguageMobile,
}[type]
const isLanguageSwitcherOpen = openDropdown === dropdownType
useHandleKeyUp((event: KeyboardEvent) => { useHandleKeyUp((event: KeyboardEvent) => {
if (event.key === "Escape" && isLanguageSwitcherOpen) { if (event.key === "Escape" && isLanguageSwitcherOpen) {

1
types/components/dropdown/dropdown.ts
View File

@@ -3,6 +3,7 @@
export enum DropdownType { export enum DropdownType {
HeaderLanguage, HeaderLanguage,
HeaderLanguageMobile,
FooterLanguage, FooterLanguage,
HamburgerMenu, HamburgerMenu,
MyPagesMenu, MyPagesMenu,