120
120
class =" options-container"
121
121
:class =" { 'options-image': isImage }"
122
122
:style =" { width: optionsBlurWidth }"
123
- v-show =" isMessageActions || isMessageReactions"
124
123
>
125
- <transition name =" slide-left" >
124
+ <transition-group name =" slide-left" >
126
125
<div
127
- v-if = " messageHover "
126
+ key = " 1 "
128
127
class =" blur-container"
129
128
:class =" {
130
129
'options-me': message.sender_id === currentUserId
131
130
}"
131
+ v-if =" isMessageActions || isMessageReactions"
132
132
></div >
133
- </transition >
134
- </div >
135
133
136
- <transition name =" slide-left" >
137
- <div
138
- ref =" actionIcon"
139
- class =" svg-button message-options"
140
- v-if =" isMessageActions"
141
- @click =" openOptions"
142
- >
143
- <svg-icon name =" dropdown" />
144
- </div >
145
- </transition >
134
+ <div
135
+ ref =" actionIcon"
136
+ key =" 2"
137
+ class =" svg-button message-options"
138
+ v-if =" isMessageActions"
139
+ @click =" openOptions"
140
+ >
141
+ <svg-icon name =" dropdown" />
142
+ </div >
146
143
147
- <transition name =" slide-left" >
148
- <emoji-picker
149
- class =" message-reactions"
150
- :style =" { right: isMessageActions ? '37px' : '14px' }"
151
- v-if =" isMessageReactions"
152
- v-click-outside =" closeEmoji"
153
- :emojiOpened =" emojiOpened"
154
- :emojiReaction =" true"
155
- :roomFooterRef =" roomFooterRef"
156
- :positionRight =" message.sender_id === currentUserId"
157
- @addEmoji =" sendMessageReaction"
158
- @openEmoji =" openEmoji"
159
- ></emoji-picker >
160
- </transition >
144
+ <emoji-picker
145
+ key =" 3"
146
+ class =" message-reactions"
147
+ :style =" { right: isMessageActions ? '28px' : '5px' }"
148
+ v-if =" isMessageReactions"
149
+ v-click-outside =" closeEmoji"
150
+ :emojiOpened =" emojiOpened"
151
+ :emojiReaction =" true"
152
+ :roomFooterRef =" roomFooterRef"
153
+ :positionRight =" message.sender_id === currentUserId"
154
+ @addEmoji =" sendMessageReaction"
155
+ @openEmoji =" openEmoji"
156
+ ></emoji-picker >
157
+ </transition-group >
158
+ </div >
161
159
162
160
<transition
163
161
:name ="
@@ -342,7 +340,7 @@ export default {
342
340
: this .messageActions .filter (message => ! message .onlyMe )
343
341
},
344
342
optionsBlurWidth () {
345
- if (this .isMessageActions && this .isMessageReactions ) {
343
+ if (this .filteredMessageActions . length && this .showReactionEmojis ) {
346
344
return this .isImage ? ' 67px' : ' 70px'
347
345
} else {
348
346
return this .isImage ? ' 42px' : ' 45px'
@@ -728,7 +726,7 @@ export default {
728
726
border-radius : 50% ;
729
727
position : absolute ;
730
728
top : 7px ;
731
- right : 14 px ;
729
+ right : 5 px ;
732
730
733
731
svg {
734
732
height : 17px ;
@@ -739,7 +737,7 @@ export default {
739
737
.message-reactions {
740
738
position : absolute ;
741
739
top : 6px ;
742
- right : 37 px ;
740
+ right : 28 px ;
743
741
}
744
742
745
743
.menu-options {
0 commit comments