Skip to content

Commit cbd90a3

Browse files
author
Roy Sutton
committed
Correct React.createClass defaultProps
1 parent e1055b1 commit cbd90a3

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

lib/rules/no-invalid-default-props.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -584,10 +584,6 @@ module.exports = {
584584
return;
585585
}
586586

587-
if (isDefaultProp && property.value.type === 'ObjectExpression') {
588-
addDefaultPropsToComponent(component, getDefaultPropsFromObjectExpression(property.value));
589-
}
590-
591587
if (isDefaultProp && property.value.type === 'FunctionExpression') {
592588
var returnStatement = utils.findReturnStatement(property);
593589
if (!returnStatement || returnStatement.argument.type !== 'ObjectExpression') {

tests/lib/rules/no-invalid-default-props.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -887,15 +887,17 @@ ruleTester.run('no-invalid-default-props', rule, {
887887
' foo: React.PropTypes.string,',
888888
' bar: React.PropTypes.string.isRequired',
889889
' },',
890-
' defaultProps: {',
891-
' baz: "baz"',
890+
' getDefaultProps: function() {',
891+
' return {',
892+
' baz: "baz"',
893+
' };',
892894
' }',
893895
'});'
894896
].join('\n'),
895897
errors: [{
896898
message: 'defaultProp "baz" has no corresponding propTypes declaration.',
897-
line: 10,
898-
column: 5
899+
line: 11,
900+
column: 7
899901
}]
900902
},
901903
{

0 commit comments

Comments
 (0)