This commit is contained in:
Eric Bailey
2023-12-13 19:04:20 -06:00
parent e2fc553420
commit 5cbb1e6bad
+11 -8
View File
@@ -119,8 +119,7 @@ export function createSystem<
).styles ).styles
} }
return acc return acc
// eslint-disable-next-line react-hooks/exhaustive-deps }, [styles, breakpoints.active, theme])
}, [styles, breakpoints.current, theme])
} }
function styled<Props extends Record<string, any>>( function styled<Props extends Record<string, any>>(
@@ -135,12 +134,16 @@ export function createSystem<
>((props, ref) => { >((props, ref) => {
const {theme} = useTheme() const {theme} = useTheme()
const breakpoints = useBreakpoints() const breakpoints = useBreakpoints()
const {styles, props: rest} = theme.style<Props>( const {styles, props: rest} = React.useMemo(
{ () =>
...defaultProps, theme.style<Props>(
...props, {
}, ...defaultProps,
breakpoints.active, ...props,
},
breakpoints.active,
),
[breakpoints.active, props, theme],
) )
if (props.debug) console.log({styles, props: rest}) if (props.debug) console.log({styles, props: rest})
return <Component {...rest} style={[styles, rest.style]} ref={ref} /> return <Component {...rest} style={[styles, rest.style]} ref={ref} />