followup changes

Author: Saadnajmi

packages/react-native/Libraries/AppDelegate/RCTDefaultReactNativeFactoryDelegate.h

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#import <UIKit/UIKit.h>
+#import <React/RCTUIKit.h> // [macOS]
 #import "RCTReactNativeFactory.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -15,7 +15,11 @@ NS_ASSUME_NONNULL_BEGIN
  * Contains default implementation of RCTReactNativeFactoryDelegate methods.
  */
 
+#if !TARGET_OS_OSX // [macOS]
 @interface RCTDefaultReactNativeFactoryDelegate : UIResponder <RCTReactNativeFactoryDelegate>
+#else // [macOS
+@interface RCTDefaultReactNativeFactoryDelegate : NSResponder <RCTReactNativeFactoryDelegate>
+#endif // macOS]
 @end
 
 NS_ASSUME_NONNULL_END

packages/react-native/Libraries/AppDelegate/RCTDefaultReactNativeFactoryDelegate.mm

@@ -33,7 +33,7 @@ - (RCTBridge *)createBridgeWithDelegate:(id<RCTBridgeDelegate>)delegate launchOp
   return [[RCTBridge alloc] initWithDelegate:delegate launchOptions:launchOptions];
 }
 
-- (void)setRootView:(UIView *)rootView toRootViewController:(UIViewController *)rootViewController
+- (void)setRootView:(RCTPlatformView *)rootView toRootViewController:(RCTPlatformViewController *)rootViewController
 {
   rootViewController.view = rootView;
 }
@@ -43,14 +43,18 @@ - (void)customizeRootView:(RCTRootView *)rootView
   // Override point for customization after application launch.
 }
 
-- (UIView *)createRootViewWithBridge:(RCTBridge *)bridge
+- (RCTPlatformView *)createRootViewWithBridge:(RCTBridge *)bridge
                           moduleName:(NSString *)moduleName
                            initProps:(NSDictionary *)initProps
 {
   BOOL enableFabric = self.fabricEnabled;
-  UIView *rootView = RCTAppSetupDefaultRootView(bridge, moduleName, initProps, enableFabric);
+  RCTUIView *rootView = RCTAppSetupDefaultRootView(bridge, moduleName, initProps, enableFabric);
 
+#if !TARGET_OS_OSX // [macOS]
   rootView.backgroundColor = [UIColor systemBackgroundColor];
+#else // [macOS
+  rootView.backgroundColor = [NSColor windowBackgroundColor];
+#endif // macOS]
 
   return rootView;
 }

packages/react-native/Libraries/AppDelegate/RCTReactNativeFactory.h

@@ -7,7 +7,7 @@
 
 #import <React/RCTBridgeDelegate.h>
 #import <React/RCTConvert.h>
-#import <UIKit/UIKit.h>
+#import <React/RCTUIKit.h> // [macOS]
 #import "RCTArchConfiguratorProtocol.h"
 #import "RCTDependencyProvider.h"
 #import "RCTRootViewFactory.h"
@@ -66,9 +66,9 @@ NS_ASSUME_NONNULL_BEGIN
  *
  * @returns: a UIView properly configured with a bridge for React Native.
  */
-- (UIView *)createRootViewWithBridge:(RCTBridge *)bridge
-                          moduleName:(NSString *)moduleName
-                           initProps:(NSDictionary *)initProps;
+- (RCTPlatformView *)createRootViewWithBridge:(RCTBridge *)bridge
+                                   moduleName:(NSString *)moduleName
+                                    initProps:(NSDictionary *)initProps;
 
 /// This method returns a map of Component Descriptors and Components classes that needs to be registered in the
 /// new renderer. The Component Descriptor is a string which represent the name used in JS to refer to the native

packages/react-native/Libraries/AppDelegate/RCTReactNativeFactory.mm

@@ -190,15 +190,15 @@ - (RCTRootViewFactory *)createRCTRootViewFactory
                                                    turboModuleEnabled:self.turboModuleEnabled
                                                     bridgelessEnabled:self.bridgelessEnabled];
 
-  configuration.createRootViewWithBridge = ^UIView *(RCTBridge *bridge, NSString *moduleName, NSDictionary *initProps) {
+  configuration.createRootViewWithBridge = ^RCTPlatformView *(RCTBridge *bridge, NSString *moduleName, NSDictionary *initProps) {
     return [weakSelf.delegate createRootViewWithBridge:bridge moduleName:moduleName initProps:initProps];
   };
 
   configuration.createBridgeWithDelegate = ^RCTBridge *(id<RCTBridgeDelegate> delegate, NSDictionary *launchOptions) {
     return [weakSelf.delegate createBridgeWithDelegate:delegate launchOptions:launchOptions];
   };
 
-  configuration.customizeRootView = ^(UIView *_Nonnull rootView) {
+  configuration.customizeRootView = ^(RCTPlatformView *_Nonnull rootView) {
     [weakSelf.delegate customizeRootView:(RCTRootView *)rootView];
   };
 

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

@@ -512,7 +512,7 @@ - (void)imageLoaderLoadedImage:(UIImage *)loadedImage
       }
     } else {
       if (strongSelf->_onLoad) {
-        RCTImageSource *sourceLoaded = [source imageSourceWithSize:image.size scale:image.scale];
+        RCTImageSource *sourceLoaded = [source imageSourceWithSize:image.size scale:UIImageGetScale(image)]; // [macOS]
         strongSelf->_onLoad(onLoadParamsForSource(sourceLoaded));
       }
       if (strongSelf->_onLoadEnd) {

packages/react-native/React/Base/RCTUIKit.h

@@ -140,7 +140,7 @@ NS_ASSUME_NONNULL_BEGIN
 // UIFontDescriptor.h/NSFontDescriptor.h
 #define UIFontDescriptorFamilyAttribute          NSFontFamilyAttribute;
 #define UIFontDescriptorNameAttribute            NSFontNameAttribute;
-#define UIFontDescriptorFaceAttribute            NSFontFaceAttribute;
+#define UIFontDescriptorFaceAttribute            NSFontFaceAttribute;
 #define UIFontDescriptorSizeAttribute            NSFontSizeAttribute
 
 #define UIFontDescriptorTraitsAttribute          NSFontTraitsAttribute
@@ -161,6 +161,13 @@ NS_ASSUME_NONNULL_BEGIN
 #define UIFontWeightHeavy                        NSFontWeightHeavy
 #define UIFontWeightBlack                        NSFontWeightBlack
 
+#define UIFontDescriptorSystemDesign             NSFontDescriptorSystemDesign
+#define UIFontDescriptorSystemDesignDefault      NSFontDescriptorSystemDesignDefault
+#define UIFontDescriptorSystemDesignSerif        NSFontDescriptorSystemDesignSerif
+#define UIFontDescriptorSystemDesignRounded      NSFontDescriptorSystemDesignRounded
+#define UIFontDescriptorSystemDesignMonospaced   NSFontDescriptorSystemDesignMonospaced
+
+
 // RCTActivityIndicatorView.h
 #define UIActivityIndicatorView NSProgressIndicator
 
@@ -473,6 +480,8 @@ CGPathRef UIBezierPathCreateCGPathRef(UIBezierPath *path);
 @property (nonatomic, assign) BOOL enableFocusRing;
 @property (nonatomic, assign, getter=isScrollEnabled) BOOL scrollEnabled;
 
+- (void)setContentOffset:(CGPoint)contentOffset animated:(BOOL)animated;
+
 @end
 
 @interface RCTClipView : NSClipView

packages/react-native/React/Base/macOS/RCTUIKit.m

@@ -617,6 +617,18 @@ - (void)setContentOffset:(CGPoint)contentOffset
   [self.documentView scrollPoint:contentOffset];
 }
 
+- (void)setContentOffset:(CGPoint)contentOffset animated:(BOOL)animated
+{
+    if (animated) {
+        [NSAnimationContext runAnimationGroup:^(NSAnimationContext *context) {
+            context.duration = 0.3; // Set the duration of the animation
+            [self.documentView.animator scrollPoint:contentOffset];
+        } completionHandler:nil];
+    } else {
+        [self.documentView scrollPoint:contentOffset];
+    }
+}
+
 - (UIEdgeInsets)contentInset
 {
   return super.contentInsets;

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

@@ -10,9 +10,10 @@
 /**
  * UIView class for root <ModalHostView> component.
  */
-@interface RCTModalHostViewComponentView : RCTViewComponentView <UIAdaptivePresentationControllerDelegate>
-
+@interface RCTModalHostViewComponentView : RCTViewComponentView
 #if !TARGET_OS_OSX // [macOS]
+<UIAdaptivePresentationControllerDelegate>
+
 /**
  * Subclasses may override this method and present the modal on different view controller.
  * Default implementation presents the modal on `[self reactViewController]`.

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

@@ -300,7 +300,7 @@ - (void)scrollViewWillEndDragging:(RCTUIScrollView *)scrollView
   }
 }
 
-- (void)scrollViewDidZoom:(__unused UIScrollView *)scrollView
+- (void)scrollViewDidZoom:(__unused RCTUIScrollView *)scrollView // [macOS]
 {
   [self centerContentIfNeeded];
 }
@@ -313,4 +313,4 @@ - (BOOL)isHorizontal:(RCTUIScrollView *)scrollView // [macOS]
       scrollView.contentSize.width > self.frame.size.width;
 }
 
-@end
+@end

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

@@ -158,9 +158,15 @@ - (void)_updateTitle
 
 #pragma mark - Attaching & Detaching
 
+#if !TARGET_OS_OSX // [macOS]
 - (void)didMoveToSuperview
 {
   [super didMoveToSuperview];
+#else // macOS]
+- (void)viewDidMoveToSuperview
+{
+  [super viewDidMoveToSuperview];
+#endif // macOS]
   if (self.superview) {
     [self _attach];
   } else {
@@ -240,4 +246,4 @@ - (NSString *)componentViewName_DO_NOT_USE_THIS_IS_BROKEN
 Class<RCTComponentViewProtocol> RCTPullToRefreshViewCls(void)
 {
   return RCTPullToRefreshViewComponentView.class;
-}
+}