(fix) remove message divider after new message

Author: antoine92190

src/ChatWindow/Message/Message.vue

@@ -277,22 +277,16 @@ export default {
 
 	watch: {
 		newMessages(val) {
-			if (!val.length || !this.showNewMessagesDivider) return
+			if (!val.length || !this.showNewMessagesDivider) {
+				return (this.newMessage = {})
+			}
+
 			this.newMessage = val.reduce((res, obj) =>
 				obj.index < res.index ? obj : res
 			)
 		}
 	},
 
-	mounted() {
-		if (!this.message.seen && this.message.senderId !== this.currentUserId) {
-			this.$emit('add-new-message', {
-				_id: this.message._id,
-				index: this.index
-			})
-		}
-	},
-
 	methods: {
 		onHoverMessage() {
 			this.imageHover = true

src/ChatWindow/Room/Room.vue

@@ -87,7 +87,6 @@
 								@message-action-handler="messageActionHandler"
 								@open-file="openFile"
 								@open-user-tag="openUserTag"
-								@add-new-message="addNewMessage"
 								@send-message-reaction="sendMessageReaction"
 								@hide-options="hideOptions = $event"
 							>
@@ -468,12 +467,23 @@ export default {
 			}
 		},
 		messages(newVal, oldVal) {
-			newVal.forEach(message => {
+			newVal.forEach((message, i) => {
 				if (!messagesValid(message)) {
 					throw new Error(
 						'Messages object is not valid! Must contain _id[String, Number], content[String, Number] and senderId[String, Number]'
 					)
 				}
+
+				if (
+					this.showNewMessagesDivider &&
+					!message.seen &&
+					message.senderId !== this.currentUserId
+				) {
+					this.newMessages.push({
+						_id: message._id,
+						index: i
+					})
+				}
 			})
 
 			const element = this.$refs.scrollContainer
@@ -487,6 +497,7 @@ export default {
 			}
 
 			if (oldVal && newVal && oldVal.length === newVal.length - 1) {
+				this.newMessages = []
 				this.loadingMessages = false
 
 				if (this.getBottomScroll(element) < 60) {
@@ -690,9 +701,6 @@ export default {
 				width: this.$refs.mediaFile.clientWidth + 26
 			}
 		},
-		addNewMessage(message) {
-			this.newMessages.push(message)
-		},
 		escapeTextarea() {
 			if (this.filteredEmojis.length) this.filteredEmojis = []
 			else if (this.filteredUsersTag.length) this.filteredUsersTag = []