macOS-specific changes to get RNTester to compile

Author: Adam Gleitman

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

@@ -15,20 +15,20 @@
 
 const NSUInteger kRCTBundleURLProviderDefaultPort = RCT_METRO_PORT;
 
-#if !TARGET_OS_OSX // [macOS]
-NSString *const kRCTPlatformName = @"ios";
-#else // [macOS
-NSString *const kRCTPlatformName = @"macos";
-#endif // macOS]
-
 #if RCT_DEV_MENU | RCT_PACKAGER_LOADING_FUNCTIONALITY
 static BOOL kRCTAllowPackagerAccess = YES;
 void RCTBundleURLProviderAllowPackagerServerAccess(BOOL allowed)
 {
   kRCTAllowPackagerAccess = allowed;
 }
 #endif
-static NSString *const kRCTPlatformName = @"ios";
+
+#if !TARGET_OS_OSX // [macOS]
+NSString *const kRCTPlatformName = @"ios";
+#else // [macOS
+NSString *const kRCTPlatformName = @"macos";
+#endif // macOS]
+
 static NSString *const kRCTPackagerSchemeKey = @"RCT_packager_scheme";
 static NSString *const kRCTJsLocationKey = @"RCT_jsLocation";
 static NSString *const kRCTEnableDevKey = @"RCT_enableDev";

packages/react-native/ReactCommon/react/debug/React-debug.podspec

@@ -23,7 +23,7 @@ Pod::Spec.new do |s|
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
   s.author                 = "Meta Platforms, Inc. and its affiliates"
-  s.platforms              = { :ios => min_ios_version_supported }
+  s.platforms              = { :ios => min_ios_version_supported, :osx => '10.15' } # [macOS]
   s.source                 = source
   s.source_files           = "**/*.{cpp,h}"
   s.header_dir             = "react/debug"

packages/react-native/ReactCommon/react/renderer/components/legacyviewmanagerinterop/RCTLegacyViewManagerInteropCoordinator.h

@@ -36,11 +36,11 @@ typedef void (^InterceptorBlock)(std::string eventName, folly::dynamic event);
 - (void)handleCommand:(NSString *)commandName
                  args:(NSArray *)args
              reactTag:(NSInteger)tag
-            paperView:(UIView *)paperView;
+            paperView:(RCTUIView *)paperView; // [macOS]
 
 - (void)removeViewFromRegistryWithTag:(NSInteger)tag;
 
-- (void)addViewToRegistry:(UIView *)view withTag:(NSInteger)tag;
+- (void)addViewToRegistry:(RCTUIView *)view withTag:(NSInteger)tag; // [macOS]
 
 @end
 

packages/react-native/ReactCommon/react/renderer/components/legacyviewmanagerinterop/RCTLegacyViewManagerInteropCoordinator.mm

@@ -103,7 +103,7 @@ - (NSString *)componentViewName
 - (void)handleCommand:(NSString *)commandName
                  args:(NSArray *)args
              reactTag:(NSInteger)tag
-            paperView:(nonnull UIView *)paperView
+            paperView:(nonnull RCTUIView *)paperView // [macOS]
 {
   Class managerClass = _componentData.managerClass;
   [self _lookupModuleMethodsIfNecessary];
@@ -143,27 +143,27 @@ - (void)handleCommand:(NSString *)commandName
   }
 }
 
-- (void)addViewToRegistry:(UIView *)view withTag:(NSInteger)tag
+- (void)addViewToRegistry:(RCTUIView *)view withTag:(NSInteger)tag // [macOS]
 {
-  [self _addUIBlock:^(RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
+  [self _addUIBlock:^(RCTUIManager *uiManager, NSDictionary<NSNumber *, RCTUIView *> *viewRegistry) { // [macOS]
     if ([viewRegistry objectForKey:@(tag)] != NULL) {
       return;
     }
-    NSMutableDictionary<NSNumber *, UIView *> *mutableViewRegistry =
-        (NSMutableDictionary<NSNumber *, UIView *> *)viewRegistry;
+    NSMutableDictionary<NSNumber *, RCTUIView *> *mutableViewRegistry =
+        (NSMutableDictionary<NSNumber *, RCTUIView *> *)viewRegistry; // [macOS]
     [mutableViewRegistry setObject:view forKey:@(tag)];
   }];
 }
 
 - (void)removeViewFromRegistryWithTag:(NSInteger)tag
 {
-  [self _addUIBlock:^(RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
+  [self _addUIBlock:^(RCTUIManager *uiManager, NSDictionary<NSNumber *, RCTUIView *> *viewRegistry) { // [macOS]
     if ([viewRegistry objectForKey:@(tag)] == NULL) {
       return;
     }
 
-    NSMutableDictionary<NSNumber *, UIView *> *mutableViewRegistry =
-        (NSMutableDictionary<NSNumber *, UIView *> *)viewRegistry;
+    NSMutableDictionary<NSNumber *, RCTUIView *> *mutableViewRegistry =
+        (NSMutableDictionary<NSNumber *, RCTUIView *> *)viewRegistry; // [macOS]
     [mutableViewRegistry removeObjectForKey:@(tag)];
   }];
 }

packages/react-native/ReactCommon/react/renderer/runtimescheduler/React-runtimescheduler.podspec

@@ -35,7 +35,7 @@ Pod::Spec.new do |s|
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
   s.author                 = "Meta Platforms, Inc. and its affiliates"
-  s.platforms              = { :ios => min_ios_version_supported }
+  s.platforms              = { :ios => min_ios_version_supported, :osx => '10.15' } # [macOS]
   s.source                 = source
   s.source_files           = "**/*.{cpp,h}"
   s.compiler_flags         = folly_compiler_flags

packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTTextLayoutManager.mm

@@ -94,6 +94,7 @@ - (void)drawAttributedString:(AttributedString)attributedString
     CGRect rect = [layoutManager usedRectForTextContainer:textContainer];
     static auto threshold = 1.0 / RCTScreenScale() + 0.01; // Size of a pixel plus some small threshold.
 
+#if !TARGET_OS_OSX // [macOS]
     // `rect`'s width is stored in double precesion.
     // `frame`'s width is also in double precesion but was stored as float in Yoga previously, precesion was lost.
     if (std::abs(RCTCeilPixelValue(rect.size.width) - frame.size.width) < threshold) {
@@ -103,6 +104,12 @@ - (void)drawAttributedString:(AttributedString)attributedString
       // We could create new `NSTextStorage` for the specific frame, but that is expensive.
       origin.x -= RCTCeilPixelValue(rect.origin.x);
     }
+#else // [macOS
+    CGFloat scale = [[NSScreen mainScreen] backingScaleFactor];
+    if (std::abs(RCTCeilPixelValue(rect.size.width, scale) - frame.size.width) < threshold) {
+      origin.x -= RCTCeilPixelValue(rect.origin.x, scale);
+    }
+#endif // macOS]
   }
 
 #if TARGET_OS_MACCATALYST
@@ -288,15 +295,15 @@ - (TextMeasurement)_measureTextStorage:(NSTextStorage *)textStorage
   NSTextContainer *textContainer = layoutManager.textContainers.firstObject;
   [layoutManager ensureLayoutForTextContainer:textContainer];
 
+  CGSize size = [layoutManager usedRectForTextContainer:textContainer].size;
+
 #if !TARGET_OS_OSX // [macOS]
   size = (CGSize){RCTCeilPixelValue(size.width), RCTCeilPixelValue(size.height)};
 #else // [macOS
   CGFloat scale = [[NSScreen mainScreen] backingScaleFactor];
   size = (CGSize){RCTCeilPixelValue(size.width, scale), RCTCeilPixelValue(size.height, scale)};
 #endif // macOS]
 
-  size = (CGSize){RCTCeilPixelValue(size.width), RCTCeilPixelValue(size.height)};
-
   __block auto attachments = TextMeasurement::Attachments{};
 
   [textStorage

packages/react-native/ReactCommon/react/utils/React-utils.podspec

@@ -36,7 +36,7 @@ Pod::Spec.new do |s|
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
   s.author                 = "Meta Platforms, Inc. and its affiliates"
-  s.platforms              = { :ios => min_ios_version_supported }
+  s.platforms              = { :ios => min_ios_version_supported, :osx => '10.15' } # [macOS]
   s.source                 = source
   s.source_files           = "**/*.{cpp,h,mm}"
   s.compiler_flags         = folly_compiler_flags

packages/rn-tester/NativeComponentExample/ios/RNTMyLegacyNativeViewManager.mm

@@ -39,8 +39,8 @@ + (BOOL)requiresMainQueueSetup
 
 RCT_EXPORT_METHOD(changeBackgroundColor : (nonnull NSNumber *)reactTag color : (NSString *)color)
 {
-  [self.bridge.uiManager addUIBlock:^(RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-    UIView *view = viewRegistry[reactTag];
+  [self.bridge.uiManager addUIBlock:^(RCTUIManager *uiManager, NSDictionary<NSNumber *, RCTUIView *> *viewRegistry) { // [macOS]
+    RCTUIView *view = viewRegistry[reactTag]; // [macOS]
     if (!view || ![view isKindOfClass:[RNTLegacyView class]]) {
       RCTLogError(@"Cannot find RNTLegacyView with tag #%@", reactTag);
       return;
@@ -53,18 +53,18 @@ + (BOOL)requiresMainQueueSetup
     [scanner setScanLocation:1]; // bypass '#' character
     [scanner scanHexInt:&rgbValue];
 
-    UIColor *newColor = [UIColor colorWithRed:((rgbValue & 0xFF0000) >> 16) / 255.0
-                                        green:((rgbValue & 0xFF00) >> 8) / 255.0
-                                         blue:(rgbValue & 0xFF) / 255.0
-                                        alpha:1.0];
+    RCTUIColor *newColor = [RCTUIColor colorWithRed:((rgbValue & 0xFF0000) >> 16) / 255.0 // [macOS]
+                                              green:((rgbValue & 0xFF00) >> 8) / 255.0
+                                               blue:(rgbValue & 0xFF) / 255.0
+                                              alpha:1.0];
     view.backgroundColor = newColor;
   }];
 }
 
 - (RCTUIView *)view // [macOS]
 {
   RNTLegacyView *view = [[RNTLegacyView alloc] init];
-  view.backgroundColor = UIColor.redColor;
+  view.backgroundColor = RCTUIColor.redColor; // [macOS]
   return view;
 }