From 92d612fe3da232559e82aac73caf679ad272d59c Mon Sep 17 00:00:00 2001 From: Maximiliano Forlenza Date: Mon, 29 Apr 2019 08:42:12 -0300 Subject: [PATCH] fix(container): fix when destructuring styles --- src/components/Decorators/index.js | 2 +- src/components/header.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Decorators/index.js b/src/components/Decorators/index.js index 0c1852d..49d46e0 100644 --- a/src/components/Decorators/index.js +++ b/src/components/Decorators/index.js @@ -34,7 +34,7 @@ class Container extends PureComponent { return (
+ style={Object.assign({}, style.container)}> {!terminal ? this.renderToggle() : null} diff --git a/src/components/header.js b/src/components/header.js index 6d32290..826cf4f 100644 --- 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 (