Skip to content

fix(core): iOS scrollToVerticalOffset lands past the offset when there is a content inset #11409

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
NathanWalker wants to merge 1 commit into
base: main
Choose a base branch
from
+16 −6
Open

fix(core): iOS scrollToVerticalOffset lands past the offset when there is a content inset #11409

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
22 changes: 16 additions & 6 deletions packages/core/ui/scroll-view/index.ios.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,17 +153,27 @@ export class ScrollView extends ScrollViewBase {
this.updateContentInsetAdjustmentBehavior(value);
}

// The offset is set directly rather than through scrollRectToVisible with a
// viewport-sized rect: that rect cannot fit inside a content inset, so UIKit
// would land contentInset.bottom (or .right) past the requested offset. The
// value is clamped to the range a user scroll can reach.
public scrollToVerticalOffset(value: number, animated: boolean) {
if (this.nativeViewProtected && this.orientation === 'vertical' && this.isScrollEnabled) {
const bounds = this.nativeViewProtected.bounds.size;
this.nativeViewProtected.scrollRectToVisibleAnimated(CGRectMake(0, value, bounds.width, bounds.height), animated);
const nativeView = this.nativeViewProtected;
if (nativeView && this.orientation === 'vertical' && this.isScrollEnabled) {
const inset = nativeView.adjustedContentInset;
const min = -inset.top;
const max = Math.max(min, nativeView.contentSize.height + inset.bottom - nativeView.bounds.size.height);
nativeView.setContentOffsetAnimated(CGPointMake(nativeView.contentOffset.x, Math.min(Math.max(value, min), max)), animated);
}
}

public scrollToHorizontalOffset(value: number, animated: boolean) {
if (this.nativeViewProtected && this.orientation === 'horizontal' && this.isScrollEnabled) {
const bounds = this.nativeViewProtected.bounds.size;
this.nativeViewProtected.scrollRectToVisibleAnimated(CGRectMake(value, 0, bounds.width, bounds.height), animated);
const nativeView = this.nativeViewProtected;
if (nativeView && this.orientation === 'horizontal' && this.isScrollEnabled) {
const inset = nativeView.adjustedContentInset;
const min = -inset.left;
const max = Math.max(min, nativeView.contentSize.width + inset.right - nativeView.bounds.size.width);
nativeView.setContentOffsetAnimated(CGPointMake(Math.min(Math.max(value, min), max), nativeView.contentOffset.y), animated);
}
}

Expand Down
Loading