Skip to content

Fix Application always in light mode on initial load. #44335

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
filip131311 wants to merge 3 commits into from
Closed

Fix Application always in light mode on initial load. #44335

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
326a3b1
fix dark mode on application intitial run
Apr 30, 2024
6a6a7a9
make sure _currentColorScheme always exist
May 6, 2024
f601650
Merge branch 'main' into main
cipolleschi Jun 5, 2024
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
12 changes: 12 additions & 0 deletions packages/react-native/React/CoreModules/RCTAppearance.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
NSString *const RCTAppearanceColorSchemeLight = @"light";
NSString *const RCTAppearanceColorSchemeDark = @"dark";

static BOOL sIsAppearancePreferenceSet = NO;

static BOOL sAppearancePreferenceEnabled = YES;
void RCTEnableAppearancePreference(BOOL enabled)
{
Expand Down Expand Up @@ -62,6 +64,12 @@ void RCTUseKeyWindowForSystemStyle(BOOL useMainScreen)
// Return the default if the app doesn't allow different color schemes.
return RCTAppearanceColorSchemeLight;
}

if (appearances[@(traitCollection.userInterfaceStyle)]){
sIsAppearancePreferenceSet = YES;
return appearances[@(traitCollection.userInterfaceStyle)];
}

UIUserInterfaceStyle systemStyle = sUseKeyWindowForSystemStyle ? RCTKeyWindow().traitCollection.userInterfaceStyle
: traitCollection.userInterfaceStyle;
return appearances[@(systemStyle)] ?: RCTAppearanceColorSchemeLight;
Expand Down Expand Up @@ -116,6 +124,10 @@ - (dispatch_queue_t)methodQueue

RCT_EXPORT_SYNCHRONOUS_TYPED_METHOD(NSString *, getColorScheme)
{
if (!sIsAppearancePreferenceSet) {
UITraitCollection *traitCollection = RCTKeyWindow().traitCollection;
_currentColorScheme = RCTColorSchemePreference(traitCollection);
}
return _currentColorScheme;
}

Expand Down