@akinon/pz-theme 2.0.117-rc.0 → 2.0.118-beta.0

package/src/blocks/carousel-item-block.tsx

@@ -1,7 +1,7 @@
 'use client';
 
 import React from 'react';
-import NextLink from 'next/link';
+import { ThemeLink as NextLink } from '../components/theme-link';
 import { getResponsiveValue, resolveOption } from '../utils';
 import { BlockRendererProps } from './block-renderer-registry';
 import { DesignerPlaceholder } from './product-block-utils';

package/src/blocks/coupon-wallet-block.tsx

@@ -8,6 +8,7 @@ import {
 } from '@akinon/next/data/client/account';
 import { useLocalization } from '@akinon/next/hooks';
 import { getResponsiveValue, partAttrs } from '../utils';
+import { useLocalizeHref } from '../hooks/use-localize-href';
 import { formatDate, formatMoney } from './commerce-format';
 import { BlockRendererProps } from './block-renderer-registry';
 import { DesignerPlaceholder, readToggle } from './product-block-utils';
@@ -114,6 +115,7 @@ const CouponWalletBlock = ({
 
   const isMobile = currentBreakpoint === 'mobile';
   const { locale, currency } = useLocalization();
+  const localize = useLocalizeHref();
   const { status } = useSession();
   const isAuthenticated = status === 'authenticated';
 
@@ -159,7 +161,7 @@ const CouponWalletBlock = ({
   const renderTermsLink = () =>
     termsLinkLabel ? (
       <a
-        href={isDesigner ? '#' : termsHref || '#'}
+        href={isDesigner ? '#' : localize(termsHref) || '#'}
         target={isDesigner ? undefined : termsLinkTarget}
         rel={termsLinkTarget === '_blank' ? 'noreferrer' : undefined}
         onClick={guard}

package/src/blocks/facet-filters-block.tsx

@@ -4,6 +4,7 @@ import React, { useEffect, useRef, useState } from 'react';
 import { usePathname, useRouter, useSearchParams } from 'next/navigation';
 import { useLocalization } from '@akinon/next/hooks';
 import { getResponsiveValue, partAttrs } from '../utils';
+import { useLocalizeHref } from '../hooks/use-localize-href';
 import { useOverlay } from '../hooks/use-overlay';
 import { hasItemTemplate, ItemTemplateList } from './item-template';
 import { BlockRendererProps } from './block-renderer-registry';
@@ -309,6 +310,7 @@ const FacetFiltersBlock = ({
   const pathname = usePathname();
   const searchParams = useSearchParams();
   const { locale } = useLocalization();
+  const localize = useLocalizeHref();
   const [collapsedKeys, setCollapsedKeys] = useState<Record<string, boolean>>(
     {}
   );
@@ -786,6 +788,14 @@ const FacetFiltersBlock = ({
     return params;
   };
 
+  /**
+   * Every URL this block navigates to or renders. Commerce's `listing.path`
+   * has no locale; `localize` adds the page's (and leaves the one a
+   * `pathname` already carries).
+   */
+  const listingHref = (params: URLSearchParams): string =>
+    localize(buildListingHref(pathname || listing?.path || '', params));
+
   /**
    * The URL that toggles one choice. Split out from the click handler so a
    * designer-authored option row can bind a link to `item.url` and still
@@ -795,8 +805,7 @@ const FacetFiltersBlock = ({
     facet: ListingFacet,
     choice: ListingFacetChoice
   ): string =>
-    buildListingHref(
-      pathname || listing?.path || '',
+    listingHref(
       toggleChoiceParams(
         new URLSearchParams(appliedQuery),
         facet,
@@ -810,7 +819,7 @@ const FacetFiltersBlock = ({
     const params = deletePageCursor(new URLSearchParams(appliedQuery));
     params.delete(facet.searchKey);
 
-    return buildListingHref(pathname || listing?.path || '', params);
+    return listingHref(params);
   };
 
   const handleSelect = (facet: ListingFacet, choice: ListingFacetChoice) => {
@@ -1407,7 +1416,7 @@ const FacetFiltersBlock = ({
     const params = deletePageCursor(new URLSearchParams(appliedQuery));
     facets.forEach((facet) => params.delete(facet.searchKey));
 
-    router.push(buildListingHref(pathname || listing?.path || '', params));
+    router.push(listingHref(params));
   };
 
   const hasStagedChanges =
@@ -1427,12 +1436,7 @@ const FacetFiltersBlock = ({
    */
   const handleApply = () => {
     if (!isDesigner && hasStagedChanges && stagedQuery !== null) {
-      router.push(
-        buildListingHref(
-          pathname || listing?.path || '',
-          new URLSearchParams(stagedQuery)
-        )
-      );
+      router.push(listingHref(new URLSearchParams(stagedQuery)));
     }
 
     setPanelOpen(false);

package/src/blocks/favorite-button-block.tsx

@@ -1,7 +1,7 @@
 'use client';
 
 import React from 'react';
-import NextLink from 'next/link';
+import { ThemeLink as NextLink } from '../components/theme-link';
 import { useSession } from 'next-auth/react';
 import {
   useAddFavoriteMutation,

package/src/blocks/favourites-grid-block.tsx

@@ -1,7 +1,7 @@
 'use client';
 
 import React from 'react';
-import NextLink from 'next/link';
+import { ThemeLink as NextLink } from '../components/theme-link';
 import { useSession } from 'next-auth/react';
 import {
   useGetFavoritesQuery,

package/src/blocks/group-block.tsx

@@ -1,6 +1,7 @@
 import React from 'react';
-import NextLink from 'next/link';
+import { ThemeLink as NextLink } from '../components/theme-link';
 import { getResponsiveValue } from '../utils';
+import { asSitePath, isRootRelativeHref } from '../utils/localize-href';
 import {
   buildCommerceItem,
   emitCommerceEvent,
@@ -17,9 +18,12 @@ import { renderComposedChildren } from './render-composed-children';
  * composition data (wishlist context, carousel items) does not reliably
  * survive. Router navigation keeps the app state alive in both directions.
  * External hrefs keep the plain anchor — the router cannot take those anyway.
+ *
+ * The package's own test (`isRootRelativeHref`) rather than a local one: it
+ * trims, and a pasted ' /yatak-odasi/' used to miss this branch and go out as
+ * a plain anchor — which also meant it never reached `ThemeLink` and lost the
+ * page's locale with it.
  */
-const isInternalHref = (href: unknown): href is string =>
-  typeof href === 'string' && href.startsWith('/') && !href.startsWith('//');
 const hasOwnLength = (value: unknown, breakpoint: string): boolean => {
   const raw = String(getResponsiveValue(value, breakpoint, '')).trim();
   return raw !== '' && raw !== 'auto' && raw !== '0' && raw !== '0px';
@@ -65,7 +69,16 @@ const GroupBlock = ({
   const tagProps: Record<string, unknown> = {
     className: 'contents'
   };
-  const useRouterLink = tag === 'a' && !isDesigner && isInternalHref(href);
+  // Trimmed once here, because it is what the router link is given. A full URL
+  // of the storefront's own counts as one of its routes as well: a merchant
+  // pastes the address bar into a group as readily as into a link, and
+  // `link-block` already routes that form through `ThemeLink`.
+  const routerHref = isRootRelativeHref(href)
+    ? href.trim()
+    : typeof href === 'string'
+      ? asSitePath(href.trim(), process.env.NEXT_PUBLIC_URL)
+      : undefined;
+  const useRouterLink = tag === 'a' && !isDesigner && routerHref !== undefined;
   if (tag === 'a' && href && !useRouterLink) {
     tagProps.href = href;
   }
@@ -105,7 +118,7 @@ const GroupBlock = ({
     if (useRouterLink) {
       return (
         <NextLink
-          href={href as string}
+          href={routerHref as string}
           prefetch={false}
           className="contents"
           onClick={handleAnchorAnalytics}
@@ -154,7 +167,7 @@ const GroupBlock = ({
   if (useRouterLink) {
     return (
       <NextLink
-        href={href as string}
+        href={routerHref as string}
         prefetch={false}
         className="contents"
         onClick={handleAnchorAnalytics}

package/src/blocks/hamburger-menu-block.tsx

@@ -1,7 +1,7 @@
 'use client';
 
 import React, { useState } from 'react';
-import NextLink from 'next/link';
+import { ThemeLink as NextLink } from '../components/theme-link';
 import { useGetMenuQuery } from '@akinon/next/data/client/misc';
 import { getResponsiveValue, partAttrs, resolveForceOpen } from '../utils';
 import { useOverlay } from '../hooks/use-overlay';

package/src/blocks/hotspot-block.tsx

@@ -5,6 +5,7 @@ import { BlockRendererProps } from './block-renderer-registry';
 import { getResponsiveValue, getCSSStyles, resolveForceOpen } from '../utils';
 import { useThemeSettingsContext } from '../theme-settings-context';
 import { useLocalization } from '@akinon/next/hooks';
+import { useLocalizeHref } from '../hooks/use-localize-href';
 import ThemeBlock from '../theme-block';
 
 import { postToEditor } from '../editor-bridge';
@@ -19,6 +20,7 @@ const HotspotBlock = ({
   const [isOpen, setIsOpen] = useState(false);
   const themeSettings = useThemeSettingsContext();
   const { locale } = useLocalization();
+  const localize = useLocalizeHref();
   const defaultLocale = process.env.NEXT_PUBLIC_DEFAULT_LOCALE || 'en';
 
   const styles = block.styles || {};
@@ -224,7 +226,7 @@ const HotspotBlock = ({
 
           {link && (
             <a
-              href={link}
+              href={localize(link)}
               className="text-blue-600 hover:underline font-medium block mt-2"
               onClick={(e) => e.stopPropagation()}
             >

package/src/blocks/hover-showcase-item-block.tsx

@@ -2,6 +2,7 @@
 
 import React from 'react';
 import { useLocalization } from '@akinon/next/hooks';
+import { useLocalizeHref } from '../hooks/use-localize-href';
 import { getResponsiveValue, partAttrs } from '../utils';
 import { BlockRendererProps } from './block-renderer-registry';
 import { DesignerPlaceholder } from './product-block-utils';
@@ -73,6 +74,7 @@ const HoverShowcaseItemBlock = ({
   isDesigner = false
 }: BlockRendererProps) => {
   const { locale } = useLocalization();
+  const localize = useLocalizeHref();
   const defaultLocale = process.env.NEXT_PUBLIC_DEFAULT_LOCALE || 'en';
 
   /**
@@ -200,7 +202,7 @@ const HoverShowcaseItemBlock = ({
         // is nothing to hang the anchor on, so an authored link is simply not
         // reachable — the same as in the section today.
         <a
-          href={link}
+          href={localize(link)}
           data-hover-showcase-link=""
           {...partAttrs('link')}
           onClick={handleLinkClick}

package/src/blocks/link-block.tsx

@@ -1,10 +1,8 @@
 'use client';
 
 import React, { useMemo } from 'react';
-import NextLink from 'next/link';
-import { useLocalization } from '@akinon/next/hooks';
-import { LocaleUrlStrategy } from '@akinon/next/localization';
-import { urlLocaleMatcherRegex, urlSchemes } from '@akinon/next/utils';
+import { ThemeLink as NextLink } from '../components/theme-link';
+import { urlSchemes } from '@akinon/next/utils';
 import {
   getInnerRootInlineStyles,
   getResponsiveValue,
@@ -25,7 +23,6 @@ const LinkBlock = ({
   currentBreakpoint = 'desktop',
   isDesigner = false
 }: BlockRendererProps) => {
-  const { locale, defaultLocaleValue, localeUrlStrategy } = useLocalization();
   const themeSettings = useThemeSettingsContext();
   const action = useBlockAction(block, { currentBreakpoint, isDesigner });
 
@@ -93,23 +90,9 @@ const LinkBlock = ({
       return '#';
     }
 
-    const pathnameWithoutLocale = trimmedHref.replace(
-      urlLocaleMatcherRegex,
-      ''
-    );
-    const hrefWithLocale = `/${locale}${pathnameWithoutLocale}`;
-
-    if (localeUrlStrategy === LocaleUrlStrategy.ShowAllLocales) {
-      return hrefWithLocale;
-    } else if (
-      localeUrlStrategy === LocaleUrlStrategy.HideDefaultLocale &&
-      locale !== defaultLocaleValue
-    ) {
-      return hrefWithLocale;
-    }
-
-    return trimmedHref || '#';
-  }, [href, defaultLocaleValue, locale, localeUrlStrategy]);
+    // The locale is ThemeLink's job, the same as for every other block link.
+    return trimmedHref;
+  }, [href]);
 
   /**
    * Only the values the generated stylesheet cannot produce; the rest now

package/src/blocks/listing-breadcrumb-block.tsx

@@ -1,7 +1,7 @@
 'use client';
 
 import React from 'react';
-import NextLink from 'next/link';
+import { ThemeLink as NextLink } from '../components/theme-link';
 import { getResponsiveValue, partAttrs } from '../utils';
 import { BlockRendererProps } from './block-renderer-registry';
 import {

package/src/blocks/listing-pagination-block.tsx

@@ -1,10 +1,11 @@
 'use client';
 
 import React from 'react';
-import NextLink from 'next/link';
+import { ThemeLink as NextLink } from '../components/theme-link';
 import { usePathname, useSearchParams } from 'next/navigation';
 import { useLocalization } from '@akinon/next/hooks';
 import { getResponsiveValue, partAttrs, resolveOption } from '../utils';
+import { useLocalizeHref } from '../hooks/use-localize-href';
 import { hasItemTemplate, ItemTemplateList } from './item-template';
 import { BlockRendererProps } from './block-renderer-registry';
 import {
@@ -301,6 +302,7 @@ const ListingPaginationBlock = ({
   const pathname = usePathname();
   const searchParams = useSearchParams();
   const { locale } = useLocalization();
+  const localize = useLocalizeHref();
 
   const mode = String(
     getResponsiveValue(block.properties?.mode, currentBreakpoint, 'pages')
@@ -455,9 +457,15 @@ const ListingPaginationBlock = ({
         params.set(queryParam, String(page));
       }
 
-      return buildListingHref(pathname || listing?.path || '', params);
+      // Linked, fetched and written to history alike, so it carries the page's
+      // locale: an unprefixed fetch would come back as the default-locale page
+      // (and switch the locale cookie with it). Commerce's `listing.path` has
+      // none; one a `pathname` already carries is kept.
+      return localize(
+        buildListingHref(pathname || listing?.path || '', params)
+      );
     },
-    [searchParams, queryParam, pathname, listing?.path]
+    [searchParams, queryParam, pathname, listing?.path, localize]
   );
 
   const loadNextPage = React.useCallback(async () => {

package/src/blocks/mega-menu-block.tsx

@@ -7,8 +7,9 @@ import React, {
   useRef,
   useState
 } from 'react';
-import NextLink from 'next/link';
+import { ThemeLink as NextLink } from '../components/theme-link';
 import { usePathname } from 'next/navigation';
+import { useLocalizeHref } from '../hooks/use-localize-href';
 import { useGetMenuQuery } from '@akinon/next/data/client/misc';
 import { getResponsiveValue, partAttrs, resolveForceOpen } from '../utils';
 import { useOverlay } from '../hooks/use-overlay';
@@ -206,6 +207,7 @@ const MegaMenuBlock = ({
   isDesigner = false
 }: BlockRendererProps) => {
   const pathname = usePathname();
+  const localize = useLocalizeHref();
   const [openKey, setOpenKey] = useState<string | null>(null);
   const openTimer = useRef<ReturnType<typeof setTimeout> | null>(null);
   const closeTimer = useRef<ReturnType<typeof setTimeout> | null>(null);
@@ -402,12 +404,16 @@ const MegaMenuBlock = ({
 
   // The entry for the page the shopper is on carries `selected` so a part
   // style can address it without the brand hand-listing every label.
+  //
+  // Menu URLs are stored without a locale while the pathname carries it
+  // (`/en/yatak-odasi`), so the entry is matched in the localized form its link
+  // renders — and so is the home entry the section match must never widen to.
   const isCurrent = (url: string) => {
-    const target = normalizePath(url);
+    const target = normalizePath(localize(url));
     const current = normalizePath(pathname);
 
     if (!target || target === '#' || !current) return false;
-    if (activeMatch === 'section' && target !== '/') {
+    if (activeMatch === 'section' && target !== normalizePath(localize('/'))) {
       return current === target || current.startsWith(`${target}/`);
     }
 

package/src/blocks/mini-basket-block.tsx

@@ -1,7 +1,7 @@
 'use client';
 
 import React from 'react';
-import NextLink from 'next/link';
+import { ThemeLink as NextLink } from '../components/theme-link';
 import { useGetBasketQuery } from '@akinon/next/data/client/basket';
 import { getResponsiveValue, partAttrs } from '../utils';
 import { BlockRendererProps } from './block-renderer-registry';

package/src/blocks/nav-menu-block.tsx

@@ -1,8 +1,9 @@
 'use client';
 
 import React, { useState } from 'react';
-import NextLink from 'next/link';
+import { ThemeLink as NextLink } from '../components/theme-link';
 import { usePathname } from 'next/navigation';
+import { useLocalizeHref } from '../hooks/use-localize-href';
 import { useGetMenuQuery } from '@akinon/next/data/client/misc';
 import { getResponsiveValue, partAttrs, resolveForceOpen } from '../utils';
 import { useMenuSeed } from '../menu-seed-context';
@@ -53,6 +54,7 @@ const NavMenuBlock = ({
   isDesigner = false
 }: BlockRendererProps) => {
   const pathname = usePathname();
+  const localize = useLocalizeHref();
   const [openKey, setOpenKey] = useState<string | null>(null);
 
   // Shared with the server's menu collector, so the key it seeded under is the
@@ -130,12 +132,16 @@ const NavMenuBlock = ({
 
   // The entry for the page the shopper is on is what a brand reaches for first
   // after colour; it carries `selected` so a part style can address it.
+  //
+  // Menu URLs are stored without a locale while the pathname carries it
+  // (`/en/yatak-odasi`), so the entry is matched in the localized form its link
+  // renders — and so is the home entry the section match must never widen to.
   const isCurrent = (url?: string) => {
-    const target = normalizePath(url);
+    const target = normalizePath(localize(url ?? ''));
     const current = normalizePath(pathname);
 
     if (!target || target === '#' || !current) return false;
-    if (activeMatch === 'section' && target !== '/') {
+    if (activeMatch === 'section' && target !== normalizePath(localize('/'))) {
       return current === target || current.startsWith(`${target}/`);
     }
 

package/src/blocks/oauth-buttons-block.tsx

@@ -1,6 +1,10 @@
 'use client';
 
 import React from 'react';
+// Not ThemeLink: `withOauthLogin` only matches an unprefixed
+// `/{provider}/login/`, so there is no locale to add. `localizeHref` leaves that
+// route alone too (`OAUTH_ROUTE`), which keeps a row template that renders
+// `item.url` through a button or group working on an English page.
 import NextLink from 'next/link';
 import { getResponsiveValue, partAttrs } from '../utils';
 import { DesignerPlaceholder, readToggle } from './product-block-utils';

package/src/blocks/order-detail-block.tsx

@@ -1,7 +1,7 @@
 'use client';
 
 import React from 'react';
-import NextLink from 'next/link';
+import { ThemeLink as NextLink } from '../components/theme-link';
 import { useParams, useSearchParams } from 'next/navigation';
 import { useGetOrderQuery } from '@akinon/next/data/client/account';
 import { useLocalization } from '@akinon/next/hooks';

package/src/blocks/order-list-block.tsx

@@ -1,7 +1,7 @@
 'use client';
 
 import React, { useEffect, useState } from 'react';
-import NextLink from 'next/link';
+import { ThemeLink as NextLink } from '../components/theme-link';
 import { useSession } from 'next-auth/react';
 import { useGetOrdersQuery } from '@akinon/next/data/client/account';
 import { useLocalization } from '@akinon/next/hooks';

package/src/blocks/order-success-block.tsx

@@ -1,7 +1,7 @@
 'use client';
 
 import React from 'react';
-import NextLink from 'next/link';
+import { ThemeLink as NextLink } from '../components/theme-link';
 import { usePathname, useSearchParams } from 'next/navigation';
 import { useFetchCheckoutResultQuery } from '@akinon/next/data/client/checkout';
 import { useLocalization } from '@akinon/next/hooks';

package/src/blocks/otp-form-block.tsx

@@ -6,6 +6,7 @@ import { signIn } from 'next-auth/react';
 import { useLocalization } from '@akinon/next/hooks';
 import { useOtpLoginMutation } from '@akinon/next/data/client/user';
 import { getResponsiveValue, partAttrs, resolveOption } from '../utils';
+import { useLocalizeHref } from '../hooks/use-localize-href';
 import { readToggle } from './product-block-utils';
 import { closeAllModals } from '../overlays/overlay-bus';
 import {
@@ -273,6 +274,7 @@ const OtpFormBlock = ({
   );
 
   const router = useRouter();
+  const localize = useLocalizeHref();
   const search = useSearchParams();
   const pathname = usePathname();
   const destination = resolveAuthDestination({
@@ -565,7 +567,8 @@ const OtpFormBlock = ({
       router.refresh();
       // Our own resolved path rather than next-auth's echo of it; `null` is
       // `stay`, where the refresh above is the whole navigation.
-      if (destination) router.push(destination);
+      // An authored destination has no locale; a returned one keeps its own.
+      if (destination) router.push(localize(destination));
     } catch {
       setError(errorLabel);
     } finally {

package/src/blocks/payment-badges-block.tsx

@@ -1,7 +1,7 @@
 'use client';
 
 import React, { useMemo } from 'react';
-import NextLink from 'next/link';
+import { ThemeLink as NextLink } from '../components/theme-link';
 import ThemeBlock, { Block } from '../theme-block';
 import { getResponsiveValue, partAttrs } from '../utils';
 import { BlockRendererProps } from './block-renderer-registry';

package/src/blocks/product-breadcrumb-block.tsx

@@ -1,7 +1,7 @@
 'use client';
 
 import React from 'react';
-import NextLink from 'next/link';
+import { ThemeLink as NextLink } from '../components/theme-link';
 import { getResponsiveValue, partAttrs } from '../utils';
 import { useThemePageContext } from '../theme-page-context';
 import { BlockRendererProps } from './block-renderer-registry';

package/src/blocks/product-grid-block.tsx

@@ -1,7 +1,7 @@
 'use client';
 
 import React from 'react';
-import NextLink from 'next/link';
+import { ThemeLink as NextLink } from '../components/theme-link';
 import { getResponsiveValue, partAttrs } from '../utils';
 import {
   buildCommerceItem,

package/src/blocks/product-recommendations-block.tsx

@@ -1,7 +1,7 @@
 'use client';
 
 import React, { useRef } from 'react';
-import NextLink from 'next/link';
+import { ThemeLink as NextLink } from '../components/theme-link';
 import { useSession } from 'next-auth/react';
 import { useGetWidgetQuery } from '@akinon/next/data/client/misc';
 import { useGetFavoritesQuery } from '@akinon/next/data/client/wishlist';

package/src/blocks/register-form-block.tsx

@@ -5,6 +5,7 @@ import { usePathname, useRouter, useSearchParams } from 'next/navigation';
 import { signIn, useSession } from 'next-auth/react';
 import { useLocalization } from '@akinon/next/hooks';
 import { getResponsiveValue, partAttrs, resolveOption } from '../utils';
+import { useLocalizeHref } from '../hooks/use-localize-href';
 import { readToggle } from './product-block-utils';
 import { closeAllModals } from '../overlays/overlay-bus';
 import {
@@ -293,6 +294,7 @@ const RegisterFormBlock = ({
   );
 
   const router = useRouter();
+  const localize = useLocalizeHref();
   const search = useSearchParams();
   const pathname = usePathname();
   const { status } = useSession();
@@ -351,8 +353,8 @@ const RegisterFormBlock = ({
   React.useEffect(() => {
     if (!isSignedIn || whenSignedIn !== 'redirect') return;
 
-    router.replace(resolveSignedInDestination(signedInHref, search));
-  }, [isSignedIn, whenSignedIn, signedInHref, router, search]);
+    router.replace(localize(resolveSignedInDestination(signedInHref, search)));
+  }, [isSignedIn, whenSignedIn, signedInHref, router, search, localize]);
 
   /**
    * The form's contents, wrapped so a Security Check block (or the form's own
@@ -718,7 +720,8 @@ const RegisterFormBlock = ({
 
       // Our own resolved path rather than next-auth's echo of it: this one has
       // been through the same-origin check. `null` is `stay`.
-      if (destination) router.push(destination);
+      // An authored destination has no locale; a returned one keeps its own.
+      if (destination) router.push(localize(destination));
     } catch {
       setError(errorLabel);
     } finally {

package/src/blocks/search-box-block.tsx

@@ -4,6 +4,7 @@ import React, { useRef, useState } from 'react';
 import { useRouter } from 'next/navigation';
 import { getResponsiveValue, partAttrs, resolveForceOpen } from '../utils';
 import { emitCommerceEvent } from '../utils/analytics';
+import { useLocalizeHref } from '../hooks/use-localize-href';
 import { applySearchTermTransform } from '../utils/search-transform';
 import { useOverlay } from '../hooks/use-overlay';
 import ThemeBlock from '../theme-block';
@@ -49,6 +50,7 @@ const SearchBoxBlock = ({
   isDesigner = false
 }: BlockRendererProps) => {
   const router = useRouter();
+  const localize = useLocalizeHref();
   const [open, setOpen] = useState(false);
   const [term, setTerm] = useState('');
   const triggerRef = useRef<HTMLButtonElement | null>(null);
@@ -190,8 +192,12 @@ const SearchBoxBlock = ({
     if (!value || isDesigner) return;
     emitCommerceEvent('search', { searchTerm: value });
     const separator = searchUrl.includes('?') ? '&' : '?';
+    // The authored `/list` has no locale; a search from an English page must
+    // land on the English results.
     router.push(
-      `${searchUrl}${separator}${queryParam}=${encodeURIComponent(value)}`
+      localize(
+        `${searchUrl}${separator}${queryParam}=${encodeURIComponent(value)}`
+      )
     );
     if (clearOnSubmit) setTerm('');
     setOpen(false);

package/src/blocks/social-icons-list-block.tsx

@@ -1,7 +1,7 @@
 'use client';
 
 import React from 'react';
-import NextLink from 'next/link';
+import { ThemeLink as NextLink } from '../components/theme-link';
 import { partAttrs } from '../utils';
 import { BlockRendererProps } from './block-renderer-registry';
 import { DesignerPlaceholder } from './product-block-utils';

package/src/blocks/social-links-block.tsx

@@ -1,7 +1,7 @@
 'use client';
 
 import React from 'react';
-import NextLink from 'next/link';
+import { ThemeLink as NextLink } from '../components/theme-link';
 import { getResponsiveValue, partAttrs } from '../utils';
 import { BlockRendererProps } from './block-renderer-registry';
 import { DesignerPlaceholder, readToggle } from './product-block-utils';