@faststore/core 4.0.1-dev.0 → 4.0.1-dev.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faststore/core",
-  "version": "4.0.1-dev.0",
+  "version": "4.0.1-dev.2",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -39,11 +39,11 @@
     "@envelop/graphql-jit": "catalog:",
     "@envelop/parser-cache": "catalog:",
     "@envelop/validation-cache": "catalog:",
-    "@faststore/api": "4.0.1-dev.0",
-    "@faststore/diagnostics": "4.0.1-dev.0",
-    "@faststore/lighthouse": "4.0.1-dev.0",
-    "@faststore/sdk": "4.0.1-dev.0",
-    "@faststore/ui": "4.0.1-dev.0",
+    "@faststore/api": "4.0.1-dev.2",
+    "@faststore/diagnostics": "4.0.1-dev.2",
+    "@faststore/lighthouse": "4.0.1-dev.2",
+    "@faststore/sdk": "4.0.1-dev.2",
+    "@faststore/ui": "4.0.1-dev.2",
     "@graphql-codegen/cli": "catalog:",
     "@graphql-codegen/client-preset": "4.2.6",
     "@graphql-codegen/typescript": "catalog:",
@@ -113,5 +113,5 @@
     "react": "catalog:",
     "react-dom": "catalog:"
   },
-  "gitHead": "a9d781c453243794ea7f5b58dfa0643c42fc62c0"
+  "gitHead": "78469e62248563c911ba449ea69fc1edacf7277e"
 }

package/src/components/ui/LocalizationButton/LocalizationButton.tsx

@@ -49,6 +49,7 @@ const LocalizationButton = ({
     setLocaleCode,
     setCurrencyCode,
     save,
+    reset,
     isSaveEnabled,
     error,
   } = useBindingSelector()
@@ -97,7 +98,10 @@ const LocalizationButton = ({
       {isSelectorOpen && (
         <LocalizationSelector
           isOpen={isSelectorOpen}
-          onClose={() => setIsSelectorOpen(false)}
+          onClose={() => {
+            setIsSelectorOpen(false)
+            reset()
+          }}
           triggerRef={buttonRef}
           languages={languages}
           currencies={currencies}

package/src/sdk/localization/useBindingSelector.ts

@@ -1,4 +1,4 @@
-import { useCallback, useMemo, useState } from 'react'
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 
 import storeConfig from '../../../discovery.config'
 import { buildRedirectUrl } from '../../utils/localization/bindingPaths'
@@ -56,6 +56,8 @@ export interface UseBindingSelectorReturn {
   setCurrencyCode: (code: string) => void
   /** Action to save selections and redirect */
   save: () => void
+  /** Discards unsaved changes and resets selections to current session values */
+  reset: () => void
 }
 
 /**
@@ -77,6 +79,23 @@ export function useBindingSelector(): UseBindingSelectorReturn {
   )
   const [error, setError] = useState<BindingSelectorError | null>(null)
 
+  const hasUserEditedSelection = useRef(false)
+
+  // Sync selections when session resolves after initial render (e.g. stale session
+  // from a previous locale when navigating between locale-prefixed paths).
+  // Skipped once the user has made an in-progress selection; call reset() on close to re-enable.
+  useEffect(() => {
+    if (!hasUserEditedSelection.current) {
+      setLocaleCode(currentLocale ?? null)
+    }
+  }, [currentLocale])
+
+  useEffect(() => {
+    if (!hasUserEditedSelection.current) {
+      setCurrencyCode(currentCurrency?.code ?? null)
+    }
+  }, [currentCurrency?.code])
+
   // Build language options with disambiguation - returns Record<localeCode, languageName>
   const languages = useMemo(
     () => buildLanguageOptions(localizationConfig.locales),
@@ -98,6 +117,7 @@ export function useBindingSelector(): UseBindingSelectorReturn {
   // Handle locale code change
   const handleSetLocaleCode = useCallback(
     (code: string) => {
+      hasUserEditedSelection.current = true
       setLocaleCode(code)
       setError(null)
 
@@ -126,6 +146,7 @@ export function useBindingSelector(): UseBindingSelectorReturn {
 
   // Handle currency code change
   const handleSetCurrencyCode = useCallback((code: string) => {
+    hasUserEditedSelection.current = true
     setCurrencyCode(code)
     setError(null)
   }, [])
@@ -169,6 +190,14 @@ export function useBindingSelector(): UseBindingSelectorReturn {
 
   const isSaveEnabled = Boolean(localeCode && currencyCode && !error)
 
+  // Discards unsaved changes and re-enables session syncing
+  const reset = useCallback(() => {
+    hasUserEditedSelection.current = false
+    setLocaleCode(currentLocale ?? null)
+    setCurrencyCode(currentCurrency?.code ?? null)
+    setError(null)
+  }, [currentLocale, currentCurrency?.code])
+
   return {
     languages,
     currencies,
@@ -179,5 +208,6 @@ export function useBindingSelector(): UseBindingSelectorReturn {
     setLocaleCode: handleSetLocaleCode,
     setCurrencyCode: handleSetCurrencyCode,
     save,
+    reset,
   }
 }