From 09402e2537e0c43c52bd8345301885647e841ed1 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Thu, 29 Jun 2023 11:31:07 -0400
Subject: [PATCH 1/3] Fix scrolling emoji selector in modal in safari ios

---
 changelog.d/scroll-emoji-selector-safari.fix | 1 +
 src/components/emoji_picker/emoji_picker.js  | 4 ++++
 src/components/emoji_picker/emoji_picker.vue | 2 ++
 3 files changed, 7 insertions(+)
 create mode 100644 changelog.d/scroll-emoji-selector-safari.fix

diff --git a/changelog.d/scroll-emoji-selector-safari.fix b/changelog.d/scroll-emoji-selector-safari.fix
new file mode 100644
index 00000000..3f5dda7d
--- /dev/null
+++ b/changelog.d/scroll-emoji-selector-safari.fix
@@ -0,0 +1 @@
+Fix scrolling emoji selector in modal in safari ios
diff --git a/src/components/emoji_picker/emoji_picker.js b/src/components/emoji_picker/emoji_picker.js
index 349b043d..30c01aa5 100644
--- a/src/components/emoji_picker/emoji_picker.js
+++ b/src/components/emoji_picker/emoji_picker.js
@@ -105,6 +105,7 @@ const EmojiPicker = {
       default: false
     }
   },
+  inject: ['popoversZLayer'],
   data () {
     return {
       keyword: '',
@@ -350,6 +351,9 @@ const EmojiPicker = {
 
         return emoji.displayText
       }
+    },
+    isInModal () {
+      return this.popoversZLayer === 'modals'
     }
   }
 }
diff --git a/src/components/emoji_picker/emoji_picker.vue b/src/components/emoji_picker/emoji_picker.vue
index 6972164b..3e77d523 100644
--- a/src/components/emoji_picker/emoji_picker.vue
+++ b/src/components/emoji_picker/emoji_picker.vue
@@ -12,6 +12,7 @@
         <span
           ref="header"
           class="emoji-tabs"
+          v-body-scroll-lock="isInModal"
         >
           <span
             v-for="group in filteredEmojiGroups"
@@ -78,6 +79,7 @@
           <DynamicScroller
             ref="emoji-groups"
             class="emoji-groups"
+            v-body-scroll-lock="isInModal"
             :class="groupsScrolledClass"
             :min-item-size="minItemSize"
             :items="emojiItems"

From bf5bd4235d9de636566ba804580136cfd58980a0 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Thu, 29 Jun 2023 11:40:33 -0400
Subject: [PATCH 2/3] Comment the v-body-scroll-lock usage in code

---
 src/components/emoji_picker/emoji_picker.vue | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/components/emoji_picker/emoji_picker.vue b/src/components/emoji_picker/emoji_picker.vue
index 3e77d523..aacd7a22 100644
--- a/src/components/emoji_picker/emoji_picker.vue
+++ b/src/components/emoji_picker/emoji_picker.vue
@@ -12,6 +12,11 @@
         <span
           ref="header"
           class="emoji-tabs"
+          <!--
+            Body scroll lock needs to be on every scrollable element on safari iOS.
+            Here we tell it to enable scrolling for this element.
+            See https://github.com/willmcpo/body-scroll-lock#vanilla-js
+          -->
           v-body-scroll-lock="isInModal"
         >
           <span
@@ -79,6 +84,7 @@
           <DynamicScroller
             ref="emoji-groups"
             class="emoji-groups"
+            <!-- Enables scrolling for this element on safari iOS. See comments for header. -->
             v-body-scroll-lock="isInModal"
             :class="groupsScrolledClass"
             :min-item-size="minItemSize"

From 9fa0c05b35d175a8186899ec46933bf437a2444c Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Thu, 29 Jun 2023 11:43:49 -0400
Subject: [PATCH 3/3] Fix lint

---
 src/components/emoji_picker/emoji_picker.vue | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/components/emoji_picker/emoji_picker.vue b/src/components/emoji_picker/emoji_picker.vue
index aacd7a22..227d7718 100644
--- a/src/components/emoji_picker/emoji_picker.vue
+++ b/src/components/emoji_picker/emoji_picker.vue
@@ -9,15 +9,15 @@
   >
     <template #content>
       <div class="heading">
+        <!--
+          Body scroll lock needs to be on every scrollable element on safari iOS.
+          Here we tell it to enable scrolling for this element.
+          See https://github.com/willmcpo/body-scroll-lock#vanilla-js
+        -->
         <span
           ref="header"
-          class="emoji-tabs"
-          <!--
-            Body scroll lock needs to be on every scrollable element on safari iOS.
-            Here we tell it to enable scrolling for this element.
-            See https://github.com/willmcpo/body-scroll-lock#vanilla-js
-          -->
           v-body-scroll-lock="isInModal"
+          class="emoji-tabs"
         >
           <span
             v-for="group in filteredEmojiGroups"
@@ -81,11 +81,11 @@
               @input="$event.target.composing = false"
             >
           </div>
+          <!-- Enables scrolling for this element on safari iOS. See comments for header. -->
           <DynamicScroller
             ref="emoji-groups"
-            class="emoji-groups"
-            <!-- Enables scrolling for this element on safari iOS. See comments for header. -->
             v-body-scroll-lock="isInModal"
+            class="emoji-groups"
             :class="groupsScrolledClass"
             :min-item-size="minItemSize"
             :items="emojiItems"