Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 14 additions & 1 deletion lib/util/usedPropTypes.js
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,20 @@ module.exports = function usedPropTypesInstructions(context, components, utils)
}
}

components.set(component ? component.node : node, {
let targetNode = component ? component.node : node;

if (component && !component.declaredPropTypes) {
let parentComponent = components.get(node.parent);
while (parentComponent) {
if (parentComponent.declaredPropTypes) {
targetNode = parentComponent.node;
break;
}
parentComponent = components.get(parentComponent.parent);
}
}

components.set(targetNode, {
usedPropTypes,
ignoreUnusedPropTypesValidation,
});
Expand Down
36 changes: 36 additions & 0 deletions tests/lib/rules/no-unused-prop-types.js
Original file line number Diff line number Diff line change
Expand Up @@ -3948,6 +3948,22 @@ ruleTester.run('no-unused-prop-types', rule, {
`,
features: ['types'],
},
{
code: `
type Props = {
used: string;
};

const Demo = React.memo<Props>(
React.forwardRef<HTMLDivElement, Props>(
({ used }, ref) => {
return <div>{used}</div>
}
)
);
`,
features: ['types'],
},
]),

invalid: parsers.all([].concat(
Expand Down Expand Up @@ -6709,6 +6725,26 @@ ruleTester.run('no-unused-prop-types', rule, {
errors: [
{ message: '\'bar\' PropType is defined but prop is never used' },
],
},
{
code: `
type Props = {
used: string;
unused: string;
};

const Demo = React.memo<Props>(
React.forwardRef<HTMLDivElement, Props>(
({ used }, ref) => {
return <div>{used}</div>
}
)
);
`,
features: ['ts', 'no-babel'],
errors: [
{ message: '\'unused\' PropType is defined but prop is never used' },
],
}
)),
});
Loading