Fix macOS build issues

Author: gabrieldonadel

packages/react-native/Libraries/Components/Pressable/Pressable.js

@@ -317,8 +317,6 @@ function Pressable({
     onPressMove,
     onPressOut,
     // [macOS
-    onFocus,
-    onBlur,
     onKeyDown,
     onKeyUp,
     keyDownEvents,
@@ -428,8 +426,6 @@ function Pressable({
         }
       },
       // [macOS
-      onFocus,
-      onBlur,
       onKeyDown,
       onKeyUp,
       // macOS]
@@ -453,8 +449,6 @@ function Pressable({
       onPressMove,
       onPressOut,
       // [macOS
-      onFocus,
-      onBlur,
       onKeyDown,
       onKeyUp,
       // macOS]

packages/react-native/Libraries/Image/RCTUIImageViewAnimated.mm

@@ -94,7 +94,8 @@ - (void)setImage:(RCTPlatformImage *)image // [macOS]
   if (image == thisImage) {
     return;
   }
-
+  
+#if !TARGET_OS_OSX // [macOS]
   [self stop];
   [self resetAnimatedImage];
 
@@ -128,6 +129,9 @@ - (void)setImage:(RCTPlatformImage *)image // [macOS]
   }
 
   super.image = image;
+#else // [macOS
+  [super setImage:image];
+#endif // macOS]
 }
 
 #pragma mark - Private

packages/react-native/Libraries/Network/RCTNetworkConversions.h

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#import <UIKit/UIKit.h>
+#import <React/RCTUIKit.h> // [macOS]
 
 #ifdef __cplusplus
 

packages/react-native/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.mm

@@ -36,7 +36,10 @@ - (instancetype)initWithTextField:(UITextField<RCTBackedTextInputViewProtocol> *
   if (self = [super init]) {
     _backedTextInputView = backedTextInputView;
     backedTextInputView.delegate = self;
+    
+#if !TARGET_OS_OSX // [macOS]
     backedTextInputView.textDropDelegate = self;
+#endif // [macOS]
 
 #if !TARGET_OS_OSX // [macOS]
     [_backedTextInputView addTarget:self
@@ -181,6 +184,8 @@ - (void)textFieldProbablyDidChangeSelection
   [_backedTextInputView.textInputDelegate textInputDidChangeSelection];
 }
 
+
+#if !TARGET_OS_OSX // [macOS]
 #pragma mark - UITextDropDelegate
 
 - (UITextDropEditability)textDroppableView:(UIView<UITextDroppable> *)textDroppableView
@@ -216,6 +221,7 @@ - (bool)_shouldAcceptDrop:(id<UITextDropRequest>)drop
     return true;
   }
 }
+#endif // macOS]
 
 #if TARGET_OS_OSX // [macOS
 
@@ -297,7 +303,11 @@ - (void)textFieldDidChangeSelection:(NSTextField *)textField
 
 #pragma mark - RCTBackedTextViewDelegateAdapter (for UITextView)
 
+#if !TARGET_OS_OSX // [macOS]
 @interface RCTBackedTextViewDelegateAdapter () <UITextViewDelegate, UITextDropDelegate>
+#else // [macOS
+@interface RCTBackedTextViewDelegateAdapter () <UITextViewDelegate>
+#endif // macOS]
 @end
 
 @implementation RCTBackedTextViewDelegateAdapter {
@@ -322,7 +332,9 @@ - (instancetype)initWithTextView:(UITextView<RCTBackedTextInputViewProtocol> *)b
   if (self = [super init]) {
     _backedTextInputView = backedTextInputView;
     backedTextInputView.delegate = self;
+#if !TARGET_OS_OSX // [macOS]
     backedTextInputView.textDropDelegate = self;
+#endif // [macOS]
   }
 
   return self;
@@ -535,6 +547,7 @@ - (void)textViewProbablyDidChangeSelection
   [_backedTextInputView.textInputDelegate textInputDidChangeSelection];
 }
 
+#if !TARGET_OS_OSX // [macOS]
 #pragma mark - UITextDropDelegate
 
 - (UITextDropEditability)textDroppableView:(UIView<UITextDroppable> *)textDroppableView
@@ -570,5 +583,6 @@ - (bool)_shouldAcceptDrop:(id<UITextDropRequest>)drop
     return true;
   }
 }
+#endif // macOS]
 
 @end

packages/react-native/Libraries/WebSocket/WebSocket.js

@@ -141,7 +141,7 @@ class WebSocket extends EventTarget {
     this._eventEmitter = new NativeEventEmitter(
       // T88715063: NativeEventEmitter only used this parameter on iOS. Now it uses it on all platforms, so this code was modified automatically to preserve its behavior
       // If you want to use the native module on other platforms, please remove this condition and test its behavior
-      (Platform.OS !== 'ios' || Platform.OS !== 'macos') ? null : NativeWebSocketModule, // [macOS]
+      (Platform.OS !== 'ios' && Platform.OS !== 'macos') ? null : NativeWebSocketModule, // [macOS]
     );
     this._socketId = nextWebSocketId++;
     this._registerEvents();

packages/react-native/React/Base/RCTUtils.mm

@@ -39,8 +39,10 @@
 // Determines if a given image URL refers to a image in Home directory (~)
 BOOL RCTIsHomeAssetURL(NSURL *__nullable imageURL);
 
+#if !TARGET_OS_OSX // [macOS]
 // Returns the current device's orientation
 UIDeviceOrientation RCTDeviceOrientation(void);
+#endif // [macOS]
 
 // Whether the New Architecture is enabled or not
 BOOL RCTIsNewArchEnabled(void)
@@ -363,6 +365,8 @@ static void RCTUnsafeExecuteOnMainQueueOnceSync(dispatch_once_t *onceToken, disp
   dispatch_sync(dispatch_get_main_queue(), executeOnce);
 }
 
+#if !TARGET_OS_OSX // [macOS]
+
 CGFloat RCTScreenScale(void)
 {
   static dispatch_once_t onceTokenScreenScale;

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

@@ -115,7 +115,7 @@ - (instancetype)init
     UITraitCollection *traitCollection = RCTKeyWindow().traitCollection;
     _currentColorScheme = RCTColorSchemePreference(traitCollection);
 #else // [macOS
-  NSAppearance *appearance = [RCTKeyWindow().currentAppearance;
+  NSAppearance *appearance = [NSApp effectiveAppearance];
   _currentColorScheme = RCTColorSchemePreference(appearance);
 #endif // macOS]
     [[NSNotificationCenter defaultCenter] addObserver:self
@@ -214,4 +214,4 @@ - (void)invalidate
 Class RCTAppearanceCls(void)
 {
   return RCTAppearance.class;
-}
+}

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

@@ -34,7 +34,7 @@ @implementation RCTDeviceInfo {
   std::atomic<BOOL> _invalidated;
   NSDictionary *_constants;
 
-  __weak UIWindow *_applicationWindow;
+  __weak RCTPlatformWindow *_applicationWindow; // [macOS]
 }
 
 static NSString *const kFrameKeyPath = @"frame";
@@ -198,7 +198,7 @@ static BOOL RCTIsIPhoneNotched()
 #endif // macOS]
 
   // We fallback to screen size if a key window is not found.
-  CGSize windowSize = mainWindow ? mainWindow.bounds.size : screenSize;
+  CGSize windowSize = mainWindow ? mainWindow.frame.size : screenSize; //[macOS]
 
 #if !TARGET_OS_OSX // [macOS]
 #if !TARGET_OS_VISION // [visionOS]

packages/react-native/React/Fabric/Mounting/ComponentViews/Modal/RCTModalHostViewComponentView.mm

@@ -291,7 +291,6 @@ - (void)presentationControllerDidAttemptToDismiss:(UIPresentationController *)co
     eventEmitter->onRequestClose({});
   }
 }
-#endif // [macOS]
 
 - (void)presentationControllerDidDismiss:(UIPresentationController *)presentationController
 {
@@ -302,6 +301,7 @@ - (void)presentationControllerDidDismiss:(UIPresentationController *)presentatio
     eventEmitter->onRequestClose({});
   }
 }
+#endif // [macOS]
 
 @end
 
@@ -319,4 +319,4 @@ - (void)presentationControllerDidDismiss:(UIPresentationController *)presentatio
 Class<RCTComponentViewProtocol> RCTModalHostViewCls(void)
 {
   return RCTModalHostViewComponentView.class;
-}
+}

packages/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm

@@ -512,16 +512,20 @@ - (void)updateState:(const State::Shared &)state oldState:(const State::Shared &
   }];
 }
 
-- (UIView *)betterHitTest:(CGPoint)point withEvent:(UIEvent *)event
+- (RCTUIView *)betterHitTest:(CGPoint)point withEvent:(UIEvent *)event // [macOS]
 {
   // This is the same algorithm as in the RCTViewComponentView with the exception of
   // skipping the immediate child (_containerView) and checking grandchildren instead.
   // This prevents issues with touches outside of _containerView being ignored even
   // if they are within the bounds of the _containerView's children.
 
+#if !TARGET_OS_OSX // [macOS]
   if (!self.userInteractionEnabled || self.hidden || self.alpha < 0.01) {
-    return nil;
-  }
+#else // [macOS
+    if (!self.userInteractionEnabled || self.hidden) {
+#endif // macOS]
+      return nil;
+    }
 
   BOOL isPointInside = [self pointInside:point withEvent:event];
 
@@ -533,8 +537,8 @@ - (UIView *)betterHitTest:(CGPoint)point withEvent:(UIEvent *)event
     return nil;
   }
 
-  for (UIView *subview in [_containerView.subviews reverseObjectEnumerator]) {
-    UIView *hitView = [subview hitTest:[subview convertPoint:point fromView:self] withEvent:event];
+  for (RCTUIView *subview in [_containerView.subviews reverseObjectEnumerator]) { // [macOS]
+    RCTUIView *hitView = [subview hitTest:[subview convertPoint:point fromView:self] withEvent:event]; // [macOS]
     if (hitView) {
       return hitView;
     }