Skip to content

fix(BaseStyles): set data-color-mode to auto when auto color mode #5649

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

Merged
merged 4 commits into from
Mar 13, 2025
Merged

fix(BaseStyles): set data-color-mode to auto when auto color mode #5649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2188bff
fix(BaseStyles): set data-color-mode to auto when auto color mode
joshblack Feb 3, 2025
8b682e7
chore: add changeset
joshblack Feb 3, 2025
3a6859e
Merge branch 'main' into fix/update-base-styles-color-mode-auto
mperrotti Feb 13, 2025
05e9b29
Merge branch 'main' into fix/update-base-styles-color-mode-auto
joshblack Mar 13, 2025
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
5 changes: 5 additions & 0 deletions .changeset/strong-walls-approve.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@primer/react": patch
---

Update BaseStyles to set data-color-mode to auto when colorMode in ThemeProvider is auto
8 changes: 4 additions & 4 deletions packages/react/src/BaseStyles.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export type BaseStylesProps = PropsWithChildren & {

function BaseStyles(props: BaseStylesProps) {
const {children, color, fontFamily, lineHeight, className, as: Component = 'div', style, ...rest} = props
const {colorScheme, dayScheme, nightScheme} = useTheme()
const {colorMode, colorScheme, dayScheme, nightScheme} = useTheme()
const enabled = useFeatureFlag(CSS_MODULES_FEATURE_FLAG)

if (enabled) {
Expand All @@ -79,7 +79,7 @@ function BaseStyles(props: BaseStylesProps) {
* valid color modes for primer/primitives: auto | light | dark
* valid color modes for primer/primer: auto | day | night | light | dark
*/
data-color-mode={colorScheme?.includes('dark') ? 'dark' : 'light'}
data-color-mode={colorMode === 'auto' ? 'auto' : colorScheme?.includes('dark') ? 'dark' : 'light'}
data-light-theme={dayScheme}
data-dark-theme={nightScheme}
style={{
Expand All @@ -103,7 +103,7 @@ function BaseStyles(props: BaseStylesProps) {
* valid color modes for primer/primitives: auto | light | dark
* valid color modes for primer/primer: auto | day | night | light | dark
*/
data-color-mode={colorScheme?.includes('dark') ? 'dark' : 'light'}
data-color-mode={colorMode === 'auto' ? 'auto' : colorScheme?.includes('dark') ? 'dark' : 'light'}
data-light-theme={dayScheme}
data-dark-theme={nightScheme}
style={{
Expand All @@ -129,7 +129,7 @@ function BaseStyles(props: BaseStylesProps) {
* valid color modes for primer/primitives: auto | light | dark
* valid color modes for primer/primer: auto | day | night | light | dark
*/
data-color-mode={colorScheme?.includes('dark') ? 'dark' : 'light'}
data-color-mode={colorMode === 'auto' ? 'auto' : colorScheme?.includes('dark') ? 'dark' : 'light'}
data-light-theme={dayScheme}
data-dark-theme={nightScheme}
style={style}
Expand Down
Loading