From 52111d2fa30a8eab8b2af3d25c57c56b299cada2 Mon Sep 17 00:00:00 2001 From: Christel Westerberg Date: Wed, 5 Jun 2024 09:01:45 +0200 Subject: [PATCH] fix: naming of urls variable --- .../(live)/@languageSwitcher/[...uri]/page.tsx | 4 ++-- .../(live-current)/@languageSwitcher/page.tsx | 4 ++-- .../Header/LanguageSwitcher/Desktop/index.tsx | 12 ++++++------ .../Header/LanguageSwitcher/Mobile/index.tsx | 14 +++++++------- types/components/current/languageSwitcher.ts | 2 +- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/app/[lang]/(live)/@languageSwitcher/[...uri]/page.tsx b/app/[lang]/(live)/@languageSwitcher/[...uri]/page.tsx index 3eb711825..50f322ad4 100644 --- a/app/[lang]/(live)/@languageSwitcher/[...uri]/page.tsx +++ b/app/[lang]/(live)/@languageSwitcher/[...uri]/page.tsx @@ -15,10 +15,10 @@ export default async function LanguageSwitcher({ return ( <>
- +
- +
) diff --git a/app/[lang]/(live-current)/@languageSwitcher/page.tsx b/app/[lang]/(live-current)/@languageSwitcher/page.tsx index 5a3787125..cf9e9c3f7 100644 --- a/app/[lang]/(live-current)/@languageSwitcher/page.tsx +++ b/app/[lang]/(live-current)/@languageSwitcher/page.tsx @@ -20,10 +20,10 @@ export default async function LanguageSwitcher({ return ( <>
- +
- +
) diff --git a/components/Current/Header/LanguageSwitcher/Desktop/index.tsx b/components/Current/Header/LanguageSwitcher/Desktop/index.tsx index 1145dec76..d79f2480b 100644 --- a/components/Current/Header/LanguageSwitcher/Desktop/index.tsx +++ b/components/Current/Header/LanguageSwitcher/Desktop/index.tsx @@ -11,7 +11,7 @@ import type { LanguageSwitcherProps } from "@/types/components/current/languageS export default function Desktop({ currentLanguage, - urlObject, + urls, }: LanguageSwitcherProps) { const [isOpen, setIsOpen] = useState(false) const divRef = useRef(null) @@ -40,9 +40,9 @@ export default function Desktop({ } }, [close]) - const urls = Object.keys(urlObject) + const urlKeys = Object.keys(urls) - if (urls.length <= 1 && urls[0] === currentLanguage) { + if (urlKeys.length === 1 && urlKeys[0] === currentLanguage) { return (
@@ -70,15 +70,15 @@ export default function Desktop({
    - {urls.map((key) => { - const url = urlObject[key as Lang]?.url + {urlKeys.map((key) => { + const url = urls[key as Lang]?.url if (url) { return (
  • - {urlObject[key as Lang]?.isExternal ? ( + {urls[key as Lang]?.isExternal ? ( {languages[key as Lang]} diff --git a/components/Current/Header/LanguageSwitcher/Mobile/index.tsx b/components/Current/Header/LanguageSwitcher/Mobile/index.tsx index 0d19b3d34..5a5e9c4de 100644 --- a/components/Current/Header/LanguageSwitcher/Mobile/index.tsx +++ b/components/Current/Header/LanguageSwitcher/Mobile/index.tsx @@ -9,19 +9,19 @@ import type { LanguageSwitcherProps } from "@/types/components/current/languageS export default function Mobile({ currentLanguage, - urlObject, + urls, }: LanguageSwitcherProps) { const [isOpen, setIsOpen] = useState(false) function toggleOpen() { setIsOpen((prevIsOpen) => !prevIsOpen) } - const urls = Object.keys(urlObject) + const urlKeys = Object.keys(urls) - if (urls.length <= 1 && urls[0] === currentLanguage) { + if (urlKeys.length === 1 && urlKeys[0] === currentLanguage) { return (
    - {languages[currentLanguage]}{" "} + {languages[currentLanguage]}
    ) } @@ -33,13 +33,13 @@ export default function Mobile({ className={styles.languageSwitcher} onClick={toggleOpen} > - {languages[currentLanguage]}{" "} + {languages[currentLanguage]} Choose language
      - {urls.map((key) => { - const url = urlObject[key as Lang]?.url + {urlKeys.map((key) => { + const url = urls[key as Lang]?.url if (url) { return (
    • diff --git a/types/components/current/languageSwitcher.ts b/types/components/current/languageSwitcher.ts index 4b1e8b0f4..e29bb4cff 100644 --- a/types/components/current/languageSwitcher.ts +++ b/types/components/current/languageSwitcher.ts @@ -9,5 +9,5 @@ export type LanguageSwitcherLink = { export type LanguageSwitcherProps = { currentLanguage: Lang - urlObject: LanguageSwitcherData + urls: LanguageSwitcherData }