Skip to content
Merged
Changes from all commits
Commits
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
14 changes: 11 additions & 3 deletions packages/fela-bindings/src/FelaComponentFactory.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,28 @@ export default function FelaComponentFactory(

return createElement(FelaTheme, undefined, theme => {
// TODO: could optimize perf by not calling combineRules if not necessary
const className = renderer.renderRule(combineRules(style), {
const renderedRule = renderer.renderRule(combineRules(style), {
...otherProps,
theme,
})

if (children instanceof Function) {
return children({
className,
className: !renderer.isNativeRenderer && renderedRule,
style: renderer.isNativeRenderer && renderedRule,
theme,
as,
})
}

return createElement(as, { className }, children)
return createElement(
as,
{
className: !renderer.isNativeRenderer && renderedRule,
style: renderer.isNativeRenderer && renderedRule,
},
children
)
})
}

Expand Down