Clear body instead of document; use textContent instead of innerHTML

facebook · Apr 28, 2020 · f45a8a1 · f45a8a1
1 parent 39b2042
commit f45a8a1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 12 deletions.
diff --git a/packages/react-art/src/ReactARTHostConfig.js b/packages/react-art/src/ReactARTHostConfig.js
@@ -427,12 +427,8 @@ export function unhideTextInstance(textInstance, text): void {
   // Noop
 }
 
-export function clearContainer(container: Container): void {
-  // TODO This doesn't work for anything other than SVG.
-  // Is that okay?
-  while (container.lastChild != null) {
-    container.lastChild.eject();
-  }
+export function clearContainer(container) {
+  // TODO Implement this
 }
 
 export function DEPRECATED_mountResponderInstance(

diff --git a/packages/react-dom/src/client/ReactDOMHostConfig.js b/packages/react-dom/src/client/ReactDOMHostConfig.js
@@ -636,11 +636,11 @@ export function unhideTextInstance(
 
 export function clearContainer(container: Container): void {
   if (container.nodeType === ELEMENT_NODE) {
-    ((container: any): Element).innerHTML = '';
+    ((container: any): Element).textContent = '';
   } else if (container.nodeType === DOCUMENT_NODE) {
-    const documentElement = ((container: any): Document).documentElement;
-    if (documentElement != null) {
-      documentElement.innerHTML = '';
+    const body = ((container: any): Document).body;
+    if (body != null) {
+      body.textContent = '';
     }
   }
 }

diff --git a/packages/react-dom/src/client/__tests__/trustedTypes-test.internal.js b/packages/react-dom/src/client/__tests__/trustedTypes-test.internal.js
@@ -74,8 +74,7 @@ describe('when Trusted Types are available in global object', () => {
         container,
       );
       expect(container.innerHTML).toBe('<div><b>Hi</b></div>');
-      // Second call to innerHTML is the clearContainer check.
-      expect(innerHTMLCalls.length).toBe(2);
+      expect(innerHTMLCalls.length).toBe(1);
       // Ensure it didn't get stringified when passed to a DOM sink:
       expect(innerHTMLCalls[0]).toBe(ttObject1);