fix based on @jamuhl suggestion in #1468 (#1470)

i18next · Mar 17, 2022 · f8e197c · f8e197c
1 parent 45c01ce
commit f8e197c
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 5 deletions.
diff --git a/src/Trans.js b/src/Trans.js
@@ -38,7 +38,10 @@ export function nodesToString(children, i18nOptions) {
 
   // do not use `React.Children.toArray`, will fail at object children
   const childrenArray = getAsArray(children);
-  const keepArray = i18nOptions.transKeepBasicHtmlNodesFor || [];
+  const keepArray =
+    i18nOptions.transSupportBasicHtmlNodes && i18nOptions.transKeepBasicHtmlNodesFor
+      ? i18nOptions.transKeepBasicHtmlNodesFor
+      : [];
 
   // e.g. lorem <br/> ipsum {{ messageCount, format }} dolor <strong>bold</strong> amet
   childrenArray.forEach((child, childIndex) => {

diff --git a/test/trans.nodeToString.spec.js b/test/trans.nodeToString.spec.js
@@ -37,7 +37,10 @@ describe('trans nodeToString', () => {
       );
       const expected = 'lorem <br/> ipsum';
       const transKeepBasicHtmlNodesFor = ['br', 'strong', 'i'];
-      const actual = nodesToString(fragment.props.children, { transKeepBasicHtmlNodesFor });
+      const actual = nodesToString(fragment.props.children, {
+        transSupportBasicHtmlNodes: true,
+        transKeepBasicHtmlNodesFor,
+      });
       expect(actual).toEqual(expected);
     });
 
@@ -49,7 +52,10 @@ describe('trans nodeToString', () => {
       );
       const expected = 'lorem <strong>bold</strong> ipsum';
       const transKeepBasicHtmlNodesFor = ['br', 'strong', 'i'];
-      const actual = nodesToString(fragment.props.children, { transKeepBasicHtmlNodesFor });
+      const actual = nodesToString(fragment.props.children, {
+        transSupportBasicHtmlNodes: true,
+        transKeepBasicHtmlNodesFor,
+      });
       expect(actual).toEqual(expected);
     });
   });
@@ -63,7 +69,10 @@ describe('trans nodeToString', () => {
       );
       const expected = 'lorem <1></1> ipsum';
       const transKeepBasicHtmlNodesFor = ['br', 'strong', 'i'];
-      const actual = nodesToString(fragment.props.children, { transKeepBasicHtmlNodesFor });
+      const actual = nodesToString(fragment.props.children, {
+        transSupportBasicHtmlNodes: true,
+        transKeepBasicHtmlNodesFor,
+      });
       expect(actual).toEqual(expected);
     });
 
@@ -75,7 +84,10 @@ describe('trans nodeToString', () => {
       );
       const expected = 'lorem <1>bold</1> ipsum';
       const transKeepBasicHtmlNodesFor = ['br', 'strong', 'i'];
-      const actual = nodesToString(fragment.props.children, { transKeepBasicHtmlNodesFor });
+      const actual = nodesToString(fragment.props.children, {
+        transSupportBasicHtmlNodes: true,
+        transKeepBasicHtmlNodesFor,
+      });
       expect(actual).toEqual(expected);
     });
   });

diff --git a/test/trans.render.spec.js b/test/trans.render.spec.js
@@ -643,3 +643,39 @@ describe('trans should allow escaped html', () => {
     `);
   });
 });
+
+it('transSupportBasicHtmlNodes: false should not keep the name of simple nodes', () => {
+  const cloneInst = i18n.cloneInstance({
+    react: { transSupportBasicHtmlNodes: false, defaultTransParent: 'div' },
+  });
+
+  const TestComponent = () => (
+    <Trans i18n={cloneInst}>
+      <p>Plain paragraph</p>
+      <p>
+        Paragraph with <em>hack</em>
+      </p>
+      <p className="hack">Paragraph with hack</p>
+    </Trans>
+  );
+
+  const { container } = render(<TestComponent />);
+  expect(container.firstChild).toMatchInlineSnapshot(`
+    <div>
+      <p>
+        Plain paragraph
+      </p>
+      <p>
+        Paragraph with 
+        <em>
+          hack
+        </em>
+      </p>
+      <p
+        class="hack"
+      >
+        Paragraph with hack
+      </p>
+    </div>
+  `);
+});