Skip to content

Extend ThemeProvider in styled-react #6867

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Extend ThemeProvider in styled-react #6867

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 15 additions & 1 deletion packages/styled-react/src/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ import {
SegmentedControl as PrimerSegmentedControl,
type SegmentedControlButtonProps as PrimerSegmentedControlButtonProps,
type SegmentedControlIconButtonProps as PrimerSegmentedControlIconButtonProps,
ThemeProvider as PRCThemeProvider,
type ThemeProviderProps,
useTheme,
theme as fallbackTheme,
} from '@primer/react'
import React, {forwardRef, type PropsWithChildren} from 'react'
import type {
Expand All @@ -28,6 +32,7 @@ import type {
SpaceProps,
TypographyProps,
} from 'styled-system'
import {ThemeProvider as SCThemeProvider} from 'styled-components'

type StyledProps = SxProp &
SpaceProps &
Expand Down Expand Up @@ -90,6 +95,16 @@ const ToggleSwitch = forwardRef<HTMLButtonElement, ToggleSwitchProps>(function T
return <Box as={PrimerToggleSwitch} ref={ref} {...props} />
})

export const ThemeProvider = (props: PropsWithChildren<ThemeProviderProps>) => {
const {children, ...rest} = props
const {theme} = useTheme()
return (
<PRCThemeProvider {...rest}>
<SCThemeProvider theme={theme || fallbackTheme}>{children}</SCThemeProvider>
</PRCThemeProvider>
)
}

export {SegmentedControl, StateLabel, SubNav, ToggleSwitch}

export {
Expand Down Expand Up @@ -136,7 +151,6 @@ export {
sx,

// theming depends on styled-components
ThemeProvider,
merge,
theme,
themeGet,
Expand Down
Loading