Skip to content

fix(macos): keep Dimensions in step with the window #3142

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
Bron Davies (brondavies) wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(macos): keep Dimensions in step with the window #3142

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
42 changes: 39 additions & 3 deletions packages/react-native/React/CoreModules/RCTDeviceInfo.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,16 @@ - (void)initialize
name:UIApplicationDidBecomeActiveNotification
object:nil];

#if TARGET_OS_OSX // [macOS
// The window observed in init is the one that was key when this module was created, which is
// often none: an app usually makes its window key after starting React Native. Observe every
// window's resize instead, so the dimensions follow the window whenever it is resized.
[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(interfaceFrameDidChange)
name:NSWindowDidResizeNotification
object:nil];
#endif // macOS]

#if TARGET_OS_IOS

_currentInterfaceOrientation = RCTKeyWindow().windowScene.interfaceOrientation;
Expand Down Expand Up @@ -188,6 +198,25 @@ static BOOL RCTIsIPhoneNotched()
}


#if TARGET_OS_OSX // [macOS
// The window whose size is reported. While the app is in the background no window is key or
// main, though the app's window is still on screen: fall back to the frontmost visible window
// that is not a panel, rather than to the screen.
static NSWindow *RCTDimensionsWindow(void)
{
NSWindow *window = RCTKeyWindow() ?: NSApp.mainWindow;
if (window != nil) {
return window;
}
for (NSWindow *candidate in NSApp.orderedWindows) {
if (candidate.isVisible && ![candidate isKindOfClass:[NSPanel class]]) {
return candidate;
}
}
return nil;
}
#endif // macOS]

static NSDictionary *RCTExportedDimensions(CGFloat fontScale)
{
RCTAssertMainQueue();
Expand All @@ -203,14 +232,15 @@ static BOOL RCTIsIPhoneNotched()
#else // [macOS
NSScreen *mainScreen = NSScreen.mainScreen;
CGSize screenSize = mainScreen.frame.size;
NSWindow *mainWindow = RCTKeyWindow();
NSWindow *mainWindow = RCTDimensionsWindow();
#endif // macOS]

// We fallback to screen size if a key window is not found.
#if !TARGET_OS_OSX // [macOS]
CGSize windowSize = mainWindow ? mainWindow.bounds.size : screenSize; //[macOS]
#else // [macOS
CGSize windowSize = mainWindow ? mainWindow.frame.size : screenSize; //[macOS]
// The content's size, which is what the root view gets: the frame includes the title bar.
CGSize windowSize = mainWindow ? [mainWindow contentRectForFrameRect:mainWindow.frame].size : screenSize; //[macOS]
#endif // macOS]


Expand Down Expand Up @@ -341,7 +371,13 @@ - (void)_interfaceFrameDidChange
NSDictionary *nextInterfaceDimensions = [self _exportedDimensions];

// update and publish the even only when the app is in active state
if (!([nextInterfaceDimensions isEqual:_currentInterfaceDimensions]) && RCTIsAppActive()) {
#if !TARGET_OS_OSX // [macOS]
const BOOL shouldPublish = RCTIsAppActive();
#else // [macOS
// A Mac app's window stays on screen in the background, and can be resized there.
const BOOL shouldPublish = YES;
#endif // macOS]
if (!([nextInterfaceDimensions isEqual:_currentInterfaceDimensions]) && shouldPublish) {
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
[[_moduleRegistry moduleForName:"EventDispatcher"] sendDeviceEventWithName:@"didUpdateDimensions"
Expand Down