Skip to content

Commit c807054

Browse files
committed
Revert "Check collapse state of tree node when doing recursive refresh (microsoft#127071)"
Fixes microsoft#127711 This reverts commit c683180.
1 parent dec4a09 commit c807054

File tree

2 files changed

+0
-45
lines changed

2 files changed

+0
-45
lines changed

src/vs/base/browser/ui/tree/asyncDataTree.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -881,10 +881,6 @@ export class AsyncDataTree<TInput, T, TFilterData = void> implements IDisposable
881881
asyncDataTreeNode.children.forEach(node => dfs(node, node => this.nodes.delete(node.element as T)));
882882
asyncDataTreeNode.children.splice(0, asyncDataTreeNode.children.length);
883883
asyncDataTreeNode.stale = true;
884-
if (this.collapseByDefault && !this.collapseByDefault(element)) {
885-
asyncDataTreeNode.collapsedByDefault = false;
886-
childrenToRefresh.push(asyncDataTreeNode);
887-
}
888884
} else {
889885
childrenToRefresh.push(asyncDataTreeNode);
890886
}

src/vs/base/test/browser/ui/tree/asyncDataTree.test.ts

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -435,45 +435,4 @@ suite('AsyncDataTree', function () {
435435

436436
assert.deepStrictEqual(Array.from(container.querySelectorAll('.monaco-list-row')).map(e => e.textContent), ['a', 'b2']);
437437
});
438-
439-
test('issue #127035 - tree should react to collapseByDefault toggles', async () => {
440-
const container = document.createElement('div');
441-
const model = new Model({
442-
id: 'root',
443-
children: [{
444-
id: 'a'
445-
}]
446-
});
447-
448-
let collapseByDefault = () => true;
449-
const tree = new AsyncDataTree<Element, Element>('test', container, new VirtualDelegate(), [new Renderer()], new DataSource(), {
450-
identityProvider: new IdentityProvider(),
451-
collapseByDefault: _ => collapseByDefault()
452-
});
453-
tree.layout(200);
454-
455-
await tree.setInput(model.root);
456-
assert.strictEqual(container.querySelectorAll('.monaco-list-row').length, 1);
457-
458-
let twistie = container.querySelector('.monaco-list-row:first-child .monaco-tl-twistie') as HTMLElement;
459-
assert(!twistie.classList.contains('collapsible'));
460-
assert(!twistie.classList.contains('collapsed'));
461-
462-
collapseByDefault = () => false;
463-
model.get('a').children = [{ id: 'aa' }];
464-
await tree.updateChildren(model.root, true);
465-
466-
const rows = container.querySelectorAll('.monaco-list-row');
467-
assert.strictEqual(rows.length, 2);
468-
469-
const aTwistie = rows.item(0).querySelector('.monaco-tl-twistie') as HTMLElement;
470-
assert(aTwistie.classList.contains('collapsible'));
471-
assert(!aTwistie.classList.contains('collapsed'));
472-
473-
const aaTwistie = rows.item(1).querySelector('.monaco-tl-twistie') as HTMLElement;
474-
assert(!aaTwistie.classList.contains('collapsible'));
475-
assert(!aaTwistie.classList.contains('collapsed'));
476-
477-
tree.dispose();
478-
});
479438
});

0 commit comments

Comments
 (0)