Skip to content

fix: support both new and old ColorSchemeName in RN #331

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
Brentlok merged 2 commits into from
Jan 26, 2026
Merged

fix: support both new and old ColorSchemeName in RN #331

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e0adc0e
fix: support both new and old ColorSchemeName in RN
Brentlok Jan 23, 2026
73cb69e
chore: 82 version
Brentlok Jan 23, 2026
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
26 changes: 22 additions & 4 deletions packages/uniwind/src/core/config/config.common.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import { UniwindListener } from '../listener'
import { CSSVariables, GenerateStyleSheetsCallback, ThemeName } from '../types'

const SYSTEM_THEME = 'system' as const
const RN_VERSION = Platform.constants.reactNativeVersion.minor
const UNSPECIFIED_THEME = RN_VERSION >= 82 ? 'unspecified' : undefined

export class UniwindConfigBuilder {
protected themes = ['light', 'dark']
Expand All @@ -12,7 +14,10 @@ export class UniwindConfigBuilder {

constructor() {
Appearance.addChangeListener(event => {
const colorScheme = event.colorScheme ?? ColorScheme.Light
// @ts-expect-error RN >0.82 - breaking change
const colorScheme = event.colorScheme === 'unspecified'
? ColorScheme.Light
: event.colorScheme ?? ColorScheme.Light
const prevTheme = this.#currentTheme

if (this.#hasAdaptiveThemes && prevTheme !== colorScheme) {
Expand All @@ -32,7 +37,14 @@ export class UniwindConfigBuilder {
}

private get colorScheme() {
return Appearance.getColorScheme() ?? ColorScheme.Light
const colorScheme = Appearance.getColorScheme()

// @ts-expect-error RN >0.82 - breaking change
if (colorScheme === 'unspecified') {
return ColorScheme.Light
}

return colorScheme ?? ColorScheme.Light
}

// eslint-disable-next-line @typescript-eslint/no-redundant-type-constituents
Expand All @@ -47,7 +59,8 @@ export class UniwindConfigBuilder {
this.#currentTheme = this.colorScheme

if (Platform.OS !== 'web') {
Appearance.setColorScheme(undefined)
// @ts-expect-error RN >0.82 - breaking change
Appearance.setColorScheme(UNSPECIFIED_THEME)
}

return
Expand All @@ -61,7 +74,12 @@ export class UniwindConfigBuilder {
this.#currentTheme = theme

if (Platform.OS !== 'web') {
Appearance.setColorScheme(isAdaptiveTheme ? this.#currentTheme as ColorScheme : undefined)
Appearance.setColorScheme(
// @ts-expect-error RN >0.82 - breaking change
isAdaptiveTheme
? this.#currentTheme as ColorScheme
: UNSPECIFIED_THEME,
)
}
} finally {
if (prevTheme !== this.#currentTheme) {
Expand Down