fix: Keep cookie value in sync when navigating within a locale (#828)

Fixes #826
amannn · Feb 1, 2024 · 1167523 · 1167523
1 parent 65241c1
commit 1167523
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/packages/next-intl/package.json b/packages/next-intl/package.json
@@ -122,11 +122,11 @@
     },
     {
       "path": "dist/production/navigation.react-client.js",
-      "limit": "2.83 KB"
+      "limit": "2.84 KB"
     },
     {
       "path": "dist/production/navigation.react-server.js",
-      "limit": "2.94 KB"
+      "limit": "2.95 KB"
     },
     {
       "path": "dist/production/server.react-client.js",

diff --git a/packages/next-intl/src/navigation/shared/syncLocaleCookie.tsx b/packages/next-intl/src/navigation/shared/syncLocaleCookie.tsx
@@ -14,7 +14,7 @@ export default function syncLocaleCookie(
   locale: string,
   nextLocale?: string
 ) {
-  const isSwitchingLocale = nextLocale !== locale;
+  const isSwitchingLocale = nextLocale !== locale && nextLocale != null;
 
   if (
     !isSwitchingLocale ||

diff --git a/packages/next-intl/test/navigation/react-client/useBaseRouter.test.tsx b/packages/next-intl/test/navigation/react-client/useBaseRouter.test.tsx
@@ -95,6 +95,9 @@ describe('unprefixed routing', () => {
     callRouter((router) => router.push('/about', {locale: 'de'}));
     expect(document.cookie).toContain('NEXT_LOCALE=de');
 
+    callRouter((router) => router.push('/test'));
+    expect(document.cookie).toContain('NEXT_LOCALE=de');
+
     callRouter((router) => router.replace('/about', {locale: 'es'}));
     expect(document.cookie).toContain('NEXT_LOCALE=es');