Skip to content

fix: Remove onTouchEnd handler in iOS usePreventScroll #7479

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

Merged
merged 1 commit into from
Dec 7, 2024
Merged

fix: Remove onTouchEnd handler in iOS usePreventScroll #7479

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
25 changes: 3 additions & 22 deletions packages/@react-aria/overlays/src/usePreventScroll.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,24 +139,7 @@ function preventScrollMobileSafari() {
}
};

let onTouchEnd = (e: TouchEvent) => {
let target = e.target as HTMLElement;

// Apply this change if we're not already focused on the target element
if (willOpenKeyboard(target) && target !== document.activeElement) {
e.preventDefault();
setupStyles();

// Apply a transform to trick Safari into thinking the input is at the top of the page
// so it doesn't try to scroll it into view. When tapping on an input, this needs to
// be done before the "focus" event, so we have to focus the element ourselves.
target.style.transform = 'translateY(-2000px)';
target.focus();
requestAnimationFrame(() => {
target.style.transform = '';
});
}

let onTouchEnd = () => {
if (restoreScrollableStyles) {
restoreScrollableStyles();
}
Expand All @@ -167,10 +150,8 @@ function preventScrollMobileSafari() {
if (willOpenKeyboard(target)) {
setupStyles();

// Transform also needs to be applied in the focus event in cases where focus moves
// other than tapping on an input directly, e.g. the next/previous buttons in the
// software keyboard. In these cases, it seems applying the transform in the focus event
// is good enough, whereas when tapping an input, it must be done before the focus event. 🤷‍♂️
// Apply a transform to trick Safari into thinking the input is at the top of the page
// so it doesn't try to scroll it into view.
target.style.transform = 'translateY(-2000px)';
requestAnimationFrame(() => {
target.style.transform = '';
Expand Down
Loading