replace contentInsetsForView: with RCTContentInsets()

Summary: as title Changelog: [Internal] Reviewed By: RSNara Differential Revision: D31949240 fbshipit-source-id: 2660a4b44fd2aad5cda52ec61e741e7b4e9eb442
NickGerleman · Nov 10, 2021 · f10741a · f10741a
1 parent 98abf1b
commit f10741a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 19 deletions.
diff --git a/React/Views/RCTView.h b/React/Views/RCTView.h
@@ -34,11 +34,6 @@ extern const UIAccessibilityTraits SwitchAccessibilityTrait;
                  withScrollView:(UIScrollView *)scrollView
                    updateOffset:(BOOL)updateOffset;
 
-/**
- * Find the first view controller whose view, or any subview is the specified view.
- */
-+ (UIEdgeInsets)contentInsetsForView:(UIView *)curView;
-
 /**
  * Layout direction of the view.
  * This is inherited from UIView+React, but we override it here

diff --git a/React/Views/RCTView.m b/React/Views/RCTView.m
@@ -11,6 +11,7 @@
 #import "RCTBorderDrawing.h"
 #import "RCTI18nUtil.h"
 #import "RCTLog.h"
+#import "RCTViewUtils.h"
 #import "UIView+React.h"
 
 UIAccessibilityTraits const SwitchAccessibilityTrait = 0x20000000000001;
@@ -456,7 +457,7 @@ + (void)autoAdjustInsetsForView:(UIView<RCTAutoInsetsProtocol> *)parentView
   CGPoint contentOffset = scrollView.contentOffset;
 
   if (parentView.automaticallyAdjustContentInsets) {
-    UIEdgeInsets autoInset = [self contentInsetsForView:parentView];
+    UIEdgeInsets autoInset = RCTContentInsets(parentView);
     baseInset.top += autoInset.top;
     baseInset.bottom += autoInset.bottom;
     baseInset.left += autoInset.left;
@@ -478,18 +479,6 @@ + (void)autoAdjustInsetsForView:(UIView<RCTAutoInsetsProtocol> *)parentView
   }
 }
 
-+ (UIEdgeInsets)contentInsetsForView:(UIView *)view
-{
-  while (view) {
-    UIViewController *controller = view.reactViewController;
-    if (controller) {
-      return controller.view.safeAreaInsets;
-    }
-    view = view.superview;
-  }
-  return UIEdgeInsetsZero;
-}
-
 #pragma mark - View Unmounting
 
 - (void)react_remountAllSubviews

diff --git a/React/Views/ScrollView/RCTScrollView.m b/React/Views/ScrollView/RCTScrollView.m
@@ -17,6 +17,7 @@
 #import "RCTUIManagerObserverCoordinator.h"
 #import "RCTUIManagerUtils.h"
 #import "RCTUtils.h"
+#import "RCTViewUtils.h"
 #import "UIView+Private.h"
 #import "UIView+React.h"
 
@@ -793,7 +794,7 @@ - (CGSize)_calculateViewportSize
 {
   CGSize viewportSize = self.bounds.size;
   if (_automaticallyAdjustContentInsets) {
-    UIEdgeInsets contentInsets = [RCTView contentInsetsForView:self];
+    UIEdgeInsets contentInsets = RCTContentInsets(self);
     viewportSize = CGSizeMake(
         self.bounds.size.width - contentInsets.left - contentInsets.right,
         self.bounds.size.height - contentInsets.top - contentInsets.bottom);