Skip to content
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

Fix calcScrollData to ensure the input is kept within view #18253

Merged
merged 5 commits into from
May 14, 2019
Merged

Fix calcScrollData to ensure the input is kept within view #18253

Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ace061d
Update scroll-data.ts
pegler May 10, 2019
d4f094b
Merge branch 'master' into issue-17457-1
brandyscarney May 10, 2019
2340459
address linting issues
pegler May 10, 2019
56040e0
Merge branch 'issue-17457-1' of github.com:pegler/ionic into issue-17…
pegler May 10, 2019
7277357
Merge branch 'master' into issue-17457-1
brandyscarney May 14, 2019
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
8 changes: 6 additions & 2 deletions core/src/utils/input-shims/hacks/scroll-data.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,17 @@ function calcScrollData(
const distanceToBottom = safeAreaBottom - inputBottom;
const distanceToTop = safeAreaTop - inputTop;

// The scrollAmount is the negated distance to the safe area.
const scrollAmount = Math.round((distanceToBottom < 0)
// desiredScrollAmount is the negated distance to the safe area according to our calculations.
const desiredScrollAmount = Math.round((distanceToBottom < 0)
? -distanceToBottom
: (distanceToTop > 0)
? -distanceToTop
: 0);

// our calculations make some assumptions that aren't always true, like the keyboard being closed when an input
// gets focus, so make sure we don't scroll the input above the visible area
const scrollAmount = Math.min(desiredScrollAmount, inputTop - visibleAreaTop);

const distance = Math.abs(scrollAmount);
const duration = distance / SCROLL_ASSIST_SPEED;
const scrollDuration = Math.min(400, Math.max(150, duration));
Expand Down