Skip to content

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

fix(trace-viewer): keep selected action in view after "Show all" (#40809)

Yury Semikhatsky62d1ea1ae572
diff --git a/packages/trace-viewer/src/ui/actionList.tsx b/packages/trace-viewer/src/ui/actionList.tsx
index 8f4e6ccaa3..07d1d12297 100644
--- a/packages/trace-viewer/src/ui/actionList.tsx
+++ b/packages/trace-viewer/src/ui/actionList.tsx
@@ -102,8 +102,14 @@ export const ActionList: React.FC<ActionListProps> = ({
onHighlighted?.(item?.action);
}, [onHighlighted]);
+ const [showAllCounter, setShowAllCounter] = React.useState<number>();
+ const onShowAll = React.useCallback(() => {
+ setSelectedTime(undefined);
+ setShowAllCounter(n => (n ?? 0) + 1);
+ }, [setSelectedTime]);
+
return <div className='vbox action-list-container'>
- {selectedTime && <div className='action-list-show-all' onClick={() => setSelectedTime(undefined)}><span className='codicon codicon-triangle-left'></span>Show all</div>}
+ {selectedTime && <div className='action-list-show-all' onClick={onShowAll}><span className='codicon codicon-triangle-left'></span>Show all</div>}
<ActionTreeView
name='actions'
rootItem={rootItem}
@@ -117,6 +123,7 @@ export const ActionList: React.FC<ActionListProps> = ({
isVisible={isVisible}
render={render}
autoExpandDepth={actionFilterText?.trim() ? 5 : 0}
+ revealSelectedKey={showAllCounter}
/>
</div>;
};
diff --git a/packages/web/src/components/treeView.tsx b/packages/web/src/components/treeView.tsx
index 2f406180bb..a2d584bb86 100644
--- a/packages/web/src/components/treeView.tsx
+++ b/packages/web/src/components/treeView.tsx
@@ -45,6 +45,7 @@ export type TreeViewProps<T> = {
treeState: TreeState,
setTreeState: (treeState: TreeState) => void,
autoExpandDepth?: number,
+ revealSelectedKey?: number,
};
const scrollPositions = new Map<string, number>();
@@ -66,6 +67,7 @@ export function TreeView<T extends TreeItem>({
noItemsMessage,
dataTestId,
autoExpandDepth,
+ revealSelectedKey,
}: TreeViewProps<T>) {
const treeItems = React.useMemo(() => {
return indexTree<T>(rootItem, selectedItem, treeState.expandedItems, autoExpandDepth || 0, isVisible);
@@ -94,6 +96,14 @@ export function TreeView<T extends TreeItem>({
itemListRef.current.scrollTop = scrollPositions.get(name) || 0;
}, [name]);
+ React.useEffect(() => {
+ if (revealSelectedKey === undefined)
+ return;
+ const selectedEl = itemListRef.current?.querySelector('[aria-selected="true"]');
+ if (selectedEl)
+ scrollIntoViewIfNeeded(selectedEl);
+ }, [revealSelectedKey]);
+
const toggleExpanded = React.useCallback((item: T) => {
const { expanded } = treeItems.get(item)!;
if (expanded) {
diff --git a/tests/library/trace-viewer.spec.ts b/tests/library/trace-viewer.spec.ts
index 813bd79351..689b6d0471 100644
--- a/tests/library/trace-viewer.spec.ts
+++ b/tests/library/trace-viewer.spec.ts
@@ -207,6 +207,29 @@ test('should filter actions by text', async ({ showTraceViewer }) => {
await expect(traceViewer.actionTitles).toHaveCount(fullCount);
});
+test('should keep selected action in view after Show all', async ({ runAndTrace, page }) => {
+ test.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/40808' });
+ const traceViewer = await runAndTrace(async () => {
+ await page.setContent('<div>hello</div>');
+ for (let i = 0; i < 50; i++)
+ await page.evaluate(x => x, i);
+ });
+
+ const treeItems = traceViewer.actionsTree.getByRole('treeitem');
+ const deepAction = treeItems.filter({ hasText: 'Evaluate' }).nth(40);
+ await deepAction.scrollIntoViewIfNeeded();
+ await deepAction.dblclick();
+
+ const showAll = traceViewer.page.locator('.action-list-show-all');
+ await expect(showAll).toBeVisible();
+ await showAll.click();
+ await expect(showAll).toBeHidden();
+
+ const selected = traceViewer.actionsTree.locator('[role="treeitem"][aria-selected="true"]');
+ await expect(selected).toHaveCount(1);
+ await expect(selected).toBeInViewport();
+});
+
test('should open uncompressed trace directory', async ({ showTraceViewer }) => {
const traceDir = test.info().outputPath('unzipped-trace');
await extractZip(traceFile, { dir: traceDir });