Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(core): update localeSwitcher to use link instead of form #1342

Merged
merged 4 commits into from
Sep 5, 2024
Merged

fix(core): update localeSwitcher to use link instead of form #1342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0abd41e
fix(core): update localeSwitcher to use link instead of form
jorgemoya Sep 5, 2024
9cdc621
fix: remove useEffect, use useMemo
jorgemoya Sep 5, 2024
9824a24
fix: no need to pass defualtLocale
jorgemoya Sep 5, 2024
0fee6fe
fix: add missing dependency
jorgemoya Sep 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/hot-buses-invent.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@bigcommerce/catalyst-core": patch
---

Update localeSwitcher to use a link instead of a form.
50 changes: 21 additions & 29 deletions core/components/ui/header/locale-switcher.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@

import * as PopoverPrimitive from '@radix-ui/react-popover';
import { useTranslations } from 'next-intl';
import { FormEvent, useMemo, useState } from 'react';
import { useMemo, useState } from 'react';

import { LocaleType, useRouter } from '~/i18n/routing';
import { Link } from '~/components/link';
import { LocaleType } from '~/i18n/routing';

import { Button } from '../button';
import { Select } from '../form';
Expand All @@ -18,7 +19,7 @@ type LanguagesByRegionMap = Record<
>;

interface Locale {
id: string;
id: LocaleType;
region: string;
language: string;
flag: string;
Expand All @@ -30,8 +31,6 @@ interface Props {
}

const LocaleSwitcher = ({ activeLocale, locales }: Props) => {
const router = useRouter();

const t = useTranslations('Components.Header.LocaleSwitcher');

const selectedLocale = locales.find((locale) => locale.id === activeLocale);
Expand All @@ -44,9 +43,7 @@ const LocaleSwitcher = ({ activeLocale, locales }: Props) => {
locales.reduce<LanguagesByRegionMap>((acc, { region, language, flag }) => {
if (!acc[region]) {
acc[region] = { languages: [language], flag };
}

if (!acc[region].languages.includes(language)) {
} else if (!acc[region].languages.includes(language)) {
acc[region].languages.push(language);
}

Expand All @@ -55,6 +52,14 @@ const LocaleSwitcher = ({ activeLocale, locales }: Props) => {
[locales],
);

const newLocale = useMemo(
() =>
locales.find(
(locale) => locale.language === languageSelected && locale.region === regionSelected,
),
[languageSelected, locales, regionSelected],
);

if (!selectedLocale) {
return null;
}
Expand All @@ -72,26 +77,11 @@ const LocaleSwitcher = ({ activeLocale, locales }: Props) => {
};

const handleLanguageChange = (language: string) => {
if (language) {
setLanguageSelected(language);
}
};

const handleOnSubmit = (event: FormEvent) => {
event.preventDefault();

const newLocale = locales.find(
(locale) => locale.language === languageSelected && locale.region === regionSelected,
);

if (newLocale) {
// eslint-disable-next-line @typescript-eslint/consistent-type-assertions
router.replace('/', { locale: newLocale.id as LocaleType });
}
setLanguageSelected(language);
};

return (
Object.keys(locales).length > 1 && (
locales.length > 1 && (
<PopoverPrimitive.Root onOpenChange={handleOnOpenChange}>
<PopoverPrimitive.Trigger asChild>
<button className="flex h-12 items-center p-3 text-2xl">{selectedLocale.flag}</button>
Expand All @@ -102,7 +92,7 @@ const LocaleSwitcher = ({ activeLocale, locales }: Props) => {
className="z-50 bg-white p-4 text-base shadow-md outline-none data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0"
sideOffset={4}
>
<form className="flex flex-col gap-4" onSubmit={handleOnSubmit}>
<div className="flex flex-col gap-4">
<p>{t('chooseCountryAndLanguage')}</p>
<Select
onValueChange={handleRegionChange}
Expand All @@ -122,10 +112,12 @@ const LocaleSwitcher = ({ activeLocale, locales }: Props) => {
}
value={languageSelected}
/>
<Button className="w-auto" type="submit">
{t('goToSite')}
<Button asChild>
<Link className="hover:text-white" href="/" locale={newLocale?.id}>
{t('goToSite')}
</Link>
</Button>
</form>
</div>
</PopoverPrimitive.Content>
</PopoverPrimitive.Portal>
</PopoverPrimitive.Root>
Expand Down
Loading