fix: Properly dismiss RCTDevLoadingView

microsoft · Oct 3, 2024 · 5e2ea59 · 5e2ea59
1 parent 6a74406
commit 5e2ea59
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/packages/react-native/React/CoreModules/RCTDevLoadingView.mm b/packages/react-native/React/CoreModules/RCTDevLoadingView.mm
@@ -142,10 +142,10 @@ - (void)showMessage:(NSString *)message color:(RCTUIColor *)color backgroundColo
                                                  styleMask:NSWindowStyleMaskBorderless
                                                    backing:NSBackingStoreBuffered
                                                      defer:YES];
-      self->_window.releasedWhenClosed = NO;
       self->_window.backgroundColor = [NSColor clearColor];
 
       NSTextField *label = [[NSTextField alloc] initWithFrame:self->_window.contentView.bounds];
+      label.font = [NSFont monospacedDigitSystemFontOfSize:12.0 weight:NSFontWeightRegular];
       label.alignment = NSTextAlignmentCenter;
       label.bezeled = NO;
       label.editable = NO;
@@ -169,7 +169,11 @@ - (void)showMessage:(NSString *)message color:(RCTUIColor *)color backgroundColo
     self->_label.textColor = color;
 
     self->_label.backgroundColor = backgroundColor;
-    [RCTKeyWindow() beginSheet:self->_window completionHandler:nil];
+    if (![[RCTKeyWindow() sheets] doesContain:self->_window]) {
+      [RCTKeyWindow() beginSheet:self->_window completionHandler:^(NSModalResponse returnCode) {
+        [self->_window orderOut:self];
+      }];
+    }
 #endif // macOS]
   });