[Hotfix] Pick up RCTDeviceInfo fix from upstream (#2130)

## Summary: Pick up facebook@d46d80d and facebook@44159e3 from upstream to fix a potential hang we're seeing internally ## Test Plan: CI should pass
microsoft · May 25, 2024 · 2e9c485 · 2e9c485
2 parents 2954e4f + 2c7a514
commit 2e9c485
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 5 deletions.
diff --git a/packages/react-native/Libraries/AppDelegate/RCTAppDelegate.mm b/packages/react-native/Libraries/AppDelegate/RCTAppDelegate.mm
@@ -235,7 +235,7 @@ - (void)windowScene:(UIWindowScene *)windowScene
         interfaceOrientation:(UIInterfaceOrientation)previousInterfaceOrientation
              traitCollection:(UITraitCollection *)previousTraitCollection API_AVAILABLE(ios(13.0))
 {
-  [[NSNotificationCenter defaultCenter] postNotificationName:RCTRootViewFrameDidChangeNotification object:self];
+  [[NSNotificationCenter defaultCenter] postNotificationName:RCTWindowFrameDidChangeNotification object:self];
 }
 #endif // [macOS]
 

diff --git a/packages/react-native/React/Base/RCTConstants.h b/packages/react-native/React/Base/RCTConstants.h
@@ -16,7 +16,7 @@ RCT_EXTERN NSString *const RCTUserInterfaceStyleDidChangeNotificationTraitCollec
 RCT_EXTERN NSString *const RCTUserInterfaceStyleDidChangeNotificationAppearanceKey;
 #endif // macOS]
 
-RCT_EXTERN NSString *const RCTRootViewFrameDidChangeNotification;
+RCT_EXTERN NSString *const RCTWindowFrameDidChangeNotification;
 
 /**
  * This notification fires when the bridge initializes.

diff --git a/packages/react-native/React/Base/RCTConstants.m b/packages/react-native/React/Base/RCTConstants.m
@@ -20,7 +20,7 @@
 NSString *const RCTUserInterfaceStyleDidChangeNotificationAppearanceKey = @"appearance";
 #endif // macOS]
 
-NSString *const RCTRootViewFrameDidChangeNotification = @"RCTRootViewFrameDidChangeNotification";
+NSString *const RCTWindowFrameDidChangeNotification = @"RCTWindowFrameDidChangeNotification";
 
 NSString *const RCTJavaScriptDidFailToLoadNotification = @"RCTJavaScriptDidFailToLoadNotification";
 NSString *const RCTJavaScriptDidLoadNotification = @"RCTJavaScriptDidLoadNotification";

diff --git a/packages/react-native/React/Base/RCTRootContentView.m b/packages/react-native/React/Base/RCTRootContentView.m
@@ -78,7 +78,7 @@ - (void)viewDidMoveToWindow
 
 - (void)sendFrameChangedEvent:(__unused NSNotification *)notification
 {
-  [[NSNotificationCenter defaultCenter] postNotificationName:RCTRootViewFrameDidChangeNotification object:self];
+  [[NSNotificationCenter defaultCenter] postNotificationName:RCTWindowFrameDidChangeNotification object:self];
 }
 
 #endif // macOS]

diff --git a/packages/react-native/React/CoreModules/RCTDeviceInfo.mm b/packages/react-native/React/CoreModules/RCTDeviceInfo.mm
@@ -82,13 +82,48 @@ - (void)initialize
 
   [[NSNotificationCenter defaultCenter] addObserver:self
                                            selector:@selector(interfaceFrameDidChange)
-                                               name:RCTRootViewFrameDidChangeNotification
+                                               name:RCTWindowFrameDidChangeNotification
+                                             object:nil];
+
+  // TODO T175901725 - Registering the RCTDeviceInfo module to the notification is a short-term fix to unblock 0.73
+  // The actual behavior should be that the module is properly registered in the TurboModule/Bridge infrastructure
+  // and the infrastructure imperatively invoke the `invalidate` method, rather than listening to a notification.
+  // This is a temporary workaround until we can investigate the issue better as there might be other modules in a
+  // similar situation.
+  [[NSNotificationCenter defaultCenter] addObserver:self
+                                           selector:@selector(invalidate)
+                                               name:RCTBridgeWillInvalidateModulesNotification
                                              object:nil];
 }
 
 - (void)invalidate
 {
+  if (_invalidated) {
+    return;
+  }
   _invalidated = YES;
+  [self _cleanupObservers];
+}
+
+- (void)_cleanupObservers
+{
+  [[NSNotificationCenter defaultCenter] removeObserver:self
+                                                  name:RCTAccessibilityManagerDidUpdateMultiplierNotification
+                                                object:[_moduleRegistry moduleForName:"AccessibilityManager"]];
+
+#if TARGET_OS_IOS // [macOS] [visionOS]
+  [[NSNotificationCenter defaultCenter] removeObserver:self
+                                                  name:UIApplicationDidChangeStatusBarOrientationNotification
+                                                object:nil];
+#endif // [macOS] [visionOS]
+
+  [[NSNotificationCenter defaultCenter] removeObserver:self name:UIApplicationDidBecomeActiveNotification object:nil];
+
+  [[NSNotificationCenter defaultCenter] removeObserver:self name:RCTUserInterfaceStyleDidChangeNotification object:nil];
+
+  [[NSNotificationCenter defaultCenter] removeObserver:self name:RCTWindowFrameDidChangeNotification object:nil];
+
+  [[NSNotificationCenter defaultCenter] removeObserver:self name:RCTBridgeWillInvalidateModulesNotification object:nil];
 }
 
 static BOOL RCTIsIPhoneNotched()