Skip to content

Commit 591e85d

Browse files
Revert "Revert "delete RCTUIUtils (#49453)""
This reverts commit 8a6139a.
1 parent 1e91853 commit 591e85d

File tree

3 files changed

+16
-72
lines changed

3 files changed

+16
-72
lines changed

packages/react-native/React/CoreModules/RCTDeviceInfo.mm

+16-12
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
#import <React/RCTEventDispatcherProtocol.h>
1515
#import <React/RCTInitializing.h>
1616
#import <React/RCTInvalidating.h>
17-
#import <React/RCTUIUtils.h>
1817
#import <React/RCTUtils.h>
1918
#import <atomic>
2019

@@ -175,20 +174,25 @@ static BOOL RCTIsIPhoneNotched()
175174
static NSDictionary *RCTExportedDimensions(CGFloat fontScale)
176175
{
177176
RCTAssertMainQueue();
178-
RCTDimensions dimensions = RCTGetDimensions(fontScale);
179-
__typeof(dimensions.window) window = dimensions.window;
177+
UIScreen *mainScreen = UIScreen.mainScreen;
178+
CGSize screenSize = mainScreen.bounds.size;
179+
UIView *mainWindow = RCTKeyWindow();
180+
181+
// We fallback to screen size if a key window is not found.
182+
CGSize windowSize = mainWindow ? mainWindow.bounds.size : screenSize;
183+
180184
NSDictionary<NSString *, NSNumber *> *dimsWindow = @{
181-
@"width" : @(window.width),
182-
@"height" : @(window.height),
183-
@"scale" : @(window.scale),
184-
@"fontScale" : @(window.fontScale)
185+
@"width" : @(windowSize.width),
186+
@"height" : @(windowSize.height),
187+
@"scale" : @(mainScreen.scale),
188+
@"fontScale" : @(fontScale)
185189
};
186-
__typeof(dimensions.screen) screen = dimensions.screen;
190+
187191
NSDictionary<NSString *, NSNumber *> *dimsScreen = @{
188-
@"width" : @(screen.width),
189-
@"height" : @(screen.height),
190-
@"scale" : @(screen.scale),
191-
@"fontScale" : @(screen.fontScale)
192+
@"width" : @(screenSize.width),
193+
@"height" : @(screenSize.height),
194+
@"scale" : @(mainScreen.scale),
195+
@"fontScale" : @(fontScale)
192196
};
193197
return @{@"window" : dimsWindow, @"screen" : dimsScreen};
194198
}

packages/react-native/React/UIUtils/RCTUIUtils.h

-30
This file was deleted.

packages/react-native/React/UIUtils/RCTUIUtils.m

-30
This file was deleted.

0 commit comments

Comments
 (0)