1
0
mirror of https://git.pleroma.social/sjw/pleroma-fe.git synced 2024-12-23 01:29:47 +01:00

Merge branch 'tusooa/scroll-emoji-selector-safari' into 'develop'

Fix scrolling emoji selector in modal in safari ios

Closes #1264

See merge request pleroma/pleroma-fe!1844
This commit is contained in:
HJ 2023-06-29 16:09:51 +00:00
commit c9d07c6202
3 changed files with 13 additions and 0 deletions

View File

@ -0,0 +1 @@
Fix scrolling emoji selector in modal in safari ios

View File

@ -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'
}
}
}

View File

@ -9,8 +9,14 @@
>
<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"
v-body-scroll-lock="isInModal"
class="emoji-tabs"
>
<span
@ -75,8 +81,10 @@
@input="$event.target.composing = false"
>
</div>
<!-- Enables scrolling for this element on safari iOS. See comments for header. -->
<DynamicScroller
ref="emoji-groups"
v-body-scroll-lock="isInModal"
class="emoji-groups"
:class="groupsScrolledClass"
:min-item-size="minItemSize"