Replace currentAppearance with currentDrawingAppearance on macOS 11+ (#1029)

Saadnajmi · web-flow · commit 88de79a697f0 · 2022-02-18T15:38:18.000-08:00
diff --git a/React/CoreModules/RCTAppearance.mm b/React/CoreModules/RCTAppearance.mm
@@ -81,7 +81,11 @@ void RCTOverrideAppearancePreference(NSString *const colorSchemeOverride)
     return RCTAppearanceColorSchemeLight;
   }
 
-  appearance = appearance ?: [NSAppearance currentAppearance];
+	if (@available(macOS 11.0, *)) {
+		appearance = appearance ?: [NSAppearance currentDrawingAppearance];
+	} else {
+		appearance = appearance ?: [NSAppearance currentAppearance];
+	}
   NSAppearanceName appearanceName = [appearance bestMatchFromAppearancesWithNames:@[NSAppearanceNameAqua, NSAppearanceNameDarkAqua]];
   return appearances[appearanceName] ?: RCTAppearanceColorSchemeLight;
 }

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,11 @@ void RCTOverrideAppearancePreference(NSString *const colorSchemeOverride)`
`81`	`81`	`return RCTAppearanceColorSchemeLight;`
`82`	`82`	`}`
`83`	`83`
`84`		`- appearance = appearance ?: [NSAppearance currentAppearance];`
	`84`	`+ if (@available(macOS 11.0, *)) {`
	`85`	`+ appearance = appearance ?: [NSAppearance currentDrawingAppearance];`
	`86`	`+ } else {`
	`87`	`+ appearance = appearance ?: [NSAppearance currentAppearance];`
	`88`	`+ }`
`85`	`89`	`NSAppearanceName appearanceName = [appearance bestMatchFromAppearancesWithNames:@[NSAppearanceNameAqua, NSAppearanceNameDarkAqua]];`
`86`	`90`	`return appearances[appearanceName] ?: RCTAppearanceColorSchemeLight;`
`87`	`91`	`}`