From 94f363f4617373d7cd3306e381e60cf60e7a29db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marina=20A=C3=ADsa?= <marina.aisa@apple.com>
Date: Wed, 3 May 2023 20:16:36 +0200
Subject: [PATCH] [rdar://108269711] fix: allow inner scroll in modals

---
 src/components/GenericModal.vue                   | 6 +++++-
 src/components/Navigator/QuickNavigationModal.vue | 1 +
 src/utils/scroll-lock.js                          | 7 ++++---
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/components/GenericModal.vue b/src/components/GenericModal.vue
index 57a371041..c3a2a8cd1 100644
--- a/src/components/GenericModal.vue
+++ b/src/components/GenericModal.vue
@@ -91,6 +91,10 @@ export default {
       type: Boolean,
       default: true,
     },
+    allowInnerScroll: {
+      type: Boolean,
+      default: false,
+    },
   },
   data() {
     return {
@@ -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
diff --git a/src/components/Navigator/QuickNavigationModal.vue b/src/components/Navigator/QuickNavigationModal.vue
index f447bf3f1..7f0451079 100644
--- a/src/components/Navigator/QuickNavigationModal.vue
+++ b/src/components/Navigator/QuickNavigationModal.vue
@@ -11,6 +11,7 @@
 <template>
   <GenericModal
     isFullscreen
+    allowInnerScroll
     :showClose="false"
     :visible.sync="isVisible"
     backdropBackgroundColorOverride="rgba(0, 0, 0, 0.7)"
diff --git a/src/utils/scroll-lock.js b/src/utils/scroll-lock.js
index 7b42f3e3f..2ecc468aa 100644
--- a/src/utils/scroll-lock.js
+++ b/src/utils/scroll-lock.js
@@ -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);