Skip to content

chore: fix warning about appearance being called off main thread #2716

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

chore: fix warning about appearance being called off main thread #2716

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
20 changes: 15 additions & 5 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 @@ -98,9 +98,12 @@ void RCTUseKeyWindowForSystemStyle(BOOL useMainScreen)
return RCTAppearanceColorSchemeLight;
}

appearance = appearance ?: [NSApp effectiveAppearance];
__block NSAppearance *resolvedAppearance = appearance;
RCTUnsafeExecuteOnMainQueueSync(^{
resolvedAppearance = resolvedAppearance ?: [NSApp effectiveAppearance];
});

NSAppearanceName appearanceName = [appearance bestMatchFromAppearancesWithNames:@[NSAppearanceNameAqua, NSAppearanceNameDarkAqua]];
NSAppearanceName appearanceName = [resolvedAppearance bestMatchFromAppearancesWithNames:@[NSAppearanceNameAqua, NSAppearanceNameDarkAqua]];
return appearances[appearanceName] ?: RCTAppearanceColorSchemeLight;
}
#endif // macOS]
Expand All @@ -119,7 +122,14 @@ - (instancetype)init
UITraitCollection *traitCollection = [RCTTraitCollectionProxy sharedInstance].currentTraitCollection;
_currentColorScheme = RCTColorSchemePreference(traitCollection);
#else // [macOS
NSAppearance *appearance = RCTSharedApplication().appearance;
// Initialize with a concrete NSAppearance, fetched safely on the main thread.
__block NSAppearance *appearance = nil;
RCTUnsafeExecuteOnMainQueueSync(^{
appearance = RCTSharedApplication().appearance ?: [NSApp effectiveAppearance];
if (!appearance) {
appearance = [NSAppearance appearanceNamed:NSAppearanceNameAqua];
}
});
_currentColorScheme = RCTColorSchemePreference(appearance);
#endif // macOS]
[[NSNotificationCenter defaultCenter] addObserver:self
Expand Down Expand Up @@ -173,7 +183,7 @@ - (dispatch_queue_t)methodQueue
RCT_EXPORT_SYNCHRONOUS_TYPED_METHOD(NSString *, getColorScheme)
{
if (!sIsAppearancePreferenceSet) {
#if !TARGET_OS_OSX // [macOS
#if !TARGET_OS_OSX // [macOS]
UITraitCollection *traitCollection = [RCTTraitCollectionProxy sharedInstance].currentTraitCollection;
_currentColorScheme = RCTColorSchemePreference(traitCollection);
#else // [macOS
Expand Down Expand Up @@ -228,4 +238,4 @@ - (void)invalidate
Class RCTAppearanceCls(void)
{
return RCTAppearance.class;
}
}
Loading