Skip to content

Commit 7434a77

Browse files
joaomorenojoaomoreno
committed
fix manual tree tests
1 parent 9acc66e commit 7434a77

2 files changed

Lines changed: 17 additions & 18 deletions

File tree

‎src/vs/base/browser/ui/list/listWidget.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -862,7 +862,7 @@ export interface IListStyles {
862862
}
863863

864864
const defaultStyles: IListStyles = {
865-
listFocusBackground: Color.fromHex('#073655'),
865+
listFocusBackground: Color.fromHex('#7FB0D0'),
866866
listActiveSelectionBackground: Color.fromHex('#0E639C'),
867867
listActiveSelectionForeground: Color.fromHex('#FFFFFF'),
868868
listFocusAndSelectionBackground: Color.fromHex('#094771'),

‎test/tree/public/index.html‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444

4545
require.config({ baseUrl: '/static' });
4646

47-
require(['vs/base/browser/ui/tree/indexTree', 'vs/base/browser/ui/tree/compressedObjectTree', 'vs/base/browser/ui/tree/asyncDataTree', 'vs/base/browser/ui/tree/dataTree', 'vs/base/browser/ui/tree/tree', 'vs/base/common/iterator'], ({ IndexTree }, { CompressedObjectTree }, { AsyncDataTree }, { DataTree }, { TreeVisibility }, { iter }) => {
47+
require(['vs/base/browser/ui/tree/indexTree', 'vs/base/browser/ui/tree/objectTree', 'vs/base/browser/ui/tree/asyncDataTree', 'vs/base/browser/ui/tree/dataTree', 'vs/base/browser/ui/tree/tree', 'vs/base/common/iterator'], ({ IndexTree }, { CompressibleObjectTree }, { AsyncDataTree }, { DataTree }, { TreeVisibility }, { iter }) => {
4848
function createIndexTree(opts) {
4949
opts = opts || {};
5050

@@ -95,7 +95,7 @@
9595
}
9696
};
9797

98-
const tree = new IndexTree(container, delegate, [renderer], null, { ...opts, filter: treeFilter, setRowLineHeight: false });
98+
const tree = new IndexTree('test', container, delegate, [renderer], null, { ...opts, filter: treeFilter, setRowLineHeight: false });
9999

100100
return { tree, treeFilter };
101101
}
@@ -113,11 +113,10 @@
113113
templateId: 'template',
114114
renderTemplate(container) { return container; },
115115
renderElement(element, index, container) {
116-
if (element.element.elements.length > 1) {
117-
container.innerHTML = `🙈 ${element.element.elements.map(el => el.name).join('/')}`;
118-
} else {
119-
container.innerHTML = element.element.elements[0].name;
120-
}
116+
container.innerHTML = element.element.name;
117+
},
118+
renderCompressedElements(node, index, container, height) {
119+
container.innerHTML = `🙈 ${node.element.elements.map(el => el.name).join('/')}`;
121120
},
122121
disposeElement() { },
123122
disposeTemplate() { }
@@ -146,7 +145,7 @@
146145
}
147146
};
148147

149-
const tree = new CompressedObjectTree(container, delegate, [renderer], { ...opts, filter: treeFilter, setRowLineHeight: false, collapseByDefault: true, setRowLineHeight: true });
148+
const tree = new CompressibleObjectTree('test', container, delegate, [renderer], { ...opts, filter: treeFilter, setRowLineHeight: false, collapseByDefault: true, setRowLineHeight: true });
150149

151150
return { tree, treeFilter };
152151
}
@@ -206,7 +205,7 @@
206205
getChildren(element) {
207206
return new Promise((c, e) => {
208207
const xhr = new XMLHttpRequest();
209-
xhr.open('GET', element ? `/ api / readdir ? path = ${element.element.path} ` : '/api/readdir');
208+
xhr.open('GET', element ? `/api/readdir?path=${element.element.path}` : '/api/readdir');
210209
xhr.send();
211210
xhr.onreadystatechange = function () {
212211
if (this.readyState == 4 && this.status == 200) {
@@ -228,7 +227,7 @@
228227
}
229228
};
230229

231-
const tree = new AsyncDataTree(container, delegate, [renderer], dataSource, { filter: treeFilter, sorter, identityProvider });
230+
const tree = new AsyncDataTree('test', container, delegate, [renderer], dataSource, { filter: treeFilter, sorter, identityProvider });
232231

233232
return { tree, treeFilter };
234233
}
@@ -283,15 +282,15 @@
283282
}
284283
};
285284

286-
const tree = new DataTree(container, delegate, [renderer], dataSource, { filter: treeFilter, identityProvider });
285+
const tree = new DataTree('test', container, delegate, [renderer], dataSource, { filter: treeFilter, identityProvider });
287286

288-
tree.input = {
287+
tree.setInput({
289288
children: [
290289
{ name: 'A', children: [{ name: 'AA' }, { name: 'AB' }] },
291290
{ name: 'B', children: [{ name: 'BA', children: [{ name: 'BAA' }] }, { name: 'BB' }] },
292291
{ name: 'C' }
293292
]
294-
};
293+
});
295294

296295
return { tree, treeFilter };
297296
}
@@ -324,9 +323,9 @@
324323
expandall.onclick = () => perf('expand all', () => tree.expandAll());
325324
collapseall.onclick = () => perf('collapse all', () => tree.collapseAll());
326325
renderwidth.onclick = () => perf('renderwidth', () => tree.layoutWidth(Math.random()));
327-
refresh.onclick = () => perf('refresh', () => tree.refresh(null, true));
326+
refresh.onclick = () => perf('refresh', () => tree.updateChildren());
328327

329-
tree.refresh(null);
328+
tree.setInput(null);
330329

331330
break;
332331
}
@@ -336,7 +335,7 @@
336335
expandall.onclick = () => perf('expand all', () => tree.expandAll());
337336
collapseall.onclick = () => perf('collapse all', () => tree.collapseAll());
338337
renderwidth.onclick = () => perf('renderwidth', () => tree.layoutWidth(Math.random()));
339-
refresh.onclick = () => perf('refresh', () => tree.refresh(null, true));
338+
refresh.onclick = () => perf('refresh', () => tree.updateChildren());
340339

341340
break;
342341
}
@@ -401,4 +400,4 @@
401400
</script>
402401
</body>
403402

404-
</html>
403+
</html>

0 commit comments

Comments
 (0)