diff options
| -rw-r--r-- | changelog.d/scroll-emoji-selector-safari.fix | 1 | ||||
| -rw-r--r-- | src/components/emoji_picker/emoji_picker.js | 4 | ||||
| -rw-r--r-- | src/components/emoji_picker/emoji_picker.vue | 2 |
3 files changed, 7 insertions, 0 deletions
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" |