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

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

View File

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

View File

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

View File

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