Move mismatch text hydration warning to the new hooks

This lets us ignore this call when we have parent props available and the suppression flag is set.
facebook · Oct 6, 2017 · b3dfd2d · b3dfd2d
1 parent 71e4d77
commit b3dfd2d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/renderers/dom/fiber/ReactDOMFiberComponent.js b/src/renderers/dom/fiber/ReactDOMFiberComponent.js
@@ -1140,12 +1140,13 @@ var ReactDOMFiberComponent = {
 
   diffHydratedText(textNode: Text, text: string): boolean {
     const isDifferent = textNode.nodeValue !== text;
+    return isDifferent;
+  },
+
+  warnForUnmatchedText(textNode: Text, text: string) {
     if (__DEV__) {
-      if (isDifferent) {
-        warnForTextDifference(textNode.nodeValue, text);
-      }
+      warnForTextDifference(textNode.nodeValue, text);
     }
-    return isDifferent;
   },
 
   warnForDeletedHydratableElement(

diff --git a/src/renderers/dom/fiber/ReactDOMFiberEntry.js b/src/renderers/dom/fiber/ReactDOMFiberEntry.js
@@ -50,6 +50,7 @@ var {
   updateProperties,
   diffHydratedProperties,
   diffHydratedText,
+  warnForUnmatchedText,
   warnForDeletedHydratableElement,
   warnForDeletedHydratableText,
   warnForInsertedHydratedElement,
@@ -531,6 +532,7 @@ var DOMRenderer = ReactFiberReconciler({
     text: string,
   ) {
     if (__DEV__) {
+      warnForUnmatchedText(textInstance, text);
     }
   },
 
@@ -541,7 +543,8 @@ var DOMRenderer = ReactFiberReconciler({
     textInstance: TextInstance,
     text: string,
   ) {
-    if (__DEV__) {
+    if (__DEV__ && parentProps[SUPPRESS_HYDRATION_WARNING] !== true) {
+      warnForUnmatchedText(textInstance, text);
     }
   },