feat: Implement RCTPausedInDebuggerOverlayController

Author: Saadnajmi

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

@@ -79,7 +79,11 @@ - (instancetype)initWithWindow:(RCTUIWindow *)window surfacePresenter:(id<RCTSur
 #if !TARGET_OS_OSX // [macOS]
   self = [super initWithWindowScene:window.windowScene];
 #else // [macOS
-  self = [super initWithContentRect:NSMakeRect(0, 0, 600, 800) styleMask:NSWindowStyleMaskTitled backing:NSBackingStoreBuffered defer:YES];
+  self = [super
+          initWithContentRect:NSMakeRect(0, 0, 600, 800)
+          styleMask:NSWindowStyleMaskBorderless | NSWindowStyleMaskFullSizeContentView
+          backing:NSBackingStoreBuffered
+          defer:YES];
   _window = window;
 #endif // macOS]
 

packages/react-native/React/DevSupport/RCTPausedInDebuggerOverlayController.mm

@@ -16,19 +16,17 @@ @interface RCTPausedInDebuggerViewController : UIViewController
 @end
 
 @interface RCTPausedInDebuggerOverlayController ()
-#if !TARGET_OS_OSX // [macOS]
 
-@property (nonatomic, strong) UIWindow *alertWindow;
+@property (nonatomic, strong) RCTPlatformWindow *alertWindow; // [macOS]
 
-#endif // [macOS];
 @end
 
 @implementation RCTPausedInDebuggerViewController
-#if !TARGET_OS_OSX // [macOS]
 - (void)viewDidLoad
 {
   [super viewDidLoad];
 
+#if !TARGET_OS_OSX // [macOS]
   UIView *dimmingView = [[UIView alloc] init];
   dimmingView.translatesAutoresizingMaskIntoConstraints = NO;
   dimmingView.backgroundColor = [[UIColor blackColor] colorWithAlphaComponent:0.2];
@@ -39,15 +37,19 @@ - (void)viewDidLoad
     [dimmingView.leadingAnchor constraintEqualToAnchor:self.view.leadingAnchor],
     [dimmingView.trailingAnchor constraintEqualToAnchor:self.view.trailingAnchor]
   ]];
-
-  UILabel *messageLabel = [[UILabel alloc] init];
+#endif // [macOS]
+  
+  RCTUILabel *messageLabel = [[RCTUILabel alloc] init]; // [macOS]
   messageLabel.text = self.message;
   messageLabel.textAlignment = NSTextAlignmentCenter;
+#if !TARGET_OS_OSX // [macOS]
   messageLabel.numberOfLines = 0;
+#endif // [macOS]
   messageLabel.font = [UIFont boldSystemFontOfSize:16];
-  messageLabel.textColor = [UIColor blackColor];
+  messageLabel.textColor = [RCTUIColor blackColor]; // [macOS]
   messageLabel.translatesAutoresizingMaskIntoConstraints = NO;
-  UIView *messageContainer = [[UIView alloc] init];
+  
+  RCTUIView *messageContainer = [[RCTUIView alloc] init]; // [macOS]
   [messageContainer addSubview:messageLabel];
   [NSLayoutConstraint activateConstraints:@[
     [messageLabel.topAnchor constraintEqualToAnchor:messageContainer.topAnchor constant:-1],
@@ -56,87 +58,155 @@ - (void)viewDidLoad
     [messageLabel.trailingAnchor constraintEqualToAnchor:messageContainer.trailingAnchor],
   ]];
 
+#if !TARGET_OS_OSX // [macOS]
   UIButton *resumeButton = [UIButton buttonWithType:UIButtonTypeCustom];
   [resumeButton setImage:[UIImage systemImageNamed:@"forward.frame.fill"] forState:UIControlStateNormal];
   resumeButton.tintColor = [UIColor colorWithRed:0.37 green:0.37 blue:0.37 alpha:1];
   resumeButton.adjustsImageWhenDisabled = NO;
   resumeButton.enabled = NO;
+#else // [macOS
+  NSButton *resumeButton = [[NSButton alloc] init];
+  [resumeButton setImage:[NSImage imageWithSystemSymbolName:@"forward.frame.fill" accessibilityDescription:@"Resume"]];
+  resumeButton.bordered = NO;
+  resumeButton.target = self;
+  resumeButton.action = @selector(handleResume:);
+  resumeButton.contentTintColor = [NSColor colorWithRed:0.37 green:0.37 blue:0.37 alpha:1];
+#endif // macOS]
+  
   [NSLayoutConstraint activateConstraints:@[
     [resumeButton.widthAnchor constraintEqualToConstant:48],
     [resumeButton.heightAnchor constraintEqualToConstant:46],
   ]];
 
+#if !TARGET_OS_OSX // [macOS]
   UIStackView *stackView = [[UIStackView alloc] initWithArrangedSubviews:@[ messageContainer, resumeButton ]];
   stackView.backgroundColor = [UIColor colorWithRed:1 green:1 blue:0.757 alpha:1];
+  stackView.axis = UILayoutConstraintAxisHorizontal;
+  stackView.distribution = UIStackViewDistributionFill;
+  stackView.alignment = UIStackViewAlignmentCenter;
   stackView.layer.cornerRadius = 12;
   stackView.layer.borderWidth = 2;
   stackView.layer.borderColor = [UIColor colorWithRed:0.71 green:0.71 blue:0.62 alpha:1].CGColor;
   stackView.translatesAutoresizingMaskIntoConstraints = NO;
-  stackView.axis = UILayoutConstraintAxisHorizontal;
-  stackView.distribution = UIStackViewDistributionFill;
-  stackView.alignment = UIStackViewAlignmentCenter;
 
   UITapGestureRecognizer *gestureRecognizer = [[UITapGestureRecognizer alloc] initWithTarget:self
                                                                                       action:@selector(handleResume:)];
   [stackView addGestureRecognizer:gestureRecognizer];
   stackView.userInteractionEnabled = YES;
+#else // [macOS
+  NSStackView *stackView = [NSStackView stackViewWithViews:@[ messageContainer, resumeButton ]];
+  stackView.wantsLayer = YES;
+  stackView.layer.backgroundColor = [NSColor colorWithRed:1 green:1 blue:0.757 alpha:1].CGColor;
+  stackView.orientation = NSUserInterfaceLayoutOrientationHorizontal;
+  stackView.distribution = NSStackViewDistributionFill;
+  stackView.alignment = NSLayoutAttributeCenterY;
+  stackView.translatesAutoresizingMaskIntoConstraints = NO;
 
+  NSClickGestureRecognizer *gestureRecognizer = [[NSClickGestureRecognizer alloc] initWithTarget:self
+                                                                                         action:@selector(handleResume:)];
+  [stackView addGestureRecognizer:gestureRecognizer];
+#endif // macOS]
+
+#if !TARGET_OS_OSX
   [self.view addSubview:stackView];
 
   [NSLayoutConstraint activateConstraints:@[
     [stackView.topAnchor constraintEqualToAnchor:self.view.safeAreaLayoutGuide.topAnchor constant:12],
-    [stackView.centerXAnchor constraintEqualToAnchor:self.view.safeAreaLayoutGuide.centerXAnchor],
+    [stackView.topAnchor constraintEqualToAnchor:self.view.topAnchor constant:20],
+    [stackView.leadingAnchor constraintEqualToAnchor:self.view.leadingAnchor constant:20],
+    [stackView.trailingAnchor constraintEqualToAnchor:self.view.trailingAnchor constant:-20],
+    [stackView.bottomAnchor constraintEqualToAnchor:self.view.bottomAnchor constant:-20],
+    [stackView.centerXAnchor constraintEqualToAnchor:self.view.centerXAnchor],
   ]];
+#else
+  [self setView:stackView];
+#endif 
 
+#if !TARGET_OS_OSX // [macOS]
   stackView.semanticContentAttribute = UISemanticContentAttributeForceLeftToRight;
+#else // [macOS
+  stackView.userInterfaceLayoutDirection = NSUserInterfaceLayoutDirectionLeftToRight;
+#endif // macOS]
 }
 
+#if !TARGET_OS_OSX // [macOS]
 - (void)handleResume:(UITapGestureRecognizer *)recognizer
 {
   self.onResume();
 }
-#endif // [macOS]
+#else // [macOS
+- (void)handleResume:(id)sender
+{
+  self.onResume();
+}
+#endif // macOS]
 @end
 
 @implementation RCTPausedInDebuggerOverlayController
 
-#if !TARGET_OS_OSX // [macOS]
-- (UIWindow *)alertWindow
+- (RCTPlatformWindow *)alertWindow // [macOS]
 {
   if (_alertWindow == nil) {
+#if !TARGET_OS_OSX // [macOS]
     _alertWindow = [[UIWindow alloc] initWithWindowScene:RCTKeyWindow().windowScene];
 
     if (_alertWindow) {
       _alertWindow.rootViewController = [UIViewController new];
       _alertWindow.windowLevel = UIWindowLevelAlert + 1;
     }
+#else // [macOS]
+    _alertWindow = [[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, 100, 100)
+                                               styleMask:NSWindowStyleMaskBorderless | NSWindowStyleMaskFullSizeContentView
+                                                 backing:NSBackingStoreBuffered
+                                                   defer:YES];
+    _alertWindow.backgroundColor = [NSColor clearColor];
+    _alertWindow.opaque = NO;
+#endif // macOS]
   }
 
   return _alertWindow;
 }
-#endif // [macOS]
 
 - (void)showWithMessage:(NSString *)message onResume:(void (^)(void))onResume
 {
   [self hide];
 
   RCTPausedInDebuggerViewController *view = [[RCTPausedInDebuggerViewController alloc] init];
-#if !TARGET_OS_OSX // [macOS]
-  view.modalPresentationStyle = UIModalPresentationOverFullScreen;
   view.message = message;
   view.onResume = onResume;
+  
+#if !TARGET_OS_OSX // [macOS]
+  view.modalPresentationStyle = UIModalPresentationOverFullScreen;
   [self.alertWindow makeKeyAndVisible];
   [self.alertWindow.rootViewController presentViewController:view animated:NO completion:nil];
-#endif // [macOS]
+#else // [macOS]
+  self.alertWindow.contentViewController = view;
+  
+  NSWindow *parentWindow = RCTKeyWindow();
+  if (![[parentWindow sheets] doesContain:self->_alertWindow]) {
+    [parentWindow beginSheet:self.alertWindow completionHandler:^(NSModalResponse returnCode) {
+      [self->_alertWindow orderOut:self];
+    }];
+  }
+#endif // macOS]
 }
 
 - (void)hide
 {
 #if !TARGET_OS_OSX // [macOS]
   [_alertWindow setHidden:YES];
-
   _alertWindow.windowScene = nil;
-
+  _alertWindow = nil;
+#else // [macOS]
+  NSWindow *parentWindow = RCTKeyWindow();
+  if (parentWindow) {
+    for (NSWindow *sheet in [parentWindow sheets]) {
+      if (sheet == _alertWindow) {
+        [parentWindow endSheet:sheet];
+        break;
+      }
+    }
+  }
   _alertWindow = nil;
 #endif // macOS]
 }

packages/rn-tester/Podfile

@@ -39,8 +39,7 @@ def pods(target_name, options = {})
 
   # Hermes is now enabled by default.
   # The following line will only disable Hermes if the USE_HERMES envvar is SET to a value other than 1 (e.g. USE_HERMES=0).
-  # [macOS] Make hermes disabled by default for our fork
-  hermes_enabled = ENV['USE_HERMES'] == '1'
+  hermes_enabled = !ENV.has_key?('USE_HERMES') || ENV['USE_HERMES'] == '1'
   puts "Configuring #{target_name} with Fabric #{fabric_enabled ? "enabled" : "disabled"}.#{hermes_enabled ? " Using Hermes engine." : ""}"
 
   use_react_native!(