Skip to content

Restore content offset after background snapshot on iOS #55026

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mhoran wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Restore content offset after background snapshot on iOS #55026

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions ...ges/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTEnhancedScrollView.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ @interface RCTEnhancedScrollView () <UIScrollViewDelegate>
@implementation RCTEnhancedScrollView {
__weak id<UIScrollViewDelegate> _publicDelegate;
BOOL _isSetContentOffsetDisabled;
CGPoint _foregroundContentOffset;
}

+ (BOOL)automaticallyNotifiesObserversForKey:(NSString *)key
Expand Down Expand Up @@ -97,6 +98,28 @@ - (void)setContentOffset:(CGPoint)contentOffset
if (_isSetContentOffsetDisabled) {
return;
}

#if TARGET_OS_IOS
UIWindowScene *scene = self.window.windowScene;
if (scene && scene.activationState == UISceneActivationStateBackground) {
if (!CGPointEqualToPoint(_foregroundContentOffset, CGPointZero)) {
BOOL isHorizontal = [self isHorizontal:self];
CGSize viewportSize = self.bounds.size;
if (isHorizontal) {
contentOffset.x =
fmin(_foregroundContentOffset.x,
fmax(0, self.contentSize.width - viewportSize.width));
} else {
contentOffset.y =
fmin(_foregroundContentOffset.y,
fmax(0, self.contentSize.height - viewportSize.height));
}
}
} else {
_foregroundContentOffset = contentOffset;
}
#endif

super.contentOffset = CGPointMake(
RCTSanitizeNaNValue(contentOffset.x, @"scrollView.contentOffset.x"),
RCTSanitizeNaNValue(contentOffset.y, @"scrollView.contentOffset.y"));
Expand Down
7 changes: 7 additions & 0 deletions ...eact-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -650,6 +650,13 @@ - (void)_updateStateWithContentOffset

_avoidAdjustmentForMaintainVisibleContentPosition = enableImmediateUpdateModeForContentOffsetChanges;

#if TARGET_OS_IOS
UIWindowScene *scene = self.window.windowScene;
if (scene && scene.activationState == UISceneActivationStateBackground) {
return;
}
#endif

auto contentOffset = RCTPointFromCGPoint(_scrollView.contentOffset);
BOOL isAccessibilityAPIUsed = _isAccessibilityAPIUsed;
_state->updateState(
Expand Down
Loading