react-i18next 14.1.2 → 15.0.0

package/dist/es/useTranslation.js

@@ -1,6 +1,6 @@
 import { useState, useEffect, useContext, useRef, useCallback } from 'react';
 import { getI18n, getDefaults, ReportNamespaces, I18nContext } from './context.js';
-import { warnOnce, loadNamespaces, loadLanguages, hasLoadedNamespace } from './utils.js';
+import { warnOnce, loadNamespaces, loadLanguages, hasLoadedNamespace, isString, isObject } from './utils.js';
 const usePrevious = (value, ignore) => {
   const ref = useRef();
   useEffect(() => {
@@ -8,14 +8,9 @@ const usePrevious = (value, ignore) => {
   }, [value, ignore]);
   return ref.current;
 };
-function alwaysNewT(i18n, language, namespace, keyPrefix) {
-  return i18n.getFixedT(language, namespace, keyPrefix);
-}
-function useMemoizedT(i18n, language, namespace, keyPrefix) {
-  return useCallback(alwaysNewT(i18n, language, namespace, keyPrefix), [i18n, language, namespace, keyPrefix]);
-}
-export function useTranslation(ns) {
-  let props = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+const alwaysNewT = (i18n, language, namespace, keyPrefix) => i18n.getFixedT(language, namespace, keyPrefix);
+const useMemoizedT = (i18n, language, namespace, keyPrefix) => useCallback(alwaysNewT(i18n, language, namespace, keyPrefix), [i18n, language, namespace, keyPrefix]);
+export const useTranslation = (ns, props = {}) => {
   const {
     i18n: i18nFromProps
   } = props;
@@ -28,8 +23,8 @@ export function useTranslation(ns) {
   if (!i18n) {
     warnOnce('You will need to pass in an i18next instance by using initReactI18next');
     const notReadyT = (k, optsOrDefaultValue) => {
-      if (typeof optsOrDefaultValue === 'string') return optsOrDefaultValue;
-      if (optsOrDefaultValue && typeof optsOrDefaultValue === 'object' && typeof optsOrDefaultValue.defaultValue === 'string') return optsOrDefaultValue.defaultValue;
+      if (isString(optsOrDefaultValue)) return optsOrDefaultValue;
+      if (isObject(optsOrDefaultValue) && isString(optsOrDefaultValue.defaultValue)) return optsOrDefaultValue.defaultValue;
       return Array.isArray(k) ? k[k.length - 1] : k;
     };
     const retNotReady = [notReadyT, {}, false];
@@ -38,7 +33,7 @@ export function useTranslation(ns) {
     retNotReady.ready = false;
     return retNotReady;
   }
-  if (i18n.options.react && i18n.options.react.wait !== undefined) warnOnce('It seems you are still using the old wait option, you may migrate to the new useSuspense behaviour.');
+  if (i18n.options.react?.wait) warnOnce('It seems you are still using the old wait option, you may migrate to the new useSuspense behaviour.');
   const i18nOptions = {
     ...getDefaults(),
     ...i18n.options.react,
@@ -48,9 +43,9 @@ export function useTranslation(ns) {
     useSuspense,
     keyPrefix
   } = i18nOptions;
-  let namespaces = ns || defaultNSFromContext || i18n.options && i18n.options.defaultNS;
-  namespaces = typeof namespaces === 'string' ? [namespaces] : namespaces || ['translation'];
-  if (i18n.reportNamespaces.addUsedNamespaces) i18n.reportNamespaces.addUsedNamespaces(namespaces);
+  let namespaces = ns || defaultNSFromContext || i18n.options?.defaultNS;
+  namespaces = isString(namespaces) ? [namespaces] : namespaces || ['translation'];
+  i18n.reportNamespaces.addUsedNamespaces?.(namespaces);
   const ready = (i18n.isInitialized || i18n.initializedStoreOnce) && namespaces.every(n => hasLoadedNamespace(n, i18n, i18nOptions));
   const memoGetT = useMemoizedT(i18n, props.lng || null, i18nOptions.nsMode === 'fallback' ? namespaces : namespaces[0], keyPrefix);
   const getT = () => memoGetT;
@@ -80,14 +75,14 @@ export function useTranslation(ns) {
     if (ready && previousJoinedNS && previousJoinedNS !== joinedNS && isMounted.current) {
       setT(getNewT);
     }
-    function boundReset() {
+    const boundReset = () => {
       if (isMounted.current) setT(getNewT);
-    }
-    if (bindI18n && i18n) i18n.on(bindI18n, boundReset);
-    if (bindI18nStore && i18n) i18n.store.on(bindI18nStore, boundReset);
+    };
+    if (bindI18n) i18n?.on(bindI18n, boundReset);
+    if (bindI18nStore) i18n?.store.on(bindI18nStore, boundReset);
     return () => {
       isMounted.current = false;
-      if (bindI18n && i18n) bindI18n.split(' ').forEach(e => i18n.off(e, boundReset));
+      if (i18n) bindI18n?.split(' ').forEach(e => i18n.off(e, boundReset));
       if (bindI18nStore && i18n) bindI18nStore.split(' ').forEach(e => i18n.store.off(e, boundReset));
     };
   }, [i18n, joinedNS]);
@@ -109,4 +104,4 @@ export function useTranslation(ns) {
       loadNamespaces(i18n, namespaces, () => resolve());
     }
   });
-}
+};

package/dist/es/utils.js

@@ -1,21 +1,15 @@
-export function warn() {
-  if (console && console.warn) {
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-    if (typeof args[0] === 'string') args[0] = `react-i18next:: ${args[0]}`;
+export const warn = (...args) => {
+  if (console?.warn) {
+    if (isString(args[0])) args[0] = `react-i18next:: ${args[0]}`;
     console.warn(...args);
   }
-}
+};
 const alreadyWarned = {};
-export function warnOnce() {
-  for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
-    args[_key2] = arguments[_key2];
-  }
-  if (typeof args[0] === 'string' && alreadyWarned[args[0]]) return;
-  if (typeof args[0] === 'string') alreadyWarned[args[0]] = new Date();
+export const warnOnce = (...args) => {
+  if (isString(args[0]) && alreadyWarned[args[0]]) return;
+  if (isString(args[0])) alreadyWarned[args[0]] = new Date();
   warn(...args);
-}
+};
 const loadedClb = (i18n, cb) => () => {
   if (i18n.isInitialized) {
     cb();
@@ -29,49 +23,28 @@ const loadedClb = (i18n, cb) => () => {
     i18n.on('initialized', initialized);
   }
 };
-export function loadNamespaces(i18n, ns, cb) {
+export const loadNamespaces = (i18n, ns, cb) => {
   i18n.loadNamespaces(ns, loadedClb(i18n, cb));
-}
-export function loadLanguages(i18n, lng, ns, cb) {
-  if (typeof ns === 'string') ns = [ns];
+};
+export const loadLanguages = (i18n, lng, ns, cb) => {
+  if (isString(ns)) ns = [ns];
   ns.forEach(n => {
     if (i18n.options.ns.indexOf(n) < 0) i18n.options.ns.push(n);
   });
   i18n.loadLanguages(lng, loadedClb(i18n, cb));
-}
-function oldI18nextHasLoadedNamespace(ns, i18n) {
-  let options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-  const lng = i18n.languages[0];
-  const fallbackLng = i18n.options ? i18n.options.fallbackLng : false;
-  const lastLng = i18n.languages[i18n.languages.length - 1];
-  if (lng.toLowerCase() === 'cimode') return true;
-  const loadNotPending = (l, n) => {
-    const loadState = i18n.services.backendConnector.state[`${l}|${n}`];
-    return loadState === -1 || loadState === 2;
-  };
-  if (options.bindI18n && options.bindI18n.indexOf('languageChanging') > -1 && i18n.services.backendConnector.backend && i18n.isLanguageChangingTo && !loadNotPending(i18n.isLanguageChangingTo, ns)) return false;
-  if (i18n.hasResourceBundle(lng, ns)) return true;
-  if (!i18n.services.backendConnector.backend || i18n.options.resources && !i18n.options.partialBundledLanguages) return true;
-  if (loadNotPending(lng, ns) && (!fallbackLng || loadNotPending(lastLng, ns))) return true;
-  return false;
-}
-export function hasLoadedNamespace(ns, i18n) {
-  let options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+};
+export const hasLoadedNamespace = (ns, i18n, options = {}) => {
   if (!i18n.languages || !i18n.languages.length) {
     warnOnce('i18n.languages were undefined or empty', i18n.languages);
     return true;
   }
-  const isNewerI18next = i18n.options.ignoreJSONStructure !== undefined;
-  if (!isNewerI18next) {
-    return oldI18nextHasLoadedNamespace(ns, i18n, options);
-  }
   return i18n.hasLoadedNamespace(ns, {
     lng: options.lng,
     precheck: (i18nInstance, loadNotPending) => {
-      if (options.bindI18n && options.bindI18n.indexOf('languageChanging') > -1 && i18nInstance.services.backendConnector.backend && i18nInstance.isLanguageChangingTo && !loadNotPending(i18nInstance.isLanguageChangingTo, ns)) return false;
+      if (options.bindI18n?.indexOf('languageChanging') > -1 && i18nInstance.services.backendConnector.backend && i18nInstance.isLanguageChangingTo && !loadNotPending(i18nInstance.isLanguageChangingTo, ns)) return false;
     }
   });
-}
-export function getDisplayName(Component) {
-  return Component.displayName || Component.name || (typeof Component === 'string' && Component.length > 0 ? Component : 'Unknown');
-}
+};
+export const getDisplayName = Component => Component.displayName || Component.name || (isString(Component) && Component.length > 0 ? Component : 'Unknown');
+export const isString = obj => typeof obj === 'string';
+export const isObject = obj => typeof obj === 'object' && obj !== null;

package/dist/es/withSSR.js

@@ -2,22 +2,19 @@ import { createElement } from 'react';
 import { useSSR } from './useSSR.js';
 import { composeInitialProps } from './context.js';
 import { getDisplayName } from './utils.js';
-export function withSSR() {
-  return function Extend(WrappedComponent) {
-    function I18nextWithSSR(_ref) {
-      let {
-        initialI18nStore,
-        initialLanguage,
-        ...rest
-      } = _ref;
-      useSSR(initialI18nStore, initialLanguage);
-      return createElement(WrappedComponent, {
-        ...rest
-      });
-    }
-    I18nextWithSSR.getInitialProps = composeInitialProps(WrappedComponent);
-    I18nextWithSSR.displayName = `withI18nextSSR(${getDisplayName(WrappedComponent)})`;
-    I18nextWithSSR.WrappedComponent = WrappedComponent;
-    return I18nextWithSSR;
-  };
-}
+export const withSSR = () => function Extend(WrappedComponent) {
+  function I18nextWithSSR({
+    initialI18nStore,
+    initialLanguage,
+    ...rest
+  }) {
+    useSSR(initialI18nStore, initialLanguage);
+    return createElement(WrappedComponent, {
+      ...rest
+    });
+  }
+  I18nextWithSSR.getInitialProps = composeInitialProps(WrappedComponent);
+  I18nextWithSSR.displayName = `withI18nextSSR(${getDisplayName(WrappedComponent)})`;
+  I18nextWithSSR.WrappedComponent = WrappedComponent;
+  return I18nextWithSSR;
+};

package/dist/es/withTranslation.js

@@ -1,36 +1,32 @@
 import { createElement, forwardRef as forwardRefReact } from 'react';
 import { useTranslation } from './useTranslation.js';
 import { getDisplayName } from './utils.js';
-export function withTranslation(ns) {
-  let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  return function Extend(WrappedComponent) {
-    function I18nextWithTranslation(_ref) {
-      let {
-        forwardedRef,
-        ...rest
-      } = _ref;
-      const [t, i18n, ready] = useTranslation(ns, {
-        ...rest,
-        keyPrefix: options.keyPrefix
-      });
-      const passDownProps = {
-        ...rest,
-        t,
-        i18n,
-        tReady: ready
-      };
-      if (options.withRef && forwardedRef) {
-        passDownProps.ref = forwardedRef;
-      } else if (!options.withRef && forwardedRef) {
-        passDownProps.forwardedRef = forwardedRef;
-      }
-      return createElement(WrappedComponent, passDownProps);
+export const withTranslation = (ns, options = {}) => function Extend(WrappedComponent) {
+  function I18nextWithTranslation({
+    forwardedRef,
+    ...rest
+  }) {
+    const [t, i18n, ready] = useTranslation(ns, {
+      ...rest,
+      keyPrefix: options.keyPrefix
+    });
+    const passDownProps = {
+      ...rest,
+      t,
+      i18n,
+      tReady: ready
+    };
+    if (options.withRef && forwardedRef) {
+      passDownProps.ref = forwardedRef;
+    } else if (!options.withRef && forwardedRef) {
+      passDownProps.forwardedRef = forwardedRef;
     }
-    I18nextWithTranslation.displayName = `withI18nextTranslation(${getDisplayName(WrappedComponent)})`;
-    I18nextWithTranslation.WrappedComponent = WrappedComponent;
-    const forwardRef = (props, ref) => createElement(I18nextWithTranslation, Object.assign({}, props, {
-      forwardedRef: ref
-    }));
-    return options.withRef ? forwardRefReact(forwardRef) : I18nextWithTranslation;
-  };
-}
+    return createElement(WrappedComponent, passDownProps);
+  }
+  I18nextWithTranslation.displayName = `withI18nextTranslation(${getDisplayName(WrappedComponent)})`;
+  I18nextWithTranslation.WrappedComponent = WrappedComponent;
+  const forwardRef = (props, ref) => createElement(I18nextWithTranslation, Object.assign({}, props, {
+    forwardedRef: ref
+  }));
+  return options.withRef ? forwardRefReact(forwardRef) : I18nextWithTranslation;
+};