Merge pull request #1939 from alexzherdev/prop-types-tests

Additional cases for prop-types and no-unused-prop-types
jsx-eslint · Aug 20, 2018 · 6b239a7 · 6b239a7
2 parents d7ba7c6 + 2d28512
commit 6b239a7
Show file tree

Hide file tree

Showing 5 changed files with 382 additions and 38 deletions.
diff --git a/lib/rules/no-unused-prop-types.js b/lib/rules/no-unused-prop-types.js
@@ -146,7 +146,7 @@ module.exports = {
     function mustBeValidated(component) {
       return Boolean(
         component &&
-        !component.ignorePropsValidation
+        !component.ignoreUnusedPropTypesValidation
       );
     }
 
@@ -397,7 +397,7 @@ module.exports = {
 
       const component = components.get(utils.getParentComponent());
       const usedPropTypes = component && component.usedPropTypes || [];
-      let ignorePropsValidation = component && component.ignorePropsValidation || false;
+      let ignoreUnusedPropTypesValidation = component && component.ignoreUnusedPropTypesValidation || false;
 
       switch (type) {
         case 'direct':
@@ -414,7 +414,7 @@ module.exports = {
         case 'destructuring':
           for (let k = 0, l = (properties || []).length; k < l; k++) {
             if (hasSpreadOperator(properties[k]) || properties[k].computed) {
-              ignorePropsValidation = true;
+              ignoreUnusedPropTypesValidation = true;
               break;
             }
             const propName = getKeyValue(properties[k]);
@@ -441,7 +441,7 @@ module.exports = {
 
       components.set(component ? component.node : node, {
         usedPropTypes: usedPropTypes,
-        ignorePropsValidation: ignorePropsValidation
+        ignoreUnusedPropTypesValidation: ignoreUnusedPropTypesValidation
       });
     }
 

diff --git a/lib/rules/prop-types.js b/lib/rules/prop-types.js
@@ -191,7 +191,7 @@ module.exports = {
           return true;
         }
         // Consider every children as declared
-        if (propType.children === true) {
+        if (propType.children === true || propType.containsSpread) {
           return true;
         }
         if (propType.acceptedProperties) {

diff --git a/lib/util/propTypes.js b/lib/util/propTypes.js
@@ -143,10 +143,10 @@ module.exports = function propTypesInstructions(context, components, utils) {
         }
       });
 
-      // nested object type spread means we need to ignore/accept everything in this object
-      if (containsObjectTypeSpread) {
-        return {};
-      }
+      // Mark if this shape has spread. We will know to consider all props from this shape as having propTypes,
+      // but still have the ability to detect unused children of this shape.
+      shapeTypeDefinition.containsSpread = containsObjectTypeSpread;
+
       return shapeTypeDefinition;
     },
 
@@ -669,7 +669,7 @@ module.exports = function propTypesInstructions(context, components, utils) {
     JSXSpreadAttribute: function(node) {
       const component = components.get(utils.getParentComponent());
       components.set(component ? component.node : node, {
-        ignorePropsValidation: true
+        ignoreUnusedPropTypesValidation: true
       });
     },