33 * Copyright (c) 2021 - 2025 Vaadin Ltd.
44 * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
55 */
6- import '@vaadin/markdown/src/vaadin-markdown.js' ;
76import { html , render } from 'lit' ;
87import { ifDefined } from 'lit/directives/if-defined.js' ;
98import { KeyboardDirectionMixin } from '@vaadin/a11y-base/src/keyboard-direction-mixin.js' ;
@@ -98,12 +97,23 @@ export const MessageListMixin = (superClass) =>
9897 }
9998
10099 /** @private */
101- __markdownChanged ( _markdown ) {
100+ __markdownChanged ( markdown ) {
101+ if ( markdown && ! customElements . get ( 'vaadin-markdown' ) ) {
102+ // Dynamically import the markdown component
103+ import ( '@vaadin/markdown/src/vaadin-markdown.js' )
104+ // Wait until the component is defined
105+ . then ( ( ) => customElements . whenDefined ( 'vaadin-markdown' ) )
106+ // Render the messages again
107+ . then ( ( ) => this . _renderMessages ( this . items ) ) ;
108+ }
102109 this . _renderMessages ( this . items ) ;
103110 }
104111
105112 /** @private */
106113 _renderMessages ( items ) {
114+ // Check if markdown component is still loading
115+ const loadingMarkdown = this . markdown && ! customElements . get ( 'vaadin-markdown' ) ;
116+
107117 render (
108118 html `
109119 ${ items . map (
@@ -118,6 +128,7 @@ export const MessageListMixin = (superClass) =>
118128 theme ="${ ifDefined ( item . theme ) } "
119129 class ="${ ifDefined ( item . className ) } "
120130 @focusin ="${ this . _onMessageFocusIn } "
131+ style ="${ ifDefined ( loadingMarkdown ? 'visibility: hidden' : undefined ) } "
121132 > ${ this . markdown
122133 ? html `< vaadin-markdown .content =${ item . text } > </ vaadin-markdown > `
123134 : item . text } < vaadin-avatar slot ="avatar "> </ vaadin-avatar
0 commit comments