rebuild

i18next · Dec 7, 2020 · 9b082ae · 9b082ae
1 parent 8db49fa
commit 9b082ae
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+### 11.8.0
+
+- typescript: Make the translation function fully type-safe [1193](https://github.com/i18next/react-i18next/pull/1193)
+- trans should work with misleading overloaded empty elements in components [1206](https://github.com/i18next/react-i18next/pull/1206)
+
 ### 11.7.4
 
 - fixes passing interpolations options via Trans components tOptions prop [1204](https://github.com/i18next/react-i18next/pull/1204)

diff --git a/react-i18next.js b/react-i18next.js
@@ -637,11 +637,11 @@
       return hasValidReactChildren(childs) && mappedChildren.length === 0 ? childs : mappedChildren;
     }
 
-    function pushTranslatedJSX(child, inner, mem, i) {
+    function pushTranslatedJSX(child, inner, mem, i, isVoid) {
       if (child.dummy) child.children = inner;
       mem.push(React__default.cloneElement(child, _objectSpread2(_objectSpread2({}, child.props), {}, {
         key: i
-      }), inner));
+      }), isVoid ? undefined : inner));
     }
 
     function mapAST(reactNode, astNode, rootReactNode) {
@@ -677,7 +677,7 @@
             if (isKnownComponent) {
               var _inner2 = renderInner(child, node, rootReactNode);
 
-              pushTranslatedJSX(child, _inner2, mem, i);
+              pushTranslatedJSX(child, _inner2, mem, i, node.voidElement);
             } else if (i18nOptions.transSupportBasicHtmlNodes && keepArray.indexOf(node.name) > -1) {
               if (node.voidElement) {
                 mem.push(React__default.createElement(node.name, {