Merge pull request #194 from storybooks/fix/container

fix(container): fix when destructuring styles
storybook-eol · Apr 29, 2019 · 9650557 · 9650557
2 parents d125c69 + 92d612f
commit 9650557
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/components/Decorators/index.js b/src/components/Decorators/index.js
@@ -34,7 +34,7 @@ class Container extends PureComponent {
         return (
             <div
                 onClick={onClick}
-                style={Object.assign({}, ...style.container)}>
+                style={Object.assign({}, style.container)}>
                 {!terminal ? this.renderToggle() : null}
 
                 <decorators.Header node={node} style={style.header}/>

diff --git a/src/components/header.js b/src/components/header.js
@@ -27,7 +27,7 @@ class NodeHeader extends Component {
         const {animations, decorators, node, onClick, style} = this.props;
         const {active, children} = node;
         const terminal = !children;
-        const container = (active && style.activeLink) ? Object.assign({}, style.link, style.activeLink)  : style.link;
+        const container = Object.assign(style.link, active ? style.activeLink : {});
         const headerStyles = Object.assign({container}, style);
 
         return (