Skip to content

Commit d952758

Browse files
committed
(fix) hide empty messages if room is loading
1 parent 07e3db3 commit d952758

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

src/ChatWindow/ChatWindow.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
:textMessages="t"
2727
:showRoomsList="showRoomsList"
2828
:isMobile="isMobile"
29+
:loadingRooms="loadingRooms"
2930
@toggleRoomsList="toggleRoomsList"
3031
@fetchMessages="fetchMessages"
3132
@sendMessage="sendMessage"

src/ChatWindow/MessagesList.vue

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,8 @@ export default {
232232
messageActions: { type: Array, required: true },
233233
showFiles: { type: Boolean, required: true },
234234
showEmojis: { type: Boolean, required: true },
235-
showReactionEmojis: { type: Boolean, required: true }
235+
showReactionEmojis: { type: Boolean, required: true },
236+
loadingRooms: { type: Boolean, required: true }
236237
},
237238
238239
data() {
@@ -320,7 +321,12 @@ export default {
320321
321322
computed: {
322323
showNoMessages() {
323-
return this.room.roomId && !this.messages.length && !this.loadingMessages
324+
return (
325+
this.room.roomId &&
326+
!this.messages.length &&
327+
!this.loadingMessages &&
328+
!this.loadingRooms
329+
)
324330
},
325331
showMessagesStarted() {
326332
return this.messages.length && this.messagesLoaded

0 commit comments

Comments
 (0)