Browse Source

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

Fix emoji picker off-by-1 error

Closes #1234

See merge request pleroma/pleroma-fe!1747
HJ 2 years ago
parent
commit
5dc6cbd487

+ 1 - 1
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
       })
     }
   },

+ 1 - 1
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;

+ 1 - 0
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