not-react-native-macos 0.87.1-rc.1 → 0.87.1-rc.2

package/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.mm

@@ -36,7 +36,7 @@ using namespace facebook::react;
 
 // ParagraphTextView is an auxiliary view we set as contentView so the drawing
 // can happen on top of the layers manipulated by RCTViewComponentView (the parent view)
-@interface RCTParagraphTextView : RCTPlatformView  // [macOS] concrete flipped, layer-backed view; UIView is an alias for NSView
+@interface RCTParagraphTextView : RCTUIView  // [macOS] concrete flipped, layer-backed view; UIView is an alias for NSView
 
 @property (nonatomic) ParagraphShadowNode::ConcreteState::Shared state;
 @property (nonatomic) ParagraphAttributes paragraphAttributes;

package/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm

@@ -844,7 +844,7 @@ static NSSet<NSNumber *> *returnKeyTypesSet;
     }
   } else {
     // Hides keyboard, but keeps blinking cursor.
-    _backedTextInputView.inputView = [RCTPlatformView new];  // [macOS] needs a flipped, layer-backed view
+    _backedTextInputView.inputView = [RCTUIView new];  // [macOS] needs a flipped, layer-backed view
   }
 }
 

package/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.h

@@ -22,7 +22,7 @@ NS_ASSUME_NONNULL_BEGIN
 /**
  * UIView class for <View> component.
  */
-@interface RCTViewComponentView : RCTPlatformView <RCTComponentViewProtocol, RCTTouchableComponentViewProtocol> {  // [macOS] concrete flipped, layer-backed view; UIView is an alias for NSView
+@interface RCTViewComponentView : RCTUIView <RCTComponentViewProtocol, RCTTouchableComponentViewProtocol> {  // [macOS] concrete flipped, layer-backed view; UIView is an alias for NSView
  @protected
   facebook::react::LayoutMetrics _layoutMetrics;
   facebook::react::SharedViewProps _props;

package/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm

@@ -916,7 +916,7 @@ static RCTBorderStyle RCTBorderStyleFromOutlineStyle(OutlineStyle outlineStyle)
   if (self.styleNeedsSwiftUIContainer) {
     if (_swiftUIWrapper == nullptr) {
       _swiftUIWrapper = [RCTSwiftUIContainerViewWrapper new];
-      UIView *swiftUIContentView = [[RCTPlatformView alloc] init];  // [macOS] needs a flipped, layer-backed view
+      UIView *swiftUIContentView = [[RCTUIView alloc] init];  // [macOS] needs a flipped, layer-backed view
       for (UIView *subview = nullptr in self.subviews) {
         [swiftUIContentView addSubview:subview];
       }
@@ -960,7 +960,7 @@ static RCTBorderStyle RCTBorderStyleFromOutlineStyle(OutlineStyle outlineStyle)
 
   if (_useCustomContainerView) {
     if (!_containerView) {
-      _containerView = [[RCTPlatformView alloc] initWithFrame:CGRectMake(0, 0, self.bounds.size.width, self.bounds.size.height)];  // [macOS] needs a flipped, layer-backed view
+      _containerView = [[RCTUIView alloc] initWithFrame:CGRectMake(0, 0, self.bounds.size.width, self.bounds.size.height)];  // [macOS] needs a flipped, layer-backed view
       for (UIView *subview = nullptr in effectiveContentView.subviews) {
         [_containerView addSubview:subview];
       }

package/React/Fabric/Mounting/RCTComponentViewDescriptor.h

@@ -21,7 +21,7 @@ class RCTComponentViewDescriptor final {
   /*
    * Associated (and owned) native view instance.
    */
-  __strong UIView<RCTComponentViewProtocol> *const view = nil;
+  __strong RCTUIView<RCTComponentViewProtocol> *const view = nil; // [macOS] see RCTComponentViewRegistry.h
 
   /*
    * Indicates a requirement to call on the view methods from

package/React/Fabric/Mounting/RCTComponentViewRegistry.h

@@ -48,7 +48,7 @@ NS_ASSUME_NONNULL_BEGIN
  * Finds a native component view by given `tag`.
  * Returns `nil` if there is no registered component with the `tag`.
  */
-- (nullable UIView<RCTComponentViewProtocol> *)findComponentViewWithTag:(facebook::react::Tag)tag;
+- (nullable RCTUIView<RCTComponentViewProtocol> *)findComponentViewWithTag:(facebook::react::Tag)tag; // [macOS] every component view derives from RCTUIView, and third-party Fabric code is written against that signature
 
 @end
 

package/React/Modules/RCTRedBoxExtraDataViewController.m

@@ -178,7 +178,7 @@
 
 - (UIView *)tableView:(__unused UITableView *)tableView viewForHeaderInSection:(NSInteger)section
 {
-  UIView *header = [RCTPlatformView new];  // [macOS] needs a flipped, layer-backed view
+  UIView *header = [RCTUIView new];  // [macOS] needs a flipped, layer-backed view
   header.backgroundColor = [UIColor colorWithRed:1 green:0 blue:0 alpha:1];
 
   UILabel *headerLabel = [UILabel new];

package/React/Views/RCTDebuggingOverlay.m

@@ -71,7 +71,7 @@
       continue;
     }
 
-    UIView *box = [[RCTPlatformView alloc] initWithFrame:rect];  // [macOS] needs a flipped, layer-backed view
+    UIView *box = [[RCTUIView alloc] initWithFrame:rect];  // [macOS] needs a flipped, layer-backed view
     box.backgroundColor = [UIColor clearColor];
 
     box.layer.borderWidth = 2.0f;
@@ -100,7 +100,7 @@
   }
 
   for (NSDictionary *rectangle in rectangles) {
-    UIView *view = [[RCTPlatformView alloc] initWithFrame:[RCTConvert CGRect:rectangle]];  // [macOS] needs a flipped, layer-backed view
+    UIView *view = [[RCTUIView alloc] initWithFrame:[RCTConvert CGRect:rectangle]];  // [macOS] needs a flipped, layer-backed view
     view.backgroundColor = [UIColor colorWithRed:200 / 255.0 green:230 / 255.0 blue:255 / 255.0 alpha:0.8];
 
     [self addSubview:view];

package/React/Views/RCTView.h

@@ -17,7 +17,7 @@ extern const UIAccessibilityTraits SwitchAccessibilityTrait;
 
 @protocol RCTAutoInsetsProtocol;
 
-@interface RCTView : RCTPlatformView  // [macOS] concrete flipped, layer-backed view; UIView is an alias for NSView
+@interface RCTView : RCTUIView  // [macOS] concrete flipped, layer-backed view; UIView is an alias for NSView
 
 /**
  * Accessibility event handlers

package/React/Views/RCTWrapperViewController.m

@@ -74,7 +74,7 @@ static BOOL RCTFindScrollViewAndRefreshContentInsetInView(UIView *view)
   // Add a wrapper so that the wrapper view managed by the
   // UINavigationController doesn't end up resetting the frames for
   //`contentView` which is a react-managed view.
-  _wrapperView = [[RCTPlatformView alloc] initWithFrame:_contentView.bounds];  // [macOS] needs a flipped, layer-backed view
+  _wrapperView = [[RCTUIView alloc] initWithFrame:_contentView.bounds];  // [macOS] needs a flipped, layer-backed view
   [_wrapperView addSubview:_contentView];
   self.view = _wrapperView;
 }

package/React-Core.podspec

@@ -68,7 +68,6 @@ Pod::Spec.new do |s|
     s# [macOS] SCDynamicStoreCopyComputerName, used by RCTInspectorUtils on macOS.
     ss.osx.frameworks        = "SystemConfiguration"
     ss.source_files = podspec_sources("React/**/*.{c,h,m,mm,S,cpp}", "React/**/*.h")
-    ss.osx.exclude_files = macos_excluded_files # [macOS]
     exclude_files = [
       "React/CoreModules/**/*",
       "React/DevSupport/**/*",
@@ -88,7 +87,6 @@ Pod::Spec.new do |s|
   end
 
   s.subspec "DevSupport" do |ss|
-    ss.osx.exclude_files = macos_excluded_files # [macOS]
     ss.source_files = podspec_sources(["React/DevSupport/*.{h,mm,m}",
                         "React/Inspector/*.{h,mm,m}"],
                         ["React/DevSupport/*.h",

package/macos/UIKitCompat/RCTPlatformViewCompat.h

@@ -15,12 +15,16 @@
  *      transitive import supplies them. A build flag fixes all of those at
  *      once, with no upstream edit.
  *
- *   2. On every platform, define the RCTPlatform* concrete types:
+ *   2. On every platform, define the platform types:
  *
- *        RCTPlatformView            iOS: UIView          macOS: flipped, layer-backed NSView
+ *        RCTPlatformView            iOS: UIView          macOS: NSView (pointer type)
+ *        RCTUIView                  iOS: UIView          macOS: flipped, layer-backed NSView
  *        RCTPlatformDisplayLink     iOS: CADisplayLink   macOS: CADisplayLink on 14+, NSTimer below
  *        RCTPlatformTouchesForEvent iOS: -allTouches     macOS: synthesised from NSEvent
  *
+ *      The RCTPlatformView / RCTUIView split matches react-native-macos, so
+ *      modules written against that fork compile here unchanged.
+ *
  *      Both are aliases on iOS, so those builds gain two names and change in no
  *      other way. Upstream already uses the RCTPlatformDisplayLink name itself:
  *      RCTAnimatedModuleProvider.mm ships a TARGET_OS_OSX branch for it.
@@ -37,7 +41,7 @@
 
 #if TARGET_OS_OSX
 
-// Resolves to macos/UIKitCompat/UIKit/UIKit.h, which declares RCTPlatformView.
+// Resolves to macos/UIKitCompat/UIKit/UIKit.h, which declares both names.
 #import <UIKit/UIKit.h>
 
 #else
@@ -46,8 +50,9 @@
 
 #import <QuartzCore/QuartzCore.h>
 
-// On iOS, tvOS and visionOS the concrete classes are simply the UIKit ones.
+// On iOS, tvOS and visionOS both names are simply UIView.
 @compatibility_alias RCTPlatformView UIView;
+@compatibility_alias RCTUIView UIView;
 @compatibility_alias RCTPlatformDisplayLink CADisplayLink;
 
 // -[UIEvent allTouches] is unavailable under its own name on macOS, because

package/macos/UIKitCompat/React-UIKitCompat.podspec

@@ -42,9 +42,17 @@ Pod::Spec.new do |s|
 
   # Consumers reach the shim as <UIKit/UIKit.h>. That requires the *parent* of
   # the UIKit directory on the search path, not the directory itself.
+  # DEFINES_MODULE is deliberately off. Turning it on makes CocoaPods emit a
+  # clang module map declaring `module UIKit`, and a module by that name on
+  # macOS poisons Swift's explicit-module graph: AuthenticationServices fails to
+  # precompile because ASFoundation.h resolves the wrong branch of its
+  # UIKit-versus-AppKit probe.
+  #
+  # Nothing needs the module. `#import <UIKit/UIKit.h>` is satisfied by the
+  # header *directory* being on the search path, which is what the line below
+  # does -- the parent of UIKit/, not UIKit/ itself.
   s.pod_target_xcconfig    = {
-    "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\"",
-    "DEFINES_MODULE" => "YES"
+    "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\""
   }
   # No user_target_xcconfig. The app reaches these headers through the
   # `post_install` hook in its Podfile, which is required anyway to force-include

package/macos/UIKitCompat/UIKit/UIApplicationDelegate.h

@@ -140,4 +140,17 @@ extern NSString *const UIKeyboardAnimationDurationUserInfoKey;
 extern NSString *const UIKeyboardAnimationCurveUserInfoKey;
 extern NSString *const UIKeyboardIsLocalUserInfoKey;
 
+/**
+ * A window delegate, which is the closest AppKit has to a scene delegate. macOS
+ * has no scene lifecycle, so this is the protocol's shape and nothing more.
+ * expo-modules-core declares it in its own macOS header; having it here means
+ * that header can defer to this one wholesale.
+ */
+@protocol UISceneDelegate <NSWindowDelegate>
+@end
+
+// No UIHostingController. NSHostingController is a Swift-only type -- SwiftUI
+// does not vend it to Objective-C -- so there is nothing to alias it to. Code
+// that needs a hosting controller has to reach it from Swift.
+
 NS_ASSUME_NONNULL_END

package/macos/UIKitCompat/UIKit/UIControls.m

@@ -477,7 +477,7 @@
 - (NSView *)contentView
 {
   if (_contentView == nil) {
-    _contentView = [[RCTPlatformView alloc] initWithFrame:self.bounds];
+    _contentView = [[RCTUIView alloc] initWithFrame:self.bounds];
     _contentView.autoresizingMask = NSViewWidthSizable | NSViewHeightSizable;
     [self addSubview:_contentView];
   }

package/macos/UIKitCompat/UIKit/UIEvent.h

@@ -60,6 +60,18 @@ typedef NS_ENUM(NSInteger, UITouchType) {
 - (CGVector)azimuthUnitVectorInView:(nullable NSView *)view;
 @property (nonatomic, readonly) CGFloat maximumPossibleForce;
 
+/**
+ * The touch location in window coordinates, bottom-left origin -- AppKit's
+ * convention, not UIKit's.
+ *
+ * UITouch has no such member; -locationInView: is the UIKit spelling. It is
+ * here because react-native-macos makes its RCTUITouch an NSEvent subclass, so
+ * every module written against that fork reaches for NSEvent's
+ * -locationInWindow on a touch. react-native-gesture-handler does it in three
+ * places. The value is already captured at init, so exposing it costs nothing.
+ */
+@property (nonatomic, readonly) CGPoint locationInWindow;
+
 - (instancetype)initWithEvent:(NSEvent *)event phase:(UITouchPhase)phase view:(nullable NSView *)view;
 
 - (CGPoint)locationInView:(nullable NSView *)view;

package/macos/UIKitCompat/UIKit/UIEvent.m

@@ -9,10 +9,13 @@
 
 @implementation UITouch {
   NSEvent *_event;
-  CGPoint _locationInWindow;
   CGPoint _previousLocationInWindow;
 }
 
+// _locationInWindow is now the backing store for the readonly property, so the
+// compiler synthesises the ivar.
+@synthesize locationInWindow = _locationInWindow;
+
 - (instancetype)initWithEvent:(NSEvent *)event phase:(UITouchPhase)phase view:(NSView *)view
 {
   if ((self = [super init])) {

package/macos/UIKitCompat/UIKit/UIPlatformGaps.h

@@ -218,7 +218,7 @@ typedef NS_ENUM(NSInteger, UIImageResizingMode) {
 
 @interface NSView (UIKitCompatCallbacks)
 // UIKit lifecycle hooks with no AppKit counterpart. Declared so any view can be
-// sent them; RCTPlatformView drives the trait one from -viewDidChangeEffectiveAppearance.
+// sent them; RCTUIView drives the trait one from -viewDidChangeEffectiveAppearance.
 - (void)safeAreaInsetsDidChange;
 - (void)traitCollectionDidChange:(nullable id)previousTraitCollection;
 - (CGSize)sizeThatFits:(CGSize)size;

package/macos/UIKitCompat/UIKit/UIPlatformGaps.m

@@ -402,7 +402,21 @@ static NSAppearance *_Nullable UIKitCompatAppearanceForStyle(UIUserInterfaceStyl
 
 - (void)setRootViewController:(NSViewController *)rootViewController
 {
+  // Assigning -contentViewController makes NSWindow resize itself to fit that
+  // controller's view. UIWindow does the opposite: the window keeps its frame
+  // and the root view is stretched to fill it.
+  //
+  // React Native's root view has no useful size when it is installed -- Fabric
+  // has not laid anything out yet -- so the AppKit behaviour collapses the
+  // window to a point, and the app runs with nothing on screen. Keep the frame
+  // the caller chose, and let the view follow it.
+  NSRect frame = self.frame;
   self.contentViewController = rootViewController;
+  if (!NSIsEmptyRect(frame)) {
+    [self setFrame:frame display:YES];
+    rootViewController.view.autoresizingMask = NSViewWidthSizable | NSViewHeightSizable;
+    rootViewController.view.frame = self.contentLayoutRect;
+  }
 }
 
 - (instancetype)initWithWindowScene:(__unused id)windowScene
@@ -559,7 +573,7 @@ static NSAppearance *_Nullable UIKitCompatAppearanceForStyle(UIUserInterfaceStyl
 
 - (void)traitCollectionDidChange:(__unused id)previousTraitCollection
 {
-  // Driven by -viewDidChangeEffectiveAppearance on RCTPlatformView.
+  // Driven by -viewDidChangeEffectiveAppearance on RCTUIView.
 }
 
 - (CGSize)sizeThatFits:(CGSize)size

package/macos/UIKitCompat/UIKit/UITouch.h

@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * Per-class forwarding header, matching real UIKit's layout.
+ *
+ * UIKit ships one header per class, and code probes for them by name to decide
+ * which platform it is on. Apple's own SDK does it -- AuthenticationServices
+ * takes its UIKit branch on `__has_include(<UIKit/UIKit.h>)`, then asks for
+ * <UIKit/UIViewController.h> and <UIKit/UIWindow.h> to decide what
+ * ASViewController and ASPresentationAnchor are. With the umbrella present but
+ * those absent, it takes the UIKit branch and then defines neither, and the
+ * framework fails to compile.
+ *
+ * So the rule is: this directory carries a per-class header for exactly the
+ * classes the shim defines, and for no others. A probe for something we do not
+ * have must keep failing, or the caller is told a lie.
+ */
+
+#pragma once
+
+#import <UIKit/UIKit.h>

package/macos/UIKitCompat/UIKit/UIView.h

@@ -86,10 +86,23 @@ NS_ASSUME_NONNULL_BEGIN
  *
  * What the alias cannot carry is behaviour. A plain NSView is not flipped, is
  * not layer-backed, and has no -layoutSubviews. Views that React Native
- * creates itself need all three, and they get them from RCTPlatformView below.
+ * creates itself need all three, and they get them from RCTUIView below.
  */
 @compatibility_alias UIView NSView;
 
+/**
+ * `RCTPlatformView` is the name react-native-macos gives to "whatever a view is
+ * on this platform", and published macOS modules use it as a pointer type --
+ * react-native-reanimated assigns an `NSView<RCTComponentViewProtocol> *` to
+ * one. It has to mean NSView, not a subclass, or that assignment does not
+ * compile.
+ *
+ * So the two names divide the same way they do in react-native-macos:
+ * `RCTPlatformView` is the pointer type, `RCTUIView` is the concrete class.
+ * Here `UIView` is a third spelling of the first one.
+ */
+@compatibility_alias RCTPlatformView NSView;
+
 /**
  * The concrete view class for anything React Native instantiates or subclasses.
  *
@@ -103,19 +116,19 @@ NS_ASSUME_NONNULL_BEGIN
  * Upstream uses this name in exactly two positions, and never as a pointer
  * type:
  *
- *     @interface RCTView : RCTPlatformView        // superclass
- *     [[RCTPlatformView alloc] initWithFrame:f]   // instantiation
+ *     @interface RCTView : RCTUIView        // superclass
+ *     [[RCTUIView alloc] initWithFrame:f]   // instantiation
  *
  * Everything else keeps saying `UIView *`. That restriction is what keeps this
  * to about 20 upstream files instead of the 538 that react-native-macos edits,
  * and macos/ci/check-budget.sh enforces it.
  */
-@interface RCTPlatformView : NSView
+@interface RCTUIView : NSView
 
 // NSView already provides -clipsToBounds (10.9+), so it is not redeclared here.
 
 // UIKit subclasses override -canBecomeFirstResponder and expect the framework
-// to honour it. RCTPlatformView bridges that to AppKit's
+// to honour it. RCTUIView bridges that to AppKit's
 // -acceptsFirstResponder, and terminates the chain at NSView's own
 // implementation rather than bouncing back through the category.
 @property (nonatomic, readonly) BOOL canBecomeFirstResponder;

package/macos/UIKitCompat/UIKit/UIView.m

@@ -289,9 +289,9 @@ static const void *kContentModeKey = &kContentModeKey;
 
 @end
 
-#pragma mark - RCTPlatformView
+#pragma mark - RCTUIView
 
-@implementation RCTPlatformView {
+@implementation RCTUIView {
   UIColor *_backgroundColor;
   BOOL _respondsToDisplayLayer;
   BOOL _hasCustomTransform3D;
@@ -316,7 +316,7 @@ static const void *kContentModeKey = &kContentModeKey;
   return keyPaths;
 }
 
-static RCTPlatformView *RCTPlatformViewCommonInit(RCTPlatformView *self)
+static RCTUIView *RCTUIViewCommonInit(RCTUIView *self)
 {
   if (self != nil) {
     self.wantsLayer = YES;
@@ -330,12 +330,12 @@ static RCTPlatformView *RCTPlatformViewCommonInit(RCTPlatformView *self)
 
 - (instancetype)initWithFrame:(NSRect)frameRect
 {
-  return RCTPlatformViewCommonInit([super initWithFrame:frameRect]);
+  return RCTUIViewCommonInit([super initWithFrame:frameRect]);
 }
 
 - (instancetype)initWithCoder:(NSCoder *)coder
 {
-  return RCTPlatformViewCommonInit([super initWithCoder:coder]);
+  return RCTUIViewCommonInit([super initWithCoder:coder]);
 }
 
 // UIKit's origin is top-left. Everything React Native computes assumes it.
@@ -369,10 +369,28 @@ static RCTPlatformView *RCTPlatformViewCommonInit(RCTPlatformView *self)
     frame.origin.x = center.x - bounds.size.width / 2;
     frame.origin.y = center.y - bounds.size.height / 2;
     [super setFrame:frame];
+
+    // UIKit calls -layoutSubviews whenever a view's bounds change. AppKit calls
+    // -layout only when the view is marked as needing it, so a size change
+    // alone never reaches -layoutSubviews. Components that recompute on resize
+    // silently stop: react-native-safe-area-context measures its insets there,
+    // and until it reports them SafeAreaProvider renders no children at all.
+    self.needsLayout = YES;
   }
   [super setBounds:NSMakeRect(bounds.origin.x, bounds.origin.y, bounds.size.width, bounds.size.height)];
 }
 
+- (void)setFrameSize:(NSSize)newSize
+{
+  BOOL changed = !NSEqualSizes(self.frame.size, newSize);
+  [super setFrameSize:newSize];
+  if (changed) {
+    // Same reason as -setBounds:. Fabric assigns frames directly in places, so
+    // both paths have to mark the view.
+    self.needsLayout = YES;
+  }
+}
+
 - (BOOL)acceptsFirstMouse:(NSEvent *)event
 {
   if (_acceptsFirstMouse || [super acceptsFirstMouse:event]) {
@@ -381,7 +399,7 @@ static RCTPlatformView *RCTPlatformViewCommonInit(RCTPlatformView *self)
   // Honour the flag if any ancestor set it, so a whole subtree can opt in.
   NSView *view = self;
   while ((view = view.superview)) {
-    if ([view isKindOfClass:[RCTPlatformView class]] && ((RCTPlatformView *)view).acceptsFirstMouse) {
+    if ([view isKindOfClass:[RCTUIView class]] && ((RCTUIView *)view).acceptsFirstMouse) {
       return YES;
     }
   }

package/macos/UIKitCompat/UIKit/UIViewController.h

@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * Per-class forwarding header, matching real UIKit's layout.
+ *
+ * UIKit ships one header per class, and code probes for them by name to decide
+ * which platform it is on. Apple's own SDK does it -- AuthenticationServices
+ * takes its UIKit branch on `__has_include(<UIKit/UIKit.h>)`, then asks for
+ * <UIKit/UIViewController.h> and <UIKit/UIWindow.h> to decide what
+ * ASViewController and ASPresentationAnchor are. With the umbrella present but
+ * those absent, it takes the UIKit branch and then defines neither, and the
+ * framework fails to compile.
+ *
+ * So the rule is: this directory carries a per-class header for exactly the
+ * classes the shim defines, and for no others. A probe for something we do not
+ * have must keep failing, or the caller is told a lie.
+ */
+
+#pragma once
+
+#import <UIKit/UIKit.h>

package/macos/UIKitCompat/UIKit/UIWindow.h

@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * Per-class forwarding header, matching real UIKit's layout.
+ *
+ * UIKit ships one header per class, and code probes for them by name to decide
+ * which platform it is on. Apple's own SDK does it -- AuthenticationServices
+ * takes its UIKit branch on `__has_include(<UIKit/UIKit.h>)`, then asks for
+ * <UIKit/UIViewController.h> and <UIKit/UIWindow.h> to decide what
+ * ASViewController and ASPresentationAnchor are. With the umbrella present but
+ * those absent, it takes the UIKit branch and then defines neither, and the
+ * framework fails to compile.
+ *
+ * So the rule is: this directory carries a per-class header for exactly the
+ * classes the shim defines, and for no others. A probe for something we do not
+ * have must keep failing, or the caller is told a lie.
+ */
+
+#pragma once
+
+#import <UIKit/UIKit.h>

package/macos/UIKitCompat/macos-excludes.txt

@@ -1,43 +1,22 @@
-# Sources excluded from the macOS build.
+# Files macos/scripts/syntax-check.sh does not attempt to parse.
 #
-# One list, read by both macos/scripts/syntax-check.sh and the macOS podspec, so
-# the thing we measure and the thing we build can never drift apart.
+# This is the syntax checker's list of known-hard files, and nothing else. It
+# used to be wired into React-Core.podspec and React-CoreModules.podspec as
+# `osx.exclude_files` too, which was wrong twice over:
 #
-# Everything here is rung 2 in MACOS-FORK.md section 4.1: rather than port a
-# module, leave it out. Each line is a path prefix, relative to
-# packages/react-native/. Blank lines and # comments are ignored.
+#   - It never took effect. `s.macos` and `s.osx` are the same platform proxy,
+#     and React-CoreModules assigns `s.macos.exclude_files` further down, which
+#     silently replaced it. Every file listed here was being compiled anyway.
+#   - Making it take effect breaks the link. RCTDevMenu, RCTActionSheetManager
+#     and RCTPerfMonitor are all referenced from CoreModulesPlugins.mm and from
+#     RCTRootViewFactory, so dropping them leaves undefined symbols.
 #
-# Two reasons appear below, and they are different:
-#
-#   no macOS concept   the feature does not exist on the platform
-#   deferred           it exists and we intend to port it, just not yet
-
-# --- no macOS concept ---------------------------------------------------------
+# They compile on macOS regardless, which is the useful discovery. So the list
+# stays advisory: it marks what the checker skips, not what the build omits.
 
-# Remote/local notifications route through UserNotifications and an app
-# delegate shape macOS does not share.
 Libraries/PushNotificationIOS/
-
-# No haptics.
 Libraries/Vibration/
-
-# No status bar. The menu bar is not a per-app, per-window equivalent.
 React/CoreModules/RCTStatusBarManager
-
-# UIActivityViewController has no AppKit counterpart; a Mac would use NSMenu or
-# NSSharingServicePicker, which is a different API, not a port.
 React/CoreModules/RCTActionSheetManager
-
-# --- deferred -----------------------------------------------------------------
-#
-# Dev-surface UI. A window-and-chrome port rather than framework work, and not
-# needed to render an app.
-#
-# RedBox is deliberately NOT here. It was excluded at first, but excluding half
-# of it broke the other half: RCTRedBox.mm imports the extra-data view
-# controller's header, which lived in a different pod and so a different
-# exclusion. Completing the UITableView shim was less work than splitting the
-# exclusion correctly, and it keeps the error overlay -- which is worth having.
-
 React/CoreModules/RCTDevMenu
 React/CoreModules/RCTPerfMonitor