@sheet-i18n/react-client 1.5.0-canary.2 → 1.5.0-canary.4

package/dist/index.js

@@ -227,23 +227,41 @@ var TranslationService = class {
     });
   }
   findTargetTranslation(id, $tParams) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f, _g;
+    console.log(
+      "1) \u2705 intlInstance in findTargetTranslation",
+      this == null ? void 0 : this.intlInstance
+    );
     const targetTranslation = (_b = (_a = this == null ? void 0 : this.intlInstance) == null ? void 0 : _a.messages) == null ? void 0 : _b[id];
     if (import_shared_utils3.validator.isNullish(targetTranslation)) {
       return id;
     }
+    console.log(
+      "2) \u2705 targetTranslation in findTargetTranslation",
+      targetTranslation
+    );
     if (typeof targetTranslation === "string" && targetTranslation.trim() === "") {
       return "";
     }
+    console.log("3) \u2705 $tParams in findTargetTranslation", $tParams);
     if (!$tParams || !($tParams == null ? void 0 : $tParams.descriptor)) {
       return "";
     }
-    return (_e = (_d = (_c = this.intlInstance) == null ? void 0 : _c.$t) == null ? void 0 : _d.call(
-      _c,
+    console.log(
+      "4) \u2705 $tParams.descriptor in findTargetTranslation",
+      (_d = (_c = this.intlInstance) == null ? void 0 : _c.$t) == null ? void 0 : _d.call(
+        _c,
+        $tParams.descriptor,
+        $tParams.values,
+        $tParams.opts
+      )
+    );
+    return (_g = (_f = (_e = this.intlInstance) == null ? void 0 : _e.$t) == null ? void 0 : _f.call(
+      _e,
       $tParams.descriptor,
       $tParams.values,
       $tParams.opts
-    )) != null ? _e : "";
+    )) != null ? _g : "";
   }
 };
 
@@ -439,7 +457,6 @@ var LocaleStorageManager = class {
     };
     this.setLocale = (locale) => {
       this.storageService.setItem(this.localeStorageKey, locale);
-      this.i18nStore.setCurrentLocale(locale);
       this.observerManager.notify(locale);
     };
     this.initializeCurrentLocale();
@@ -456,26 +473,25 @@ var getLocaleStorageManager = (i18nStore, storage) => {
 
 // src/hooks/useLocaleStorage.ts
 var import_react3 = require("react");
+var LISTENER_ID = "LOCALE_STORAGE_LISTENER_ID";
 function useLocaleStorage(localeStorageManager) {
   var _a;
   const [locale, setLocale] = (0, import_react3.useState)((_a = localeStorageManager == null ? void 0 : localeStorageManager.getLocale) == null ? void 0 : _a.call(localeStorageManager));
-  const listenerIdRef = (0, import_react3.useRef)(
-    `LOCALE_STORAGE_LISTENER_${Math.random().toString(36).substring(2, 11)}`
-  );
+  console.log("\u2705 locale in useLocaleStorage", locale);
   (0, import_react3.useEffect)(() => {
     var _a2;
-    const listenerId = listenerIdRef.current;
     (_a2 = localeStorageManager == null ? void 0 : localeStorageManager.observerManager) == null ? void 0 : _a2.addListener({
-      listenerId,
+      listenerId: LISTENER_ID,
       listener: (newLocale) => {
+        console.log("\u2705 did you update the locale?", newLocale);
         setLocale(newLocale);
       }
     });
     return () => {
       var _a3;
-      (_a3 = localeStorageManager == null ? void 0 : localeStorageManager.observerManager) == null ? void 0 : _a3.removeListener(listenerId);
+      (_a3 = localeStorageManager == null ? void 0 : localeStorageManager.observerManager) == null ? void 0 : _a3.removeListener(LISTENER_ID);
     };
-  }, [localeStorageManager]);
+  }, []);
   return { locale };
 }
 

package/dist/index.mjs

@@ -204,23 +204,41 @@ var TranslationService = class {
     });
   }
   findTargetTranslation(id, $tParams) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f, _g;
+    console.log(
+      "1) \u2705 intlInstance in findTargetTranslation",
+      this == null ? void 0 : this.intlInstance
+    );
     const targetTranslation = (_b = (_a = this == null ? void 0 : this.intlInstance) == null ? void 0 : _a.messages) == null ? void 0 : _b[id];
     if (validator3.isNullish(targetTranslation)) {
       return id;
     }
+    console.log(
+      "2) \u2705 targetTranslation in findTargetTranslation",
+      targetTranslation
+    );
     if (typeof targetTranslation === "string" && targetTranslation.trim() === "") {
       return "";
     }
+    console.log("3) \u2705 $tParams in findTargetTranslation", $tParams);
     if (!$tParams || !($tParams == null ? void 0 : $tParams.descriptor)) {
       return "";
     }
-    return (_e = (_d = (_c = this.intlInstance) == null ? void 0 : _c.$t) == null ? void 0 : _d.call(
-      _c,
+    console.log(
+      "4) \u2705 $tParams.descriptor in findTargetTranslation",
+      (_d = (_c = this.intlInstance) == null ? void 0 : _c.$t) == null ? void 0 : _d.call(
+        _c,
+        $tParams.descriptor,
+        $tParams.values,
+        $tParams.opts
+      )
+    );
+    return (_g = (_f = (_e = this.intlInstance) == null ? void 0 : _e.$t) == null ? void 0 : _f.call(
+      _e,
       $tParams.descriptor,
       $tParams.values,
       $tParams.opts
-    )) != null ? _e : "";
+    )) != null ? _g : "";
   }
 };
 
@@ -416,7 +434,6 @@ var LocaleStorageManager = class {
     };
     this.setLocale = (locale) => {
       this.storageService.setItem(this.localeStorageKey, locale);
-      this.i18nStore.setCurrentLocale(locale);
       this.observerManager.notify(locale);
     };
     this.initializeCurrentLocale();
@@ -432,27 +449,26 @@ var getLocaleStorageManager = (i18nStore, storage) => {
 };
 
 // src/hooks/useLocaleStorage.ts
-import { useEffect as useEffect2, useState as useState2, useRef } from "react";
+import { useEffect as useEffect2, useState as useState2 } from "react";
+var LISTENER_ID = "LOCALE_STORAGE_LISTENER_ID";
 function useLocaleStorage(localeStorageManager) {
   var _a;
   const [locale, setLocale] = useState2((_a = localeStorageManager == null ? void 0 : localeStorageManager.getLocale) == null ? void 0 : _a.call(localeStorageManager));
-  const listenerIdRef = useRef(
-    `LOCALE_STORAGE_LISTENER_${Math.random().toString(36).substring(2, 11)}`
-  );
+  console.log("\u2705 locale in useLocaleStorage", locale);
   useEffect2(() => {
     var _a2;
-    const listenerId = listenerIdRef.current;
     (_a2 = localeStorageManager == null ? void 0 : localeStorageManager.observerManager) == null ? void 0 : _a2.addListener({
-      listenerId,
+      listenerId: LISTENER_ID,
       listener: (newLocale) => {
+        console.log("\u2705 did you update the locale?", newLocale);
         setLocale(newLocale);
       }
     });
     return () => {
       var _a3;
-      (_a3 = localeStorageManager == null ? void 0 : localeStorageManager.observerManager) == null ? void 0 : _a3.removeListener(listenerId);
+      (_a3 = localeStorageManager == null ? void 0 : localeStorageManager.observerManager) == null ? void 0 : _a3.removeListener(LISTENER_ID);
     };
-  }, [localeStorageManager]);
+  }, []);
   return { locale };
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sheet-i18n/react-client",
-  "version": "1.5.0-canary.2",
+  "version": "1.5.0-canary.4",
   "description": "a client package for react modules used by sheet-i18n",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -25,8 +25,8 @@
   },
   "license": "ISC",
   "dependencies": {
-    "@sheet-i18n/errors": "1.8.0-canary.0",
     "@sheet-i18n/shared-utils": "1.8.0-canary.0",
+    "@sheet-i18n/errors": "1.8.0-canary.0",
     "@sheet-i18n/react-core": "1.5.0-canary.0"
   },
   "devDependencies": {