From 067be0a96e1b5d8a0b96cc600fbaa7d859df3dc9 Mon Sep 17 00:00:00 2001 From: Federico Zivolo Date: Fri, 28 Apr 2017 18:23:49 +0200 Subject: [PATCH] fix #217 for functional components (#235) Revert "fix: Make `styles` property always not enumerable" This reverts commit f2e1bee75cc23aea2d4a66512d0c0b1f0341bdca. --- src/wrapStatelessFunction.js | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/wrapStatelessFunction.js b/src/wrapStatelessFunction.js index 304fd58..b6b9162 100644 --- a/src/wrapStatelessFunction.js +++ b/src/wrapStatelessFunction.js @@ -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 = {};