Skip to content

Commit

Permalink
fix #217 for functional components (#235)
Browse files Browse the repository at this point in the history
Revert "fix: Make `styles` property always not enumerable"

This reverts commit f2e1bee.
  • Loading branch information
FezVrasta authored and gajus committed Apr 28, 2017
1 parent 1c43518 commit 067be0a
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions src/wrapStatelessFunction.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,23 @@ export default (Component: Function, defaultStyles: Object, options: Object): Fu
const WrappedComponent = (props = {}, ...args) => {
let styles;
let useProps;
const hasDefaultstyles = _.isObject(defaultStyles);

if (props.styles) {
useProps = props;
styles = props.styles;
} else if (_.isObject(defaultStyles)) {
useProps = _.assign({}, props, {
styles: defaultStyles
});
if (props.styles || hasDefaultstyles) {
useProps = Object.assign({}, props);

if (props.styles) {
styles = props.styles;
} else {
styles = defaultStyles;
}

Object.defineProperty(useProps, 'styles', {
configurable: true,
enumerable: false,
value: defaultStyles,
value: styles,
writable: false
});

styles = defaultStyles;
} else {
useProps = props;
styles = {};
Expand Down

0 comments on commit 067be0a

Please sign in to comment.