logo

pleroma-fe

My custom branche(s) on git.pleroma.social/pleroma/pleroma-fe git clone https://hacktivis.me/git/pleroma-fe.git
commit: 09402e2537e0c43c52bd8345301885647e841ed1
parent d5e9a28c8482c8594e0761ae3ba8781d76642214
Author: tusooa <tusooa@kazv.moe>
Date:   Thu, 29 Jun 2023 11:31:07 -0400

Fix scrolling emoji selector in modal in safari ios

Diffstat:

Achangelog.d/scroll-emoji-selector-safari.fix1+
Msrc/components/emoji_picker/emoji_picker.js4++++
Msrc/components/emoji_picker/emoji_picker.vue2++
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 @@ -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 @@ -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 @@ -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"