From a4d890b62a978c92a488acee158ff8b9c85a9c93 Mon Sep 17 00:00:00 2001 From: Jason Morse Date: Fri, 13 Nov 2026 01:45:34 +0000 Subject: [PATCH] fix(0.81, view): bridge safe-area inset changes on macOS Port the same UIKit callback bridge to 0.81's existing monolithic RCTUIKit implementation without copying the newer folder layout. The legacy native host passes both callback regressions plus all nine selected Paper layout/gzip regressions. Add an Nx patch plan for this branch's existing release group. This compatibility layer is separate from the renderer synchronization fix and keeps iOS on UIKit. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 33ea5c72-8bbd-448d-aa21-c9b99dd03c96 --- .../version-plan-1794534092894.md | 5 ++ packages/react-native/React/Base/RCTUIKit.h | 2 + .../react-native/React/Base/macOS/RCTUIKit.m | 18 ++++ .../RNTesterUnitTests_macOS.m | 86 +++++++++++++++---- .../RNTesterPods.xcodeproj/project.pbxproj | 4 + 5 files changed, 97 insertions(+), 18 deletions(-) create mode 100644 .nx/version-plans/version-plan-1794534092894.md diff --git a/.nx/version-plans/version-plan-1794534092894.md b/.nx/version-plans/version-plan-1794534092894.md new file mode 100644 index 000000000000..118aae3d5a84 --- /dev/null +++ b/.nx/version-plans/version-plan-1794534092894.md @@ -0,0 +1,5 @@ +--- +__default__: patch +--- + +Bridge AppKit safe-area changes to the UIKit-compatible view callback used by Fabric components. diff --git a/packages/react-native/React/Base/RCTUIKit.h b/packages/react-native/React/Base/RCTUIKit.h index 8f1094a71ed4..4242e69c7953 100644 --- a/packages/react-native/React/Base/RCTUIKit.h +++ b/packages/react-native/React/Base/RCTUIKit.h @@ -518,6 +518,8 @@ void UIBezierPathAppendPath(UIBezierPath *path, UIBezierPath *appendPath); - (void)layoutSubviews; +- (void)safeAreaInsetsDidChange; + - (void)setNeedsDisplay; @property (nonatomic, copy) NSColor *backgroundColor; diff --git a/packages/react-native/React/Base/macOS/RCTUIKit.m b/packages/react-native/React/Base/macOS/RCTUIKit.m index a37a1c106a04..e24e32c5822c 100644 --- a/packages/react-native/React/Base/macOS/RCTUIKit.m +++ b/packages/react-native/React/Base/macOS/RCTUIKit.m @@ -168,6 +168,7 @@ @implementation RCTUIView BOOL _respondsToDisplayLayer; CATransform3D _transform3D; BOOL _hasCustomTransform3D; + NSEdgeInsets _lastSafeAreaInsets; } + (NSSet *)keyPathsForValuesAffectingValueForKey:(NSString *)key @@ -204,6 +205,17 @@ @implementation RCTUIView return self; } +static void RCTUIViewUpdateSafeAreaInsets(RCTUIView *self) +{ + if (@available(macOS 11.0, *)) { + NSEdgeInsets insets = self.safeAreaInsets; + if (!NSEdgeInsetsEqual(insets, self->_lastSafeAreaInsets)) { + self->_lastSafeAreaInsets = insets; + [self safeAreaInsetsDidChange]; + } + } +} + - (instancetype)initWithFrame:(NSRect)frameRect { return RCTUIViewCommonInit([super initWithFrame:frameRect]); @@ -243,6 +255,7 @@ - (BOOL)isFirstResponder { - (void)viewDidMoveToWindow { [self didMoveToWindow]; + RCTUIViewUpdateSafeAreaInsets(self); } - (BOOL)mouseDownCanMoveWindow{ @@ -353,6 +366,7 @@ - (void)layout { [super layout]; if (self.window != nil) { + RCTUIViewUpdateSafeAreaInsets(self); [self layoutSubviews]; } } @@ -425,6 +439,10 @@ - (void)layoutSubviews [super layout]; } +- (void)safeAreaInsetsDidChange +{ +} + - (void)setNeedsDisplay { self.needsDisplay = YES; diff --git a/packages/rn-tester/RNTester-macOSUnitTests/RNTesterUnitTests_macOS.m b/packages/rn-tester/RNTester-macOSUnitTests/RNTesterUnitTests_macOS.m index 7d7bfd4d574a..154bda5a3c29 100644 --- a/packages/rn-tester/RNTester-macOSUnitTests/RNTesterUnitTests_macOS.m +++ b/packages/rn-tester/RNTester-macOSUnitTests/RNTesterUnitTests_macOS.m @@ -6,36 +6,86 @@ // Copyright © 2017 Facebook. All rights reserved. // +// [macOS] + +#import #import +@interface RCTSafeAreaObservingView : RCTUIView +@property (nonatomic, assign) NSUInteger safeAreaChangeCount; +@property (nonatomic, assign) NSEdgeInsets observedSafeAreaInsets; +@end + +@implementation RCTSafeAreaObservingView + +- (void)safeAreaInsetsDidChange +{ + [super safeAreaInsetsDidChange]; + self.safeAreaChangeCount++; + self.observedSafeAreaInsets = self.safeAreaInsets; +} + +@end + +static void RCTPerformOnMainThread(dispatch_block_t block) +{ + if (NSThread.isMainThread) { + block(); + } else { + dispatch_sync(dispatch_get_main_queue(), block); + } +} + @interface RNTesterUnitTests_macOS : XCTestCase @end @implementation RNTesterUnitTests_macOS -- (void)setUp +- (void)testSafeAreaCallbackSupportsSuperclassCalls { - [super setUp]; - // Put setup code here. This method is called before the invocation of each test method in the class. + RCTPerformOnMainThread(^{ + [NSApplication sharedApplication]; + RCTSafeAreaObservingView *view = [RCTSafeAreaObservingView new]; + XCTAssertNoThrow([view safeAreaInsetsDidChange]); + XCTAssertEqual(view.safeAreaChangeCount, 1u); + }); } -- (void)tearDown +- (void)testLayoutReportsChangedSafeAreaInsetsOnce { - // Put teardown code here. This method is called after the invocation of each test method in the class. - [super tearDown]; -} + RCTPerformOnMainThread(^{ + [NSApplication sharedApplication]; + NSWindow *window = [[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, 400, 300) + styleMask:NSWindowStyleMaskBorderless + backing:NSBackingStoreBuffered + defer:NO]; + window.releasedWhenClosed = NO; + @try { + RCTSafeAreaObservingView *view = [[RCTSafeAreaObservingView alloc] initWithFrame:window.contentView.bounds]; + window.contentView = view; + [view layoutSubtreeIfNeeded]; + NSUInteger originalCount = view.safeAreaChangeCount; -//- (void)testFunctionalExample { -// // This is an example of a functional test case. -// // Use XCTAssert and related functions to verify your tests produce the correct results. -//} -// -//- (void)testPerformanceExample { -// // This is an example of a performance test case. -// [self measureBlock:^{ -// // Put the code you want to measure the time of here. -// }]; -//} + view.additionalSafeAreaInsets = NSEdgeInsetsMake(5, 7, 11, 13); + view.needsLayout = YES; + [view layoutSubtreeIfNeeded]; + XCTAssertEqual(view.safeAreaChangeCount, originalCount + 1); + XCTAssertTrue(NSEdgeInsetsEqual(view.observedSafeAreaInsets, view.safeAreaInsets)); + + view.needsLayout = YES; + [view layoutSubtreeIfNeeded]; + XCTAssertEqual(view.safeAreaChangeCount, originalCount + 1); + + view.additionalSafeAreaInsets = NSEdgeInsetsMake(7, 11, 13, 17); + view.needsLayout = YES; + [view layoutSubtreeIfNeeded]; + XCTAssertEqual(view.safeAreaChangeCount, originalCount + 2); + XCTAssertTrue(NSEdgeInsetsEqual(view.observedSafeAreaInsets, view.safeAreaInsets)); + } @finally { + [window close]; + } + }); +} @end diff --git a/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj b/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj index 842c7c003929..bf0fbff0e2b3 100644 --- a/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj +++ b/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj @@ -7,6 +7,7 @@ objects = { /* Begin PBXBuildFile section */ + D5E7A8F02FF0010100000002 /* RNTesterUnitTests_macOS.m in Sources */ = {isa = PBXBuildFile; fileRef = D5E7A8F02FF0010100000001 /* RNTesterUnitTests_macOS.m */; }; /* [macOS] */ 08E25EBE4A584CD7B70FBB1E /* libPods-RNTester.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D74056A5352F0925816E50E0 /* libPods-RNTester.a */; }; 0CBC915D60C701A81731A5A4 /* libPods-RNTester-macOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9C88AE81E635231C7F0F3BA4 /* libPods-RNTester-macOS.a */; }; 0E3E8DF4F87D07566A9489D4 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = AC276E71CF27E40DFA22979F /* PrivacyInfo.xcprivacy */; }; @@ -144,6 +145,7 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ + D5E7A8F02FF0010100000001 /* RNTesterUnitTests_macOS.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNTesterUnitTests_macOS.m; sourceTree = ""; }; /* [macOS] */ 07517909E4081E5D74D5DD60 /* libPods-RNTester-macOSUnitTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RNTester-macOSUnitTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 086F285685A842F5E52B6F9C /* Pods-RNTester-visionOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNTester-visionOS.debug.xcconfig"; path = "Target Support Files/Pods-RNTester-visionOS/Pods-RNTester-visionOS.debug.xcconfig"; sourceTree = ""; }; 0EA618022BE537D3001875EF /* RNTesterBundle.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = RNTesterBundle.bundle; path = RNTester/RNTesterBundle.bundle; sourceTree = ""; }; @@ -466,6 +468,7 @@ ACC52F56299ECB8A002A2B0B /* RNTester-macOSUnitTests */ = { isa = PBXGroup; children = ( + D5E7A8F02FF0010100000001 /* RNTesterUnitTests_macOS.m */, /* [macOS] */ ); path = "RNTester-macOSUnitTests"; sourceTree = ""; @@ -1350,6 +1353,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + D5E7A8F02FF0010100000002 /* RNTesterUnitTests_macOS.m in Sources */, /* [macOS] */ AC73FCEF29B1318B0003586F /* RCTAnimationUtilsTests.m in Sources */, AC73FD0729B131DA0003586F /* RCTUIManagerTests.m in Sources */, AC73FCF729B131A20003586F /* RCTEventDispatcherTests.m in Sources */,