Merge branch 'master' into spread-only-direct-styles

jfschwarz · Sep 2, 2016 · 67c2d9f · 67c2d9f
2 parents d3bbb1b + 1a2e7ed
commit 67c2d9f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "substyle",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "description": "Universal styling for reusable React components",
   "main": "lib/index.js",
   "scripts": {

diff --git a/src/substyle.js b/src/substyle.js
@@ -1,5 +1,5 @@
 import invariant from 'invariant'
-import { keys, values, negate, identity, flatten, merge } from 'lodash'
+import { keys, values, negate, identity, flatten, merge, assign } from 'lodash'
 import { filter, map, compose } from 'lodash/fp'
 
 import { pickDirectStyles, pickNestedStyles, pickNestedStylesRecursive } from './pickStyles'
@@ -72,7 +72,7 @@ function createSubstyle(closureProps) {
 
   // assign `style` and/or `className` props to the return function object
   // TODO call propsDecorator function
-  Object.assign(substyle, propsForSpread)
+  assign(substyle, propsForSpread)
   return substyle
 }