@umituz/react-native-localization 1.2.2 → 1.3.1

package/lib/index.d.ts

@@ -4,6 +4,8 @@
  */
 export { useLocalization, useLocalizationStore } from './infrastructure/storage/LocalizationStore';
 export { LocalizationProvider } from './infrastructure/components/LocalizationProvider';
+export { LanguageSwitcher } from './infrastructure/components/LanguageSwitcher';
+export { useLanguageNavigation } from './infrastructure/components/useLanguageNavigation';
 export { default as i18n } from './infrastructure/config/i18n';
 export { SUPPORTED_LANGUAGES, DEFAULT_LANGUAGE, getLanguageByCode, isLanguageSupported, getDefaultLanguage, getDeviceLocale, } from './infrastructure/config/languages';
 export type { Language, ILocalizationRepository } from './domain/repositories/ILocalizationRepository';

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AAGnG,OAAO,EAAE,oBAAoB,EAAE,MAAM,kDAAkD,CAAC;AAGxF,OAAO,EAAE,OAAO,IAAI,IAAI,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EACL,mBAAmB,EACnB,gBAAgB,EAChB,iBAAiB,EACjB,mBAAmB,EACnB,kBAAkB,EAClB,eAAe,GAChB,MAAM,mCAAmC,CAAC;AAG3C,YAAY,EAAE,QAAQ,EAAE,uBAAuB,EAAE,MAAM,+CAA+C,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AAGnG,OAAO,EAAE,oBAAoB,EAAE,MAAM,kDAAkD,CAAC;AACxF,OAAO,EAAE,gBAAgB,EAAE,MAAM,8CAA8C,CAAC;AAChF,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAG1F,OAAO,EAAE,OAAO,IAAI,IAAI,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EACL,mBAAmB,EACnB,gBAAgB,EAChB,iBAAiB,EACjB,mBAAmB,EACnB,kBAAkB,EAClB,eAAe,GAChB,MAAM,mCAAmC,CAAC;AAG3C,YAAY,EAAE,QAAQ,EAAE,uBAAuB,EAAE,MAAM,+CAA+C,CAAC"}

package/lib/index.js

@@ -6,6 +6,8 @@
 export { useLocalization, useLocalizationStore } from './infrastructure/storage/LocalizationStore';
 // Components
 export { LocalizationProvider } from './infrastructure/components/LocalizationProvider';
+export { LanguageSwitcher } from './infrastructure/components/LanguageSwitcher';
+export { useLanguageNavigation } from './infrastructure/components/useLanguageNavigation';
 // Configuration
 export { default as i18n } from './infrastructure/config/i18n';
 export { SUPPORTED_LANGUAGES, DEFAULT_LANGUAGE, getLanguageByCode, isLanguageSupported, getDefaultLanguage, getDeviceLocale, } from './infrastructure/config/languages';

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,QAAQ;AACR,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AAEnG,aAAa;AACb,OAAO,EAAE,oBAAoB,EAAE,MAAM,kDAAkD,CAAC;AAExF,gBAAgB;AAChB,OAAO,EAAE,OAAO,IAAI,IAAI,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EACL,mBAAmB,EACnB,gBAAgB,EAChB,iBAAiB,EACjB,mBAAmB,EACnB,kBAAkB,EAClB,eAAe,GAChB,MAAM,mCAAmC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,QAAQ;AACR,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AAEnG,aAAa;AACb,OAAO,EAAE,oBAAoB,EAAE,MAAM,kDAAkD,CAAC;AACxF,OAAO,EAAE,gBAAgB,EAAE,MAAM,8CAA8C,CAAC;AAChF,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAE1F,gBAAgB;AAChB,OAAO,EAAE,OAAO,IAAI,IAAI,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EACL,mBAAmB,EACnB,gBAAgB,EAChB,iBAAiB,EACjB,mBAAmB,EACnB,kBAAkB,EAClB,eAAe,GAChB,MAAM,mCAAmC,CAAC"}

package/lib/infrastructure/components/LanguageSwitcher.d.ts

@@ -0,0 +1,12 @@
+import React from 'react';
+interface LanguageSwitcherProps {
+    showName?: boolean;
+    showFlag?: boolean;
+    color?: string;
+    navigationScreen?: string;
+    style?: any;
+    textStyle?: any;
+}
+export declare const LanguageSwitcher: React.FC<LanguageSwitcherProps>;
+export default LanguageSwitcher;
+//# sourceMappingURL=LanguageSwitcher.d.ts.map

package/lib/infrastructure/components/LanguageSwitcher.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"LanguageSwitcher.d.ts","sourceRoot":"","sources":["../../../src/infrastructure/components/LanguageSwitcher.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAQ1B,UAAU,qBAAqB;IAC7B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,SAAS,CAAC,EAAE,GAAG,CAAC;CACjB;AAQD,eAAO,MAAM,gBAAgB,EAAE,KAAK,CAAC,EAAE,CAAC,qBAAqB,CAwC5D,CAAC;AAqBF,eAAe,gBAAgB,CAAC"}

package/lib/infrastructure/components/LanguageSwitcher.js

@@ -0,0 +1,49 @@
+import React from 'react';
+import { TouchableOpacity, Text, StyleSheet } from 'react-native';
+// @ts-ignore - Optional peer dependency
+import { useNavigation } from '@react-navigation/native';
+import { useLocalization } from '../storage/LocalizationStore';
+import { getLanguageByCode, getDefaultLanguage } from '../config/languages';
+const languageSwitcherConfig = {
+    defaultIconSize: 20,
+    defaultNavigationScreen: 'LanguageSelection',
+    hitSlop: { top: 10, bottom: 10, left: 10, right: 10 },
+};
+export const LanguageSwitcher = ({ showName = false, showFlag = true, color, navigationScreen = languageSwitcherConfig.defaultNavigationScreen, style, textStyle, }) => {
+    const navigation = useNavigation();
+    const { currentLanguage } = useLocalization();
+    const currentLang = getLanguageByCode(currentLanguage) || getDefaultLanguage();
+    const navigateToLanguageSelection = () => {
+        if (navigation && navigationScreen) {
+            navigation.navigate(navigationScreen);
+        }
+    };
+    const iconColor = color || '#000000';
+    return (<TouchableOpacity style={[styles.container, style]} onPress={navigateToLanguageSelection} activeOpacity={0.7} hitSlop={languageSwitcherConfig.hitSlop}>
+      {showFlag && (<Text style={[styles.flag, textStyle]}>{currentLang.flag}</Text>)}
+      {showName && (<Text style={[styles.languageName, { color: iconColor }, textStyle]}>
+          {currentLang.nativeName}
+        </Text>)}
+      {!showName && !showFlag && (<Text style={[styles.icon, { color: iconColor }]}>🌐</Text>)}
+    </TouchableOpacity>);
+};
+const styles = StyleSheet.create({
+    container: {
+        flexDirection: 'row',
+        alignItems: 'center',
+        gap: 8,
+        paddingHorizontal: 4,
+    },
+    flag: {
+        fontSize: 20,
+    },
+    languageName: {
+        fontSize: 14,
+        fontWeight: '600',
+    },
+    icon: {
+        fontSize: 20,
+    },
+});
+export default LanguageSwitcher;
+//# sourceMappingURL=LanguageSwitcher.js.map

package/lib/infrastructure/components/LanguageSwitcher.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"LanguageSwitcher.js","sourceRoot":"","sources":["../../../src/infrastructure/components/LanguageSwitcher.tsx"],"names":[],"mappings":"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"}

package/lib/infrastructure/components/useLanguageNavigation.d.ts

@@ -0,0 +1,6 @@
+import { Language } from '../../domain/repositories/ILocalizationRepository';
+export declare const useLanguageNavigation: (navigationScreen: string) => {
+    currentLang: Language;
+    navigateToLanguageSelection: () => void;
+};
+//# sourceMappingURL=useLanguageNavigation.d.ts.map

package/lib/infrastructure/components/useLanguageNavigation.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useLanguageNavigation.d.ts","sourceRoot":"","sources":["../../../src/infrastructure/components/useLanguageNavigation.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,QAAQ,EAAE,MAAM,mDAAmD,CAAC;AAE7E,eAAO,MAAM,qBAAqB,GAAI,kBAAkB,MAAM;;;CAY7D,CAAC"}

package/lib/infrastructure/components/useLanguageNavigation.js

@@ -0,0 +1,16 @@
+// @ts-ignore - Optional peer dependency
+import { useNavigation } from '@react-navigation/native';
+import { useLocalization } from '../storage/LocalizationStore';
+import { getLanguageByCode, getDefaultLanguage } from '../config/languages';
+export const useLanguageNavigation = (navigationScreen) => {
+    const navigation = useNavigation();
+    const { currentLanguage } = useLocalization();
+    const currentLang = getLanguageByCode(currentLanguage) || getDefaultLanguage();
+    const navigateToLanguageSelection = () => {
+        if (navigation && navigationScreen) {
+            navigation.navigate(navigationScreen);
+        }
+    };
+    return { currentLang, navigateToLanguageSelection };
+};
+//# sourceMappingURL=useLanguageNavigation.js.map

package/lib/infrastructure/components/useLanguageNavigation.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useLanguageNavigation.js","sourceRoot":"","sources":["../../../src/infrastructure/components/useLanguageNavigation.ts"],"names":[],"mappings":"AAAA,wCAAwC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAG5E,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,gBAAwB,EAAE,EAAE;IAChE,MAAM,UAAU,GAAG,aAAa,EAAE,CAAC;IACnC,MAAM,EAAE,eAAe,EAAE,GAAG,eAAe,EAAE,CAAC;IAC9C,MAAM,WAAW,GAAG,iBAAiB,CAAC,eAAe,CAAC,IAAI,kBAAkB,EAAE,CAAC;IAE/E,MAAM,2BAA2B,GAAG,GAAG,EAAE;QACvC,IAAI,UAAU,IAAI,gBAAgB,EAAE,CAAC;YACnC,UAAU,CAAC,QAAQ,CAAC,gBAAyB,CAAC,CAAC;QACjD,CAAC;IACH,CAAC,CAAC;IAEF,OAAO,EAAE,WAAW,EAAE,2BAA2B,EAAE,CAAC;AACtD,CAAC,CAAC"}

package/lib/infrastructure/storage/LocalizationStore.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LocalizationStore.d.ts","sourceRoot":"","sources":["../../../src/infrastructure/storage/LocalizationStore.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAMH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mDAAmD,CAAC;AAElF,UAAU,iBAAiB;IACzB,eAAe,EAAE,MAAM,CAAC;IACxB,KAAK,EAAE,OAAO,CAAC;IACf,aAAa,EAAE,OAAO,CAAC;IACvB,kBAAkB,EAAE,QAAQ,EAAE,CAAC;IAC/B,WAAW,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACrD,UAAU,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CACjC;AAED,eAAO,MAAM,oBAAoB,gFAqE9B,CAAC;AAEJ;;;GAGG;AACH,eAAO,MAAM,eAAe;;;;;;;gCA/EE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC;sBAClC,OAAO,CAAC,IAAI,CAAC;CAoGhC,CAAC"}
+{"version":3,"file":"LocalizationStore.d.ts","sourceRoot":"","sources":["../../../src/infrastructure/storage/LocalizationStore.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAMH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mDAAmD,CAAC;AAElF,UAAU,iBAAiB;IACzB,eAAe,EAAE,MAAM,CAAC;IACxB,KAAK,EAAE,OAAO,CAAC;IACf,aAAa,EAAE,OAAO,CAAC;IACvB,kBAAkB,EAAE,QAAQ,EAAE,CAAC;IAC/B,WAAW,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACrD,UAAU,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CACjC;AAED,eAAO,MAAM,oBAAoB,gFA0J9B,CAAC;AAEJ;;;GAGG;AACH,eAAO,MAAM,eAAe;;;;;;;gCApKE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC;sBAClC,OAAO,CAAC,IAAI,CAAC;CAyLhC,CAAC"}

package/lib/infrastructure/storage/LocalizationStore.js

@@ -19,54 +19,151 @@ export const useLocalizationStore = create((set, get) => ({
      * - Fallback: English (en-US) if device locale not supported
      */
     initialize: async () => {
-        // ✅ CRITICAL FIX: Don't reset isInitialized if already initialized
-        // This prevents UI flash on re-initialization
-        const { isInitialized: alreadyInitialized } = get();
-        if (alreadyInitialized)
-            return;
-        // Get saved language preference
-        const savedLanguage = await StorageWrapper.getString(STORAGE_KEYS.LANGUAGE, DEFAULT_LANGUAGE);
-        // ✅ DEVICE LOCALE DETECTION: Use device locale on first launch
-        let languageCode;
-        if (savedLanguage && savedLanguage !== DEFAULT_LANGUAGE) {
-            // User has previously selected a language → Use their choice
-            languageCode = savedLanguage;
+        /* eslint-disable-next-line no-console */
+        if (__DEV__)
+            console.log('[LocalizationStore] Starting initialization...');
+        try {
+            // ✅ CRITICAL FIX: Don't reset isInitialized if already initialized
+            // This prevents UI flash on re-initialization
+            const { isInitialized: alreadyInitialized } = get();
+            if (alreadyInitialized) {
+                /* eslint-disable-next-line no-console */
+                if (__DEV__)
+                    console.log('[LocalizationStore] Already initialized, skipping...');
+                return;
+            }
+            /* eslint-disable-next-line no-console */
+            if (__DEV__)
+                console.log('[LocalizationStore] Getting saved language preference...');
+            // Get saved language preference
+            const savedLanguage = await StorageWrapper.getString(STORAGE_KEYS.LANGUAGE, DEFAULT_LANGUAGE);
+            /* eslint-disable-next-line no-console */
+            if (__DEV__)
+                console.log('[LocalizationStore] Saved language:', savedLanguage);
+            // ✅ DEVICE LOCALE DETECTION: Use device locale on first launch
+            let languageCode;
+            if (savedLanguage && savedLanguage !== DEFAULT_LANGUAGE) {
+                // User has previously selected a language → Use their choice
+                /* eslint-disable-next-line no-console */
+                if (__DEV__)
+                    console.log('[LocalizationStore] Using saved language preference:', savedLanguage);
+                languageCode = savedLanguage;
+            }
+            else {
+                // First launch → Detect device locale automatically
+                /* eslint-disable-next-line no-console */
+                if (__DEV__)
+                    console.log('[LocalizationStore] First launch, detecting device locale...');
+                languageCode = getDeviceLocale();
+                /* eslint-disable-next-line no-console */
+                if (__DEV__)
+                    console.log('[LocalizationStore] Detected device locale:', languageCode);
+                // Save detected locale for future launches
+                await StorageWrapper.setString(STORAGE_KEYS.LANGUAGE, languageCode);
+                /* eslint-disable-next-line no-console */
+                if (__DEV__)
+                    console.log('[LocalizationStore] Saved detected locale to storage');
+            }
+            // ✅ DEFENSIVE: Validate language exists, fallback to default
+            /* eslint-disable-next-line no-console */
+            if (__DEV__)
+                console.log('[LocalizationStore] Validating language code:', languageCode);
+            const language = getLanguageByCode(languageCode);
+            const finalLanguage = language ? languageCode : DEFAULT_LANGUAGE;
+            const finalLanguageObj = getLanguageByCode(finalLanguage);
+            if (!language) {
+                /* eslint-disable-next-line no-console */
+                console.warn('[LocalizationStore] ⚠️ Language not found:', languageCode, 'falling back to:', DEFAULT_LANGUAGE);
+            }
+            /* eslint-disable-next-line no-console */
+            if (__DEV__)
+                console.log('[LocalizationStore] Changing i18n language to:', finalLanguage);
+            await i18n.changeLanguage(finalLanguage);
+            /* eslint-disable-next-line no-console */
+            if (__DEV__)
+                console.log('[LocalizationStore] Setting store state...');
+            set({
+                currentLanguage: finalLanguage,
+                isRTL: finalLanguageObj?.rtl || false,
+                isInitialized: true, // ✅ Always set true to unblock UI
+            });
+            /* eslint-disable-next-line no-console */
+            if (__DEV__)
+                console.log('[LocalizationStore] ✅ Initialization complete. Language:', finalLanguage, 'RTL:', finalLanguageObj?.rtl || false);
         }
-        else {
-            // First launch → Detect device locale automatically
-            languageCode = getDeviceLocale();
-            // Save detected locale for future launches
-            await StorageWrapper.setString(STORAGE_KEYS.LANGUAGE, languageCode);
+        catch (error) {
+            /* eslint-disable-next-line no-console */
+            console.error('[LocalizationStore] ❌ FATAL: Initialization failed:', error);
+            /* eslint-disable-next-line no-console */
+            if (error instanceof Error) {
+                /* eslint-disable-next-line no-console */
+                console.error('[LocalizationStore] Error name:', error.name);
+                /* eslint-disable-next-line no-console */
+                console.error('[LocalizationStore] Error message:', error.message);
+                /* eslint-disable-next-line no-console */
+                console.error('[LocalizationStore] Error stack:', error.stack);
+            }
+            // Set to default language even on error to prevent app from breaking
+            try {
+                await i18n.changeLanguage(DEFAULT_LANGUAGE);
+                set({
+                    currentLanguage: DEFAULT_LANGUAGE,
+                    isRTL: false,
+                    isInitialized: true, // Set true even on error to unblock UI
+                });
+                /* eslint-disable-next-line no-console */
+                console.warn('[LocalizationStore] ⚠️ Fallback to default language due to error');
+            }
+            catch (fallbackError) {
+                /* eslint-disable-next-line no-console */
+                console.error('[LocalizationStore] ❌ CRITICAL: Even fallback failed:', fallbackError);
+                throw fallbackError;
+            }
         }
-        // ✅ DEFENSIVE: Validate language exists, fallback to default
-        const language = getLanguageByCode(languageCode);
-        const finalLanguage = language ? languageCode : DEFAULT_LANGUAGE;
-        const finalLanguageObj = getLanguageByCode(finalLanguage);
-        await i18n.changeLanguage(finalLanguage);
-        set({
-            currentLanguage: finalLanguage,
-            isRTL: finalLanguageObj?.rtl || false,
-            isInitialized: true, // ✅ Always set true to unblock UI
-        });
     },
     /**
      * Change language
      * Updates i18n, state, and persists to AsyncStorage
      */
     setLanguage: async (languageCode) => {
-        const language = getLanguageByCode(languageCode);
-        // ✅ DEFENSIVE: Early return if unsupported language
-        if (!language)
-            return;
-        // Update i18n
-        await i18n.changeLanguage(languageCode);
-        // Update state
-        set({
-            currentLanguage: languageCode,
-            isRTL: language.rtl || false,
-        });
-        // Persist language preference
-        await StorageWrapper.setString(STORAGE_KEYS.LANGUAGE, languageCode);
+        /* eslint-disable-next-line no-console */
+        if (__DEV__)
+            console.log('[LocalizationStore] Changing language to:', languageCode);
+        try {
+            const language = getLanguageByCode(languageCode);
+            // ✅ DEFENSIVE: Early return if unsupported language
+            if (!language) {
+                /* eslint-disable-next-line no-console */
+                console.warn('[LocalizationStore] ⚠️ Unsupported language code:', languageCode);
+                return;
+            }
+            /* eslint-disable-next-line no-console */
+            if (__DEV__)
+                console.log('[LocalizationStore] Updating i18n language...');
+            // Update i18n
+            await i18n.changeLanguage(languageCode);
+            /* eslint-disable-next-line no-console */
+            if (__DEV__)
+                console.log('[LocalizationStore] Updating store state...');
+            // Update state
+            set({
+                currentLanguage: languageCode,
+                isRTL: language.rtl || false,
+            });
+            /* eslint-disable-next-line no-console */
+            if (__DEV__)
+                console.log('[LocalizationStore] Persisting language preference...');
+            // Persist language preference
+            await StorageWrapper.setString(STORAGE_KEYS.LANGUAGE, languageCode);
+            /* eslint-disable-next-line no-console */
+            if (__DEV__)
+                console.log('[LocalizationStore] ✅ Language changed successfully to:', languageCode);
+        }
+        catch (error) {
+            /* eslint-disable-next-line no-console */
+            console.error('[LocalizationStore] ❌ Error changing language:', error);
+            throw error;
+        }
     },
 }));
 /**

package/lib/infrastructure/storage/LocalizationStore.js.map

@@ -1 +1 @@
-{"version":3,"file":"LocalizationStore.js","sourceRoot":"","sources":["../../../src/infrastructure/storage/LocalizationStore.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"LocalizationStore.js","sourceRoot":"","sources":["../../../src/infrastructure/storage/LocalizationStore.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-localization",
-  "version": "1.2.2",
+  "version": "1.3.1",
   "description": "Universal localization system for React Native apps with i18n support",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -46,7 +46,13 @@
   },
   "peerDependencies": {
     "react": ">=18.2.0",
-    "react-native": ">=0.74.0"
+    "react-native": ">=0.74.0",
+    "@react-navigation/native": "^6.0.0"
+  },
+  "peerDependenciesMeta": {
+    "@react-navigation/native": {
+      "optional": true
+    }
   },
   "devDependencies": {
     "typescript": "^5.3.3",

package/scripts/setup-languages.js

@@ -54,11 +54,40 @@ async function setupLanguages() {
 
   console.log("🚀 Setting up language directories and files...\n");
 
-  // Check if en-US directory exists
+  // Create en-US directory if it doesn't exist
   if (!fs.existsSync(enUSDir)) {
-    console.error("❌ en-US directory not found!");
-    console.error("   Expected path:", enUSDir);
-    process.exit(1);
+    fs.mkdirSync(enUSDir, { recursive: true });
+    console.log(`📁 Created en-US directory: ${enUSDir}`);
+  }
+
+  // Get default files from localization package
+  const packageRoot = path.dirname(require.resolve('@umituz/react-native-localization/package.json'));
+  const packageEnUSDir = path.join(packageRoot, 'src/infrastructure/locales/en-US');
+  const defaultFiles = [
+    'auth.json',
+    'branding.json',
+    'datetime.json',
+    'errors.json',
+    'general.json',
+    'navigation.json',
+    'onboarding.json',
+    'settings.json',
+  ];
+
+  // Copy default files from package if they don't exist in project
+  let copiedFiles = 0;
+  if (fs.existsSync(packageEnUSDir)) {
+    for (const file of defaultFiles) {
+      const packageFile = path.join(packageEnUSDir, file);
+      const projectFile = path.join(enUSDir, file);
+      
+      if (fs.existsSync(packageFile) && !fs.existsSync(projectFile)) {
+        const content = fs.readFileSync(packageFile, "utf8");
+        fs.writeFileSync(projectFile, content);
+        console.log(`📄 Copied default file: en-US/${file}`);
+        copiedFiles++;
+      }
+    }
   }
 
   // Automatically discover all JSON files in en-US directory
@@ -69,6 +98,7 @@ async function setupLanguages() {
 
   if (files.length === 0) {
     console.error("❌ No JSON files found in en-US directory!");
+    console.error("   Please add translation files to:", enUSDir);
     process.exit(1);
   }
 

package/scripts/utils/findLocalesDir.js

@@ -14,16 +14,16 @@ const path = require('path');
 function findLocalesDir() {
   const projectRoot = process.cwd();
   
-  // Common paths to search
+  // Common paths to search (prefer simple structure first)
   const possiblePaths = [
+    // Simple structure (preferred)
+    path.join(projectRoot, 'src/locales'),
+    path.join(projectRoot, 'locales'),
+    path.join(projectRoot, 'translations'),
     // DDD structure
     path.join(projectRoot, 'src/domains/localization/infrastructure/locales'),
     path.join(projectRoot, 'src/domains/i18n/infrastructure/locales'),
     path.join(projectRoot, 'src/infrastructure/localization/locales'),
-    // Simple structure
-    path.join(projectRoot, 'src/locales'),
-    path.join(projectRoot, 'locales'),
-    path.join(projectRoot, 'translations'),
     // Alternative DDD
     path.join(projectRoot, 'src/features/localization/locales'),
   ];
@@ -49,25 +49,22 @@ function getLocalesDir(createIfNotExists = false) {
   
   if (!localesDir) {
     if (createIfNotExists) {
-      // Try to create in most common location
+      // Try to create in most common location (prefer simple structure)
       const projectRoot = process.cwd();
-      localesDir = path.join(projectRoot, 'src/domains/localization/infrastructure/locales');
-      const enUSDir = path.join(localesDir, 'en-US');
-      
+      // Always prefer simple structure first
+      localesDir = path.join(projectRoot, 'src/locales');
       if (!fs.existsSync(localesDir)) {
         fs.mkdirSync(localesDir, { recursive: true });
-        fs.mkdirSync(enUSDir, { recursive: true });
         console.log(`✅ Created locales directory: ${localesDir}`);
       }
-      
       return localesDir;
     }
     
     console.error('❌ Locales directory not found!');
     console.error('\nPlease create a locales directory in one of these locations:');
-    console.error('  - src/domains/localization/infrastructure/locales');
     console.error('  - src/locales');
     console.error('  - locales');
+    console.error('  - src/domains/localization/infrastructure/locales');
     console.error('\nOr run: npm run i18n:setup');
     process.exit(1);
   }

package/src/index.ts

@@ -8,6 +8,8 @@ export { useLocalization, useLocalizationStore } from './infrastructure/storage/
 
 // Components
 export { LocalizationProvider } from './infrastructure/components/LocalizationProvider';
+export { LanguageSwitcher } from './infrastructure/components/LanguageSwitcher';
+export { useLanguageNavigation } from './infrastructure/components/useLanguageNavigation';
 
 // Configuration
 export { default as i18n } from './infrastructure/config/i18n';

package/src/infrastructure/components/LanguageSwitcher.tsx

@@ -0,0 +1,86 @@
+import React from 'react';
+import { TouchableOpacity, Text, View, StyleSheet } from 'react-native';
+// @ts-ignore - Optional peer dependency
+import { useNavigation } from '@react-navigation/native';
+import { useLocalization } from '../storage/LocalizationStore';
+import { getLanguageByCode, getDefaultLanguage } from '../config/languages';
+import { Language } from '../../domain/repositories/ILocalizationRepository';
+
+interface LanguageSwitcherProps {
+  showName?: boolean;
+  showFlag?: boolean;
+  color?: string;
+  navigationScreen?: string;
+  style?: any;
+  textStyle?: any;
+}
+
+const languageSwitcherConfig = {
+  defaultIconSize: 20,
+  defaultNavigationScreen: 'LanguageSelection',
+  hitSlop: { top: 10, bottom: 10, left: 10, right: 10 },
+};
+
+export const LanguageSwitcher: React.FC<LanguageSwitcherProps> = ({
+  showName = false,
+  showFlag = true,
+  color,
+  navigationScreen = languageSwitcherConfig.defaultNavigationScreen,
+  style,
+  textStyle,
+}) => {
+  const navigation = useNavigation();
+  const { currentLanguage } = useLocalization();
+  const currentLang = getLanguageByCode(currentLanguage) || getDefaultLanguage();
+
+  const navigateToLanguageSelection = () => {
+    if (navigation && navigationScreen) {
+      navigation.navigate(navigationScreen as never);
+    }
+  };
+
+  const iconColor = color || '#000000';
+
+  return (
+    <TouchableOpacity
+      style={[styles.container, style]}
+      onPress={navigateToLanguageSelection}
+      activeOpacity={0.7}
+      hitSlop={languageSwitcherConfig.hitSlop}
+    >
+      {showFlag && (
+        <Text style={[styles.flag, textStyle]}>{currentLang.flag}</Text>
+      )}
+      {showName && (
+        <Text style={[styles.languageName, { color: iconColor }, textStyle]}>
+          {currentLang.nativeName}
+        </Text>
+      )}
+      {!showName && !showFlag && (
+        <Text style={[styles.icon, { color: iconColor }]}>🌐</Text>
+      )}
+    </TouchableOpacity>
+  );
+};
+
+const styles = StyleSheet.create({
+  container: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    gap: 8,
+    paddingHorizontal: 4,
+  },
+  flag: {
+    fontSize: 20,
+  },
+  languageName: {
+    fontSize: 14,
+    fontWeight: '600',
+  },
+  icon: {
+    fontSize: 20,
+  },
+});
+
+export default LanguageSwitcher;
+

package/src/infrastructure/components/useLanguageNavigation.ts

@@ -0,0 +1,20 @@
+// @ts-ignore - Optional peer dependency
+import { useNavigation } from '@react-navigation/native';
+import { useLocalization } from '../storage/LocalizationStore';
+import { getLanguageByCode, getDefaultLanguage } from '../config/languages';
+import { Language } from '../../domain/repositories/ILocalizationRepository';
+
+export const useLanguageNavigation = (navigationScreen: string) => {
+  const navigation = useNavigation();
+  const { currentLanguage } = useLocalization();
+  const currentLang = getLanguageByCode(currentLanguage) || getDefaultLanguage();
+
+  const navigateToLanguageSelection = () => {
+    if (navigation && navigationScreen) {
+      navigation.navigate(navigationScreen as never);
+    }
+  };
+
+  return { currentLang, navigateToLanguageSelection };
+};
+

package/src/infrastructure/storage/LocalizationStore.ts

@@ -32,37 +32,100 @@ export const useLocalizationStore = create<LocalizationState>((set, get) => ({
    * - Fallback: English (en-US) if device locale not supported
    */
   initialize: async () => {
-    // ✅ CRITICAL FIX: Don't reset isInitialized if already initialized
-    // This prevents UI flash on re-initialization
-    const { isInitialized: alreadyInitialized } = get();
-    if (alreadyInitialized) return;
-
-    // Get saved language preference
-    const savedLanguage = await StorageWrapper.getString(STORAGE_KEYS.LANGUAGE, DEFAULT_LANGUAGE);
-
-    // ✅ DEVICE LOCALE DETECTION: Use device locale on first launch
-    let languageCode: string;
-    if (savedLanguage && savedLanguage !== DEFAULT_LANGUAGE) {
-      // User has previously selected a language → Use their choice
-      languageCode = savedLanguage;
-    } else {
-      // First launch → Detect device locale automatically
-      languageCode = getDeviceLocale();
-      // Save detected locale for future launches
-      await StorageWrapper.setString(STORAGE_KEYS.LANGUAGE, languageCode);
+    /* eslint-disable-next-line no-console */
+    if (__DEV__) console.log('[LocalizationStore] Starting initialization...');
+    
+    try {
+      // ✅ CRITICAL FIX: Don't reset isInitialized if already initialized
+      // This prevents UI flash on re-initialization
+      const { isInitialized: alreadyInitialized } = get();
+      if (alreadyInitialized) {
+        /* eslint-disable-next-line no-console */
+        if (__DEV__) console.log('[LocalizationStore] Already initialized, skipping...');
+        return;
+      }
+
+      /* eslint-disable-next-line no-console */
+      if (__DEV__) console.log('[LocalizationStore] Getting saved language preference...');
+      // Get saved language preference
+      const savedLanguage = await StorageWrapper.getString(STORAGE_KEYS.LANGUAGE, DEFAULT_LANGUAGE);
+      /* eslint-disable-next-line no-console */
+      if (__DEV__) console.log('[LocalizationStore] Saved language:', savedLanguage);
+
+      // ✅ DEVICE LOCALE DETECTION: Use device locale on first launch
+      let languageCode: string;
+      if (savedLanguage && savedLanguage !== DEFAULT_LANGUAGE) {
+        // User has previously selected a language → Use their choice
+        /* eslint-disable-next-line no-console */
+        if (__DEV__) console.log('[LocalizationStore] Using saved language preference:', savedLanguage);
+        languageCode = savedLanguage;
+      } else {
+        // First launch → Detect device locale automatically
+        /* eslint-disable-next-line no-console */
+        if (__DEV__) console.log('[LocalizationStore] First launch, detecting device locale...');
+        languageCode = getDeviceLocale();
+        /* eslint-disable-next-line no-console */
+        if (__DEV__) console.log('[LocalizationStore] Detected device locale:', languageCode);
+        // Save detected locale for future launches
+        await StorageWrapper.setString(STORAGE_KEYS.LANGUAGE, languageCode);
+        /* eslint-disable-next-line no-console */
+        if (__DEV__) console.log('[LocalizationStore] Saved detected locale to storage');
+      }
+
+      // ✅ DEFENSIVE: Validate language exists, fallback to default
+      /* eslint-disable-next-line no-console */
+      if (__DEV__) console.log('[LocalizationStore] Validating language code:', languageCode);
+      const language = getLanguageByCode(languageCode);
+      const finalLanguage = language ? languageCode : DEFAULT_LANGUAGE;
+      const finalLanguageObj = getLanguageByCode(finalLanguage);
+      
+      if (!language) {
+        /* eslint-disable-next-line no-console */
+        console.warn('[LocalizationStore] ⚠️ Language not found:', languageCode, 'falling back to:', DEFAULT_LANGUAGE);
+      }
+
+      /* eslint-disable-next-line no-console */
+      if (__DEV__) console.log('[LocalizationStore] Changing i18n language to:', finalLanguage);
+      await i18n.changeLanguage(finalLanguage);
+      
+      /* eslint-disable-next-line no-console */
+      if (__DEV__) console.log('[LocalizationStore] Setting store state...');
+      set({
+        currentLanguage: finalLanguage,
+        isRTL: finalLanguageObj?.rtl || false,
+        isInitialized: true, // ✅ Always set true to unblock UI
+      });
+      
+      /* eslint-disable-next-line no-console */
+      if (__DEV__) console.log('[LocalizationStore] ✅ Initialization complete. Language:', finalLanguage, 'RTL:', finalLanguageObj?.rtl || false);
+    } catch (error) {
+      /* eslint-disable-next-line no-console */
+      console.error('[LocalizationStore] ❌ FATAL: Initialization failed:', error);
+      /* eslint-disable-next-line no-console */
+      if (error instanceof Error) {
+        /* eslint-disable-next-line no-console */
+        console.error('[LocalizationStore] Error name:', error.name);
+        /* eslint-disable-next-line no-console */
+        console.error('[LocalizationStore] Error message:', error.message);
+        /* eslint-disable-next-line no-console */
+        console.error('[LocalizationStore] Error stack:', error.stack);
+      }
+      // Set to default language even on error to prevent app from breaking
+      try {
+        await i18n.changeLanguage(DEFAULT_LANGUAGE);
+        set({
+          currentLanguage: DEFAULT_LANGUAGE,
+          isRTL: false,
+          isInitialized: true, // Set true even on error to unblock UI
+        });
+        /* eslint-disable-next-line no-console */
+        console.warn('[LocalizationStore] ⚠️ Fallback to default language due to error');
+      } catch (fallbackError) {
+        /* eslint-disable-next-line no-console */
+        console.error('[LocalizationStore] ❌ CRITICAL: Even fallback failed:', fallbackError);
+        throw fallbackError;
+      }
     }
-
-    // ✅ DEFENSIVE: Validate language exists, fallback to default
-    const language = getLanguageByCode(languageCode);
-    const finalLanguage = language ? languageCode : DEFAULT_LANGUAGE;
-    const finalLanguageObj = getLanguageByCode(finalLanguage);
-
-    await i18n.changeLanguage(finalLanguage);
-    set({
-      currentLanguage: finalLanguage,
-      isRTL: finalLanguageObj?.rtl || false,
-      isInitialized: true, // ✅ Always set true to unblock UI
-    });
   },
 
   /**
@@ -70,22 +133,44 @@ export const useLocalizationStore = create<LocalizationState>((set, get) => ({
    * Updates i18n, state, and persists to AsyncStorage
    */
   setLanguage: async (languageCode: string) => {
-    const language = getLanguageByCode(languageCode);
-
-    // ✅ DEFENSIVE: Early return if unsupported language
-    if (!language) return;
-
-    // Update i18n
-    await i18n.changeLanguage(languageCode);
-
-    // Update state
-    set({
-      currentLanguage: languageCode,
-      isRTL: language.rtl || false,
-    });
-
-    // Persist language preference
-    await StorageWrapper.setString(STORAGE_KEYS.LANGUAGE, languageCode);
+    /* eslint-disable-next-line no-console */
+    if (__DEV__) console.log('[LocalizationStore] Changing language to:', languageCode);
+    
+    try {
+      const language = getLanguageByCode(languageCode);
+
+      // ✅ DEFENSIVE: Early return if unsupported language
+      if (!language) {
+        /* eslint-disable-next-line no-console */
+        console.warn('[LocalizationStore] ⚠️ Unsupported language code:', languageCode);
+        return;
+      }
+
+      /* eslint-disable-next-line no-console */
+      if (__DEV__) console.log('[LocalizationStore] Updating i18n language...');
+      // Update i18n
+      await i18n.changeLanguage(languageCode);
+
+      /* eslint-disable-next-line no-console */
+      if (__DEV__) console.log('[LocalizationStore] Updating store state...');
+      // Update state
+      set({
+        currentLanguage: languageCode,
+        isRTL: language.rtl || false,
+      });
+
+      /* eslint-disable-next-line no-console */
+      if (__DEV__) console.log('[LocalizationStore] Persisting language preference...');
+      // Persist language preference
+      await StorageWrapper.setString(STORAGE_KEYS.LANGUAGE, languageCode);
+      
+      /* eslint-disable-next-line no-console */
+      if (__DEV__) console.log('[LocalizationStore] ✅ Language changed successfully to:', languageCode);
+    } catch (error) {
+      /* eslint-disable-next-line no-console */
+      console.error('[LocalizationStore] ❌ Error changing language:', error);
+      throw error;
+    }
   },
 }));