fix: measure frame relative to nearest view controller

th3rdwave · Jun 28, 2024 · ab10a80 · ab10a80
1 parent b4ae2f8
commit ab10a80
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/ios/Fabric/RNCSafeAreaProviderComponentView.mm b/ios/Fabric/RNCSafeAreaProviderComponentView.mm
@@ -58,7 +58,7 @@ - (void)invalidateSafeAreaInsets
   }
 
   UIEdgeInsets safeAreaInsets = self.safeAreaInsets;
-  CGRect frame = [self convertRect:self.bounds toView:nil];
+  CGRect frame = [self convertRect:self.bounds toView:RNCParentViewController(self).view];
 
   if (_initialInsetsSent &&
       UIEdgeInsetsEqualToEdgeInsetsWithThreshold(safeAreaInsets, _currentSafeAreaInsets, 1.0 / RCTScreenScale()) &&

diff --git a/ios/RNCSafeAreaProvider.m b/ios/RNCSafeAreaProvider.m
@@ -49,7 +49,7 @@ - (void)invalidateSafeAreaInsets
   }
 
   UIEdgeInsets safeAreaInsets = self.safeAreaInsets;
-  CGRect frame = [self convertRect:self.bounds toView:nil];
+  CGRect frame = [self convertRect:self.bounds toView:RNCParentViewController(self).view];
 
   if (_initialInsetsSent &&
       UIEdgeInsetsEqualToEdgeInsetsWithThreshold(safeAreaInsets, _currentSafeAreaInsets, 1.0 / RCTScreenScale()) &&

diff --git a/ios/RNCSafeAreaUtils.h b/ios/RNCSafeAreaUtils.h
@@ -6,3 +6,5 @@ extern NSString *const RNCSafeAreaDidChange;
 
 RCT_EXTERN BOOL
 UIEdgeInsetsEqualToEdgeInsetsWithThreshold(UIEdgeInsets insets1, UIEdgeInsets insets2, CGFloat threshold);
+
+RCT_EXTERN UIViewController *RNCParentViewController(UIView *view);
diff --git a/ios/RNCSafeAreaUtils.m b/ios/RNCSafeAreaUtils.m
@@ -9,3 +9,15 @@ BOOL UIEdgeInsetsEqualToEdgeInsetsWithThreshold(UIEdgeInsets insets1, UIEdgeInse
   return ABS(insets1.left - insets2.left) <= threshold && ABS(insets1.right - insets2.right) <= threshold &&
       ABS(insets1.top - insets2.top) <= threshold && ABS(insets1.bottom - insets2.bottom) <= threshold;
 }
+
+UIViewController *RNCParentViewController(UIView *view)
+{
+  UIResponder *responder = view.nextResponder;
+  while (responder != nil) {
+    if ([responder isKindOfClass:[UIViewController class]]) {
+      return (UIViewController *)responder;
+    }
+    responder = responder.nextResponder;
+  }
+  return nil;
+}