Skip to content

Avoids mutating the original styles object #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
javivelasco merged 2 commits into from
Aug 19, 2016
Merged

Avoids mutating the original styles object #13

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e5e2085
no mutations
Aug 19, 2016
554b5fc
no mutations
Aug 19, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
no mutations
  • Loading branch information
Victor Saiz committed Aug 19, 2016
commit 554b5fcfb57fe4ffe02a953f810ce10c2abfb148
4 changes: 2 additions & 2 deletions src/components/themr.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,11 @@ export default (componentName, localTheme, options = {}) => (ThemedComponent) =>
function themeable(style = {}, theme) {
if (!theme) return style
return Object.keys(theme).reduce((result, key) => (
Object.assign({}, result, { [key]:
Object.assign(result, { [key]:
style[key] && theme[key].indexOf(style[key]) === -1
? `${style[key]} ${theme[key]}`
: theme[key] || style[key]
})), style)
})), Object.assign({}, style))
}

function validateComposeOption(composeTheme) {
Expand Down