Skip to content

Commit e6e8955

Browse files
committed
Add SpreadElement support to default-props-match-prop-types
1 parent 589231a commit e6e8955

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

lib/rules/default-props-match-prop-types.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ module.exports = {
111111
* @returns {Object[]} Array of PropType object representations, to be consumed by `addPropTypesToComponent`.
112112
*/
113113
function getPropTypesFromObjectExpression(objectExpression) {
114-
const props = objectExpression.properties.filter(property => property.type !== 'ExperimentalSpreadProperty');
114+
const props = objectExpression.properties.filter(property => property.type !== 'ExperimentalSpreadProperty' && property.type !== 'SpreadElement');
115115

116116
return props.map(property => ({
117117
name: property.key.name,
@@ -209,7 +209,7 @@ module.exports = {
209209
* from this ObjectExpression can't be resolved.
210210
*/
211211
function getDefaultPropsFromObjectExpression(objectExpression) {
212-
const hasSpread = objectExpression.properties.find(property => property.type === 'ExperimentalSpreadProperty');
212+
const hasSpread = objectExpression.properties.find(property => property.type === 'ExperimentalSpreadProperty' || property.type === 'SpreadElement');
213213

214214
if (hasSpread) {
215215
return 'unresolved';
@@ -543,7 +543,7 @@ module.exports = {
543543

544544
// Search for the proptypes declaration
545545
node.properties.forEach(property => {
546-
if (property.type === 'ExperimentalSpreadProperty') {
546+
if (property.type === 'ExperimentalSpreadProperty' || property.type === 'SpreadElement') {
547547
return;
548548
}
549549

0 commit comments

Comments
 (0)