Skip to content

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

chore: revert bogus keyboard navigability attempts (#41432)

Pavel Feldmanc47f96a5d0ef
diff --git a/packages/html-reporter/src/tabbedPane.tsx b/packages/html-reporter/src/tabbedPane.tsx
index a2e8fab51c..a1e533348b 100644
--- a/packages/html-reporter/src/tabbedPane.tsx
+++ b/packages/html-reporter/src/tabbedPane.tsx
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-import { clsx, handleTabListKeyDown } from '@web/uiUtils';
+import { clsx } from '@web/uiUtils';
import './colors.css';
import './tabbedPane.css';
import * as React from 'react';
@@ -32,25 +32,16 @@ export const TabbedPane: React.FunctionComponent<{
setSelectedTab: (tab: string) => void
}> = ({ tabs, selectedTab, setSelectedTab }) => {
const idPrefix = React.useId();
- const tabStripRef = React.useRef<HTMLDivElement>(null);
-
- const handleKeyDown = (e: React.KeyboardEvent) => {
- const nextIndex = handleTabListKeyDown(e, tabStripRef.current);
- if (nextIndex !== -1)
- setSelectedTab(tabs[nextIndex].id);
- };
-
return <div className='tabbed-pane'>
<div className='vbox'>
<div className='hbox' style={{ flex: 'none' }}>
- <div className='tabbed-pane-tab-strip' role='tablist' onKeyDown={handleKeyDown} ref={tabStripRef}>{
+ <div className='tabbed-pane-tab-strip' role='tablist'>{
tabs.map(tab => (
<div className={clsx('tabbed-pane-tab-element', selectedTab === tab.id && 'selected')}
onClick={() => setSelectedTab(tab.id)}
id={`${idPrefix}-${tab.id}`}
key={tab.id}
role='tab'
- tabIndex={selectedTab === tab.id ? 0 : -1}
aria-selected={selectedTab === tab.id}>
<div className='tabbed-pane-tab-label'>{tab.title}</div>
</div>
diff --git a/packages/trace-viewer/src/ui/networkFilters.tsx b/packages/trace-viewer/src/ui/networkFilters.tsx
index df6fcbca58..df0f0b9e73 100644
--- a/packages/trace-viewer/src/ui/networkFilters.tsx
+++ b/packages/trace-viewer/src/ui/networkFilters.tsx
@@ -14,8 +14,6 @@
* limitations under the License.
*/
-import * as React from 'react';
-import { handleTabListKeyDown } from '@web/uiUtils';
import './networkFilters.css';
const resourceTypes = ['Fetch', 'HTML', 'JS', 'CSS', 'Font', 'Image', 'WS'] as const;
@@ -32,14 +30,6 @@ export const NetworkFilters = ({ filterState, onFilterStateChange }: {
filterState: FilterState,
onFilterStateChange: (filterState: FilterState) => void,
}) => {
- const tabListRef = React.useRef<HTMLDivElement>(null);
-
- const handleKeyDown = (e: React.KeyboardEvent) => {
- handleTabListKeyDown(e, tabListRef.current);
- };
-
- const isAllSelected = filterState.resourceTypes.size === 0;
-
return (
<div className='network-filters'>
<input
@@ -50,14 +40,11 @@ export const NetworkFilters = ({ filterState, onFilterStateChange }: {
onChange={e => onFilterStateChange({ ...filterState, searchValue: e.target.value })}
/>
- <div className='network-filters-resource-types' role='tablist' aria-multiselectable='true' onKeyDown={handleKeyDown} ref={tabListRef}>
+ <div className='network-filters-resource-types' role='tablist' aria-multiselectable='true'>
<div
title='All'
onClick={() => onFilterStateChange({ ...filterState, resourceTypes: new Set() })}
- className={`network-filters-resource-type ${isAllSelected ? 'selected' : ''}`}
- role='tab'
- tabIndex={isAllSelected ? 0 : -1}
- aria-selected={isAllSelected}
+ className={`network-filters-resource-type ${filterState.resourceTypes.size === 0 ? 'selected' : ''}`}
>
All
</div>
@@ -77,7 +64,6 @@ export const NetworkFilters = ({ filterState, onFilterStateChange }: {
}}
className={`network-filters-resource-type ${filterState.resourceTypes.has(resourceType) ? 'selected' : ''}`}
role='tab'
- tabIndex={filterState.resourceTypes.has(resourceType) ? 0 : -1}
aria-selected={filterState.resourceTypes.has(resourceType)}
>
{resourceType}
diff --git a/packages/web/src/components/tabbedPane.tsx b/packages/web/src/components/tabbedPane.tsx
index b0084b4abc..a031cdaa07 100644
--- a/packages/web/src/components/tabbedPane.tsx
+++ b/packages/web/src/components/tabbedPane.tsx
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-import { clsx, handleTabListKeyDown } from '../uiUtils';
+import { clsx } from '../uiUtils';
import './tabbedPane.css';
import { Toolbar } from './toolbar';
import * as React from 'react';
@@ -38,25 +38,17 @@ export const TabbedPane: React.FunctionComponent<{
mode?: 'default' | 'select',
}> = ({ tabs, selectedTab, setSelectedTab, leftToolbar, rightToolbar, dataTestId, mode }) => {
const id = React.useId();
- const tabListRef = React.useRef<HTMLDivElement>(null);
if (!selectedTab)
selectedTab = tabs[0].id;
if (!mode)
mode = 'default';
-
- const handleKeyDown = (e: React.KeyboardEvent) => {
- const nextIndex = handleTabListKeyDown(e, tabListRef.current);
- if (nextIndex !== -1)
- setSelectedTab?.(tabs[nextIndex].id);
- };
-
return <div className='tabbed-pane' data-testid={dataTestId}>
<div className='vbox'>
<Toolbar>
{ leftToolbar && <div style={{ flex: 'none', display: 'flex', margin: '0 4px', alignItems: 'center' }}>
{...leftToolbar}
</div>}
- {mode === 'default' && <div style={{ flex: 'auto', display: 'flex', height: '100%', overflow: 'hidden' }} role='tablist' onKeyDown={handleKeyDown} ref={tabListRef}>
+ {mode === 'default' && <div style={{ flex: 'auto', display: 'flex', height: '100%', overflow: 'hidden' }} role='tablist'>
{[...tabs.map(tab => (
<TabbedPaneTab
key={tab.id}
@@ -67,7 +59,6 @@ export const TabbedPane: React.FunctionComponent<{
errorCount={tab.errorCount}
selected={selectedTab === tab.id}
onSelect={setSelectedTab}
- tabIndex={selectedTab === tab.id ? 0 : -1}
/>)),
]}
</div>}
@@ -110,13 +101,11 @@ export const TabbedPaneTab: React.FunctionComponent<{
selected?: boolean,
onSelect?: (id: string) => void,
ariaControls?: string,
- tabIndex?: number,
-}> = ({ id, title, count, errorCount, selected, onSelect, ariaControls, tabIndex }) => {
+}> = ({ id, title, count, errorCount, selected, onSelect, ariaControls }) => {
return <div className={clsx('tabbed-pane-tab', selected && 'selected')}
onClick={() => onSelect?.(id)}
role='tab'
title={title}
- tabIndex={tabIndex ?? (selected ? 0 : -1)}
aria-controls={ariaControls}
aria-selected={selected}>
<div className='tabbed-pane-tab-label'>{title}</div>
diff --git a/packages/web/src/uiUtils.ts b/packages/web/src/uiUtils.ts
index bd2c73344e..48b68f91e0 100644
--- a/packages/web/src/uiUtils.ts
+++ b/packages/web/src/uiUtils.ts
@@ -210,27 +210,6 @@ export function scrollIntoViewIfNeeded(element: Element | undefined) {
element?.scrollIntoView();
}
-export function handleTabListKeyDown(e: React.KeyboardEvent, tabListElement: HTMLElement | null): number {
- const tabElements = Array.from(tabListElement?.querySelectorAll('[role="tab"]') ?? []) as HTMLElement[];
- const currentIndex = tabElements.findIndex(el => el === document.activeElement);
- if (currentIndex === -1)
- return -1;
- let nextIndex = currentIndex;
- if (e.key === 'ArrowRight')
- nextIndex = (currentIndex + 1) % tabElements.length;
- else if (e.key === 'ArrowLeft')
- nextIndex = (currentIndex - 1 + tabElements.length) % tabElements.length;
- else if (e.key === 'Home')
- nextIndex = 0;
- else if (e.key === 'End')
- nextIndex = tabElements.length - 1;
- else
- return -1;
- e.preventDefault();
- tabElements[nextIndex].focus();
- return nextIndex;
-}
-
const kControlCodesRe = '\\u0000-\\u0020\\u007f-\\u009f';
export const kWebLinkRe = new RegExp('(?:[a-zA-Z][a-zA-Z0-9+.-]{2,}:\\/\\/|www\\.)[^\\s' + kControlCodesRe + '"]{2,}[^\\s' + kControlCodesRe + '"\')}\\],:;.!?]', 'ug');
diff --git a/tests/playwright-test/ui-mode-test-network-tab.spec.ts b/tests/playwright-test/ui-mode-test-network-tab.spec.ts
index 77225d56f4..406336e75c 100644
--- a/tests/playwright-test/ui-mode-test-network-tab.spec.ts
+++ b/tests/playwright-test/ui-mode-test-network-tab.spec.ts
@@ -478,51 +478,3 @@ test('should preserve selection during test run', async ({ runUITest, server },
await page.waitForTimeout(1000);
await expect(headersPanel).toBeVisible();
});
-
-test('should support keyboard navigation for resource type filters', async ({ runUITest, server }) => {
- server.setRoute('/api/endpoint', (_, res) => res.setHeader('Content-Type', 'application/json').end());
-
- const { page } = await runUITest({
- 'network-tab.test.ts': `
- import { test, expect } from '@playwright/test';
- test('network tab test', async ({ page }) => {
- await page.goto('${server.PREFIX}/network-tab/network.html');
- await page.evaluate(() => (window as any).donePromise);
- });
- `,
- });
-
- await page.getByRole('treeitem', { name: 'network tab test' }).dblclick();
- await expect(page.getByTestId('workbench-run-status')).toContainText('Passed');
-
- await page.getByRole('tab', { name: 'Network' }).click();
-
- const filters = page.locator('.network-filters-resource-types');
-
- // Focus the "All" tab and navigate with arrow keys.
- await filters.getByText('All', { exact: true }).focus();
- await page.keyboard.press('ArrowRight');
- await expect(filters.getByText('Fetch', { exact: true })).toBeFocused();
-
- await page.keyboard.press('ArrowRight');
- await expect(filters.getByText('HTML', { exact: true })).toBeFocused();
-
- await page.keyboard.press('ArrowRight');
- await expect(filters.getByText('JS', { exact: true })).toBeFocused();
-
- // ArrowLeft goes back.
- await page.keyboard.press('ArrowLeft');
- await expect(filters.getByText('HTML', { exact: true })).toBeFocused();
-
- // Home jumps to first tab.
- await page.keyboard.press('Home');
- await expect(filters.getByText('All', { exact: true })).toBeFocused();
-
- // End jumps to last tab.
- await page.keyboard.press('End');
- await expect(filters.getByText('WS', { exact: true })).toBeFocused();
-
- // Wraps around from last to first.
- await page.keyboard.press('ArrowRight');
- await expect(filters.getByText('All', { exact: true })).toBeFocused();
-});