Repository navigation
Conversation
This was referenced Nov 12, 2026
huntie
marked this pull request as ready for review
November 12, 2026 16:33
|
Warning Missing Test Plan Please add a "## Test Plan" section to your PR description. A Test Plan lets us know how these changes were tested. |
This branch has not been deployed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary:
Pick #59194 (
f072e7f43da480d26f4f701187ea20bc1542d4f6) to0.88-stable.This fixes iOS
<ScrollView contentInsetAdjustmentBehavior>so the content container stays clear of the safe area across the non-scrollable axis, such as the iPhone Duo rail and landscape notches, while the scroll view and scroll indicator still reach the screen edge.Conflict resolution
packages/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTEnhancedScrollView.h: 0.88 does not include Prepare native ScrollView safe area content padding (#59528) #59528invertedproperty. Kept only thebaseContentInset,horizontal, andpadsContentForSafeAreadeclarations needed for this pick, and left out the Prepare native ScrollView safe area content padding (#59528) #59528 inverted-list edge-effect API.packages/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm: kept [ScrollView][iOS] Fix contentInsetAdjustmentBehavior for the horizontal safe area (iPhone Duo) #59194's content-view safe-area padding update aftersuper updateProps:and omitted Prepare native ScrollView safe area content padding (#59528) #59528'sinvertedassignment. Added the minimal 0.88 bridge to the inset bookkeeping (horizontal,baseContentInset, and metrics/reporting) so the behavior matches main without exposing Prepare native ScrollView safe area content padding (#59528) #59528's temporary raw prop.scripts/cxx-api/api-snapshots/ReactAndroidFrameworksCxx.api: this snapshot file does not exist on0.88-stable, so it stays deleted.scripts/cxx-api/api-snapshots/ReactAppleFrameworksCxx.api: this snapshot file does not exist on0.88-stable, so it stays deleted.scripts/cxx-api/api-snapshots/ReactCommonFrameworksCxx.api: this snapshot file does not exist on0.88-stable, so it stays deleted.Additional 0.88 adaptation:
RCTEnhancedScrollView.mmdid not have #59528's inset bookkeeping implementation on0.88-stable, so this pick includes only thebaseContentInset/padsContentForSafeAreaimplementation required to avoid double-applying UIKit's safe-area inset across the scrollable axis. It does not bring in #59528's inverted virtualized-list behavior, rawpadsContentForSafeAreaprop, or tests.Changelog:
[iOS][Fixed] - ScrollView:
contentInsetAdjustmentBehaviorkeeps content clear of the safe area across the scrollable axis, such as the rail on iPhone Duo and the notch in landscape