Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[fix]prop-types: fix case with destructuring and default param #2246

Merged
merged 1 commit into from
Apr 28, 2019
Merged

[fix]prop-types: fix case with destructuring and default param #2246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions lib/util/usedPropTypes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,16 +316,17 @@ module.exports = function usedPropTypesInstructions(context, components, utils)
break;
case 'ArrowFunctionExpression':
case 'FunctionDeclaration':
case 'FunctionExpression':
case 'FunctionExpression': {
if (node.params.length === 0) {
break;
}
type = 'destructuring';
properties = node.params[0].properties;
if (inSetStateUpdater()) {
properties = node.params[1].properties;
}
const propParam = inSetStateUpdater() ? node.params[1] : node.params[0];
properties = propParam.type === 'AssignmentPattern'
? propParam.left.properties
: propParam.properties;
break;
}
case 'VariableDeclarator':
for (let i = 0, j = node.id.properties.length; i < j; i++) {
// let {props: {firstname}} = this
Expand Down Expand Up @@ -421,7 +422,13 @@ module.exports = function usedPropTypesInstructions(context, components, utils)
* FunctionDeclaration, or FunctionExpression
*/
function markDestructuredFunctionArgumentsAsUsed(node) {
const destructuring = node.params && node.params[0] && node.params[0].type === 'ObjectPattern';
const param = node.params && inSetStateUpdater() ? node.params[1] : node.params[0];

const destructuring = param && (
param.type === 'ObjectPattern' ||
param.type === 'AssignmentPattern' && param.left.type === 'ObjectPattern'
);

if (destructuring && (components.get(node) || components.get(node.parent))) {
markPropTypesAsUsed(node);
}
Expand Down
25 changes: 25 additions & 0 deletions tests/lib/rules/prop-types.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3393,6 +3393,16 @@ ruleTester.run('prop-types', rule, {
errors: [
{message: '\'bar\' is missing in props validation'}
]
}, {
code: [
'function SomeComponent({bar} = baz) {',
' function f({foo}) {}',
' return <div className={f()}>{bar}</div>;',
'}'
].join('\n'),
errors: [
{message: '\'bar\' is missing in props validation'}
]
}, {
code: [
'class Hello extends React.PureComponent {',
Expand Down Expand Up @@ -4226,6 +4236,21 @@ ruleTester.run('prop-types', rule, {
message: '\'bar\' is missing in props validation'
}]
},
{
code: `
class Foo extends React.Component {
setZoo() {
this.setState((state, {zoo}) => ({ zoo }));
}
render() {
return <div />;
}
}
`,
errors: [{
message: '\'zoo\' is missing in props validation'
}]
},
{
code: `
class Foo extends React.Component {
Expand Down