Skip to content

Commit 5e7c3ca

Browse files
sherginfacebook-github-bot
authored andcommittedSep 17, 2018
Making RCTIsIPhoneX() return true for the R and Max models
Summary: Actual sizes can be found on the offical website. Reviewed By: fkgozali Differential Revision: D9837072 fbshipit-source-id: 38b3f2177629e82740eecc8df4566febbe20815a
1 parent e82a217 commit 5e7c3ca

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed
 

‎React/Modules/RCTDeviceInfo.m

+9-4
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,15 @@ static BOOL RCTIsIPhoneX() {
5858
dispatch_once(&onceToken, ^{
5959
RCTAssertMainQueue();
6060

61-
isIPhoneX = CGSizeEqualToSize(
62-
[UIScreen mainScreen].nativeBounds.size,
63-
CGSizeMake(1125, 2436)
64-
);
61+
CGSize screenSize = [UIScreen mainScreen].nativeBounds.size;
62+
CGSize iPhoneXScreenSize = CGSizeMake(1125, 2436);
63+
CGSize iPhoneXMaxScreenSize = CGSizeMake(1242, 2688);
64+
CGSize iPhoneXRScreenSize = CGSizeMake(828, 1792);
65+
66+
isIPhoneX =
67+
CGSizeEqualToSize(screenSize, iPhoneXScreenSize) ||
68+
CGSizeEqualToSize(screenSize, iPhoneXMaxScreenSize) ||
69+
CGSizeEqualToSize(screenSize, iPhoneXRScreenSize);
6570
});
6671

6772
return isIPhoneX;

0 commit comments

Comments
 (0)