Always use adjustedContentInset for effective inset

Miyou · Miyou · commit 1dfeba765144 · 2026-03-27T10:41:57.000+07:00
diff --git a/packages/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm b/packages/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm
@@ -278,9 +278,7 @@ static inline UIViewAnimationOptions animationOptionsWithCurve(UIViewAnimationCu
 static inline UIEdgeInsets RCTEffectiveContentInset(UIScrollView *scrollView)
 {
   if (@available(iOS 11.0, *)) {
-    if (!UIEdgeInsetsEqualToEdgeInsets(UIEdgeInsetsZero, scrollView.adjustedContentInset)) {
-      return scrollView.adjustedContentInset;
-    }
+    return scrollView.adjustedContentInset;
   }
 
   return scrollView.contentInset;
diff --git a/packages/react-native/React/Views/ScrollView/RCTScrollView.m b/packages/react-native/React/Views/ScrollView/RCTScrollView.m
@@ -284,9 +284,7 @@ static inline UIViewAnimationOptions animationOptionsWithCurve(UIViewAnimationCu
 static inline UIEdgeInsets RCTEffectiveContentInset(UIScrollView *scrollView)
 {
   if (@available(iOS 11.0, *)) {
-    if (!UIEdgeInsetsEqualToEdgeInsets(UIEdgeInsetsZero, scrollView.adjustedContentInset)) {
-      return scrollView.adjustedContentInset;
-    }
+    return scrollView.adjustedContentInset;
   }
 
   return scrollView.contentInset;

Original file line number	Diff line number	Diff line change
`@@ -278,9 +278,7 @@ static inline UIViewAnimationOptions animationOptionsWithCurve(UIViewAnimationCu`
`278`	`278`	`static inline UIEdgeInsets RCTEffectiveContentInset(UIScrollView *scrollView)`
`279`	`279`	`{`
`280`	`280`	`if (@available(iOS 11.0, *)) {`
`281`		`- if (!UIEdgeInsetsEqualToEdgeInsets(UIEdgeInsetsZero, scrollView.adjustedContentInset)) {`
`282`		`- return scrollView.adjustedContentInset;`
`283`		`- }`
	`281`	`+ return scrollView.adjustedContentInset;`
`284`	`282`	`}`
`285`	`283`
`286`	`284`	`return scrollView.contentInset;`
Original file line number	Diff line number	Diff line change
`@@ -284,9 +284,7 @@ static inline UIViewAnimationOptions animationOptionsWithCurve(UIViewAnimationCu`
`284`	`284`	`static inline UIEdgeInsets RCTEffectiveContentInset(UIScrollView *scrollView)`
`285`	`285`	`{`
`286`	`286`	`if (@available(iOS 11.0, *)) {`
`287`		`- if (!UIEdgeInsetsEqualToEdgeInsets(UIEdgeInsetsZero, scrollView.adjustedContentInset)) {`
`288`		`- return scrollView.adjustedContentInset;`
`289`		`- }`
	`287`	`+ return scrollView.adjustedContentInset;`
`290`	`288`	`}`
`291`	`289`
`292`	`290`	`return scrollView.contentInset;`