-reverted factories

mnajdova · mnajdova · commit 01a5e63328d4 · 2020-01-10T17:52:26.000+01:00
diff --git a/packages/react/src/utils/factories.ts b/packages/react/src/utils/factories.ts
@@ -9,7 +9,7 @@ import {
   ShorthandRenderFunction,
   ShorthandRenderer,
 } from '../types'
-// import { mergeStyles } from './mergeThemes'
+import { mergeStyles } from './mergeThemes'
 
 type HTMLTag = 'iframe' | 'img' | 'input'
 type ShorthandProp = 'children' | 'src' | 'type'
@@ -250,17 +250,10 @@ function createShorthandFromValue<P>({
 
   // Merge styles
   if (defaultProps.styles || overrideProps.styles || usersProps.styles) {
-    // As long as we allow the styles prop to be a function, I don't see how we can cache it, as the stirng of the function will always be mergeStyles..
-    // ;(props as any).styles = mergeStyles(
-    //   defaultProps.styles,
-    //   usersProps.styles,
-    //   overrideProps.styles,
-    // )
-    // Just for hacking, relaying that it will always be an object, so we can cache...
-    ;(props as any).styles = _.merge(
-      defaultProps.styles || {},
-      usersProps.styles || {},
-      overrideProps.styles || {},
+    ;(props as any).styles = mergeStyles(
+      defaultProps.styles,
+      usersProps.styles,
+      overrideProps.styles,
     )
   }
 
