@umituz/react-native-localization 1.6.1 → 1.6.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-localization",
-  "version": "1.6.1",
+  "version": "1.6.3",
   "description": "Universal localization system for React Native apps with i18n support",
   "main": "./src/index.ts",
   "types": "./src/index.ts",

package/src/infrastructure/config/i18n.ts

@@ -266,16 +266,9 @@ const initializeI18n = () => {
   }
 };
 
-// Defer initialization until React is ready
-// React Native doesn't have window, so we check for global
-if (typeof global !== 'undefined') {
-  // Use setTimeout to defer initialization
-  setTimeout(() => {
-    initializeI18n();
-  }, 0);
-} else {
-  // Fallback: initialize immediately
-  initializeI18n();
-}
+// Initialize immediately - no need to defer
+// React Native and React are ready when this module loads
+// Deferring causes race conditions with useTranslation hook
+initializeI18n();
 
 export default i18n;

package/src/infrastructure/storage/LocalizationStore.ts

@@ -131,28 +131,25 @@ export const useLocalization = () => {
 
   const currentLanguageObject = getLanguageByCode(currentLanguage);
 
+  // Always call useTranslation hook (React hooks rules - must be unconditional)
+  // If i18n is not ready, useTranslation will throw, but we handle it gracefully
+  const translationResult = useTranslation();
+  
   // Check if i18n is initialized and react-i18next is ready
   // If not, use direct i18n.t as fallback
   const isI18nReady = i18n.isInitialized && typeof i18n.t === 'function';
   
-  // Always call useTranslation hook (React hooks rules)
-  // But use fallback if i18n is not ready
-  let translationResult;
-  try {
-    translationResult = useTranslation();
-  } catch (error) {
-    // If useTranslation fails, we'll use direct i18n.t
-    translationResult = null;
-  }
-
   // Use translation function from react-i18next if available, otherwise use direct i18n.t
-  const t: (key: string, options?: any) => string = translationResult?.t || ((key: string, options?: any) => {
-    if (isI18nReady) {
-      return i18n.t(key, options);
-    }
-    // Final fallback: return key if i18n is not ready
-    return key;
-  });
+  // This handles the case where react-i18next is not yet initialized
+  const t: (key: string, options?: any) => string = (translationResult?.t && typeof translationResult.t === 'function') 
+    ? translationResult.t 
+    : ((key: string, options?: any) => {
+        if (isI18nReady) {
+          return i18n.t(key, options);
+        }
+        // Final fallback: return key if i18n is not ready
+        return key;
+      });
 
   return {
     t, // Translation function from react-i18next or i18n fallback