From d12e573af6fb4167bf5886371038fec0d3267c3c Mon Sep 17 00:00:00 2001
From: Serhii Kulykov <iamkulykov@gmail.com>
Date: Tue, 19 Mar 2024 15:46:54 +0200
Subject: [PATCH] fix: render message avatars with Lit to keep them on items
 update (#7240)

---
 packages/message-list/src/vaadin-message-list.js | 4 ++--
 packages/message-list/test/message-list.test.js  | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/message-list/src/vaadin-message-list.js b/packages/message-list/src/vaadin-message-list.js
index 2acc7dbc72..390870ea71 100644
--- a/packages/message-list/src/vaadin-message-list.js
+++ b/packages/message-list/src/vaadin-message-list.js
@@ -163,8 +163,8 @@ class MessageList extends KeyboardDirectionMixin(ElementMixin(ThemableMixin(Poly
                 theme="${ifDefined(item.theme)}"
                 class="${ifDefined(item.className)}"
                 @focusin="${this._onMessageFocusIn}"
-                >${item.text}</vaadin-message
-              >
+                >${item.text}<vaadin-avatar slot="avatar"></vaadin-avatar
+              ></vaadin-message>
             `,
         )}
       `,
diff --git a/packages/message-list/test/message-list.test.js b/packages/message-list/test/message-list.test.js
index c5eaf9a9c0..4eda6ffe57 100644
--- a/packages/message-list/test/message-list.test.js
+++ b/packages/message-list/test/message-list.test.js
@@ -144,6 +144,12 @@ describe('message-list', () => {
         expect(items[0]).to.eql(firstMessage);
         expect(items[1]).to.not.eql(firstMessage);
       });
+
+      it('should not remove vaadin-avatar elements when updating items', async () => {
+        messageList.items = [{ text: '', userName: 'Assistant' }];
+        await nextRender();
+        expect(messageList.querySelector('vaadin-avatar')).to.be.ok;
+      });
     });
 
     describe('scroll', () => {