react-i18next 11.3.3 → 11.5.0

package/dist/commonjs/context.js

@@ -5,8 +5,6 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.usedI18nextProvider = usedI18nextProvider;
-exports.getHasUsedI18nextProvider = getHasUsedI18nextProvider;
 exports.setDefaults = setDefaults;
 exports.getDefaults = getDefaults;
 exports.setI18n = setI18n;
@@ -25,7 +23,7 @@ var _react = _interopRequireDefault(require("react"));
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 var defaultOptions = {
   bindI18n: 'languageChanged',
@@ -38,20 +36,11 @@ var defaultOptions = {
   useSuspense: true
 };
 var i18nInstance;
-var hasUsedI18nextProvider;
 
 var I18nContext = _react["default"].createContext();
 
 exports.I18nContext = I18nContext;
 
-function usedI18nextProvider(used) {
-  hasUsedI18nextProvider = used;
-}
-
-function getHasUsedI18nextProvider() {
-  return hasUsedI18nextProvider;
-}
-
 function setDefaults() {
   var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   defaultOptions = _objectSpread({}, defaultOptions, {}, options);
@@ -61,9 +50,7 @@ function getDefaults() {
   return defaultOptions;
 }
 
-var ReportNamespaces =
-/*#__PURE__*/
-function () {
+var ReportNamespaces = /*#__PURE__*/function () {
   function ReportNamespaces() {
     (0, _classCallCheck2["default"])(this, ReportNamespaces);
     this.usedNamespaces = {};

package/dist/commonjs/useSSR.js

@@ -12,12 +12,11 @@ var _context = require("./context");
 function useSSR(initialI18nStore, initialLanguage) {
   var props = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   var i18nFromProps = props.i18n;
-  var ReactI18nContext = (0, _react.useContext)(_context.I18nContext);
 
-  var _ref = (0, _context.getHasUsedI18nextProvider)() ? ReactI18nContext || {} : {},
+  var _ref = (0, _react.useContext)(_context.I18nContext) || {},
       i18nFromContext = _ref.i18n;
 
-  var i18n = i18nFromProps || i18nFromContext || (0, _context.getI18n)(); // opt out if is a cloned instance, eg. created by i18next-express-middleware on request
+  var i18n = i18nFromProps || i18nFromContext || (0, _context.getI18n)(); // opt out if is a cloned instance, eg. created by i18next-http-middleware on request
   // -> do not set initial stuff on server side
 
   if (i18n.options && i18n.options.isClone) return; // nextjs / SSR: getting data from next.js or other ssr stack

package/dist/commonjs/useTranslation.js

@@ -19,15 +19,14 @@ var _utils = require("./utils");
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 function useTranslation(ns) {
   var props = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   // assert we have the needed i18nInstance
   var i18nFromProps = props.i18n;
-  var ReactI18nContext = (0, _react.useContext)(_context.I18nContext);
 
-  var _ref = (0, _context.getHasUsedI18nextProvider)() ? ReactI18nContext || {} : {},
+  var _ref = (0, _react.useContext)(_context.I18nContext) || {},
       i18nFromContext = _ref.i18n,
       defaultNSFromContext = _ref.defaultNS;
 
@@ -73,20 +72,21 @@ function useTranslation(ns) {
       setT = _useState2[1]; // seems we can't have functions as value -> wrap it in obj
 
 
+  var isMounted = (0, _react.useRef)(true);
   (0, _react.useEffect)(function () {
-    var isMounted = true;
     var bindI18n = i18nOptions.bindI18n,
-        bindI18nStore = i18nOptions.bindI18nStore; // if not ready and not using suspense load the namespaces
+        bindI18nStore = i18nOptions.bindI18nStore;
+    isMounted.current = true; // if not ready and not using suspense load the namespaces
     // in side effect and do not call resetT if unmounted
 
     if (!ready && !useSuspense) {
       (0, _utils.loadNamespaces)(i18n, namespaces, function () {
-        if (isMounted) setT(getT());
+        if (isMounted.current) setT(getT());
       });
     }
 
     function boundReset() {
-      if (isMounted) setT(getT());
+      if (isMounted.current) setT(getT());
     } // bind events to trigger change, like languageChanged
 
 
@@ -94,7 +94,7 @@ function useTranslation(ns) {
     if (bindI18nStore && i18n) i18n.store.on(bindI18nStore, boundReset); // unbinding on unmount
 
     return function () {
-      isMounted = false;
+      isMounted.current = false;
       if (bindI18n && i18n) bindI18n.split(' ').forEach(function (e) {
         return i18n.off(e, boundReset);
       });
@@ -115,7 +115,7 @@ function useTranslation(ns) {
 
   throw new Promise(function (resolve) {
     (0, _utils.loadNamespaces)(i18n, namespaces, function () {
-      setT(getT());
+      if (isMounted.current) setT(getT());
       resolve();
     });
   });

package/dist/commonjs/withSSR.js

@@ -21,7 +21,7 @@ var _utils = require("./utils");
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 function withSSR() {
   return function Extend(WrappedComponent) {

package/dist/commonjs/withTranslation.js

@@ -21,7 +21,7 @@ var _utils = require("./utils");
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 function withTranslation(ns) {
   var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};

package/dist/es/I18nextProvider.js

@@ -1,11 +1,10 @@
-import React from 'react';
-import { I18nContext, usedI18nextProvider } from './context';
+import { createElement } from 'react';
+import { I18nContext } from './context';
 export function I18nextProvider(_ref) {
   var i18n = _ref.i18n,
       defaultNS = _ref.defaultNS,
       children = _ref.children;
-  usedI18nextProvider(true);
-  return React.createElement(I18nContext.Provider, {
+  return createElement(I18nContext.Provider, {
     value: {
       i18n: i18n,
       defaultNS: defaultNS

package/dist/es/Trans.js

@@ -1,14 +1,14 @@
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _typeof from "@babel/runtime/helpers/typeof";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 import React, { useContext } from 'react';
 import HTML from 'html-parse-stringify2';
-import { getI18n, getHasUsedI18nextProvider, I18nContext, getDefaults } from './context';
+import { getI18n, I18nContext, getDefaults } from './context';
 import { warn, warnOnce } from './utils';
 
 function hasChildren(node) {
@@ -31,44 +31,63 @@ function getAsArray(data) {
   return Array.isArray(data) ? data : [data];
 }
 
-export function nodesToString(startingString, children, index, i18nOptions) {
+function mergeProps(source, target) {
+  var newTarget = _objectSpread({}, target); // overwrite source.props when target.props already set
+
+
+  newTarget.props = Object.assign(source.props, target.props);
+  return newTarget;
+}
+
+export function nodesToString(children, i18nOptions) {
   if (!children) return '';
-  var stringNode = startingString;
+  var stringNode = ''; // do not use `React.Children.toArray`, will fail at object children
+
   var childrenArray = getAsArray(children);
-  var keepArray = i18nOptions.transKeepBasicHtmlNodesFor || [];
-  childrenArray.forEach(function (child, i) {
-    var elementKey = "".concat(i);
+  var keepArray = i18nOptions.transKeepBasicHtmlNodesFor || []; // e.g. lorem <br/> ipsum {{ messageCount, format }} dolor <strong>bold</strong> amet
 
+  childrenArray.forEach(function (child, childIndex) {
     if (typeof child === 'string') {
-      stringNode = "".concat(stringNode).concat(child);
-    } else if (hasChildren(child)) {
-      var elementTag = keepArray.indexOf(child.type) > -1 && Object.keys(child.props).length === 1 && typeof hasChildren(child) === 'string' ? child.type : elementKey;
-
-      if (child.props && child.props.i18nIsDynamicList) {
-        // we got a dynamic list like "<ul>{['a', 'b'].map(item => ( <li key={item}>{item}</li> ))}</ul>""
-        // the result should be "<0></0>" and not "<0><0>a</0><1>b</1></0>"
-        stringNode = "".concat(stringNode, "<").concat(elementTag, "></").concat(elementTag, ">");
-      } else {
-        // regular case mapping the inner children
-        stringNode = "".concat(stringNode, "<").concat(elementTag, ">").concat(nodesToString('', getChildren(child), i + 1, i18nOptions), "</").concat(elementTag, ">");
-      }
+      // actual e.g. lorem
+      // expected e.g. lorem
+      stringNode += "".concat(child);
     } else if (React.isValidElement(child)) {
-      if (keepArray.indexOf(child.type) > -1 && Object.keys(child.props).length === 0) {
-        stringNode = "".concat(stringNode, "<").concat(child.type, "/>");
+      var childPropsCount = Object.keys(child.props).length;
+      var shouldKeepChild = keepArray.indexOf(child.type) > -1;
+      var childChildren = child.props.children;
+
+      if (!childChildren && shouldKeepChild && childPropsCount === 0) {
+        // actual e.g. lorem <br/> ipsum
+        // expected e.g. lorem <br/> ipsum
+        stringNode += "<".concat(child.type, "/>");
+      } else if (!childChildren && (!shouldKeepChild || childPropsCount !== 0)) {
+        // actual e.g. lorem <hr className="test" /> ipsum
+        // expected e.g. lorem <0></0> ipsum
+        stringNode += "<".concat(childIndex, "></").concat(childIndex, ">");
+      } else if (child.props.i18nIsDynamicList) {
+        // we got a dynamic list like
+        // e.g. <ul i18nIsDynamicList>{['a', 'b'].map(item => ( <li key={item}>{item}</li> ))}</ul>
+        // expected e.g. "<0></0>", not e.g. "<0><0>a</0><1>b</1></0>"
+        stringNode += "<".concat(childIndex, "></").concat(childIndex, ">");
+      } else if (shouldKeepChild && childPropsCount === 1 && typeof childChildren === 'string') {
+        // actual e.g. dolor <strong>bold</strong> amet
+        // expected e.g. dolor <strong>bold</strong> amet
+        stringNode += "<".concat(child.type, ">").concat(childChildren, "</").concat(child.type, ">");
       } else {
-        stringNode = "".concat(stringNode, "<").concat(elementKey, "></").concat(elementKey, ">");
+        // regular case mapping the inner children
+        var content = nodesToString(childChildren, i18nOptions);
+        stringNode += "<".concat(childIndex, ">").concat(content, "</").concat(childIndex, ">");
       }
     } else if (_typeof(child) === 'object') {
-      var clone = _objectSpread({}, child);
+      // e.g. lorem {{ value, format }} ipsum
+      var format = child.format,
+          clone = _objectWithoutProperties(child, ["format"]);
 
-      var format = clone.format;
-      delete clone.format;
       var keys = Object.keys(clone);
 
-      if (format && keys.length === 1) {
-        stringNode = "".concat(stringNode, "{{").concat(keys[0], ", ").concat(format, "}}");
-      } else if (keys.length === 1) {
-        stringNode = "".concat(stringNode, "{{").concat(keys[0], "}}");
+      if (keys.length === 1) {
+        var value = format ? "".concat(keys[0], ", ").concat(format) : keys[0];
+        stringNode += "{{".concat(value, "}}");
       } else {
         // not a valid interpolation object (can only contain one value plus format)
         warn("react-i18next: the passed in object contained more than one variable - the object should look like {{ value, format }} where format is optional.", child);
@@ -111,7 +130,10 @@ function renderNodes(children, targetString, i18n, i18nOptions, combinedTOpts) {
       var translationContent = node.children && node.children[0] && node.children[0].content;
 
       if (node.type === 'tag') {
-        var child = reactNodes[parseInt(node.name, 10)] || {};
+        var tmp = reactNodes[parseInt(node.name, 10)] || {};
+        var child = Object.keys(node.attrs).length !== 0 ? mergeProps({
+          props: node.attrs
+        }, tmp) : tmp;
         var isElement = React.isValidElement(child);
 
         if (typeof child === 'string') {
@@ -210,9 +232,7 @@ export function Trans(_ref) {
       tFromProps = _ref.t,
       additionalProps = _objectWithoutProperties(_ref, ["children", "count", "parent", "i18nKey", "tOptions", "values", "defaults", "components", "ns", "i18n", "t"]);
 
-  var ReactI18nContext = useContext(I18nContext);
-
-  var _ref2 = getHasUsedI18nextProvider() ? ReactI18nContext || {} : {},
+  var _ref2 = useContext(I18nContext) || {},
       i18nFromContext = _ref2.i18n,
       defaultNSFromContext = _ref2.defaultNS;
 
@@ -227,13 +247,12 @@ export function Trans(_ref) {
     return k;
   };
 
-  var reactI18nextOptions = _objectSpread({}, getDefaults(), {}, i18n.options && i18n.options.react);
+  var reactI18nextOptions = _objectSpread({}, getDefaults(), {}, i18n.options && i18n.options.react); // prepare having a namespace
 
-  var useAsParent = parent !== undefined ? parent : reactI18nextOptions.defaultTransParent; // prepare having a namespace
 
   var namespaces = ns || t.ns || defaultNSFromContext || i18n.options && i18n.options.defaultNS;
   namespaces = typeof namespaces === 'string' ? [namespaces] : namespaces || ['translation'];
-  var defaultValue = defaults || nodesToString('', children, 0, reactI18nextOptions) || reactI18nextOptions.transEmptyNodeValue;
+  var defaultValue = defaults || nodesToString(children, reactI18nextOptions) || reactI18nextOptions.transEmptyNodeValue || i18nKey;
   var hashTransKey = reactI18nextOptions.hashTransKey;
   var key = i18nKey || (hashTransKey ? hashTransKey(defaultValue) : defaultValue);
   var interpolationOverride = values ? {} : {
@@ -251,6 +270,9 @@ export function Trans(_ref) {
   });
 
   var translation = key ? t(key, combinedTOpts) : defaultValue;
-  if (!useAsParent) return renderNodes(components || children, translation, i18n, reactI18nextOptions, combinedTOpts);
-  return React.createElement(useAsParent, additionalProps, renderNodes(components || children, translation, i18n, reactI18nextOptions, combinedTOpts));
+  var content = renderNodes(components || children, translation, i18n, reactI18nextOptions, combinedTOpts); // allows user to pass `null` to `parent`
+  // and override `defaultTransParent` if is present
+
+  var useAsParent = parent !== undefined ? parent : reactI18nextOptions.defaultTransParent;
+  return useAsParent ? React.createElement(useAsParent, additionalProps, content) : content;
 }

package/dist/es/context.js

@@ -4,7 +4,7 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 import React from 'react';
 var defaultOptions = {
@@ -18,14 +18,7 @@ var defaultOptions = {
   useSuspense: true
 };
 var i18nInstance;
-var hasUsedI18nextProvider;
 export var I18nContext = React.createContext();
-export function usedI18nextProvider(used) {
-  hasUsedI18nextProvider = used;
-}
-export function getHasUsedI18nextProvider() {
-  return hasUsedI18nextProvider;
-}
 export function setDefaults() {
   var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   defaultOptions = _objectSpread({}, defaultOptions, {}, options);
@@ -33,9 +26,7 @@ export function setDefaults() {
 export function getDefaults() {
   return defaultOptions;
 }
-export var ReportNamespaces =
-/*#__PURE__*/
-function () {
+export var ReportNamespaces = /*#__PURE__*/function () {
   function ReportNamespaces() {
     _classCallCheck(this, ReportNamespaces);
 

package/dist/es/useSSR.js

@@ -1,14 +1,13 @@
 import { useContext } from 'react';
-import { getI18n, getHasUsedI18nextProvider, I18nContext } from './context';
+import { getI18n, I18nContext } from './context';
 export function useSSR(initialI18nStore, initialLanguage) {
   var props = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   var i18nFromProps = props.i18n;
-  var ReactI18nContext = useContext(I18nContext);
 
-  var _ref = getHasUsedI18nextProvider() ? ReactI18nContext || {} : {},
+  var _ref = useContext(I18nContext) || {},
       i18nFromContext = _ref.i18n;
 
-  var i18n = i18nFromProps || i18nFromContext || getI18n(); // opt out if is a cloned instance, eg. created by i18next-express-middleware on request
+  var i18n = i18nFromProps || i18nFromContext || getI18n(); // opt out if is a cloned instance, eg. created by i18next-http-middleware on request
   // -> do not set initial stuff on server side
 
   if (i18n.options && i18n.options.isClone) return; // nextjs / SSR: getting data from next.js or other ssr stack

package/dist/es/useTranslation.js

@@ -3,18 +3,17 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
-import { useState, useEffect, useContext } from 'react';
-import { getI18n, getDefaults, ReportNamespaces, getHasUsedI18nextProvider, I18nContext } from './context';
+import { useState, useEffect, useContext, useRef } from 'react';
+import { getI18n, getDefaults, ReportNamespaces, I18nContext } from './context';
 import { warnOnce, loadNamespaces, hasLoadedNamespace } from './utils';
 export function useTranslation(ns) {
   var props = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   // assert we have the needed i18nInstance
   var i18nFromProps = props.i18n;
-  var ReactI18nContext = useContext(I18nContext);
 
-  var _ref = getHasUsedI18nextProvider() ? ReactI18nContext || {} : {},
+  var _ref = useContext(I18nContext) || {},
       i18nFromContext = _ref.i18n,
       defaultNSFromContext = _ref.defaultNS;
 
@@ -60,20 +59,21 @@ export function useTranslation(ns) {
       setT = _useState2[1]; // seems we can't have functions as value -> wrap it in obj
 
 
+  var isMounted = useRef(true);
   useEffect(function () {
-    var isMounted = true;
     var bindI18n = i18nOptions.bindI18n,
-        bindI18nStore = i18nOptions.bindI18nStore; // if not ready and not using suspense load the namespaces
+        bindI18nStore = i18nOptions.bindI18nStore;
+    isMounted.current = true; // if not ready and not using suspense load the namespaces
     // in side effect and do not call resetT if unmounted
 
     if (!ready && !useSuspense) {
       loadNamespaces(i18n, namespaces, function () {
-        if (isMounted) setT(getT());
+        if (isMounted.current) setT(getT());
       });
     }
 
     function boundReset() {
-      if (isMounted) setT(getT());
+      if (isMounted.current) setT(getT());
     } // bind events to trigger change, like languageChanged
 
 
@@ -81,7 +81,7 @@ export function useTranslation(ns) {
     if (bindI18nStore && i18n) i18n.store.on(bindI18nStore, boundReset); // unbinding on unmount
 
     return function () {
-      isMounted = false;
+      isMounted.current = false;
       if (bindI18n && i18n) bindI18n.split(' ').forEach(function (e) {
         return i18n.off(e, boundReset);
       });
@@ -102,7 +102,7 @@ export function useTranslation(ns) {
 
   throw new Promise(function (resolve) {
     loadNamespaces(i18n, namespaces, function () {
-      setT(getT());
+      if (isMounted.current) setT(getT());
       resolve();
     });
   });

package/dist/es/withSSR.js

@@ -3,7 +3,7 @@ import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProper
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 import React from 'react';
 import { useSSR } from './useSSR';

package/dist/es/withTranslation.js

@@ -4,7 +4,7 @@ import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProper
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 import React from 'react';
 import { useTranslation } from './useTranslation';