Skip to content

Allow inner scroll in modals when device is iOS #635

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

Closed
wants to merge 1 commit into from
Closed

Allow inner scroll in modals when device is iOS #635

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
6 changes: 5 additions & 1 deletion src/components/GenericModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,10 @@ export default {
type: Boolean,
default: true,
},
allowInnerScroll: {
type: Boolean,
default: false,
},
},
data() {
return {
Expand Down Expand Up @@ -168,7 +172,7 @@ export default {
// make sure PortalVue is ready
await this.$nextTick();
// lock scroll
scrollLock.lockScroll(this.$refs.container);
scrollLock.lockScroll(this.$refs.container, this.allowInnerScroll);
// remember last focus item
await this.focusCloseButton();
// update the focus container
Expand Down
1 change: 1 addition & 0 deletions src/components/Navigator/QuickNavigationModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<template>
<GenericModal
isFullscreen
allowInnerScroll
:showClose="false"
:visible.sync="isVisible"
backdropBackgroundColorOverride="rgba(0, 0, 0, 0.7)"
Expand Down
7 changes: 4 additions & 3 deletions src/utils/scroll-lock.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,11 +127,12 @@ export default {
* Locks the scrolling of the body, except for an element
* @param {HTMLElement} targetElement
*/
lockScroll(targetElement) {
lockScroll(targetElement, allowInnerScroll) {
// skip lock if already locked
if (isLocked) return;
// iOS devices require a more advanced locking.
if (!isIosDevice()) {
// use simple lock if device is not iOS
// or it allows inner scrolling
if (!isIosDevice() || allowInnerScroll) {
simpleLock();
} else {
advancedLock(targetElement);
Expand Down