Skip to content

Commit 067be0a

Browse files
FezVrastagajus
authored andcommitted
fix #217 for functional components (gajus#235)
Revert "fix: Make `styles` property always not enumerable" This reverts commit f2e1bee.
1 parent 1c43518 commit 067be0a

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

src/wrapStatelessFunction.js

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,23 @@ export default (Component: Function, defaultStyles: Object, options: Object): Fu
1212
const WrappedComponent = (props = {}, ...args) => {
1313
let styles;
1414
let useProps;
15+
const hasDefaultstyles = _.isObject(defaultStyles);
1516

16-
if (props.styles) {
17-
useProps = props;
18-
styles = props.styles;
19-
} else if (_.isObject(defaultStyles)) {
20-
useProps = _.assign({}, props, {
21-
styles: defaultStyles
22-
});
17+
if (props.styles || hasDefaultstyles) {
18+
useProps = Object.assign({}, props);
19+
20+
if (props.styles) {
21+
styles = props.styles;
22+
} else {
23+
styles = defaultStyles;
24+
}
2325

2426
Object.defineProperty(useProps, 'styles', {
2527
configurable: true,
2628
enumerable: false,
27-
value: defaultStyles,
29+
value: styles,
2830
writable: false
2931
});
30-
31-
styles = defaultStyles;
3232
} else {
3333
useProps = props;
3434
styles = {};

0 commit comments

Comments
 (0)