diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2023-06-29 16:09:51 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2023-06-29 16:09:51 +0000 |
| commit | c9d07c62024a9e2d6f45e33a491daa6b7127abac (patch) | |
| tree | 11a9f0d107609be45d4442af23c112bf2ed28256 /src/components/emoji_picker/emoji_picker.js | |
| parent | 586705ec02d6f399cc72cc759b523519e3d6992b (diff) | |
| parent | 9fa0c05b35d175a8186899ec46933bf437a2444c (diff) | |
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
Diffstat (limited to 'src/components/emoji_picker/emoji_picker.js')
| -rw-r--r-- | src/components/emoji_picker/emoji_picker.js | 4 |
1 files changed, 4 insertions, 0 deletions
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' } } } |