aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortusooa <tusooa@kazv.moe>2023-01-06 13:14:38 -0500
committertusooa <tusooa@kazv.moe>2023-01-06 13:14:38 -0500
commit76019d1e0349ecf170d660b8324145677b1e472c (patch)
tree79f28cb2d229556db099103325b5cfeb61e1bc96 /src
parenta7387332ed3a3a26de1f818d0bf6b967ab778d4a (diff)
Fix emoji picker off-by-1 error
Diffstat (limited to 'src')
-rw-r--r--src/components/emoji_picker/emoji_picker.js2
-rw-r--r--src/components/emoji_picker/emoji_picker.scss2
-rw-r--r--src/components/emoji_picker/emoji_picker.vue1
3 files changed, 3 insertions, 2 deletions
diff --git a/src/components/emoji_picker/emoji_picker.js b/src/components/emoji_picker/emoji_picker.js
index 4a447905..0d7ca812 100644
--- a/src/components/emoji_picker/emoji_picker.js
+++ b/src/components/emoji_picker/emoji_picker.js
@@ -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
})
}
},
diff --git a/src/components/emoji_picker/emoji_picker.scss b/src/components/emoji_picker/emoji_picker.scss
index dda12197..848d435a 100644
--- a/src/components/emoji_picker/emoji_picker.scss
+++ b/src/components/emoji_picker/emoji_picker.scss
@@ -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;
diff --git a/src/components/emoji_picker/emoji_picker.vue b/src/components/emoji_picker/emoji_picker.vue
index 453ecdfc..ca90bf26 100644
--- a/src/components/emoji_picker/emoji_picker.vue
+++ b/src/components/emoji_picker/emoji_picker.vue
@@ -83,6 +83,7 @@
:emit-update="true"
@update="onScroll"
@visible="recalculateItemPerRow"
+ @resize="recalculateItemPerRow"
>
<template #default="{ item: group, index, active }">
<DynamicScrollerItem