initialise member variable in RCTWindowSafeAreaProxy startObservingSa…

…feArea to prevent potential race Summary: changelog: [internal] _currentSafeAreaInsets should be initialised as part of `startObservingSafeArea` to make sure it is set before accessed. Even though, right now _currentSafeAreaInsets is always set before it is read because notification RCTUserInterfaceStyleDidChangeNotification fires eagerly, it might change in the future and introduce a bug. Differential Revision: D69846681
sammy-SC · Feb 19, 2025 · c1c600e · c1c600e
1 parent d69874f
commit c1c600e
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/packages/react-native/React/Base/UIKitProxies/RCTWindowSafeAreaProxy.mm b/packages/react-native/React/Base/UIKitProxies/RCTWindowSafeAreaProxy.mm
@@ -34,6 +34,7 @@ - (void)startObservingSafeArea
   std::lock_guard<std::mutex> lock(_mutex);
   if (!_isObserving) {
     _isObserving = YES;
+    _currentSafeAreaInsets = [UIApplication sharedApplication].delegate.window.safeAreaInsets;
     [[NSNotificationCenter defaultCenter] addObserver:self
                                              selector:@selector(_interfaceFrameDidChange)
                                                  name:RCTUserInterfaceStyleDidChangeNotification