From def8f25b9f25af603da8bf4251f54dcad370fd9c Mon Sep 17 00:00:00 2001 From: Robin Weser Date: Wed, 23 Feb 2022 09:08:32 +0100 Subject: [PATCH] dont append theme to props --- packages/react-fela/src/useFela.js | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/packages/react-fela/src/useFela.js b/packages/react-fela/src/useFela.js index 3c1fe8255..6036cc857 100644 --- a/packages/react-fela/src/useFela.js +++ b/packages/react-fela/src/useFela.js @@ -3,7 +3,20 @@ import { combineRules } from 'fela' import { RendererContext, ThemeContext } from './context' -export default function useFela(props = {}) { +function getPropsWithTheme(props, theme) { + if (props) { + return { + ...props, + theme, + } + } + + return { + theme, + } +} + +export default function useFela(props) { const renderer = useContext(RendererContext) const theme = useContext(ThemeContext) || {} @@ -14,10 +27,7 @@ export default function useFela(props = {}) { } // we add the theme to props so that it can be used within styles - const propsWithTheme = { - ...props, - theme, - } + const propsWithTheme = getPropsWithTheme(props, theme) function css(...rules) { return renderer.renderRule(combineRules(...rules), propsWithTheme)