Anon/yandere_fe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'tusooa/1234-emoji-regression' into 'develop'

Browse Source 
Fix emoji picker off-by-1 error

Closes #1234

See merge request pleroma/pleroma-fe!1747
This commit is contained in:
HJ 2023-01-09 21:11:39 +00:00
commit 5dc6cbd487
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/emoji_picker/emoji_picker.js
View File

@ -244,7 +244,7 @@ const EmojiPicker = {
if (!this.$refs['emoji-groups']) { if (!this.$refs['emoji-groups']) {
return return
} }
this.width = this.$refs['emoji-groups'].$el.offsetWidth this.width = this.$refs['emoji-groups'].$el.clientWidth
}) })
} }
}, },

2
src/components/emoji_picker/emoji_picker.scss
View File

@ -7,7 +7,7 @@ $emoji-picker-emoji-size: 32px;
.emoji-picker { .emoji-picker {
width: 25em; width: 25em;
max-width: 100vw; max-width: calc(100vw - 20px); // popover gives 10px margin from window edge
display: flex; display: flex;
flex-direction: column; flex-direction: column;
background-color: $fallback--bg; background-color: $fallback--bg;

1
src/components/emoji_picker/emoji_picker.vue
View File

@ -83,6 +83,7 @@
:emit-update="true" :emit-update="true"
@update="onScroll" @update="onScroll"
@visible="recalculateItemPerRow" @visible="recalculateItemPerRow"
@resize="recalculateItemPerRow"
> >
<template #default="{ item: group, index, active }"> <template #default="{ item: group, index, active }">
<DynamicScrollerItem <DynamicScrollerItem