Skip to content
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

fix: return the correct default trait collection #38214

Closed
wants to merge 2 commits into from
Closed

fix: return the correct default trait collection #38214

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d194cc
fix: return the correct default trait collection
alanjhughes Jul 6, 2023
3da09de
make requested changes
alanjhughes Sep 9, 2023
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
10 changes: 9 additions & 1 deletion packages/react-native/React/CoreModules/RCTAppearance.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,14 @@ void RCTOverrideAppearancePreference(NSString *const colorSchemeOverride)
return sColorSchemeOverride;
}

UITraitCollection* getKeyWindowTraitCollection() {
__block UITraitCollection* traitCollection = nil;
RCTExecuteOnMainQueue(^{
traitCollection = RCTSharedApplication().delegate.window.traitCollection;
});
return traitCollection;
}

NSString *RCTColorSchemePreference(UITraitCollection *traitCollection)
{
static NSDictionary *appearances;
Expand All @@ -57,7 +65,7 @@ void RCTOverrideAppearancePreference(NSString *const colorSchemeOverride)
return RCTAppearanceColorSchemeLight;
}

traitCollection = traitCollection ?: [UITraitCollection currentTraitCollection];
traitCollection = traitCollection ?: getKeyWindowTraitCollection();
return appearances[@(traitCollection.userInterfaceStyle)] ?: RCTAppearanceColorSchemeLight;

// Default to light on older OS version - same behavior as Android.
Expand Down