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(iOS): Check for multiple screens while changing screen orientation #2035

Merged
merged 2 commits into from
Feb 20, 2024
Merged

fix(iOS): Check for multiple screens while changing screen orientation #2035

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e126b92
improve handling of scenes on ios
uzegonemad Feb 15, 2024
9de94ce
Merge branch 'software-mansion:main' into hotfix/ios-scenes
uzegonemad Feb 19, 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
16 changes: 15 additions & 1 deletion ios/RNSScreenWindowTraits.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,21 @@ + (void)enforceDesiredDeviceOrientation
__IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_16_0
if (@available(iOS 16.0, *)) {
NSArray *array = [[[UIApplication sharedApplication] connectedScenes] allObjects];
UIWindowScene *scene = (UIWindowScene *)array[0];

// when an app supports multiple scenes (e.g. CarPlay), it is possible that
// UIWindowScene is not the first scene, or it may not be present at all
UIWindowScene *scene = nil;
for (id connectedScene in array) {
if ([connectedScene isKindOfClass:[UIWindowScene class]]) {
scene = connectedScene;
break;
}
}

if (scene == nil) {
return;
}

UIWindowSceneGeometryPreferencesIOS *geometryPreferences =
[[UIWindowSceneGeometryPreferencesIOS alloc] initWithInterfaceOrientations:orientationMask];
[scene requestGeometryUpdateWithPreferences:geometryPreferences
Expand Down
Loading