Merge pull request facebook#3148 from hmarr/fix-nan-mutation-warning

Prevent NaN props from triggering warnings
nickkeers · Feb 17, 2015 · de3ecab · de3ecab
2 parents cf4bef8 + 198aaba
commit de3ecab
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/classic/element/ReactElementValidator.js b/src/classic/element/ReactElementValidator.js
@@ -312,8 +312,14 @@ function checkAndWarnForMutatedProps(element) {
 
   for (var propName in props) {
     if (props.hasOwnProperty(propName)) {
-      if (!originalProps.hasOwnProperty(propName) ||
-          originalProps[propName] !== props[propName]) {
+      var valueChanged = originalProps[propName] !== props[propName];
+      // Necessary because NaN !== NaN
+      if (typeof originalProps[propName] === 'number' &&
+          typeof props[propName] === 'number' &&
+          isNaN(originalProps[propName]) && isNaN(props[propName])) {
+        valueChanged = false;
+      }
+      if (!originalProps.hasOwnProperty(propName) || valueChanged) {
         warnForPropsMutation(propName, element);
 
         // Copy over the new value so that the two props objects match again