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

fix: naming of urls variable

Browse Source
This commit is contained in:
Christel Westerberg
2024-06-05 09:01:45 +02:00
parent c5b2855876
commit 52111d2fa3
5 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/[lang]/(live)/@languageSwitcher/[...uri]/page.tsx
View File

@@ -15,10 +15,10 @@ export default async function LanguageSwitcher({
return ( return (
<> <>
<section className={styles.desktop}> <section className={styles.desktop}>
<Desktop currentLanguage={params.lang} urlObject={urls} /> <Desktop currentLanguage={params.lang} urls={urls} />
</section> </section>
<section className={styles.mobile}> <section className={styles.mobile}>
<Mobile currentLanguage={params.lang} urlObject={urls} /> <Mobile currentLanguage={params.lang} urls={urls} />
</section> </section>
</> </>
) )

4
app/[lang]/(live-current)/@languageSwitcher/page.tsx
View File

@@ -20,10 +20,10 @@ export default async function LanguageSwitcher({
return ( return (
<> <>
<section className={styles.desktop}> <section className={styles.desktop}>
<Desktop currentLanguage={params.lang} urlObject={urls} /> <Desktop currentLanguage={params.lang} urls={urls} />
</section> </section>
<section className={styles.mobile}> <section className={styles.mobile}>
<Mobile currentLanguage={params.lang} urlObject={urls} /> <Mobile currentLanguage={params.lang} urls={urls} />
</section> </section>
</> </>
) )

12
components/Current/Header/LanguageSwitcher/Desktop/index.tsx
View File

@@ -11,7 +11,7 @@ import type { LanguageSwitcherProps } from "@/types/components/current/languageS
export default function Desktop({ export default function Desktop({
currentLanguage, currentLanguage,
urlObject, urls,
}: LanguageSwitcherProps) { }: LanguageSwitcherProps) {
const [isOpen, setIsOpen] = useState(false) const [isOpen, setIsOpen] = useState(false)
const divRef = useRef<HTMLDivElement>(null) const divRef = useRef<HTMLDivElement>(null)
@@ -40,9 +40,9 @@ export default function Desktop({
} }
}, [close]) }, [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 ( return (
<div className={styles.container} ref={divRef}> <div className={styles.container} ref={divRef}>
<section className={styles.languageSwitcher}> <section className={styles.languageSwitcher}>
@@ -70,15 +70,15 @@ export default function Desktop({
<span className={styles.caret}></span> <span className={styles.caret}></span>
</button> </button>
<ul className={`${styles.dropdown} ${isOpen ? styles.isOpen : ""}`}> <ul className={`${styles.dropdown} ${isOpen ? styles.isOpen : ""}`}>
{urls.map((key) => { {urlKeys.map((key) => {
const url = urlObject[key as Lang]?.url const url = urls[key as Lang]?.url
if (url) { if (url) {
return ( return (
<li <li
key={key} key={key}
className={`${styles.li} ${currentLanguage === key ? styles.active : ""}`} className={`${styles.li} ${currentLanguage === key ? styles.active : ""}`}
> >
{urlObject[key as Lang]?.isExternal ? ( {urls[key as Lang]?.isExternal ? (
<Link className={styles.link} href={url}> <Link className={styles.link} href={url}>
{languages[key as Lang]} {languages[key as Lang]}
</Link> </Link>

14
components/Current/Header/LanguageSwitcher/Mobile/index.tsx
View File

@@ -9,19 +9,19 @@ import type { LanguageSwitcherProps } from "@/types/components/current/languageS
export default function Mobile({ export default function Mobile({
currentLanguage, currentLanguage,
urlObject, urls,
}: LanguageSwitcherProps) { }: LanguageSwitcherProps) {
const [isOpen, setIsOpen] = useState(false) const [isOpen, setIsOpen] = useState(false)
function toggleOpen() { function toggleOpen() {
setIsOpen((prevIsOpen) => !prevIsOpen) 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 ( return (
<div className={styles.languageSwitcher}> <div className={styles.languageSwitcher}>
{languages[currentLanguage]}{" "} {languages[currentLanguage]}
</div> </div>
) )
} }
@@ -33,13 +33,13 @@ export default function Mobile({
className={styles.languageSwitcher} className={styles.languageSwitcher}
onClick={toggleOpen} onClick={toggleOpen}
> >
{languages[currentLanguage]}{" "} {languages[currentLanguage]}
<span className={`${styles.arrow} ${isOpen ? styles.open : ""}`}></span> <span className={`${styles.arrow} ${isOpen ? styles.open : ""}`}></span>
<span className={styles.hiddenAccessible}>Choose language</span> <span className={styles.hiddenAccessible}>Choose language</span>
</button> </button>
<ul className={`${styles.dropdown} ${isOpen ? styles.isOpen : ""}`}> <ul className={`${styles.dropdown} ${isOpen ? styles.isOpen : ""}`}>
{urls.map((key) => { {urlKeys.map((key) => {
const url = urlObject[key as Lang]?.url const url = urls[key as Lang]?.url
if (url) { if (url) {
return ( return (
<li key={key} className={styles.li}> <li key={key} className={styles.li}>

2
types/components/current/languageSwitcher.ts
View File

@@ -9,5 +9,5 @@ export type LanguageSwitcherLink = {
export type LanguageSwitcherProps = { export type LanguageSwitcherProps = {
currentLanguage: Lang currentLanguage: Lang
urlObject: LanguageSwitcherData urls: LanguageSwitcherData
} }