Merge pull request #1322 from DianaSuvorova/issue_#1309

Fix an issue with unused prop types.

Fixes #1309.

Author: ljharb

lib/util/Components.js

@@ -10,6 +10,30 @@ const doctrine = require('doctrine');
 const variableUtil = require('./variable');
 const pragmaUtil = require('./pragma');
 
+const usedPropTypesAreEquivalent = (propA, propB) => {
+  if (propA.name === propB.name) {
+    if (!propA.allNames && !propB.allNames) {
+      return true;
+    } else if (Array.isArray(propA.allNames) && Array.isArray(propB.allNames) && propA.allNames.join('') === propB.allNames.join('')) {
+      return true;
+    }
+    return false;
+  }
+  return false;
+};
+
+const mergeUsedPropTypes = (propsList, newPropsList) => {
+  const propsToAdd = [];
+  newPropsList.forEach(newProp => {
+    const newPropisAlreadyInTheList = propsList.some(prop => usedPropTypesAreEquivalent(prop, newProp));
+    if (!newPropisAlreadyInTheList) {
+      propsToAdd.push(newProp);
+    }
+  });
+  return propsList.concat(propsToAdd);
+};
+
+
 /**
  * Components
  * @class
@@ -70,7 +94,16 @@ Components.prototype.set = function(node, props) {
     return;
   }
   const id = this._getId(node);
+  let copyUsedPropTypes;
+  if (this._list[id]) {
+    // usedPropTypes is an array. _extend replaces existing array with a new one which caused issue #1309.
+    // preserving original array so it can be merged later on.
+    copyUsedPropTypes = this._list[id].usedPropTypes && this._list[id].usedPropTypes.slice();
+  }
   this._list[id] = util._extend(this._list[id], props);
+  if (this._list[id] && props.usedPropTypes) {
+    this._list[id].usedPropTypes = mergeUsedPropTypes(copyUsedPropTypes || [], props.usedPropTypes);
+  }
 };
 
 /**

tests/lib/rules/no-unused-prop-types.js

@@ -1897,7 +1897,7 @@ ruleTester.run('no-unused-prop-types', rule, {
         'const Thing = (props) => (',
         '    <div>',
         '      {(() => {',
-        '            if(props.enabled){',
+        '            if(props.enabled && props.test){',
         '                return (',
         '                    <span>Enabled!</span>',
         '                )',
@@ -1910,13 +1910,13 @@ ruleTester.run('no-unused-prop-types', rule, {
         ');',
 
         'Thing.propTypes = {',
-        '    enabled: React.PropTypes.bool',
+        '    enabled: React.PropTypes.bool,',
+        '    test: React.PropTypes.bool',
         '};'
       ].join('\n')
     }
   ],
 
-
   invalid: [
     {
       code: [