Skip to content

Playwright is a framework for Web Testing and Automation. It allows testing Chromium, Firefox and WebKit with a single API.

feat(ui-mode): support macOS alt key to expand/collapse sections of tree (#37284)

Adam Gastineaub5322349e476
diff --git a/packages/web/src/components/treeView.tsx b/packages/web/src/components/treeView.tsx
index f478ba4025..d4f955fb9c 100644
--- a/packages/web/src/components/treeView.tsx
+++ b/packages/web/src/components/treeView.tsx
@@ -112,6 +112,20 @@ export function TreeView<T extends TreeItem>({
setTreeState({ ...treeState });
}, [treeItems, selectedItem, onSelected, treeState, setTreeState]);
+ const toggleSubtree = React.useCallback((item: T) => {
+ const { expanded } = treeItems.get(item)!;
+
+ const stack: TreeItem[] = [item];
+ while (stack.length) {
+ const current = stack.pop()!;
+ stack.push(...current.children);
+
+ treeState.expandedItems.set(current.id, !expanded);
+ }
+
+ setTreeState({ ...treeState });
+ }, [treeItems, treeState, setTreeState]);
+
return <div className={clsx(`tree-view vbox`, name + '-tree-view')} role={'tree'} data-testid={dataTestId || (name + '-tree')}>
<div
className={clsx('tree-view-content')}
@@ -187,6 +201,7 @@ export function TreeView<T extends TreeItem>({
onAccepted={onAccepted}
isError={isError}
toggleExpanded={toggleExpanded}
+ toggleSubtree={toggleSubtree}
highlightedItem={highlightedItem}
setHighlightedItem={setHighlightedItem}
render={render}
@@ -205,6 +220,7 @@ type TreeItemHeaderProps<T> = {
selectedItem: T | undefined,
onSelected?: (item: T) => void,
toggleExpanded: (item: T) => void,
+ toggleSubtree: (item: T) => void,
highlightedItem: T | undefined,
isError?: (item: T) => boolean,
onAccepted?: (item: T) => void,
@@ -226,6 +242,7 @@ export function TreeItemHeader<T extends TreeItem>({
isError,
onAccepted,
toggleExpanded,
+ toggleSubtree,
render,
title,
icon,
@@ -276,7 +293,10 @@ export function TreeItemHeader<T extends TreeItem>({
onClick={e => {
e.stopPropagation();
e.preventDefault();
- toggleExpanded(item);
+ if (e.altKey)
+ toggleSubtree(item);
+ else
+ toggleExpanded(item);
}}
/>
{icon && <div className={'codicon ' + iconed} style={{ minWidth: 16, marginRight: 4 }} aria-label={'[' + iconed.replace('codicon', 'icon') + ']'}></div>}
@@ -294,6 +314,7 @@ export function TreeItemHeader<T extends TreeItem>({
onAccepted={onAccepted}
isError={isError}
toggleExpanded={toggleExpanded}
+ toggleSubtree={toggleSubtree}
highlightedItem={highlightedItem}
setHighlightedItem={setHighlightedItem}
render={render}
diff --git a/tests/playwright-test/ui-mode-test-tree.spec.ts b/tests/playwright-test/ui-mode-test-tree.spec.ts
index e663b986b6..36942507b6 100644
--- a/tests/playwright-test/ui-mode-test-tree.spec.ts
+++ b/tests/playwright-test/ui-mode-test-tree.spec.ts
@@ -480,6 +480,66 @@ test('should expand all', {
`);
});
+test('should allow expanding entire subtrees', async ({ runUITest }) => {
+ const { page } = await runUITest(basicTestTree);
+
+ await page.getByTestId('test-tree').getByText('suite').click();
+ await page.getByTitle('Collapse all').click();
+ await expect.poll(dumpTestTree(page)).toContain(`
+ ► ◯ a.test.ts
+ ► ◯ b.test.ts
+ `);
+
+ const firstTestClosedLocator = page.getByTitle('a.test.ts').locator('.codicon-chevron-right').first();
+ const firstTestOpenLocator = page.getByTitle('a.test.ts').locator('.codicon-chevron-down').first();
+
+ await firstTestClosedLocator.click();
+ await expect.poll(dumpTestTree(page)).toContain(`
+ ▼ ◯ a.test.ts
+ ◯ passes
+ ◯ fails
+ ► ◯ suite
+ ► ◯ b.test.ts
+ `);
+
+ await firstTestOpenLocator.click();
+ await firstTestClosedLocator.click({ modifiers: ['Alt'] });
+
+ await expect.poll(dumpTestTree(page)).toContain(`
+ ▼ ◯ a.test.ts
+ ◯ passes
+ ◯ fails
+ ▼ ◯ suite
+ ◯ inner passes
+ ◯ inner fails
+ ► ◯ b.test.ts
+ `);
+
+ await firstTestOpenLocator.click();
+ await firstTestClosedLocator.click();
+
+ await expect.poll(dumpTestTree(page)).toContain(`
+ ▼ ◯ a.test.ts
+ ◯ passes
+ ◯ fails
+ ▼ ◯ suite
+ ◯ inner passes
+ ◯ inner fails
+ ► ◯ b.test.ts
+ `);
+
+ await firstTestOpenLocator.click({ modifiers: ['Alt'] });
+ await firstTestClosedLocator.click();
+
+ await expect.poll(dumpTestTree(page)).toContain(`
+ ▼ ◯ a.test.ts
+ ◯ passes
+ ◯ fails
+ ► ◯ suite
+ ► ◯ b.test.ts
+ `);
+});
+
test('should resolve title conflicts', async ({ runUITest }) => {
const { page } = await runUITest({
'a.test.ts': `