Skip to content

Commit 632941c

Browse files
committed
Add SpreadElement support to require-default-props
1 parent b3ed9d6 commit 632941c

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

lib/rules/require-default-props.js

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

118118
return props.map(property => ({
119119
name: sourceCode.getText(property.key).replace(QUOTES_REGEX, ''),
@@ -184,7 +184,7 @@ module.exports = {
184184
* from this ObjectExpression can't be resolved.
185185
*/
186186
function getDefaultPropsFromObjectExpression(objectExpression) {
187-
const hasSpread = objectExpression.properties.find(property => property.type === 'ExperimentalSpreadProperty');
187+
const hasSpread = objectExpression.properties.find(property => property.type === 'ExperimentalSpreadProperty' || property.type === 'SpreadElement');
188188

189189
if (hasSpread) {
190190
return 'unresolved';
@@ -555,7 +555,7 @@ module.exports = {
555555

556556
// Search for the proptypes declaration
557557
node.properties.forEach(property => {
558-
if (property.type === 'ExperimentalSpreadProperty') {
558+
if (property.type === 'ExperimentalSpreadProperty' || property.type === 'SpreadElement') {
559559
return;
560560
}
561561

0 commit comments

Comments
 (0)