Merge pull request #2320 from golopot/issue-2319

[Fix] `prop-types`: fix crash on multiple destructuring
jsx-eslint · Jun 24, 2019 · 655eb01 · 655eb01
2 parents dfaa92f + 9639d82
commit 655eb01
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 1 deletion.
diff --git a/lib/util/usedPropTypes.js b/lib/util/usedPropTypes.js
@@ -489,7 +489,7 @@ module.exports = function usedPropTypesInstructions(context, components, utils)
 
       // let {firstname} = thing, where thing is defined by const thing = this.props.**.*
       if (propVariables.get(node.init.name)) {
-        markPropTypesAsUsed(node, propVariables.get(node.init.name));
+        markPropTypesAsUsed(node.id, propVariables.get(node.init.name));
       }
     },
 

diff --git a/tests/lib/rules/no-unused-prop-types.js b/tests/lib/rules/no-unused-prop-types.js
@@ -492,6 +492,22 @@ ruleTester.run('no-unused-prop-types', rule, {
       `,
       options: [{skipShapeProps: false}],
       parser: parsers.BABEL_ESLINT
+    }, {
+      code: `
+        function Foo({ a }) {
+          const { b } = a
+          return <>{ b.c }</>
+        }
+        Foo.propTypes = {
+          a: PropTypes.shape({
+            b: PropType.shape({
+              c: PropTypes.string,
+            }),
+          })
+        }
+      `,
+      options: [{skipShapeProps: false}],
+      parser: parsers.BABEL_ESLINT
     }, {
       // Destructured assignment with Shape propTypes with skipShapeProps off issue #816
       code: `

diff --git a/tests/lib/rules/prop-types.js b/tests/lib/rules/prop-types.js
@@ -2472,6 +2472,25 @@ ruleTester.run('prop-types', rule, {
         {message: "'a.nope' is missing in props validation"}
       ]
     },
+    {
+      code: `
+        function Foo({ a }) {
+          const { b } = a
+          return <p>{ b.nope }</p>
+        }
+
+        Foo.propTypes = {
+          a: PropTypes.shape({
+            b: PropType.shape({
+              _: PropType.string,
+            }),
+          })
+        }
+      `,
+      errors: [
+        {message: "'a.b.nope' is missing in props validation"}
+      ]
+    },
     {
       code: `
         function Foo(props) {