Merge pull request #669 from rofrischmann/useFela-props-with-theme

pass theme with props when using useFela
robinweser · Feb 12, 2019 · 628fc55 · 628fc55
2 parents ebdab31 + 93e9e4c
commit 628fc55
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/packages/react-fela/src/useFela.js b/packages/react-fela/src/useFela.js
@@ -13,10 +13,15 @@ type HookInterface = {
 
 export default function useFela(props: Object = {}): HookInterface {
   const renderer = useContext(RendererContext)
-  const theme = useContext(ThemeContext)
+  const theme = useContext(ThemeContext) || {}
+
+  const propsWithTheme = {
+    ...props,
+    theme,
+  }
 
   function css(...rules: Array<Object | Function>) {
-    return renderer.renderRule(combineRules(...rules), props)
+    return renderer.renderRule(combineRules(...rules), propsWithTheme)
   }
 
   return {