Skip to content

Commit 2dea1b4

Browse files
committed
(UI) improve options blur animation
1 parent 0f1a084 commit 2dea1b4

File tree

1 file changed

+30
-32
lines changed

1 file changed

+30
-32
lines changed

src/ChatWindow/Message.vue

Lines changed: 30 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -120,44 +120,42 @@
120120
class="options-container"
121121
:class="{ 'options-image': isImage }"
122122
:style="{ width: optionsBlurWidth }"
123-
v-show="isMessageActions || isMessageReactions"
124123
>
125-
<transition name="slide-left">
124+
<transition-group name="slide-left">
126125
<div
127-
v-if="messageHover"
126+
key="1"
128127
class="blur-container"
129128
:class="{
130129
'options-me': message.sender_id === currentUserId
131130
}"
131+
v-if="isMessageActions || isMessageReactions"
132132
></div>
133-
</transition>
134-
</div>
135133

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>
146143

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>
161159

162160
<transition
163161
:name="
@@ -342,7 +340,7 @@ export default {
342340
: this.messageActions.filter(message => !message.onlyMe)
343341
},
344342
optionsBlurWidth() {
345-
if (this.isMessageActions && this.isMessageReactions) {
343+
if (this.filteredMessageActions.length && this.showReactionEmojis) {
346344
return this.isImage ? '67px' : '70px'
347345
} else {
348346
return this.isImage ? '42px' : '45px'
@@ -728,7 +726,7 @@ export default {
728726
border-radius: 50%;
729727
position: absolute;
730728
top: 7px;
731-
right: 14px;
729+
right: 5px;
732730
733731
svg {
734732
height: 17px;
@@ -739,7 +737,7 @@ export default {
739737
.message-reactions {
740738
position: absolute;
741739
top: 6px;
742-
right: 37px;
740+
right: 28px;
743741
}
744742
745743
.menu-options {

0 commit comments

Comments
 (0)