Skip to content

fix: avoid reallocating views on RCTDevLoadingView showMessage calls #2762

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
wants to merge 1 commit into
base: main
Choose a base branch
from
+27 −14
Open

fix: avoid reallocating views on RCTDevLoadingView showMessage calls #2762

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
41 changes: 27 additions & 14 deletions packages/react-native/React/CoreModules/RCTDevLoadingView.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,33 +128,21 @@ - (void)showMessage:(NSString *)message color:(RCTUIColor *)color backgroundColo
self->_window = [[UIWindow alloc] initWithWindowScene:mainWindow.windowScene];
self->_window.windowLevel = UIWindowLevelStatusBar + 1;
self->_window.rootViewController = [UIViewController new];
#else // [macOS
self->_window = [[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, 375, 20)
styleMask:NSWindowStyleMaskBorderless | NSWindowStyleMaskFullSizeContentView
backing:NSBackingStoreBuffered
defer:YES];
[self->_window setIdentifier:sRCTDevLoadingViewWindowIdentifier];
#endif // macOS]

self->_container = [[RCTUIView alloc] init]; // [macOS]
self->_container = [[UIView alloc] init];
self->_container.backgroundColor = backgroundColor;
self->_container.translatesAutoresizingMaskIntoConstraints = NO;

self->_label = [[RCTUILabel alloc] init]; // [macOS]
self->_label = [[UILabel alloc] init];
self->_label.translatesAutoresizingMaskIntoConstraints = NO;
self->_label.font = [UIFont monospacedDigitSystemFontOfSize:12.0 weight:UIFontWeightRegular];
self->_label.textAlignment = NSTextAlignmentCenter;
self->_label.textColor = color;
self->_label.text = message;

#if !TARGET_OS_OSX // [macOS]
[self->_window.rootViewController.view addSubview:self->_container];
#else // [macOS
[self->_window.contentView addSubview:self->_container];
#endif // macOS]
[self->_container addSubview:self->_label];

#if !TARGET_OS_OSX // [macOS]
CGFloat topSafeAreaHeight = mainWindow.safeAreaInsets.top;
CGFloat height = topSafeAreaHeight + 25;
self->_window.frame = CGRectMake(0, 0, mainWindow.frame.size.width, height);
Expand All @@ -175,6 +163,31 @@ - (void)showMessage:(NSString *)message color:(RCTUIColor *)color backgroundColo
[self->_label.bottomAnchor constraintEqualToAnchor:self->_container.bottomAnchor constant:-5],
]];
#else // [macOS
if (!self->_label) {
self->_label = [[RCTUILabel alloc] init]; // [macOS]
self->_label.translatesAutoresizingMaskIntoConstraints = NO;
self->_label.font = [UIFont monospacedDigitSystemFontOfSize:12.0 weight:UIFontWeightRegular];
self->_label.textAlignment = NSTextAlignmentCenter;
}
self->_label.textColor = color;
self->_label.text = message;

if (!self->_container) {
self->_container = [[RCTUIView alloc] init]; // [macOS]
self->_container.translatesAutoresizingMaskIntoConstraints = NO;
[self->_container addSubview:self->_label];
}
self->_container.backgroundColor = backgroundColor;

if (!self->_window) {
self->_window = [[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, 375, 20)
styleMask:NSWindowStyleMaskBorderless | NSWindowStyleMaskFullSizeContentView
backing:NSBackingStoreBuffered
defer:YES];
[self->_window setIdentifier:sRCTDevLoadingViewWindowIdentifier];
[self->_window.contentView addSubview:self->_container];
}

// Container constraints
[NSLayoutConstraint activateConstraints:@[
[self->_container.topAnchor constraintEqualToAnchor:self->_window.contentView.topAnchor],
Expand Down