@rdyl/react-i18n-connect 0.1.3 → 0.2.0

package/CHANGELOG.md

@@ -1,4 +1,4 @@
-## 0.1.2 (2025-09-25)
+## 0.1.3 (2025-09-25)
 
 
 

package/dist/index.js

@@ -52,20 +52,15 @@ var react_1 = __importStar(require("react"));
 var utils_1 = require("./utils");
 var I18nCtx = (0, react_1.createContext)({});
 var I18nConnect = function (_a) {
-    var children = _a.children, _b = _a.initial, initial = _b === void 0 ? "" : _b, _c = _a.locales, __locales__ = _c === void 0 ? {} : _c, onAfterChange = _a.onAfterChange, onBeforeChange = _a.onBeforeChange, onLoadLocales = _a.onLoadLocales, onLoadInitial = _a.onLoadInitial;
-    var _d = (0, react_1.useState)(!onLoadInitial), ready = _d[0], setReady = _d[1];
-    var _e = (0, react_1.useState)(initial), lang = _e[0], _setLang = _e[1];
-    var _f = (0, react_1.useState)({}), loaded = _f[0], setLoaded = _f[1];
-    var records = (0, react_1.useMemo)(function () {
-        // 异步加载
-        if (onLoadLocales) {
-            return loaded;
-        }
-        var current = __locales__[lang] || {};
-        var initLocales = __locales__[initial] || {};
-        return __assign(__assign({}, initLocales), current);
-    }, [lang, loaded, initial, onLoadLocales]);
-    var t = (0, react_1.useCallback)((0, utils_1.ParserI18nFn)(records), [records]);
+    var children = _a.children, initial = _a.initial, defaultLang = _a.defaultLang, onAfterChange = _a.onAfterChange, onBeforeChange = _a.onBeforeChange, getLocales = _a.getLocales;
+    var _b = (0, react_1.useState)(false), ready = _b[0], setReady = _b[1];
+    var _c = (0, react_1.useState)(defaultLang), lang = _c[0], _setLang = _c[1];
+    var _d = (0, react_1.useState)({}), defaultLocales = _d[0], setDefaultLocales = _d[1];
+    var _e = (0, react_1.useState)({}), loaded = _e[0], setLoaded = _e[1];
+    var locales = (0, react_1.useMemo)(function () {
+        return __assign(__assign({}, defaultLocales), loaded);
+    }, [defaultLocales, loaded]);
+    var t = (0, react_1.useCallback)((0, utils_1.ParserI18nFn)(locales), [locales]);
     var setLang = (0, react_1.useCallback)(function (e) {
         var cb = function () {
             _setLang(e);
@@ -83,23 +78,25 @@ var I18nConnect = function (_a) {
         }
     }, [onBeforeChange, onAfterChange, t]);
     (0, react_1.useEffect)(function () {
-        if (onLoadLocales) {
-            setLoaded({});
-            onLoadLocales(lang).then(setLoaded);
-        }
-    }, [lang, onLoadLocales]);
+        Promise.resolve(getLocales(defaultLang)).then(setDefaultLocales);
+    }, [defaultLang]);
     (0, react_1.useEffect)(function () {
-        if (onLoadInitial) {
-            onLoadInitial()
-                .then(setLang)
+        if (initial) {
+            initial()
+                .then(function (l) {
+                setLang(l);
+                Promise.resolve(getLocales(l)).then(setLoaded);
+            })
                 .finally(function () {
                 setReady(true);
             });
         }
-    }, []);
+        else {
+            setReady(true);
+        }
+    }, [initial]);
     return (react_1.default.createElement(I18nCtx.Provider, { value: {
-            __locales__: __locales__,
-            records: records,
+            locales: locales,
             lang: lang,
             t: t,
             setLang: setLang,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rdyl/react-i18n-connect",
-  "version": "0.1.3",
+  "version": "0.2.0",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "types/index.d.ts",

package/types/index.d.ts

@@ -2,8 +2,9 @@ import { FC, PropsWithChildren } from "react";
 import { GenI18nTokenFn, I18nConfig, I18nConnectValue, I18nTokenValue } from "./utils";
 declare const I18nConnect: FC<PropsWithChildren<I18nConnectProps>>;
 export type I18nConnectProps = Partial<I18nConfig> & {
-    onLoadInitial?(): Promise<string>;
-    onLoadLocales?(lang: string): Promise<Record<string, I18nTokenValue>>;
+    defaultLang: string;
+    initial?(): Promise<string>;
+    getLocales(lang: string): Record<string, I18nTokenValue> | Promise<Record<string, I18nTokenValue>>;
     onAfterChange?(lang: string, t: GenI18nTokenFn): void;
     onBeforeChange?(lang: string): boolean | Promise<boolean>;
 };

package/types/utils.d.ts

@@ -6,9 +6,8 @@ export interface I18nConfig {
 }
 export type GenI18nTokenFn = (k: string, o?: Record<string, unknown>) => string;
 export interface I18nConnectValue {
-    __locales__: Record<string, Record<string, I18nTokenValue>>;
     lang: string;
-    records: Record<string, I18nTokenValue>;
+    locales: Record<string, I18nTokenValue>;
     setLang(name: string): void;
     t: GenI18nTokenFn;
 }