Skip to content

Commit daec531

Browse files
author
Vlad Balin
committed
removed dummy id from props defaults
1 parent 8bda205 commit daec531

File tree

4 files changed

+25
-29
lines changed

4 files changed

+25
-29
lines changed

nestedreact.js

Lines changed: 12 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

nestedreact.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/createClass.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,14 +105,13 @@ function createClass( spec ){
105105
var props = getTypeSpecs( spec, 'props' );
106106

107107
if( props ){
108-
var parsedProps = propTypes.parseProps( props ),
109-
propsModel = parsedProps.model;
108+
var parsedProps = propTypes.parseProps( props );
110109

111110
spec.propTypes = parsedProps.propTypes;
112111

113-
if( propsModel ){
112+
if( parsedProps.defaults ){
114113
spec.getDefaultProps = function(){
115-
return propsModel.defaults();
114+
return parsedProps.defaults;
116115
}
117116
}
118117
}

src/propTypes.js

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,23 @@ var Nested = require( 'nestedtypes' ),
33

44
function parseProps( props ){
55
var propTypes = {},
6-
defaults, defaultsProto,
6+
defaults,
77
modelProto = Nested.Model.defaults( props ).prototype;
88

99
modelProto.forEachAttr( modelProto.__attributes, function( spec, name ){
10-
propTypes[ name ] = translateType( spec.type );
11-
if( spec.value !== void 0 ){
12-
defaults || ( defaults = {} );
13-
defaults[ name ] = props[ name ];
10+
if( name !== 'id' ){
11+
propTypes[ name ] = translateType( spec.type );
12+
13+
if( spec.value !== void 0 ){
14+
defaults || ( defaults = {} );
15+
defaults[ name ] = spec.value;
16+
}
1417
}
1518
});
1619

17-
if( defaults ){
18-
defaultsProto = Nested.Model.defaults( defaults ).prototype;
19-
}
20-
2120
return {
2221
propTypes : propTypes,
23-
model : defaultsProto
22+
defaults : defaults
2423
};
2524
}
2625

0 commit comments

Comments
 (0)