@@ -12,19 +12,28 @@ import { timeout } from 'vs/base/common/async';
1212
1313interface Element {
1414 id : string ;
15+ suffix ?: string ;
1516 children ?: Element [ ] ;
1617}
1718
18- function find ( elements : Element [ ] | undefined , id : string ) : Element {
19- while ( elements ) {
20- for ( const element of elements ) {
21- if ( element . id === id ) {
22- return element ;
23- }
19+ function find ( element : Element , id : string ) : Element | undefined {
20+ if ( element . id === id ) {
21+ return element ;
22+ }
23+
24+ if ( ! element . children ) {
25+ return undefined ;
26+ }
27+
28+ for ( const child of element . children ) {
29+ const result = find ( child , id ) ;
30+
31+ if ( result ) {
32+ return result ;
2433 }
2534 }
2635
27- throw new Error ( 'element not found' ) ;
36+ return undefined ;
2837}
2938
3039class Renderer implements ITreeRenderer < Element , void , HTMLElement > {
@@ -33,7 +42,7 @@ class Renderer implements ITreeRenderer<Element, void, HTMLElement> {
3342 return container ;
3443 }
3544 renderElement ( element : ITreeNode < Element , void > , index : number , templateData : HTMLElement ) : void {
36- templateData . textContent = element . element . id ;
45+ templateData . textContent = element . element . id + ( element . element . suffix || '' ) ;
3746 }
3847 disposeTemplate ( templateData : HTMLElement ) : void {
3948 // noop
@@ -65,7 +74,13 @@ class Model {
6574 constructor ( readonly root : Element ) { }
6675
6776 get ( id : string ) : Element {
68- return find ( this . root . children , id ) ;
77+ const result = find ( this . root , id ) ;
78+
79+ if ( ! result ) {
80+ throw new Error ( 'element not found' ) ;
81+ }
82+
83+ return result ;
6984 }
7085}
7186
@@ -389,4 +404,36 @@ suite('AsyncDataTree', function () {
389404 assert ( ! hasClass ( twistie , 'collapsible' ) ) ;
390405 assert ( ! hasClass ( twistie , 'collapsed' ) ) ;
391406 } ) ;
407+
408+ test ( 'issues #84569, #82629 - rerender' , async ( ) => {
409+ const container = document . createElement ( 'div' ) ;
410+ const model = new Model ( {
411+ id : 'root' ,
412+ children : [ {
413+ id : 'a' ,
414+ children : [ {
415+ id : 'b' ,
416+ suffix : '1'
417+ } ]
418+ } ]
419+ } ) ;
420+
421+ const tree = new AsyncDataTree < Element , Element > ( 'test' , container , new VirtualDelegate ( ) , [ new Renderer ( ) ] , new DataSource ( ) , { identityProvider : new IdentityProvider ( ) } ) ;
422+ tree . layout ( 200 ) ;
423+
424+ await tree . setInput ( model . root ) ;
425+ await tree . expand ( model . get ( 'a' ) ) ;
426+ assert . deepEqual ( Array . from ( container . querySelectorAll ( '.monaco-list-row' ) ) . map ( e => e . textContent ) , [ 'a' , 'b1' ] ) ;
427+
428+ const a = model . get ( 'a' ) ;
429+ const b = model . get ( 'b' ) ;
430+ a . children ?. splice ( 0 , 1 , { id : 'b' , suffix : '2' } ) ;
431+
432+ await Promise . all ( [
433+ tree . updateChildren ( a , true , true ) ,
434+ tree . updateChildren ( b , true , true )
435+ ] ) ;
436+
437+ assert . deepEqual ( Array . from ( container . querySelectorAll ( '.monaco-list-row' ) ) . map ( e => e . textContent ) , [ 'a' , 'b2' ] ) ;
438+ } ) ;
392439} ) ;
0 commit comments