@sheet-i18n/react 1.7.7 → 1.7.9

package/README.md

@@ -71,6 +71,7 @@ export const i18nStore = new I18nStore({
   //   jp: () => import('./jp.json'),
   //   cn: () => import('./cn.json'),
   // },
+  // preload: ['ko', 'en'],
 });
 ```
 
@@ -139,6 +140,7 @@ Import it from `@sheet-i18n/core`, then pass the created store to `createI18nCon
 | `defaultLocale`    | string                             | ✅       | Default locale to use when no match is found. Must be included in `supportedLocales`.                                 |
 | localeSet          | Record<string, object>             |          | _(Static Loading Option)_ Preload all translation data for each locale in memory. Keys must match `supportedLocales`. |
 | dynamicLoaders     | Record<string, () => Promise<any>> |          | _(Recommended for large locale sets)_ Dynamically load translation data on demand, reducing initial bundle size.      |
+| preload            | string[]                           |          | Locales to preload eagerly. This option is available only when `dynamicLoaders` is defined.                           |
 | typeSafe           | boolean                            |          | Enable strict key checking and autocompletion (default: `false`).                                                     |
 |                    |
 
@@ -190,10 +192,12 @@ export const i18nStore = new I18nStore({
     fr: () => import('./fr.json'),
     ko: () => import('./ko.json'),
   },
+  preload: ['en'],
 });
 ```
 
 💡 When both `localeSet` and `dynamicLoaders` are defined, sheet-i18n **automatically merges** both sources — static data loads immediately, while dynamic data supplements on-demand.
+`preload` can be used only together with `dynamicLoaders`, and its values must be locale keys that exist in `dynamicLoaders`.
 
 ---
 
@@ -225,6 +229,7 @@ export const i18nStore = new I18nStore({
   //   jp: () => import('./jp.json'),
   //   cn: () => import('./cn.json'),
   // },
+  // preload: ['ko'],
 });
 ```
 

package/dist/index.d.mts

@@ -1,9 +1,9 @@
 import * as _sheet_i18n_shared_service from '@sheet-i18n/shared-service';
 import { LocaleStorageManager, IStorageService } from '@sheet-i18n/shared-service';
 export { LocaleStorageManager, IStorageService as Storage, ruleFactory } from '@sheet-i18n/shared-service';
+import { SupportedLocales, LocaleSet, DynamicLoaderMap, TypeSafe, SafeSheetTitle, SafeMessageId } from '@sheet-i18n/typescript';
 import { I18nStore } from '@sheet-i18n/core';
 import { MessageDescriptor, IntlShape } from 'react-intl';
-import { SupportedLocales, LocaleSet, TypeSafe, SafeSheetTitle, SafeMessageId } from '@sheet-i18n/typescript';
 import * as react_jsx_runtime from 'react/jsx-runtime';
 
 type UseIntlParams<D = MessageDescriptor> = Parameters<IntlShape['$t']> extends [D, ...infer R] ? [...R, Omit<D, 'id'>] : never;
@@ -15,13 +15,13 @@ type RuleKey = string;
  * Used internally by RuleService / ruleFactory so that createRule infers the
  * correct value and message-id types from the store's locale data.
  */
-type RuleFn<TSupportedLocales extends SupportedLocales, TLocaleSet extends LocaleSet, TI18nStore extends I18nStore<TSupportedLocales, TLocaleSet, TTypeSafe>, TTypeSafe extends TypeSafe, TSheetTitle extends SafeSheetTitle<TSupportedLocales, TLocaleSet, TTypeSafe>, TMessageId extends SafeMessageId<TSupportedLocales, TLocaleSet, TSheetTitle, TTypeSafe>, TValues = any> = (values: TValues, currentLocaleSet: ReturnType<TI18nStore['getCurrentLocaleSet']>) => TMessageId;
+type RuleFn<TSupportedLocales extends SupportedLocales, TLocaleSet extends LocaleSet, TDynamicLoaders extends DynamicLoaderMap<TSupportedLocales>, TI18nStore extends I18nStore<TSupportedLocales, TLocaleSet, TDynamicLoaders, TTypeSafe>, TTypeSafe extends TypeSafe, TSheetTitle extends SafeSheetTitle<TSupportedLocales, TLocaleSet, TTypeSafe>, TMessageId extends SafeMessageId<TSupportedLocales, TLocaleSet, TSheetTitle, TTypeSafe>, TValues = any> = (values: TValues, currentLocaleSet: ReturnType<TI18nStore['getCurrentLocaleSet']>) => TMessageId;
 /**
  * Extended rules map with full generic chain.
  * Consumers can annotate their rules objects with the simpler `Rules` from
  * @sheet-i18n/typescript; this extended version is used for inference only.
  */
-type Rules<TSupportedLocales extends SupportedLocales = SupportedLocales, TLocaleSet extends LocaleSet = LocaleSet, TTypeSafe extends TypeSafe = TypeSafe, TI18nStore extends I18nStore<TSupportedLocales, TLocaleSet, TTypeSafe> = I18nStore<TSupportedLocales, TLocaleSet, TTypeSafe>, TSheetTitle extends SafeSheetTitle<TSupportedLocales, TLocaleSet, TTypeSafe> = SafeSheetTitle<TSupportedLocales, TLocaleSet, TTypeSafe>, TMessageId extends SafeMessageId<TSupportedLocales, TLocaleSet, TSheetTitle, TTypeSafe> = SafeMessageId<TSupportedLocales, TLocaleSet, TSheetTitle, TTypeSafe>> = Record<RuleKey, RuleFn<TSupportedLocales, TLocaleSet, TI18nStore, TTypeSafe, TSheetTitle, TMessageId>>;
+type Rules<TSupportedLocales extends SupportedLocales = SupportedLocales, TLocaleSet extends LocaleSet = LocaleSet, TDynamicLoaders extends DynamicLoaderMap<TSupportedLocales> = DynamicLoaderMap<TSupportedLocales>, TTypeSafe extends TypeSafe = TypeSafe, TI18nStore extends I18nStore<TSupportedLocales, TLocaleSet, TDynamicLoaders, TTypeSafe> = I18nStore<TSupportedLocales, TLocaleSet, TDynamicLoaders, TTypeSafe>, TSheetTitle extends SafeSheetTitle<TSupportedLocales, TLocaleSet, TTypeSafe> = SafeSheetTitle<TSupportedLocales, TLocaleSet, TTypeSafe>, TMessageId extends SafeMessageId<TSupportedLocales, TLocaleSet, TSheetTitle, TTypeSafe> = SafeMessageId<TSupportedLocales, TLocaleSet, TSheetTitle, TTypeSafe>> = Record<RuleKey, RuleFn<TSupportedLocales, TLocaleSet, TDynamicLoaders, TI18nStore, TTypeSafe, TSheetTitle, TMessageId>>;
 /**
  * Plugin container for createI18nContext.
  * Constrains TRules against React's own extended Rules (not the simplified
@@ -50,32 +50,33 @@ type UseTranslationReturn<TSupportedLocales extends readonly string[], TLocaleSe
     };
 };
 
-type IntlProviderProps<TSupportedLocales extends readonly string[], TLocaleSet extends Partial<Record<TSupportedLocales[number], Record<string, any>>>, TTypeSafe extends boolean = false> = {
-    i18nStore: I18nStore<TSupportedLocales, TLocaleSet, TTypeSafe>;
+type IntlProviderProps<TSupportedLocales extends readonly string[], TLocaleSet extends Partial<Record<TSupportedLocales[number], Record<string, any>>>, TDynamicLoaders extends DynamicLoaderMap<TSupportedLocales> = DynamicLoaderMap<TSupportedLocales>, TTypeSafe extends boolean = false> = {
+    i18nStore: I18nStore<TSupportedLocales, TLocaleSet, TDynamicLoaders, TTypeSafe>;
     currentLocale?: TSupportedLocales[number];
+    fallbackUI?: React.ReactNode;
     children: React.ReactNode | ((currentLocale?: TSupportedLocales[number]) => React.ReactNode);
 };
 
-declare function useLocaleStorage<TSupportedLocales extends readonly string[], TLocaleSet extends Partial<Record<TSupportedLocales[number], Record<string, any>>>, TTypeSafe extends boolean = false>(localeStorageManager: LocaleStorageManager<TSupportedLocales, TLocaleSet, TTypeSafe>): {
+declare function useLocaleStorage<TSupportedLocales extends readonly string[], TLocaleSet extends Partial<Record<TSupportedLocales[number], Record<string, any>>>, TDynamicLoaders extends DynamicLoaderMap<TSupportedLocales> = DynamicLoaderMap<TSupportedLocales>, TTypeSafe extends boolean = false>(localeStorageManager: LocaleStorageManager<TSupportedLocales, TLocaleSet, TDynamicLoaders, TTypeSafe>): {
     locale: TSupportedLocales[number] | undefined;
 };
 
-interface StorageBasedIntlProviderProps<TSupportedLocales extends readonly string[], TLocaleSet extends Partial<Record<TSupportedLocales[number], Record<string, any>>>, TTypeSafe extends boolean = false> {
-    i18nStore: I18nStore<TSupportedLocales, TLocaleSet, TTypeSafe>;
-    storageManager: LocaleStorageManager<TSupportedLocales, TLocaleSet, TTypeSafe>;
+interface StorageBasedIntlProviderProps<TSupportedLocales extends readonly string[], TLocaleSet extends Partial<Record<TSupportedLocales[number], Record<string, any>>>, TDynamicLoaders extends DynamicLoaderMap<TSupportedLocales> = DynamicLoaderMap<TSupportedLocales>, TTypeSafe extends boolean = false> {
+    i18nStore: I18nStore<TSupportedLocales, TLocaleSet, TDynamicLoaders, TTypeSafe>;
+    storageManager: LocaleStorageManager<TSupportedLocales, TLocaleSet, TDynamicLoaders, TTypeSafe>;
     fallbackUI?: React.ReactNode;
     children: React.ReactNode | ((currentLocale?: TSupportedLocales[number]) => React.ReactNode);
 }
 
-declare function createI18nContext<TSupportedLocales extends readonly string[], TLocaleSet extends Partial<Record<TSupportedLocales[number], Record<string, any>>>, TRules extends Rules, TTypeSafe extends boolean = false>(i18nStore: I18nStore<TSupportedLocales, TLocaleSet, TTypeSafe>, plugins?: Plugins<TRules>): {
+declare function createI18nContext<TSupportedLocales extends readonly string[], TLocaleSet extends Partial<Record<TSupportedLocales[number], Record<string, any>>>, TDynamicLoaders extends DynamicLoaderMap<TSupportedLocales>, TRules extends Rules, TTypeSafe extends boolean = false>(i18nStore: I18nStore<TSupportedLocales, TLocaleSet, TDynamicLoaders, TTypeSafe>, plugins?: Plugins<TRules>): {
     IntlProvider: ({ currentLocale, children, }: Omit<IntlProviderProps<TSupportedLocales, TLocaleSet>, "currentLocale" | "i18nStore"> & {
         currentLocale?: string;
         children?: React.ReactNode;
     }) => react_jsx_runtime.JSX.Element;
-    StorageBasedIntlProvider: ({ storageManager, children, }: Omit<StorageBasedIntlProviderProps<TSupportedLocales, TLocaleSet, TTypeSafe>, "i18nStore">) => react_jsx_runtime.JSX.Element;
+    StorageBasedIntlProvider: ({ storageManager, children, }: Omit<StorageBasedIntlProviderProps<TSupportedLocales, TLocaleSet, TDynamicLoaders, TTypeSafe>, "i18nStore">) => react_jsx_runtime.JSX.Element;
     useTranslation: <TSheetTitle extends SafeSheetTitle<TSupportedLocales, TLocaleSet, TTypeSafe>>(sheetTitle: TSheetTitle) => UseTranslationReturn<TSupportedLocales, TLocaleSet, TTypeSafe, TSheetTitle, TRules>;
     getTranslation: <TSheetTitle extends SafeSheetTitle<TSupportedLocales, TLocaleSet, TTypeSafe>>(sheetTitle: TSheetTitle) => GetTranslationReturn<TSupportedLocales, TLocaleSet, TTypeSafe, TSheetTitle>;
-    getLocaleStorageManager: (storageService?: IStorageService<string>) => _sheet_i18n_shared_service.LocaleStorageManager<TSupportedLocales, TLocaleSet, TTypeSafe>;
+    getLocaleStorageManager: (storageService?: IStorageService<string>) => _sheet_i18n_shared_service.LocaleStorageManager<TSupportedLocales, TLocaleSet, TDynamicLoaders, TTypeSafe>;
     useLocaleStorage: typeof useLocaleStorage;
 };
 

package/dist/index.d.ts

@@ -1,9 +1,9 @@
 import * as _sheet_i18n_shared_service from '@sheet-i18n/shared-service';
 import { LocaleStorageManager, IStorageService } from '@sheet-i18n/shared-service';
 export { LocaleStorageManager, IStorageService as Storage, ruleFactory } from '@sheet-i18n/shared-service';
+import { SupportedLocales, LocaleSet, DynamicLoaderMap, TypeSafe, SafeSheetTitle, SafeMessageId } from '@sheet-i18n/typescript';
 import { I18nStore } from '@sheet-i18n/core';
 import { MessageDescriptor, IntlShape } from 'react-intl';
-import { SupportedLocales, LocaleSet, TypeSafe, SafeSheetTitle, SafeMessageId } from '@sheet-i18n/typescript';
 import * as react_jsx_runtime from 'react/jsx-runtime';
 
 type UseIntlParams<D = MessageDescriptor> = Parameters<IntlShape['$t']> extends [D, ...infer R] ? [...R, Omit<D, 'id'>] : never;
@@ -15,13 +15,13 @@ type RuleKey = string;
  * Used internally by RuleService / ruleFactory so that createRule infers the
  * correct value and message-id types from the store's locale data.
  */
-type RuleFn<TSupportedLocales extends SupportedLocales, TLocaleSet extends LocaleSet, TI18nStore extends I18nStore<TSupportedLocales, TLocaleSet, TTypeSafe>, TTypeSafe extends TypeSafe, TSheetTitle extends SafeSheetTitle<TSupportedLocales, TLocaleSet, TTypeSafe>, TMessageId extends SafeMessageId<TSupportedLocales, TLocaleSet, TSheetTitle, TTypeSafe>, TValues = any> = (values: TValues, currentLocaleSet: ReturnType<TI18nStore['getCurrentLocaleSet']>) => TMessageId;
+type RuleFn<TSupportedLocales extends SupportedLocales, TLocaleSet extends LocaleSet, TDynamicLoaders extends DynamicLoaderMap<TSupportedLocales>, TI18nStore extends I18nStore<TSupportedLocales, TLocaleSet, TDynamicLoaders, TTypeSafe>, TTypeSafe extends TypeSafe, TSheetTitle extends SafeSheetTitle<TSupportedLocales, TLocaleSet, TTypeSafe>, TMessageId extends SafeMessageId<TSupportedLocales, TLocaleSet, TSheetTitle, TTypeSafe>, TValues = any> = (values: TValues, currentLocaleSet: ReturnType<TI18nStore['getCurrentLocaleSet']>) => TMessageId;
 /**
  * Extended rules map with full generic chain.
  * Consumers can annotate their rules objects with the simpler `Rules` from
  * @sheet-i18n/typescript; this extended version is used for inference only.
  */
-type Rules<TSupportedLocales extends SupportedLocales = SupportedLocales, TLocaleSet extends LocaleSet = LocaleSet, TTypeSafe extends TypeSafe = TypeSafe, TI18nStore extends I18nStore<TSupportedLocales, TLocaleSet, TTypeSafe> = I18nStore<TSupportedLocales, TLocaleSet, TTypeSafe>, TSheetTitle extends SafeSheetTitle<TSupportedLocales, TLocaleSet, TTypeSafe> = SafeSheetTitle<TSupportedLocales, TLocaleSet, TTypeSafe>, TMessageId extends SafeMessageId<TSupportedLocales, TLocaleSet, TSheetTitle, TTypeSafe> = SafeMessageId<TSupportedLocales, TLocaleSet, TSheetTitle, TTypeSafe>> = Record<RuleKey, RuleFn<TSupportedLocales, TLocaleSet, TI18nStore, TTypeSafe, TSheetTitle, TMessageId>>;
+type Rules<TSupportedLocales extends SupportedLocales = SupportedLocales, TLocaleSet extends LocaleSet = LocaleSet, TDynamicLoaders extends DynamicLoaderMap<TSupportedLocales> = DynamicLoaderMap<TSupportedLocales>, TTypeSafe extends TypeSafe = TypeSafe, TI18nStore extends I18nStore<TSupportedLocales, TLocaleSet, TDynamicLoaders, TTypeSafe> = I18nStore<TSupportedLocales, TLocaleSet, TDynamicLoaders, TTypeSafe>, TSheetTitle extends SafeSheetTitle<TSupportedLocales, TLocaleSet, TTypeSafe> = SafeSheetTitle<TSupportedLocales, TLocaleSet, TTypeSafe>, TMessageId extends SafeMessageId<TSupportedLocales, TLocaleSet, TSheetTitle, TTypeSafe> = SafeMessageId<TSupportedLocales, TLocaleSet, TSheetTitle, TTypeSafe>> = Record<RuleKey, RuleFn<TSupportedLocales, TLocaleSet, TDynamicLoaders, TI18nStore, TTypeSafe, TSheetTitle, TMessageId>>;
 /**
  * Plugin container for createI18nContext.
  * Constrains TRules against React's own extended Rules (not the simplified
@@ -50,32 +50,33 @@ type UseTranslationReturn<TSupportedLocales extends readonly string[], TLocaleSe
     };
 };
 
-type IntlProviderProps<TSupportedLocales extends readonly string[], TLocaleSet extends Partial<Record<TSupportedLocales[number], Record<string, any>>>, TTypeSafe extends boolean = false> = {
-    i18nStore: I18nStore<TSupportedLocales, TLocaleSet, TTypeSafe>;
+type IntlProviderProps<TSupportedLocales extends readonly string[], TLocaleSet extends Partial<Record<TSupportedLocales[number], Record<string, any>>>, TDynamicLoaders extends DynamicLoaderMap<TSupportedLocales> = DynamicLoaderMap<TSupportedLocales>, TTypeSafe extends boolean = false> = {
+    i18nStore: I18nStore<TSupportedLocales, TLocaleSet, TDynamicLoaders, TTypeSafe>;
     currentLocale?: TSupportedLocales[number];
+    fallbackUI?: React.ReactNode;
     children: React.ReactNode | ((currentLocale?: TSupportedLocales[number]) => React.ReactNode);
 };
 
-declare function useLocaleStorage<TSupportedLocales extends readonly string[], TLocaleSet extends Partial<Record<TSupportedLocales[number], Record<string, any>>>, TTypeSafe extends boolean = false>(localeStorageManager: LocaleStorageManager<TSupportedLocales, TLocaleSet, TTypeSafe>): {
+declare function useLocaleStorage<TSupportedLocales extends readonly string[], TLocaleSet extends Partial<Record<TSupportedLocales[number], Record<string, any>>>, TDynamicLoaders extends DynamicLoaderMap<TSupportedLocales> = DynamicLoaderMap<TSupportedLocales>, TTypeSafe extends boolean = false>(localeStorageManager: LocaleStorageManager<TSupportedLocales, TLocaleSet, TDynamicLoaders, TTypeSafe>): {
     locale: TSupportedLocales[number] | undefined;
 };
 
-interface StorageBasedIntlProviderProps<TSupportedLocales extends readonly string[], TLocaleSet extends Partial<Record<TSupportedLocales[number], Record<string, any>>>, TTypeSafe extends boolean = false> {
-    i18nStore: I18nStore<TSupportedLocales, TLocaleSet, TTypeSafe>;
-    storageManager: LocaleStorageManager<TSupportedLocales, TLocaleSet, TTypeSafe>;
+interface StorageBasedIntlProviderProps<TSupportedLocales extends readonly string[], TLocaleSet extends Partial<Record<TSupportedLocales[number], Record<string, any>>>, TDynamicLoaders extends DynamicLoaderMap<TSupportedLocales> = DynamicLoaderMap<TSupportedLocales>, TTypeSafe extends boolean = false> {
+    i18nStore: I18nStore<TSupportedLocales, TLocaleSet, TDynamicLoaders, TTypeSafe>;
+    storageManager: LocaleStorageManager<TSupportedLocales, TLocaleSet, TDynamicLoaders, TTypeSafe>;
     fallbackUI?: React.ReactNode;
     children: React.ReactNode | ((currentLocale?: TSupportedLocales[number]) => React.ReactNode);
 }
 
-declare function createI18nContext<TSupportedLocales extends readonly string[], TLocaleSet extends Partial<Record<TSupportedLocales[number], Record<string, any>>>, TRules extends Rules, TTypeSafe extends boolean = false>(i18nStore: I18nStore<TSupportedLocales, TLocaleSet, TTypeSafe>, plugins?: Plugins<TRules>): {
+declare function createI18nContext<TSupportedLocales extends readonly string[], TLocaleSet extends Partial<Record<TSupportedLocales[number], Record<string, any>>>, TDynamicLoaders extends DynamicLoaderMap<TSupportedLocales>, TRules extends Rules, TTypeSafe extends boolean = false>(i18nStore: I18nStore<TSupportedLocales, TLocaleSet, TDynamicLoaders, TTypeSafe>, plugins?: Plugins<TRules>): {
     IntlProvider: ({ currentLocale, children, }: Omit<IntlProviderProps<TSupportedLocales, TLocaleSet>, "currentLocale" | "i18nStore"> & {
         currentLocale?: string;
         children?: React.ReactNode;
     }) => react_jsx_runtime.JSX.Element;
-    StorageBasedIntlProvider: ({ storageManager, children, }: Omit<StorageBasedIntlProviderProps<TSupportedLocales, TLocaleSet, TTypeSafe>, "i18nStore">) => react_jsx_runtime.JSX.Element;
+    StorageBasedIntlProvider: ({ storageManager, children, }: Omit<StorageBasedIntlProviderProps<TSupportedLocales, TLocaleSet, TDynamicLoaders, TTypeSafe>, "i18nStore">) => react_jsx_runtime.JSX.Element;
     useTranslation: <TSheetTitle extends SafeSheetTitle<TSupportedLocales, TLocaleSet, TTypeSafe>>(sheetTitle: TSheetTitle) => UseTranslationReturn<TSupportedLocales, TLocaleSet, TTypeSafe, TSheetTitle, TRules>;
     getTranslation: <TSheetTitle extends SafeSheetTitle<TSupportedLocales, TLocaleSet, TTypeSafe>>(sheetTitle: TSheetTitle) => GetTranslationReturn<TSupportedLocales, TLocaleSet, TTypeSafe, TSheetTitle>;
-    getLocaleStorageManager: (storageService?: IStorageService<string>) => _sheet_i18n_shared_service.LocaleStorageManager<TSupportedLocales, TLocaleSet, TTypeSafe>;
+    getLocaleStorageManager: (storageService?: IStorageService<string>) => _sheet_i18n_shared_service.LocaleStorageManager<TSupportedLocales, TLocaleSet, TDynamicLoaders, TTypeSafe>;
     useLocaleStorage: typeof useLocaleStorage;
 };
 

package/dist/index.js

@@ -44,7 +44,7 @@ __export(src_exports, {
 module.exports = __toCommonJS(src_exports);
 
 // src/createI18nContext.tsx
-var import_shared_utils5 = require("@sheet-i18n/shared-utils");
+var import_shared_utils4 = require("@sheet-i18n/shared-utils");
 var import_core = require("@sheet-i18n/core");
 var import_shared_service2 = require("@sheet-i18n/shared-service");
 
@@ -151,6 +151,25 @@ ${err}`);
       setIsLoading(false);
     });
   }, [currentLocale]);
+  (0, import_react.useEffect)(() => {
+    const currentLocaleSet = i18nStore == null ? void 0 : i18nStore.localeSet;
+    const dynamicLoaders = i18nStore == null ? void 0 : i18nStore.dynamicLoaders;
+    const preload = i18nStore == null ? void 0 : i18nStore.preload;
+    if (!dynamicLoaders || !preload) return;
+    preload.forEach((locale) => {
+      if (locale === currentLocale) return;
+      const isDataLoaded = Boolean(currentLocaleSet == null ? void 0 : currentLocaleSet[locale]);
+      if (isDataLoaded) return;
+      const dynamicLoader = dynamicLoaders[locale];
+      if (!dynamicLoader) return;
+      dynamicLoader().then((res) => {
+        const { default: localeData } = res;
+        i18nStore == null ? void 0 : i18nStore.mergeLocaleSet(locale, localeData);
+        intlInstanceCache.resetTotalCache();
+      }).catch(() => {
+      });
+    });
+  }, []);
   return {
     isLoading
   };
@@ -161,8 +180,10 @@ var import_jsx_runtime = require("react/jsx-runtime");
 function IntlProvider({
   i18nStore,
   currentLocale,
+  fallbackUI = null,
   children: childrenFromProps
 }) {
+  var _a;
   const { locale } = useIntlLocale({ i18nStore, currentLocale });
   const onIntlError = (err) => {
     const typeSafe = i18nStore.typeSafe;
@@ -171,14 +192,16 @@ function IntlProvider({
     }
   };
   const { isLoading } = useDynamicLocale({ i18nStore });
-  const children = typeof childrenFromProps === "function" ? childrenFromProps(locale) : childrenFromProps;
+  const children = typeof childrenFromProps === "function" ? childrenFromProps(
+    (_a = locale != null ? locale : i18nStore.currentLocale) != null ? _a : i18nStore.defaultLocale
+  ) : childrenFromProps;
   return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
     import_react_intl2.IntlProvider,
     {
       locale,
       messages: i18nStore == null ? void 0 : i18nStore.localeSet[locale],
       onError: onIntlError,
-      children: !isLoading && children
+      children: !isLoading ? children : fallbackUI != null ? fallbackUI : children
     },
     `sheet-i18n-locale-${locale}`
   );
@@ -360,7 +383,6 @@ function useLocaleStorage(localeStorageManager) {
 }
 
 // src/Provider/StorageBasedIntlProvider.tsx
-var import_shared_utils4 = require("@sheet-i18n/shared-utils");
 var import_jsx_runtime2 = require("react/jsx-runtime");
 function StorageBasedIntlProvider({
   i18nStore,
@@ -368,18 +390,26 @@ function StorageBasedIntlProvider({
   fallbackUI = null,
   children: childrenFromProps
 }) {
+  var _a;
   const { locale } = useLocaleStorage(storageManager);
-  if (import_shared_utils4.validator.isNullish(locale)) {
-    return fallbackUI;
-  }
-  const children = typeof childrenFromProps === "function" ? childrenFromProps(locale) : childrenFromProps;
-  return /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(IntlProvider, { currentLocale: locale, i18nStore, children });
+  const children = typeof childrenFromProps === "function" ? childrenFromProps(
+    (_a = locale != null ? locale : i18nStore.currentLocale) != null ? _a : i18nStore.defaultLocale
+  ) : childrenFromProps;
+  return /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(
+    IntlProvider,
+    {
+      currentLocale: locale,
+      fallbackUI,
+      i18nStore,
+      children
+    }
+  );
 }
 
 // src/createI18nContext.tsx
 var import_jsx_runtime3 = require("react/jsx-runtime");
 function createI18nContext(i18nStore, plugins) {
-  if (import_shared_utils5.validator.isNullish(i18nStore)) {
+  if (import_shared_utils4.validator.isNullish(i18nStore)) {
     throw new import_shared_service2.InvalidI18nContextStateError(
       "\u26A0\uFE0F no i18nStore provided. To use createI18nContext, you must provide an i18nStore as a parameter"
     );

package/dist/index.mjs

@@ -19,7 +19,7 @@ var __spreadValues = (a, b) => {
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 
 // src/createI18nContext.tsx
-import { validator as validator5 } from "@sheet-i18n/shared-utils";
+import { validator as validator4 } from "@sheet-i18n/shared-utils";
 import { I18nStore } from "@sheet-i18n/core";
 import {
   InvalidI18nContextStateError,
@@ -29,11 +29,11 @@ import {
 
 // src/Provider/IntlProvider.tsx
 import { IntlProvider as ReactIntlProvider } from "react-intl";
-import { useEffect } from "react";
+import { useEffect as useEffect2 } from "react";
 
 // src/hooks/useDynamicLocale.ts
 import { validator as validator2 } from "@sheet-i18n/shared-utils";
-import { useLayoutEffect, useState } from "react";
+import { useEffect, useLayoutEffect, useState } from "react";
 
 // src/Service/IntlInstanceCache.ts
 import { createIntl, createIntlCache, useIntl } from "react-intl";
@@ -130,6 +130,25 @@ ${err}`);
       setIsLoading(false);
     });
   }, [currentLocale]);
+  useEffect(() => {
+    const currentLocaleSet = i18nStore == null ? void 0 : i18nStore.localeSet;
+    const dynamicLoaders = i18nStore == null ? void 0 : i18nStore.dynamicLoaders;
+    const preload = i18nStore == null ? void 0 : i18nStore.preload;
+    if (!dynamicLoaders || !preload) return;
+    preload.forEach((locale) => {
+      if (locale === currentLocale) return;
+      const isDataLoaded = Boolean(currentLocaleSet == null ? void 0 : currentLocaleSet[locale]);
+      if (isDataLoaded) return;
+      const dynamicLoader = dynamicLoaders[locale];
+      if (!dynamicLoader) return;
+      dynamicLoader().then((res) => {
+        const { default: localeData } = res;
+        i18nStore == null ? void 0 : i18nStore.mergeLocaleSet(locale, localeData);
+        intlInstanceCache.resetTotalCache();
+      }).catch(() => {
+      });
+    });
+  }, []);
   return {
     isLoading
   };
@@ -140,8 +159,10 @@ import { jsx } from "react/jsx-runtime";
 function IntlProvider({
   i18nStore,
   currentLocale,
+  fallbackUI = null,
   children: childrenFromProps
 }) {
+  var _a;
   const { locale } = useIntlLocale({ i18nStore, currentLocale });
   const onIntlError = (err) => {
     const typeSafe = i18nStore.typeSafe;
@@ -150,14 +171,16 @@ function IntlProvider({
     }
   };
   const { isLoading } = useDynamicLocale({ i18nStore });
-  const children = typeof childrenFromProps === "function" ? childrenFromProps(locale) : childrenFromProps;
+  const children = typeof childrenFromProps === "function" ? childrenFromProps(
+    (_a = locale != null ? locale : i18nStore.currentLocale) != null ? _a : i18nStore.defaultLocale
+  ) : childrenFromProps;
   return /* @__PURE__ */ jsx(
     ReactIntlProvider,
     {
       locale,
       messages: i18nStore == null ? void 0 : i18nStore.localeSet[locale],
       onError: onIntlError,
-      children: !isLoading && children
+      children: !isLoading ? children : fallbackUI != null ? fallbackUI : children
     },
     `sheet-i18n-locale-${locale}`
   );
@@ -168,7 +191,7 @@ function useIntlLocale({
 }) {
   const locale = currentLocale || detectClientLanguage(i18nStore) || i18nStore.defaultLocale;
   i18nStore.setCurrentLocale(locale);
-  useEffect(() => {
+  useEffect2(() => {
     i18nStore.setCurrentLocale(locale);
   }, [locale]);
   return {
@@ -314,15 +337,15 @@ function getTranslation({
 }
 
 // src/hooks/useLocaleStorage.ts
-import { useEffect as useEffect2, useState as useState2 } from "react";
+import { useEffect as useEffect3, useState as useState2 } from "react";
 var LISTENER_ID = "LOCALE_STORAGE_LISTENER_ID";
 function useLocaleStorage(localeStorageManager) {
   const [locale, setLocale] = useState2();
-  useEffect2(() => {
+  useEffect3(() => {
     const storedLocale = localeStorageManager.currentLocale;
     setLocale(storedLocale);
   }, []);
-  useEffect2(() => {
+  useEffect3(() => {
     var _a;
     (_a = localeStorageManager == null ? void 0 : localeStorageManager.observerManager) == null ? void 0 : _a.addListener({
       listenerId: LISTENER_ID,
@@ -339,7 +362,6 @@ function useLocaleStorage(localeStorageManager) {
 }
 
 // src/Provider/StorageBasedIntlProvider.tsx
-import { validator as validator4 } from "@sheet-i18n/shared-utils";
 import { jsx as jsx2 } from "react/jsx-runtime";
 function StorageBasedIntlProvider({
   i18nStore,
@@ -347,18 +369,26 @@ function StorageBasedIntlProvider({
   fallbackUI = null,
   children: childrenFromProps
 }) {
+  var _a;
   const { locale } = useLocaleStorage(storageManager);
-  if (validator4.isNullish(locale)) {
-    return fallbackUI;
-  }
-  const children = typeof childrenFromProps === "function" ? childrenFromProps(locale) : childrenFromProps;
-  return /* @__PURE__ */ jsx2(IntlProvider, { currentLocale: locale, i18nStore, children });
+  const children = typeof childrenFromProps === "function" ? childrenFromProps(
+    (_a = locale != null ? locale : i18nStore.currentLocale) != null ? _a : i18nStore.defaultLocale
+  ) : childrenFromProps;
+  return /* @__PURE__ */ jsx2(
+    IntlProvider,
+    {
+      currentLocale: locale,
+      fallbackUI,
+      i18nStore,
+      children
+    }
+  );
 }
 
 // src/createI18nContext.tsx
 import { jsx as jsx3 } from "react/jsx-runtime";
 function createI18nContext(i18nStore, plugins) {
-  if (validator5.isNullish(i18nStore)) {
+  if (validator4.isNullish(i18nStore)) {
     throw new InvalidI18nContextStateError(
       "\u26A0\uFE0F no i18nStore provided. To use createI18nContext, you must provide an i18nStore as a parameter"
     );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sheet-i18n/react",
-  "version": "1.7.7",
+  "version": "1.7.9",
   "description": "i18n client logic based on react",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -33,15 +33,16 @@
     "@types/react": "^19.0.2",
     "@types/react-dom": "^19.0.2",
     "react": "^19.0.0",
-    "@sheet-i18n/typescript-config": "1.8.4"
+    "@sheet-i18n/typescript-config": "1.8.6",
+    "@sheet-i18n/typescript": "0.4.4"
   },
   "dependencies": {
     "react-intl": "^7.0.4",
-    "@sheet-i18n/core": "1.7.2",
-    "@sheet-i18n/shared-service": "0.2.2",
-    "@sheet-i18n/errors": "1.8.4",
-    "@sheet-i18n/shared-utils": "1.8.5",
-    "@sheet-i18n/typescript": "0.4.2"
+    "@sheet-i18n/core": "1.7.4",
+    "@sheet-i18n/errors": "1.8.6",
+    "@sheet-i18n/shared-utils": "1.8.7",
+    "@sheet-i18n/shared-service": "0.2.4",
+    "@sheet-i18n/typescript": "0.4.4"
   },
   "peerDependencies": {
     "react": "^18 || ^19 || ^20 || ^21",