From 09402e2537e0c43c52bd8345301885647e841ed1 Mon Sep 17 00:00:00 2001 From: tusooa Date: Thu, 29 Jun 2023 11:31:07 -0400 Subject: [PATCH] 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 @@