Merge pull request #6469 from keyanzhang/validate-foreignObject-children

Ensure validateDOMNesting catches nested body elements (cherry picked from commit 4016e71)
facebook · Apr 28, 2016 · afba0f3 · afba0f3
1 parent d2b947c
commit afba0f3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/src/renderers/dom/client/__tests__/validateDOMNesting-test.js b/src/renderers/dom/client/__tests__/validateDOMNesting-test.js
@@ -83,5 +83,7 @@ describe('ReactContextValidator', function() {
     expect(isTagStackValid(['table', 'tr'])).toBe(false);
     expect(isTagStackValid(['div', 'ul', 'li', 'div', 'li'])).toBe(false);
     expect(isTagStackValid(['div', 'html'])).toBe(false);
+    expect(isTagStackValid(['body', 'body'])).toBe(false);
+    expect(isTagStackValid(['svg', 'foreignObject', 'body', 'p'])).toBe(false);
   });
 });
diff --git a/src/renderers/dom/client/validateDOMNesting.js b/src/renderers/dom/client/validateDOMNesting.js
@@ -208,6 +208,7 @@ if (__DEV__) {
       case 'rt':
         return impliedEndTags.indexOf(parentTag) === -1;
 
+      case 'body':
       case 'caption':
       case 'col':
       case 'colgroup':