react-i18next 10.12.4 → 10.13.2

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+### 10.13.2
+
+- typescript: Add t function to TransProps types [969](https://github.com/i18next/react-i18next/pull/969)
+- lint: Fix linter errors [966](https://github.com/i18next/react-i18next/pull/966)
+
+### 10.13.1
+
+- avoid conditional hook call in edge case (was only issue in wrong setup useContext outside I18nextProvider) [951](https://github.com/i18next/react-i18next/pull/951)
+
+### 10.13.0
+
+- also use count from `values` object passed to Trans if passed - else use the one on props [947](https://github.com/i18next/react-i18next/pull/947)
+
+### 10.12.5
+
+- typescript: Update types for reportNamespaces [945](https://github.com/i18next/react-i18next/pull/945)
+- typescript: Improve withSSR type definition [943](https://github.com/i18next/react-i18next/pull/943)
+
 ### 10.12.4
 
 - ICU: Fixes macro to support count prop and expressions better [939](https://github.com/i18next/react-i18next/pull/939)

package/dist/amd/react-i18next.js

@@ -17,6 +17,24 @@ define(['exports', 'react'], function (exports, React) { 'use strict';
     return obj;
   }
 
+  function _extends() {
+    _extends = Object.assign || function (target) {
+      for (var i = 1; i < arguments.length; i++) {
+        var source = arguments[i];
+
+        for (var key in source) {
+          if (Object.prototype.hasOwnProperty.call(source, key)) {
+            target[key] = source[key];
+          }
+        }
+      }
+
+      return target;
+    };
+
+    return _extends.apply(this, arguments);
+  }
+
   function ownKeys(object, enumerableOnly) {
     var keys = Object.keys(object);
 
@@ -488,33 +506,36 @@ define(['exports', 'react'], function (exports, React) { 'use strict';
     return children.every(child => React__default.isValidElement(child));
   }
 
-  function nodesToString(mem, children, index, i18nOptions) {
+  function getAsArray(data) {
+    return Array.isArray(data) ? data : [data];
+  }
+
+  function nodesToString(startingString, children, index, i18nOptions) {
     if (!children) return '';
-    if (Object.prototype.toString.call(children) !== '[object Array]') children = [children];
+    var stringNode = startingString;
+    var childrenArray = getAsArray(children);
     var keepArray = i18nOptions.transKeepBasicHtmlNodesFor || [];
-    children.forEach((child, i) => {
-      // const isElement = React.isValidElement(child);
-      // const elementKey = `${index !== 0 ? index + '-' : ''}${i}:${typeof child.type === 'function' ? child.type.name : child.type || 'var'}`;
+    childrenArray.forEach((child, i) => {
       var elementKey = "".concat(i);
 
       if (typeof child === 'string') {
-        mem = "".concat(mem).concat(child);
+        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>"
-          mem = "".concat(mem, "<").concat(elementTag, "></").concat(elementTag, ">");
+          stringNode = "".concat(stringNode, "<").concat(elementTag, "></").concat(elementTag, ">");
         } else {
           // regular case mapping the inner children
-          mem = "".concat(mem, "<").concat(elementTag, ">").concat(nodesToString('', getChildren(child), i + 1, i18nOptions), "</").concat(elementTag, ">");
+          stringNode = "".concat(stringNode, "<").concat(elementTag, ">").concat(nodesToString('', getChildren(child), i + 1, i18nOptions), "</").concat(elementTag, ">");
         }
       } else if (React__default.isValidElement(child)) {
         if (keepArray.indexOf(child.type) > -1 && Object.keys(child.props).length === 0) {
-          mem = "".concat(mem, "<").concat(child.type, "/>");
+          stringNode = "".concat(stringNode, "<").concat(child.type, "/>");
         } else {
-          mem = "".concat(mem, "<").concat(elementKey, "></").concat(elementKey, ">");
+          stringNode = "".concat(stringNode, "<").concat(elementKey, "></").concat(elementKey, ">");
         }
       } else if (typeof child === 'object') {
         var clone = _objectSpread2({}, child);
@@ -526,9 +547,9 @@ define(['exports', 'react'], function (exports, React) { 'use strict';
         var keys = Object.keys(clone);
 
         if (format && keys.length === 1) {
-          mem = "".concat(mem, "{{").concat(keys[0], ", ").concat(format, "}}");
+          stringNode = "".concat(stringNode, "{{").concat(keys[0], ", ").concat(format, "}}");
         } else if (keys.length === 1) {
-          mem = "".concat(mem, "{{").concat(keys[0], "}}");
+          stringNode = "".concat(stringNode, "{{").concat(keys[0], "}}");
         } 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);
@@ -537,7 +558,7 @@ define(['exports', 'react'], function (exports, React) { 'use strict';
         warn("Trans: the passed in value is invalid - seems you passed in a variable like {number} - please pass in variables for interpolation as full objects like {{number}}.", child);
       }
     });
-    return mem;
+    return stringNode;
   }
 
   function renderNodes(children, targetString, i18n, i18nOptions, combinedTOpts) {
@@ -551,22 +572,22 @@ define(['exports', 'react'], function (exports, React) { 'use strict';
     var data = {};
 
     function getData(childs) {
-      if (Object.prototype.toString.call(childs) !== '[object Array]') childs = [childs];
-      childs.forEach(child => {
+      var childrenArray = getAsArray(childs);
+      childrenArray.forEach(child => {
         if (typeof child === 'string') return;
         if (hasChildren(child)) getData(getChildren(child));else if (typeof child === 'object' && !React__default.isValidElement(child)) Object.assign(data, child);
       });
     }
 
     getData(children);
-    targetString = i18n.services.interpolator.interpolate(targetString, _objectSpread2({}, data, {}, combinedTOpts), i18n.language); // parse ast from string with additional wrapper tag
+    var interpolatedString = i18n.services.interpolator.interpolate(targetString, _objectSpread2({}, data, {}, combinedTOpts), i18n.language); // parse ast from string with additional wrapper tag
     // -> avoids issues in parser removing prepending text nodes
 
-    var ast = htmlParseStringify2.parse("<0>".concat(targetString, "</0>"));
+    var ast = htmlParseStringify2.parse("<0>".concat(interpolatedString, "</0>"));
 
-    function mapAST(reactNodes, astNodes) {
-      if (Object.prototype.toString.call(reactNodes) !== '[object Array]') reactNodes = [reactNodes];
-      if (Object.prototype.toString.call(astNodes) !== '[object Array]') astNodes = [astNodes];
+    function mapAST(reactNode, astNode) {
+      var reactNodes = getAsArray(reactNode);
+      var astNodes = getAsArray(astNode);
       return astNodes.reduce((mem, node, i) => {
         var translationContent = node.children && node.children[0] && node.children[0].content;
 
@@ -596,7 +617,7 @@ define(['exports', 'react'], function (exports, React) { 'use strict';
             mem.push(React__default.cloneElement(child, _objectSpread2({}, child.props, {
               key: i
             }), _inner));
-          } else if (isNaN(node.name)) {
+          } else if (Number.isNaN(parseFloat(node.name))) {
             if (i18nOptions.transSupportBasicHtmlNodes && keepArray.indexOf(node.name) > -1) {
               if (node.voidElement) {
                 mem.push(React__default.createElement(node.name, {
@@ -703,9 +724,10 @@ define(['exports', 'react'], function (exports, React) { 'use strict';
       }
     };
 
-    var combinedTOpts = _objectSpread2({}, tOptions, {}, values, {}, interpolationOverride, {
+    var combinedTOpts = _objectSpread2({}, tOptions, {
+      count
+    }, values, {}, interpolationOverride, {
       defaultValue,
-      count,
       ns: namespaces
     });
 
@@ -809,17 +831,22 @@ define(['exports', 'react'], function (exports, React) { 'use strict';
   function withTranslation(ns) {
     var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     return function Extend(WrappedComponent) {
-      function I18nextWithTranslation(props, ref) {
-        var [t, i18n, ready] = useTranslation(ns, props);
+      function I18nextWithTranslation(_ref) {
+        var {
+          forwardedRef
+        } = _ref,
+            rest = _objectWithoutProperties(_ref, ["forwardedRef"]);
+
+        var [t, i18n, ready] = useTranslation(ns, rest);
 
-        var passDownProps = _objectSpread2({}, props, {
+        var passDownProps = _objectSpread2({}, rest, {
           t,
           i18n,
           tReady: ready
         });
 
-        if (options.withRef && ref) {
-          passDownProps.ref = ref;
+        if (options.withRef && forwardedRef) {
+          passDownProps.ref = forwardedRef;
         }
 
         return React__default.createElement(WrappedComponent, passDownProps);
@@ -827,7 +854,12 @@ define(['exports', 'react'], function (exports, React) { 'use strict';
 
       I18nextWithTranslation.displayName = "withI18nextTranslation(".concat(getDisplayName(WrappedComponent), ")");
       I18nextWithTranslation.WrappedComponent = WrappedComponent;
-      return options.withRef ? React__default.forwardRef(I18nextWithTranslation) : I18nextWithTranslation;
+
+      var forwardRef = (props, ref) => React__default.createElement(I18nextWithTranslation, _extends({}, props, {
+        forwardedRef: ref
+      }));
+
+      return options.withRef ? React__default.forwardRef(forwardRef) : I18nextWithTranslation;
     };
   }
 
@@ -865,9 +897,10 @@ define(['exports', 'react'], function (exports, React) { 'use strict';
     var {
       i18n: i18nFromProps
     } = props;
+    var ReactI18nContext = React.useContext(I18nContext);
     var {
       i18n: i18nFromContext
-    } = getHasUsedI18nextProvider() ? React.useContext(I18nContext) : {};
+    } = getHasUsedI18nextProvider() ? ReactI18nContext || {} : {};
     var i18n = i18nFromProps || i18nFromContext || getI18n(); // opt out if is a cloned instance, eg. created by i18next-express-middleware on request
     // -> do not set initial stuff on server side
 

package/dist/amd/react-i18next.min.js

@@ -1 +1 @@
-define(["exports","react"],function(e,n){"use strict";var t="default"in n?n.default:n;function r(e,n,t){return n in e?Object.defineProperty(e,n,{value:t,enumerable:!0,configurable:!0,writable:!0}):e[n]=t,e}function a(e,n){var t=Object.keys(e);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e);n&&(r=r.filter(function(n){return Object.getOwnPropertyDescriptor(e,n).enumerable})),t.push.apply(t,r)}return t}function i(e){for(var n=1;n<arguments.length;n++){var t=null!=arguments[n]?arguments[n]:{};n%2?a(t,!0).forEach(function(n){r(e,n,t[n])}):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(t)):a(t).forEach(function(n){Object.defineProperty(e,n,Object.getOwnPropertyDescriptor(t,n))})}return e}function o(e,n){if(null==e)return{};var t,r,a=function(e,n){if(null==e)return{};var t,r,a={},i=Object.keys(e);for(r=0;r<i.length;r++)t=i[r],n.indexOf(t)>=0||(a[t]=e[t]);return a}(e,n);if(Object.getOwnPropertySymbols){var i=Object.getOwnPropertySymbols(e);for(r=0;r<i.length;r++)t=i[r],n.indexOf(t)>=0||Object.prototype.propertyIsEnumerable.call(e,t)&&(a[t]=e[t])}return a}var c={area:!0,base:!0,br:!0,col:!0,embed:!0,hr:!0,img:!0,input:!0,keygen:!0,link:!0,menuitem:!0,meta:!0,param:!0,source:!0,track:!0,wbr:!0},s=/([\w-]+)|=|(['"])([.\s\S]*?)\2/g,l=/(?:<!--[\S\s]*?-->|<(?:"[^"]*"['"]*|'[^']*'['"]*|[^'">])+>)/g,u=Object.create?Object.create(null):{};function p(e,n,t,r,a){var i=n.indexOf("<",r),o=n.slice(r,-1===i?void 0:i);/^\s*$/.test(o)&&(o=" "),(!a&&i>-1&&t+e.length>=0||" "!==o)&&e.push({type:"text",content:o})}function f(e,n){switch(n.type){case"text":return e+n.content;case"tag":return e+="<"+n.name+(n.attrs?function(e){var n=[];for(var t in e)n.push(t+'="'+e[t]+'"');return n.length?" "+n.join(" "):""}(n.attrs):"")+(n.voidElement?"/>":">"),n.voidElement?e:e+n.children.reduce(f,"")+"</"+n.name+">"}}var d,g,m={parse:function(e,n){n||(n={}),n.components||(n.components=u);var t,r=[],a=-1,i=[],o={},f=!1;return e.replace(l,function(l,u){if(f){if(l!=="</"+t.name+">")return;f=!1}var d,g="/"!==l.charAt(1),m=0===l.indexOf("\x3c!--"),h=u+l.length,v=e.charAt(h);g&&!m&&(a++,"tag"===(t=function(e){var n,t=0,r=!0,a={type:"tag",name:"",voidElement:!1,attrs:{},children:[]};return e.replace(s,function(i){if("="===i)return r=!0,void t++;r?0===t?((c[i]||"/"===e.charAt(e.length-2))&&(a.voidElement=!0),a.name=i):(a.attrs[n]=i.replace(/^['"]|['"]$/g,""),n=void 0):(n&&(a.attrs[n]=n),n=i),t++,r=!1}),a}(l)).type&&n.components[t.name]&&(t.type="component",f=!0),t.voidElement||f||!v||"<"===v||p(t.children,e,a,h,n.ignoreWhitespace),o[t.tagName]=t,0===a&&r.push(t),(d=i[a-1])&&d.children.push(t),i[a]=t),(m||!g||t.voidElement)&&(m||a--,!f&&"<"!==v&&v&&p(d=-1===a?r:i[a].children,e,a,h,n.ignoreWhitespace))}),!r.length&&e.length&&p(r,e,0,0,n.ignoreWhitespace),r},stringify:function(e){return e.reduce(function(e,n){return e+f("",n)},"")}},h={bindI18n:"languageChanging languageChanged",bindI18nStore:"",transEmptyNodeValue:"",transSupportBasicHtmlNodes:!0,transKeepBasicHtmlNodesFor:["br","strong","i","p"],useSuspense:!0},v=t.createContext();function y(){return g}function b(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};h=i({},h,{},e)}function O(){return h}class j{constructor(){this.usedNamespaces={}}addUsedNamespaces(e){e.forEach(e=>{this.usedNamespaces[e]||(this.usedNamespaces[e]=!0)})}getUsedNamespaces(){return Object.keys(this.usedNamespaces)}}function S(e){d=e}function E(){return d}var w={type:"3rdParty",init(e){b(e.options.react),S(e)}};function N(e){return n=>new Promise(t=>{var r=x();e.getInitialProps?e.getInitialProps(n).then(e=>{t(i({},e,{},r))}):t(r)})}function x(){var e=E(),n=e.reportNamespaces?e.reportNamespaces.getUsedNamespaces():[],t={},r={};return e.languages.forEach(t=>{r[t]={},n.forEach(n=>{r[t][n]=e.getResourceBundle(t,n)||{}})}),t.initialI18nStore=r,t.initialLanguage=e.language,t}function k(){if(console&&console.warn){for(var e=arguments.length,n=new Array(e),t=0;t<e;t++)n[t]=arguments[t];"string"==typeof n[0]&&(n[0]="react-i18next:: ".concat(n[0])),console.warn(...n)}}var I={};function P(){for(var e=arguments.length,n=new Array(e),t=0;t<e;t++)n[t]=arguments[t];"string"==typeof n[0]&&I[n[0]]||("string"==typeof n[0]&&(I[n[0]]=new Date),k(...n))}function C(e,n,t){e.loadNamespaces(n,()=>{if(e.isInitialized)t();else{var n=()=>{setTimeout(()=>{e.off("initialized",n)},0),t()};e.on("initialized",n)}})}function R(e){return e.displayName||e.name||("string"==typeof e&&e.length>0?e:"Unknown")}function A(e){return e&&(e.children||e.props&&e.props.children)}function T(e){return e?e&&e.children?e.children:e.props&&e.props.children:[]}function z(e,n,r,a,o){if(""===n)return[];var c=a.transKeepBasicHtmlNodesFor||[],s=n&&new RegExp(c.join("|")).test(n);if(!e&&!s)return[n];var l={};!function e(n){"[object Array]"!==Object.prototype.toString.call(n)&&(n=[n]),n.forEach(n=>{"string"!=typeof n&&(A(n)?e(T(n)):"object"!=typeof n||t.isValidElement(n)||Object.assign(l,n))})}(e),n=r.services.interpolator.interpolate(n,i({},l,{},o),r.language);var u=function e(n,r){return"[object Array]"!==Object.prototype.toString.call(n)&&(n=[n]),"[object Array]"!==Object.prototype.toString.call(r)&&(r=[r]),r.reduce((r,o,l)=>{var u=o.children&&o.children[0]&&o.children[0].content;if("tag"===o.type){var p=n[parseInt(o.name,10)]||{},f=t.isValidElement(p);if("string"==typeof p)r.push(p);else if(A(p)){var d=T(p),g=e(d,o.children),m=function(e){return"[object Array]"===Object.prototype.toString.call(e)&&e.every(e=>t.isValidElement(e))}(d)&&0===g.length?d:g;p.dummy&&(p.children=m),r.push(t.cloneElement(p,i({},p.props,{key:l}),m))}else if(s&&"object"==typeof p&&p.dummy&&!f){var h=e(n,o.children);r.push(t.cloneElement(p,i({},p.props,{key:l}),h))}else if(isNaN(o.name))if(a.transSupportBasicHtmlNodes&&c.indexOf(o.name)>-1)if(o.voidElement)r.push(t.createElement(o.name,{key:"".concat(o.name,"-").concat(l)}));else{var v=e(n,o.children);r.push(t.createElement(o.name,{key:"".concat(o.name,"-").concat(l)},v))}else if(o.voidElement)r.push("<".concat(o.name," />"));else{var y=e(n,o.children);r.push("<".concat(o.name,">").concat(y,"</").concat(o.name,">"))}else if("object"!=typeof p||f)1===o.children.length&&u?r.push(t.cloneElement(p,i({},p.props,{key:l}),u)):r.push(t.cloneElement(p,i({},p.props,{key:l})));else{var b=o.children[0]?u:null;b&&r.push(b)}}else"text"===o.type&&r.push(o.content);return r},[])}([{dummy:!0,children:e}],m.parse("<0>".concat(n,"</0>")));return T(u[0])}function L(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},{i18n:r}=t,a=n.useContext(v),{i18n:o,defaultNS:c}=y()&&a||{},s=r||o||E();if(s&&!s.reportNamespaces&&(s.reportNamespaces=new j),!s){P("You will need pass in an i18next instance by using initReactI18next");var l=[e=>e,{},!1];return l.t=e=>e,l.i18n={},l.ready=!1,l}var u=i({},O(),{},s.options.react),{useSuspense:p=u.useSuspense}=t,f=e||c||s.options&&s.options.defaultNS;f="string"==typeof f?[f]:f||["translation"],s.reportNamespaces.addUsedNamespaces&&s.reportNamespaces.addUsedNamespaces(f);var d=(s.isInitialized||s.initializedStoreOnce)&&f.every(e=>(function(e,n){if(!n.languages||!n.languages.length)return P("i18n.languages were undefined or empty",n.languages),!0;var t=n.languages[0],r=!!n.options&&n.options.fallbackLng,a=n.languages[n.languages.length-1];if("cimode"===t.toLowerCase())return!0;var i=(e,t)=>{var r=n.services.backendConnector.state["".concat(e,"|").concat(t)];return-1===r||2===r};return!!n.hasResourceBundle(t,e)||(!n.services.backendConnector.backend||!(!i(t,e)||r&&!i(a,e)))})(e,s));function g(){return{t:s.getFixedT(null,"fallback"===u.nsMode?f:f[0])}}var[m,h]=n.useState(g());n.useEffect(()=>{var e=!0,{bindI18n:n,bindI18nStore:t}=u;function r(){e&&h(g())}return d||p||C(s,f,()=>{e&&h(g())}),n&&s&&s.on(n,r),t&&s&&s.store.on(t,r),()=>{e=!1,n&&s&&n.split(" ").forEach(e=>s.off(e,r)),t&&s&&t.split(" ").forEach(e=>s.store.off(e,r))}},[f.join()]);var b=[m.t,s,d];if(b.t=m.t,b.i18n=s,b.ready=d,d)return b;if(!d&&!p)return b;throw new Promise(e=>{C(s,f,()=>{h(g()),e()})})}function D(e,t){var r=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{},{i18n:a}=r,{i18n:i}=y()?n.useContext(v):{},o=a||i||E();o.options&&o.options.isClone||(e&&!o.initializedStoreOnce&&(o.services.resourceStore.data=e,o.initializedStoreOnce=!0),t&&!o.initializedLanguageOnce&&(o.changeLanguage(t),o.initializedLanguageOnce=!0))}e.I18nContext=v,e.I18nextProvider=function(e){var{i18n:n,defaultNS:r,children:a}=e;return g=!0,t.createElement(v.Provider,{value:{i18n:n,defaultNS:r}},a)},e.Trans=function(e){var{children:r,count:a,parent:c,i18nKey:s,tOptions:l,values:u,defaults:p,components:f,ns:d,i18n:g,t:m}=e,h=o(e,["children","count","parent","i18nKey","tOptions","values","defaults","components","ns","i18n","t"]),{i18n:b,defaultNS:j}=y()&&n.useContext(v)||{},S=g||b||E();if(!S)return P("You will need pass in an i18next instance by using i18nextReactModule"),r;var w=m||S.t.bind(S)||(e=>e),N=i({},O(),{},S.options&&S.options.react),x=void 0!==c?c:N.defaultTransParent,I=d||w.ns||j||S.options&&S.options.defaultNS;I="string"==typeof I?[I]:I||["translation"];var C=p||function e(n,r,a,o){if(!r)return"";"[object Array]"!==Object.prototype.toString.call(r)&&(r=[r]);var c=o.transKeepBasicHtmlNodesFor||[];return r.forEach((r,a)=>{var s="".concat(a);if("string"==typeof r)n="".concat(n).concat(r);else if(A(r)){var l=c.indexOf(r.type)>-1&&1===Object.keys(r.props).length&&"string"==typeof A(r)?r.type:s;n=r.props&&r.props.i18nIsDynamicList?"".concat(n,"<").concat(l,"></").concat(l,">"):"".concat(n,"<").concat(l,">").concat(e("",T(r),a+1,o),"</").concat(l,">")}else if(t.isValidElement(r))n=c.indexOf(r.type)>-1&&0===Object.keys(r.props).length?"".concat(n,"<").concat(r.type,"/>"):"".concat(n,"<").concat(s,"></").concat(s,">");else if("object"==typeof r){var u=i({},r),{format:p}=u;delete u.format;var f=Object.keys(u);p&&1===f.length?n="".concat(n,"{{").concat(f[0],", ").concat(p,"}}"):1===f.length?n="".concat(n,"{{").concat(f[0],"}}"):k("react-i18next: the passed in object contained more than one variable - the object should look like {{ value, format }} where format is optional.",r)}else k("Trans: the passed in value is invalid - seems you passed in a variable like {number} - please pass in variables for interpolation as full objects like {{number}}.",r)}),n}("",r,0,N)||N.transEmptyNodeValue,{hashTransKey:R}=N,L=s||(R?R(C):C),D=i({},l,{},u,{},u?{}:{interpolation:{prefix:"#$?",suffix:"?$#"}},{defaultValue:C,count:a,ns:I}),B=L?w(L,D):C;return x?t.createElement(x,h,z(f||r,B,S,N,D)):z(f||r,B,S,N,D)},e.Translation=function(e){var{ns:n,children:t}=e,r=o(e,["ns","children"]),[a,i,c]=L(n,r);return t(a,{i18n:i,lng:i.language},c)},e.composeInitialProps=N,e.getDefaults=O,e.getI18n=E,e.getInitialProps=x,e.initReactI18next=w,e.setDefaults=b,e.setI18n=S,e.useSSR=D,e.useTranslation=L,e.withSSR=function(){return function(e){function n(n){var{initialI18nStore:r,initialLanguage:a}=n,c=o(n,["initialI18nStore","initialLanguage"]);return D(r,a),t.createElement(e,i({},c))}return n.getInitialProps=N(e),n.displayName="withI18nextSSR(".concat(R(e),")"),n.WrappedComponent=e,n}},e.withTranslation=function(e){var n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};return function(r){function a(a,o){var[c,s,l]=L(e,a),u=i({},a,{t:c,i18n:s,tReady:l});return n.withRef&&o&&(u.ref=o),t.createElement(r,u)}return a.displayName="withI18nextTranslation(".concat(R(r),")"),a.WrappedComponent=r,n.withRef?t.forwardRef(a):a}},Object.defineProperty(e,"__esModule",{value:!0})});
+define(["exports","react"],(function(e,n){"use strict";var t="default"in n?n.default:n;function r(e,n,t){return n in e?Object.defineProperty(e,n,{value:t,enumerable:!0,configurable:!0,writable:!0}):e[n]=t,e}function a(){return(a=Object.assign||function(e){for(var n=1;n<arguments.length;n++){var t=arguments[n];for(var r in t)Object.prototype.hasOwnProperty.call(t,r)&&(e[r]=t[r])}return e}).apply(this,arguments)}function i(e,n){var t=Object.keys(e);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e);n&&(r=r.filter((function(n){return Object.getOwnPropertyDescriptor(e,n).enumerable}))),t.push.apply(t,r)}return t}function o(e){for(var n=1;n<arguments.length;n++){var t=null!=arguments[n]?arguments[n]:{};n%2?i(t,!0).forEach((function(n){r(e,n,t[n])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(t)):i(t).forEach((function(n){Object.defineProperty(e,n,Object.getOwnPropertyDescriptor(t,n))}))}return e}function s(e,n){if(null==e)return{};var t,r,a=function(e,n){if(null==e)return{};var t,r,a={},i=Object.keys(e);for(r=0;r<i.length;r++)t=i[r],n.indexOf(t)>=0||(a[t]=e[t]);return a}(e,n);if(Object.getOwnPropertySymbols){var i=Object.getOwnPropertySymbols(e);for(r=0;r<i.length;r++)t=i[r],n.indexOf(t)>=0||Object.prototype.propertyIsEnumerable.call(e,t)&&(a[t]=e[t])}return a}var c={area:!0,base:!0,br:!0,col:!0,embed:!0,hr:!0,img:!0,input:!0,keygen:!0,link:!0,menuitem:!0,meta:!0,param:!0,source:!0,track:!0,wbr:!0},l=/([\w-]+)|=|(['"])([.\s\S]*?)\2/g,u=/(?:<!--[\S\s]*?-->|<(?:"[^"]*"['"]*|'[^']*'['"]*|[^'">])+>)/g,p=Object.create?Object.create(null):{};function f(e,n,t,r,a){var i=n.indexOf("<",r),o=n.slice(r,-1===i?void 0:i);/^\s*$/.test(o)&&(o=" "),(!a&&i>-1&&t+e.length>=0||" "!==o)&&e.push({type:"text",content:o})}function d(e,n){switch(n.type){case"text":return e+n.content;case"tag":return e+="<"+n.name+(n.attrs?function(e){var n=[];for(var t in e)n.push(t+'="'+e[t]+'"');return n.length?" "+n.join(" "):""}(n.attrs):"")+(n.voidElement?"/>":">"),n.voidElement?e:e+n.children.reduce(d,"")+"</"+n.name+">"}}var g,h,m={parse:function(e,n){n||(n={}),n.components||(n.components=p);var t,r=[],a=-1,i=[],o={},s=!1;return e.replace(u,(function(u,p){if(s){if(u!=="</"+t.name+">")return;s=!1}var d,g="/"!==u.charAt(1),h=0===u.indexOf("\x3c!--"),m=p+u.length,v=e.charAt(m);g&&!h&&(a++,"tag"===(t=function(e){var n,t=0,r=!0,a={type:"tag",name:"",voidElement:!1,attrs:{},children:[]};return e.replace(l,(function(i){if("="===i)return r=!0,void t++;r?0===t?((c[i]||"/"===e.charAt(e.length-2))&&(a.voidElement=!0),a.name=i):(a.attrs[n]=i.replace(/^['"]|['"]$/g,""),n=void 0):(n&&(a.attrs[n]=n),n=i),t++,r=!1})),a}(u)).type&&n.components[t.name]&&(t.type="component",s=!0),t.voidElement||s||!v||"<"===v||f(t.children,e,a,m,n.ignoreWhitespace),o[t.tagName]=t,0===a&&r.push(t),(d=i[a-1])&&d.children.push(t),i[a]=t),(h||!g||t.voidElement)&&(h||a--,!s&&"<"!==v&&v&&f(d=-1===a?r:i[a].children,e,a,m,n.ignoreWhitespace))})),!r.length&&e.length&&f(r,e,0,0,n.ignoreWhitespace),r},stringify:function(e){return e.reduce((function(e,n){return e+d("",n)}),"")}},v={bindI18n:"languageChanging languageChanged",bindI18nStore:"",transEmptyNodeValue:"",transSupportBasicHtmlNodes:!0,transKeepBasicHtmlNodesFor:["br","strong","i","p"],useSuspense:!0},y=t.createContext();function b(){return h}function O(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};v=o({},v,{},e)}function w(){return v}class E{constructor(){this.usedNamespaces={}}addUsedNamespaces(e){e.forEach(e=>{this.usedNamespaces[e]||(this.usedNamespaces[e]=!0)})}getUsedNamespaces(){return Object.keys(this.usedNamespaces)}}function j(e){g=e}function N(){return g}var S={type:"3rdParty",init(e){O(e.options.react),j(e)}};function x(e){return n=>new Promise(t=>{var r=k();e.getInitialProps?e.getInitialProps(n).then(e=>{t(o({},e,{},r))}):t(r)})}function k(){var e=N(),n=e.reportNamespaces?e.reportNamespaces.getUsedNamespaces():[],t={},r={};return e.languages.forEach(t=>{r[t]={},n.forEach(n=>{r[t][n]=e.getResourceBundle(t,n)||{}})}),t.initialI18nStore=r,t.initialLanguage=e.language,t}function I(){if(console&&console.warn){for(var e=arguments.length,n=new Array(e),t=0;t<e;t++)n[t]=arguments[t];"string"==typeof n[0]&&(n[0]="react-i18next:: ".concat(n[0])),console.warn(...n)}}var P={};function R(){for(var e=arguments.length,n=new Array(e),t=0;t<e;t++)n[t]=arguments[t];"string"==typeof n[0]&&P[n[0]]||("string"==typeof n[0]&&(P[n[0]]=new Date),I(...n))}function C(e,n,t){e.loadNamespaces(n,()=>{if(e.isInitialized)t();else{var n=()=>{setTimeout(()=>{e.off("initialized",n)},0),t()};e.on("initialized",n)}})}function T(e){return e.displayName||e.name||("string"==typeof e&&e.length>0?e:"Unknown")}function z(e){return e&&(e.children||e.props&&e.props.children)}function L(e){return e?e&&e.children?e.children:e.props&&e.props.children:[]}function A(e){return Array.isArray(e)?e:[e]}function D(e,n,r,a,i){if(""===n)return[];var s=a.transKeepBasicHtmlNodesFor||[],c=n&&new RegExp(s.join("|")).test(n);if(!e&&!c)return[n];var l={};!function e(n){A(n).forEach(n=>{"string"!=typeof n&&(z(n)?e(L(n)):"object"!=typeof n||t.isValidElement(n)||Object.assign(l,n))})}(e);var u=r.services.interpolator.interpolate(n,o({},l,{},i),r.language);var p=function e(n,r){var i=A(n);return A(r).reduce((n,r,l)=>{var u=r.children&&r.children[0]&&r.children[0].content;if("tag"===r.type){var p=i[parseInt(r.name,10)]||{},f=t.isValidElement(p);if("string"==typeof p)n.push(p);else if(z(p)){var d=L(p),g=e(d,r.children),h=function(e){return"[object Array]"===Object.prototype.toString.call(e)&&e.every(e=>t.isValidElement(e))}(d)&&0===g.length?d:g;p.dummy&&(p.children=h),n.push(t.cloneElement(p,o({},p.props,{key:l}),h))}else if(c&&"object"==typeof p&&p.dummy&&!f){var m=e(i,r.children);n.push(t.cloneElement(p,o({},p.props,{key:l}),m))}else if(Number.isNaN(parseFloat(r.name)))if(a.transSupportBasicHtmlNodes&&s.indexOf(r.name)>-1)if(r.voidElement)n.push(t.createElement(r.name,{key:"".concat(r.name,"-").concat(l)}));else{var v=e(i,r.children);n.push(t.createElement(r.name,{key:"".concat(r.name,"-").concat(l)},v))}else if(r.voidElement)n.push("<".concat(r.name," />"));else{var y=e(i,r.children);n.push("<".concat(r.name,">").concat(y,"</").concat(r.name,">"))}else if("object"!=typeof p||f)1===r.children.length&&u?n.push(t.cloneElement(p,o({},p.props,{key:l}),u)):n.push(t.cloneElement(p,o({},p.props,{key:l})));else{var b=r.children[0]?u:null;b&&n.push(b)}}else"text"===r.type&&n.push(r.content);return n},[])}([{dummy:!0,children:e}],m.parse("<0>".concat(u,"</0>")));return L(p[0])}function B(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},{i18n:r}=t,a=n.useContext(y),{i18n:i,defaultNS:s}=b()&&a||{},c=r||i||N();if(c&&!c.reportNamespaces&&(c.reportNamespaces=new E),!c){R("You will need pass in an i18next instance by using initReactI18next");var l=[e=>e,{},!1];return l.t=e=>e,l.i18n={},l.ready=!1,l}var u=o({},w(),{},c.options.react),{useSuspense:p=u.useSuspense}=t,f=e||s||c.options&&c.options.defaultNS;f="string"==typeof f?[f]:f||["translation"],c.reportNamespaces.addUsedNamespaces&&c.reportNamespaces.addUsedNamespaces(f);var d=(c.isInitialized||c.initializedStoreOnce)&&f.every(e=>(function(e,n){if(!n.languages||!n.languages.length)return R("i18n.languages were undefined or empty",n.languages),!0;var t=n.languages[0],r=!!n.options&&n.options.fallbackLng,a=n.languages[n.languages.length-1];if("cimode"===t.toLowerCase())return!0;var i=(e,t)=>{var r=n.services.backendConnector.state["".concat(e,"|").concat(t)];return-1===r||2===r};return!!n.hasResourceBundle(t,e)||(!n.services.backendConnector.backend||!(!i(t,e)||r&&!i(a,e)))})(e,c));function g(){return{t:c.getFixedT(null,"fallback"===u.nsMode?f:f[0])}}var[h,m]=n.useState(g());n.useEffect(()=>{var e=!0,{bindI18n:n,bindI18nStore:t}=u;function r(){e&&m(g())}return d||p||C(c,f,()=>{e&&m(g())}),n&&c&&c.on(n,r),t&&c&&c.store.on(t,r),()=>{e=!1,n&&c&&n.split(" ").forEach(e=>c.off(e,r)),t&&c&&t.split(" ").forEach(e=>c.store.off(e,r))}},[f.join()]);var v=[h.t,c,d];if(v.t=h.t,v.i18n=c,v.ready=d,d)return v;if(!d&&!p)return v;throw new Promise(e=>{C(c,f,()=>{m(g()),e()})})}function V(e,t){var r=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{},{i18n:a}=r,i=n.useContext(y),{i18n:o}=b()&&i||{},s=a||o||N();s.options&&s.options.isClone||(e&&!s.initializedStoreOnce&&(s.services.resourceStore.data=e,s.initializedStoreOnce=!0),t&&!s.initializedLanguageOnce&&(s.changeLanguage(t),s.initializedLanguageOnce=!0))}e.I18nContext=y,e.I18nextProvider=function(e){var{i18n:n,defaultNS:r,children:a}=e;return h=!0,t.createElement(y.Provider,{value:{i18n:n,defaultNS:r}},a)},e.Trans=function(e){var{children:r,count:a,parent:i,i18nKey:c,tOptions:l,values:u,defaults:p,components:f,ns:d,i18n:g,t:h}=e,m=s(e,["children","count","parent","i18nKey","tOptions","values","defaults","components","ns","i18n","t"]),{i18n:v,defaultNS:O}=b()&&n.useContext(y)||{},E=g||v||N();if(!E)return R("You will need pass in an i18next instance by using i18nextReactModule"),r;var j=h||E.t.bind(E)||(e=>e),S=o({},w(),{},E.options&&E.options.react),x=void 0!==i?i:S.defaultTransParent,k=d||j.ns||O||E.options&&E.options.defaultNS;k="string"==typeof k?[k]:k||["translation"];var P=p||function e(n,r,a,i){if(!r)return"";var s=n,c=A(r),l=i.transKeepBasicHtmlNodesFor||[];return c.forEach((n,r)=>{var a="".concat(r);if("string"==typeof n)s="".concat(s).concat(n);else if(z(n)){var c=l.indexOf(n.type)>-1&&1===Object.keys(n.props).length&&"string"==typeof z(n)?n.type:a;s=n.props&&n.props.i18nIsDynamicList?"".concat(s,"<").concat(c,"></").concat(c,">"):"".concat(s,"<").concat(c,">").concat(e("",L(n),r+1,i),"</").concat(c,">")}else if(t.isValidElement(n))s=l.indexOf(n.type)>-1&&0===Object.keys(n.props).length?"".concat(s,"<").concat(n.type,"/>"):"".concat(s,"<").concat(a,"></").concat(a,">");else if("object"==typeof n){var u=o({},n),{format:p}=u;delete u.format;var f=Object.keys(u);p&&1===f.length?s="".concat(s,"{{").concat(f[0],", ").concat(p,"}}"):1===f.length?s="".concat(s,"{{").concat(f[0],"}}"):I("react-i18next: the passed in object contained more than one variable - the object should look like {{ value, format }} where format is optional.",n)}else I("Trans: the passed in value is invalid - seems you passed in a variable like {number} - please pass in variables for interpolation as full objects like {{number}}.",n)}),s}("",r,0,S)||S.transEmptyNodeValue,{hashTransKey:C}=S,T=c||(C?C(P):P),B=o({},l,{count:a},u,{},u?{}:{interpolation:{prefix:"#$?",suffix:"?$#"}},{defaultValue:P,ns:k}),V=T?j(T,B):P;return x?t.createElement(x,m,D(f||r,V,E,S,B)):D(f||r,V,E,S,B)},e.Translation=function(e){var{ns:n,children:t}=e,r=s(e,["ns","children"]),[a,i,o]=B(n,r);return t(a,{i18n:i,lng:i.language},o)},e.composeInitialProps=x,e.getDefaults=w,e.getI18n=N,e.getInitialProps=k,e.initReactI18next=S,e.setDefaults=O,e.setI18n=j,e.useSSR=V,e.useTranslation=B,e.withSSR=function(){return function(e){function n(n){var{initialI18nStore:r,initialLanguage:a}=n,i=s(n,["initialI18nStore","initialLanguage"]);return V(r,a),t.createElement(e,o({},i))}return n.getInitialProps=x(e),n.displayName="withI18nextSSR(".concat(T(e),")"),n.WrappedComponent=e,n}},e.withTranslation=function(e){var n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};return function(r){function i(a){var{forwardedRef:i}=a,c=s(a,["forwardedRef"]),[l,u,p]=B(e,c),f=o({},c,{t:l,i18n:u,tReady:p});return n.withRef&&i&&(f.ref=i),t.createElement(r,f)}i.displayName="withI18nextTranslation(".concat(T(r),")"),i.WrappedComponent=r;return n.withRef?t.forwardRef((e,n)=>t.createElement(i,a({},e,{forwardedRef:n}))):i}},Object.defineProperty(e,"__esModule",{value:!0})}));

package/dist/commonjs/Trans.js

@@ -44,33 +44,36 @@ function hasValidReactChildren(children) {
   });
 }
 
-function nodesToString(mem, children, index, i18nOptions) {
+function getAsArray(data) {
+  return Array.isArray(data) ? data : [data];
+}
+
+function nodesToString(startingString, children, index, i18nOptions) {
   if (!children) return '';
-  if (Object.prototype.toString.call(children) !== '[object Array]') children = [children];
+  var stringNode = startingString;
+  var childrenArray = getAsArray(children);
   var keepArray = i18nOptions.transKeepBasicHtmlNodesFor || [];
-  children.forEach(function (child, i) {
-    // const isElement = React.isValidElement(child);
-    // const elementKey = `${index !== 0 ? index + '-' : ''}${i}:${typeof child.type === 'function' ? child.type.name : child.type || 'var'}`;
+  childrenArray.forEach(function (child, i) {
     var elementKey = "".concat(i);
 
     if (typeof child === 'string') {
-      mem = "".concat(mem).concat(child);
+      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>"
-        mem = "".concat(mem, "<").concat(elementTag, "></").concat(elementTag, ">");
+        stringNode = "".concat(stringNode, "<").concat(elementTag, "></").concat(elementTag, ">");
       } else {
         // regular case mapping the inner children
-        mem = "".concat(mem, "<").concat(elementTag, ">").concat(nodesToString('', getChildren(child), i + 1, i18nOptions), "</").concat(elementTag, ">");
+        stringNode = "".concat(stringNode, "<").concat(elementTag, ">").concat(nodesToString('', getChildren(child), i + 1, i18nOptions), "</").concat(elementTag, ">");
       }
     } else if (_react["default"].isValidElement(child)) {
       if (keepArray.indexOf(child.type) > -1 && Object.keys(child.props).length === 0) {
-        mem = "".concat(mem, "<").concat(child.type, "/>");
+        stringNode = "".concat(stringNode, "<").concat(child.type, "/>");
       } else {
-        mem = "".concat(mem, "<").concat(elementKey, "></").concat(elementKey, ">");
+        stringNode = "".concat(stringNode, "<").concat(elementKey, "></").concat(elementKey, ">");
       }
     } else if ((0, _typeof2["default"])(child) === 'object') {
       var clone = _objectSpread({}, child);
@@ -80,9 +83,9 @@ function nodesToString(mem, children, index, i18nOptions) {
       var keys = Object.keys(clone);
 
       if (format && keys.length === 1) {
-        mem = "".concat(mem, "{{").concat(keys[0], ", ").concat(format, "}}");
+        stringNode = "".concat(stringNode, "{{").concat(keys[0], ", ").concat(format, "}}");
       } else if (keys.length === 1) {
-        mem = "".concat(mem, "{{").concat(keys[0], "}}");
+        stringNode = "".concat(stringNode, "{{").concat(keys[0], "}}");
       } else {
         // not a valid interpolation object (can only contain one value plus format)
         (0, _utils.warn)("react-i18next: the passed in object contained more than one variable - the object should look like {{ value, format }} where format is optional.", child);
@@ -91,7 +94,7 @@ function nodesToString(mem, children, index, i18nOptions) {
       (0, _utils.warn)("Trans: the passed in value is invalid - seems you passed in a variable like {number} - please pass in variables for interpolation as full objects like {{number}}.", child);
     }
   });
-  return mem;
+  return stringNode;
 }
 
 function renderNodes(children, targetString, i18n, i18nOptions, combinedTOpts) {
@@ -105,22 +108,22 @@ function renderNodes(children, targetString, i18n, i18nOptions, combinedTOpts) {
   var data = {};
 
   function getData(childs) {
-    if (Object.prototype.toString.call(childs) !== '[object Array]') childs = [childs];
-    childs.forEach(function (child) {
+    var childrenArray = getAsArray(childs);
+    childrenArray.forEach(function (child) {
       if (typeof child === 'string') return;
       if (hasChildren(child)) getData(getChildren(child));else if ((0, _typeof2["default"])(child) === 'object' && !_react["default"].isValidElement(child)) Object.assign(data, child);
     });
   }
 
   getData(children);
-  targetString = i18n.services.interpolator.interpolate(targetString, _objectSpread({}, data, {}, combinedTOpts), i18n.language); // parse ast from string with additional wrapper tag
+  var interpolatedString = i18n.services.interpolator.interpolate(targetString, _objectSpread({}, data, {}, combinedTOpts), i18n.language); // parse ast from string with additional wrapper tag
   // -> avoids issues in parser removing prepending text nodes
 
-  var ast = _htmlParseStringify["default"].parse("<0>".concat(targetString, "</0>"));
+  var ast = _htmlParseStringify["default"].parse("<0>".concat(interpolatedString, "</0>"));
 
-  function mapAST(reactNodes, astNodes) {
-    if (Object.prototype.toString.call(reactNodes) !== '[object Array]') reactNodes = [reactNodes];
-    if (Object.prototype.toString.call(astNodes) !== '[object Array]') astNodes = [astNodes];
+  function mapAST(reactNode, astNode) {
+    var reactNodes = getAsArray(reactNode);
+    var astNodes = getAsArray(astNode);
     return astNodes.reduce(function (mem, node, i) {
       var translationContent = node.children && node.children[0] && node.children[0].content;
 
@@ -151,7 +154,7 @@ function renderNodes(children, targetString, i18n, i18nOptions, combinedTOpts) {
           mem.push(_react["default"].cloneElement(child, _objectSpread({}, child.props, {
             key: i
           }), _inner));
-        } else if (isNaN(node.name)) {
+        } else if (Number.isNaN(parseFloat(node.name))) {
           if (i18nOptions.transSupportBasicHtmlNodes && keepArray.indexOf(node.name) > -1) {
             if (node.voidElement) {
               mem.push(_react["default"].createElement(node.name, {
@@ -256,9 +259,10 @@ function Trans(_ref) {
     }
   };
 
-  var combinedTOpts = _objectSpread({}, tOptions, {}, values, {}, interpolationOverride, {
+  var combinedTOpts = _objectSpread({}, tOptions, {
+    count: count
+  }, values, {}, interpolationOverride, {
     defaultValue: defaultValue,
-    count: count,
     ns: namespaces
   });
 

package/dist/commonjs/Translation.js

@@ -11,8 +11,6 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 
-var _react = _interopRequireDefault(require("react"));
-
 var _useTranslation3 = require("./useTranslation");
 
 function Translation(props) {

package/dist/commonjs/useSSR.js

@@ -12,8 +12,9 @@ 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)() ? (0, _react.useContext)(_context.I18nContext) : {},
+  var _ref = (0, _context.getHasUsedI18nextProvider)() ? ReactI18nContext || {} : {},
       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

package/dist/commonjs/withTranslation.js

@@ -7,10 +7,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.withTranslation = withTranslation;
 
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+
 var _react = _interopRequireDefault(require("react"));
 
 var _useTranslation3 = require("./useTranslation");
@@ -24,21 +28,24 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function withTranslation(ns) {
   var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   return function Extend(WrappedComponent) {
-    function I18nextWithTranslation(props, ref) {
-      var _useTranslation = (0, _useTranslation3.useTranslation)(ns, props),
+    function I18nextWithTranslation(_ref) {
+      var forwardedRef = _ref.forwardedRef,
+          rest = (0, _objectWithoutProperties2["default"])(_ref, ["forwardedRef"]);
+
+      var _useTranslation = (0, _useTranslation3.useTranslation)(ns, rest),
           _useTranslation2 = (0, _slicedToArray2["default"])(_useTranslation, 3),
           t = _useTranslation2[0],
           i18n = _useTranslation2[1],
           ready = _useTranslation2[2];
 
-      var passDownProps = _objectSpread({}, props, {
+      var passDownProps = _objectSpread({}, rest, {
         t: t,
         i18n: i18n,
         tReady: ready
       });
 
-      if (options.withRef && ref) {
-        passDownProps.ref = ref;
+      if (options.withRef && forwardedRef) {
+        passDownProps.ref = forwardedRef;
       }
 
       return _react["default"].createElement(WrappedComponent, passDownProps);
@@ -46,6 +53,13 @@ function withTranslation(ns) {
 
     I18nextWithTranslation.displayName = "withI18nextTranslation(".concat((0, _utils.getDisplayName)(WrappedComponent), ")");
     I18nextWithTranslation.WrappedComponent = WrappedComponent;
-    return options.withRef ? _react["default"].forwardRef(I18nextWithTranslation) : I18nextWithTranslation;
+
+    var forwardRef = function forwardRef(props, ref) {
+      return _react["default"].createElement(I18nextWithTranslation, (0, _extends2["default"])({}, props, {
+        forwardedRef: ref
+      }));
+    };
+
+    return options.withRef ? _react["default"].forwardRef(forwardRef) : I18nextWithTranslation;
   };
 }

package/dist/es/Trans.js

@@ -27,33 +27,36 @@ function hasValidReactChildren(children) {
   });
 }
 
-export function nodesToString(mem, children, index, i18nOptions) {
+function getAsArray(data) {
+  return Array.isArray(data) ? data : [data];
+}
+
+export function nodesToString(startingString, children, index, i18nOptions) {
   if (!children) return '';
-  if (Object.prototype.toString.call(children) !== '[object Array]') children = [children];
+  var stringNode = startingString;
+  var childrenArray = getAsArray(children);
   var keepArray = i18nOptions.transKeepBasicHtmlNodesFor || [];
-  children.forEach(function (child, i) {
-    // const isElement = React.isValidElement(child);
-    // const elementKey = `${index !== 0 ? index + '-' : ''}${i}:${typeof child.type === 'function' ? child.type.name : child.type || 'var'}`;
+  childrenArray.forEach(function (child, i) {
     var elementKey = "".concat(i);
 
     if (typeof child === 'string') {
-      mem = "".concat(mem).concat(child);
+      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>"
-        mem = "".concat(mem, "<").concat(elementTag, "></").concat(elementTag, ">");
+        stringNode = "".concat(stringNode, "<").concat(elementTag, "></").concat(elementTag, ">");
       } else {
         // regular case mapping the inner children
-        mem = "".concat(mem, "<").concat(elementTag, ">").concat(nodesToString('', getChildren(child), i + 1, i18nOptions), "</").concat(elementTag, ">");
+        stringNode = "".concat(stringNode, "<").concat(elementTag, ">").concat(nodesToString('', getChildren(child), i + 1, i18nOptions), "</").concat(elementTag, ">");
       }
     } else if (React.isValidElement(child)) {
       if (keepArray.indexOf(child.type) > -1 && Object.keys(child.props).length === 0) {
-        mem = "".concat(mem, "<").concat(child.type, "/>");
+        stringNode = "".concat(stringNode, "<").concat(child.type, "/>");
       } else {
-        mem = "".concat(mem, "<").concat(elementKey, "></").concat(elementKey, ">");
+        stringNode = "".concat(stringNode, "<").concat(elementKey, "></").concat(elementKey, ">");
       }
     } else if (_typeof(child) === 'object') {
       var clone = _objectSpread({}, child);
@@ -63,9 +66,9 @@ export function nodesToString(mem, children, index, i18nOptions) {
       var keys = Object.keys(clone);
 
       if (format && keys.length === 1) {
-        mem = "".concat(mem, "{{").concat(keys[0], ", ").concat(format, "}}");
+        stringNode = "".concat(stringNode, "{{").concat(keys[0], ", ").concat(format, "}}");
       } else if (keys.length === 1) {
-        mem = "".concat(mem, "{{").concat(keys[0], "}}");
+        stringNode = "".concat(stringNode, "{{").concat(keys[0], "}}");
       } 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);
@@ -74,7 +77,7 @@ export function nodesToString(mem, children, index, i18nOptions) {
       warn("Trans: the passed in value is invalid - seems you passed in a variable like {number} - please pass in variables for interpolation as full objects like {{number}}.", child);
     }
   });
-  return mem;
+  return stringNode;
 }
 
 function renderNodes(children, targetString, i18n, i18nOptions, combinedTOpts) {
@@ -88,22 +91,22 @@ function renderNodes(children, targetString, i18n, i18nOptions, combinedTOpts) {
   var data = {};
 
   function getData(childs) {
-    if (Object.prototype.toString.call(childs) !== '[object Array]') childs = [childs];
-    childs.forEach(function (child) {
+    var childrenArray = getAsArray(childs);
+    childrenArray.forEach(function (child) {
       if (typeof child === 'string') return;
       if (hasChildren(child)) getData(getChildren(child));else if (_typeof(child) === 'object' && !React.isValidElement(child)) Object.assign(data, child);
     });
   }
 
   getData(children);
-  targetString = i18n.services.interpolator.interpolate(targetString, _objectSpread({}, data, {}, combinedTOpts), i18n.language); // parse ast from string with additional wrapper tag
+  var interpolatedString = i18n.services.interpolator.interpolate(targetString, _objectSpread({}, data, {}, combinedTOpts), i18n.language); // parse ast from string with additional wrapper tag
   // -> avoids issues in parser removing prepending text nodes
 
-  var ast = HTML.parse("<0>".concat(targetString, "</0>"));
+  var ast = HTML.parse("<0>".concat(interpolatedString, "</0>"));
 
-  function mapAST(reactNodes, astNodes) {
-    if (Object.prototype.toString.call(reactNodes) !== '[object Array]') reactNodes = [reactNodes];
-    if (Object.prototype.toString.call(astNodes) !== '[object Array]') astNodes = [astNodes];
+  function mapAST(reactNode, astNode) {
+    var reactNodes = getAsArray(reactNode);
+    var astNodes = getAsArray(astNode);
     return astNodes.reduce(function (mem, node, i) {
       var translationContent = node.children && node.children[0] && node.children[0].content;
 
@@ -133,7 +136,7 @@ function renderNodes(children, targetString, i18n, i18nOptions, combinedTOpts) {
           mem.push(React.cloneElement(child, _objectSpread({}, child.props, {
             key: i
           }), _inner));
-        } else if (isNaN(node.name)) {
+        } else if (Number.isNaN(parseFloat(node.name))) {
           if (i18nOptions.transSupportBasicHtmlNodes && keepArray.indexOf(node.name) > -1) {
             if (node.voidElement) {
               mem.push(React.createElement(node.name, {
@@ -238,9 +241,10 @@ export function Trans(_ref) {
     }
   };
 
-  var combinedTOpts = _objectSpread({}, tOptions, {}, values, {}, interpolationOverride, {
+  var combinedTOpts = _objectSpread({}, tOptions, {
+    count: count
+  }, values, {}, interpolationOverride, {
     defaultValue: defaultValue,
-    count: count,
     ns: namespaces
   });
 

package/dist/es/Translation.js

@@ -1,6 +1,5 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-import React from 'react';
 import { useTranslation } from './useTranslation';
 export function Translation(props) {
   var ns = props.ns,

package/dist/es/useSSR.js

@@ -3,8 +3,9 @@ import { getI18n, getHasUsedI18nextProvider, 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() ? useContext(I18nContext) : {},
+  var _ref = getHasUsedI18nextProvider() ? ReactI18nContext || {} : {},
       i18nFromContext = _ref.i18n;
 
   var i18n = i18nFromProps || i18nFromContext || getI18n(); // opt out if is a cloned instance, eg. created by i18next-express-middleware on request