fix(macos): build fixes after 0.85 merge

Targeted compile fixes uncovered while bringing up RNTester-macOS against
the merged 0.85-stable tree:

- RCTUtils.h: drop duplicate RCTUIStatusBarManager decl; close
  outstanding #if !TARGET_OS_OSX around RCTPresentedViewController +
  nested !TARGET_OS_TV around RCTUIStatusBarManager.
- RCTUIManager.mm: wrap namedOrientationDidChange in
  #if TARGET_OS_IOS (uses UIDevice.orientation); switch new-arch stub
  @implementation block to RCTPlatformView/RCTUIView typedefs to match
  the macOS-fork header signatures.
- RCTFrameTimingsObserver.mm: new 0.85 file using UIKit/CADisplayLink.
  Wrap iOS impl in #if !TARGET_OS_OSX and add macOS no-op stub
  @implementation so the @interface in the .h has a definition.
- RCTBackedTextInputDelegateAdapter.mm: remove two leftover #endif
  directives left over from the merge (no matching #if).
- RCTActivityIndicatorView.m: move the macOS RCTActivityIndicatorView
  category extension inside #ifndef RCT_REMOVE_LEGACY_ARCH so the base
  @interface (declared only in the legacy block) is visible.
- RCTView.m: guard accessibilityElementsHidden behind !TARGET_OS_OSX
  (NSView has no such property) and guard [RCTTextView class] dispatch
  behind #ifndef RCT_REMOVE_LEGACY_ARCH (RCTTextView is legacy-only).
- RCTImageUtils.mm: wrap UIImageOrientationFromCGImagePropertyOrientation
  helper + the in-function UIImageOrientation usage in #if !TARGET_OS_OSX
  (NSImage path doesn't use UIImageOrientation).
- RCTRedBox+Internal.h: replace #import <UIKit/UIKit.h> with the fork's
  cross-platform <React/RCTUIKit.h> umbrella.
- RCTLogBoxView.mm: guard macOS layoutIfNeeded's [_surface setSize:...]
  behind #ifndef RCT_REMOVE_LEGACY_ARCH (_surface only exists in legacy
  block).

Author: tvinhas

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

@@ -59,6 +59,7 @@ static CGImagePropertyOrientation CGImagePropertyOrientationFromUIImageOrientati
 }
 #endif // [macOS]
 
+#if !TARGET_OS_OSX // [macOS]
 static UIImageOrientation UIImageOrientationFromCGImagePropertyOrientation(CGImagePropertyOrientation imageOrientation)
 {
   switch (imageOrientation) {
@@ -82,6 +83,7 @@ static UIImageOrientation UIImageOrientationFromCGImagePropertyOrientation(CGIma
       return UIImageOrientationUp;
   }
 }
+#endif // [macOS]
 
 CGRect RCTTargetRect(CGSize sourceSize, CGSize destSize, CGFloat destScale, RCTResizeMode resizeMode)
 {
@@ -326,7 +328,9 @@ BOOL RCTUpscalingRequired(
   CGImageRef imageRef;
   BOOL createThumbnail = targetPixelSize.width != 0 && targetPixelSize.height != 0 &&
       (sourceSize.width > targetPixelSize.width || sourceSize.height > targetPixelSize.height);
+#if !TARGET_OS_OSX // [macOS]
   UIImageOrientation orientation = UIImageOrientationUp;
+#endif // [macOS]
 
   if (createThumbnail) {
     CGFloat maxPixelSize = fmax(targetPixelSize.width, targetPixelSize.height);
@@ -353,10 +357,14 @@ BOOL RCTUpscalingRequired(
     // Unlike `CGImageSourceCreateThumbnailAtIndex` (with `kCGImageSourceCreateThumbnailWithTransform` set to YES),
     // `CGImageSourceCreateImageAtIndex` doesn't rotate the image to keep the orientation, so we'll need to pass
     // the actual orientation (if present) to the `UIImage` initializer
+#if !TARGET_OS_OSX // [macOS]
     if (orientationNum) {
       orientation = UIImageOrientationFromCGImagePropertyOrientation(
           (CGImagePropertyOrientation)[orientationNum unsignedIntValue]);
     }
+#else // [macOS
+    (void)orientationNum;
+#endif // macOS]
   }
 
   CFRelease(sourceRef);

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

@@ -306,8 +306,6 @@ - (void)textFieldDidChangeSelection:(NSTextField *)textField
 }
 #endif // macOS]
 
-#endif
-
 @end
 
 #pragma mark - RCTBackedTextViewDelegateAdapter (for UITextView)
@@ -601,6 +599,4 @@ - (bool)_shouldAcceptDrop:(id<UITextDropRequest>)drop
 }
 #endif // macOS]
 
-#endif
-
 @end

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

@@ -98,11 +98,6 @@ RCT_EXTERN RCTPlatformApplication *__nullable RCTSharedApplication(void); // [ma
 // or view controller
 RCT_EXTERN RCTPlatformWindow *__nullable RCTKeyWindow(void); // [macOS]
 
-#if !TARGET_OS_OSX // [macOS]
-// Returns UIStatusBarManager to get it's configuration info.
-RCT_EXTERN UIStatusBarManager *__nullable RCTUIStatusBarManager(void);
-#endif // [macOS]
-
 #if !TARGET_OS_OSX // [macOS]
 // Returns the presented view controller, useful if you need
 // e.g. to present a modal view controller or alert over it
@@ -111,6 +106,7 @@ RCT_EXTERN UIViewController *__nullable RCTPresentedViewController(void);
 // Retrieve current window UIStatusBarManager
 #if !TARGET_OS_TV
 RCT_EXTERN UIStatusBarManager *__nullable RCTUIStatusBarManager(void) API_AVAILABLE(ios(13));
+#endif // !TARGET_OS_TV
 #endif // [macOS]
 
 // Does this device support force touch (aka 3D Touch)?

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

@@ -116,7 +116,9 @@ - (void)layoutIfNeeded
   [super layoutIfNeeded];
   NSRect frame = NSMakeRect(self.frame.origin.x, self.frame.origin.y, 600, 800);
   [self setFrame:frame display:NO];
+#ifndef RCT_REMOVE_LEGACY_ARCH
   [_surface setSize:self.frame.size];
+#endif // RCT_REMOVE_LEGACY_ARCH
 }
 #endif // macOS]
 

packages/react-native/React/CoreModules/RCTRedBox+Internal.h

@@ -6,7 +6,7 @@
  */
 
 #import <React/RCTDefines.h>
-#import <UIKit/UIKit.h>
+#import <React/RCTUIKit.h> // [macOS]
 
 #if RCT_DEV_MENU
 

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

@@ -7,6 +7,7 @@
 
 #import "RCTFrameTimingsObserver.h"
 
+#if !TARGET_OS_OSX // [macOS] iOS-only screenshot/CADisplayLink frame timings
 #import <UIKit/UIKit.h>
 
 #import <mach/thread_act.h>
@@ -296,3 +297,23 @@ - (UIWindow *)_getKeyWindow
 }
 
 @end
+#else // [macOS macOS no-op stub
+@implementation RCTFrameTimingsObserver
+
+#ifdef __cplusplus
+- (instancetype)initWithScreenshotsEnabled:(BOOL)screenshotsEnabled callback:(RCTFrameTimingCallback)callback
+{
+  return [super init];
+}
+#endif
+
+- (void)start
+{
+}
+
+- (void)stop
+{
+}
+
+@end
+#endif // macOS]

packages/react-native/React/Modules/RCTUIManager.mm

@@ -373,6 +373,7 @@ - (void)didReceiveNewContentSizeMultiplier
 }
 #endif // [macOS] [visionOS]
 
+#if TARGET_OS_IOS // [macOS] [visionOS]
 - (void)namedOrientationDidChange
 {
   NSDictionary *orientationEvent = deviceOrientationEventBody([UIDevice currentDevice].orientation);
@@ -386,7 +387,7 @@ - (void)namedOrientationDidChange
                                                                         body:orientationEvent];
 #pragma clang diagnostic pop
 }
-#endif
+#endif // [macOS] [visionOS]
 
 - (dispatch_queue_t)methodQueue
 {
@@ -1687,11 +1688,11 @@ - (void)registerRootViewTag:(NSNumber *)rootTag
 {
 }
 
-- (void)registerRootView:(UIView *)rootView
+- (void)registerRootView:(RCTUIView *)rootView // [macOS]
 {
 }
 
-- (UIView *)viewForReactTag:(NSNumber *)reactTag
+- (RCTPlatformView *)viewForReactTag:(NSNumber *)reactTag // [macOS]
 {
   return nil;
 }
@@ -1710,19 +1711,19 @@ - (RCTShadowView *)shadowViewForReactTag:(NSNumber *)reactTag
   return nil;
 }
 
-- (void)setAvailableSize:(CGSize)availableSize forRootView:(UIView *)rootView
+- (void)setAvailableSize:(CGSize)availableSize forRootView:(RCTUIView *)rootView // [macOS]
 {
 }
 
-- (void)setLocalData:(NSObject *)localData forView:(UIView *)view
+- (void)setLocalData:(NSObject *)localData forView:(RCTPlatformView *)view // [macOS]
 {
 }
 
-- (void)setSize:(CGSize)size forView:(UIView *)view
+- (void)setSize:(CGSize)size forView:(RCTPlatformView *)view // [macOS]
 {
 }
 
-- (void)setIntrinsicContentSize:(CGSize)intrinsicContentSize forView:(UIView *)view
+- (void)setIntrinsicContentSize:(CGSize)intrinsicContentSize forView:(RCTPlatformView *)view // [macOS]
 {
 }
 
@@ -1742,24 +1743,24 @@ - (void)synchronouslyUpdateViewOnUIThread:(NSNumber *)reactTag viewName:(NSStrin
 {
 }
 
-- (void)rootViewForReactTag:(NSNumber *)reactTag withCompletion:(void (^__strong)(UIView *__strong))completion
+- (void)rootViewForReactTag:(NSNumber *)reactTag withCompletion:(void (^__strong)(RCTPlatformView *__strong))completion // [macOS]
 {
 }
 
-- (UIView *)viewForNativeID:(NSString *)nativeID withRootTag:(NSNumber *)rootTag
+- (RCTPlatformView *)viewForNativeID:(NSString *)nativeID withRootTag:(NSNumber *)rootTag // [macOS]
 {
   return nil;
 }
 
-- (void)setNativeID:(NSString *)nativeID forView:(UIView *)view
+- (void)setNativeID:(NSString *)nativeID forView:(RCTPlatformView *)view // [macOS]
 {
 }
 
 - (void)setNeedsLayout
 {
 }
 
-+ (UIView *)JSResponder
++ (RCTPlatformView *)JSResponder // [macOS]
 {
   return nil;
 }

packages/react-native/React/Views/RCTActivityIndicatorView.m

@@ -7,6 +7,8 @@
 
 #import "RCTActivityIndicatorView.h"
 
+#ifndef RCT_REMOVE_LEGACY_ARCH
+
 #if TARGET_OS_OSX // [macOS
 #import <CoreImage/CIFilter.h>
 #import <CoreImage/CIVector.h>
@@ -16,8 +18,6 @@ @interface RCTActivityIndicatorView ()
 @end
 #endif // macOS]
 
-#ifndef RCT_REMOVE_LEGACY_ARCH
-
 @implementation RCTActivityIndicatorView {
 }
 

packages/react-native/React/Views/RCTView.m

@@ -108,21 +108,25 @@ - (RCTPlatformView *)react_findClipView // [macOS]
   // Result string is initialized lazily to prevent useless but costly allocations.
   NSMutableString *str = nil;
   for (RCTUIView *subview in view.subviews) { // [macOS]
+#if !TARGET_OS_OSX // [macOS]
     // Skip subviews that have accessibilityElementsHidden set to YES
     if (subview.accessibilityElementsHidden) {
       continue;
     }
-#if !TARGET_OS_OSX // [macOS]
     NSString *label = subview.accessibilityLabel;
 #else // [macOS
     NSString *label;
+#ifndef RCT_REMOVE_LEGACY_ARCH
     if ([subview isKindOfClass:[RCTTextView class]]) {
       // on macOS VoiceOver a text element will always have its accessibilityValue read, but will only read it's accessibilityLabel if it's value is set.
       // the macOS RCTTextView accessibilityValue will return its accessibilityLabel if set otherwise return its text.
       label = subview.accessibilityValue;
     } else {
       label = subview.accessibilityLabel;
     }
+#else
+    label = subview.accessibilityLabel;
+#endif // RCT_REMOVE_LEGACY_ARCH
 #endif // macOS]
     if (!label) {
       label = RCTRecursiveAccessibilityLabel(subview);