Skip to content

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

feat(web): canonical keyboard traversal and focus rings (#41434)

Pavel Feldman72601dfd6198
diff --git a/packages/web/src/common.css b/packages/web/src/common.css
index ec84251f46..19f7cdc574 100644
--- a/packages/web/src/common.css
+++ b/packages/web/src/common.css
@@ -177,6 +177,11 @@ input[type=text], input[type=search] {
outline: none;
}
+input[type=text]:focus-visible, input[type=search]:focus-visible {
+ outline: 1px solid var(--vscode-focusBorder);
+ outline-offset: -1px;
+}
+
.codicon-loading {
animation: spin 1s infinite linear;
}
diff --git a/packages/web/src/components/codeMirrorWrapper.css b/packages/web/src/components/codeMirrorWrapper.css
index 61ba36bbf0..afec44ffde 100644
--- a/packages/web/src/components/codeMirrorWrapper.css
+++ b/packages/web/src/components/codeMirrorWrapper.css
@@ -20,6 +20,10 @@
line-height: 18px;
}
+.cm-wrapper:has(textarea:focus-visible) {
+ outline: 1px solid var(--vscode-focusBorder);
+}
+
.cm-wrapper, .cm-wrapper > div {
width: 100%;
height: 100%;
diff --git a/packages/web/src/components/codeMirrorWrapper.tsx b/packages/web/src/components/codeMirrorWrapper.tsx
index 385a42b603..19f48c26ae 100644
--- a/packages/web/src/components/codeMirrorWrapper.tsx
+++ b/packages/web/src/components/codeMirrorWrapper.tsx
@@ -110,7 +110,9 @@ export const CodeMirrorWrapper: React.FC<SourceProps> = ({
autoCloseBrackets: true,
extraKeys: {
'Ctrl-F': 'findPersistent',
- 'Cmd-F': 'findPersistent'
+ 'Cmd-F': 'findPersistent',
+ 'Tab': false,
+ 'Shift-Tab': false,
}
});
codemirrorRef.current = { cm };
diff --git a/packages/web/src/components/tabbedPane.css b/packages/web/src/components/tabbedPane.css
index d3291e02bf..b5ba591988 100644
--- a/packages/web/src/components/tabbedPane.css
+++ b/packages/web/src/components/tabbedPane.css
@@ -39,11 +39,20 @@
align-items: center;
justify-content: center;
user-select: none;
+ background: none;
+ border: none;
border-bottom: 2px solid transparent;
+ color: inherit;
+ font: inherit;
outline: none;
height: 100%;
}
+.tabbed-pane-tab:focus-visible {
+ outline: 1px solid var(--vscode-focusBorder);
+ outline-offset: -1px;
+}
+
.tabbed-pane-tab-label {
max-width: 250px;
white-space: pre;
diff --git a/packages/web/src/components/tabbedPane.tsx b/packages/web/src/components/tabbedPane.tsx
index a031cdaa07..5b9132ce8b 100644
--- a/packages/web/src/components/tabbedPane.tsx
+++ b/packages/web/src/components/tabbedPane.tsx
@@ -42,6 +42,7 @@ export const TabbedPane: React.FunctionComponent<{
selectedTab = tabs[0].id;
if (!mode)
mode = 'default';
+
return <div className='tabbed-pane' data-testid={dataTestId}>
<div className='vbox'>
<Toolbar>
@@ -102,7 +103,7 @@ export const TabbedPaneTab: React.FunctionComponent<{
onSelect?: (id: string) => void,
ariaControls?: string,
}> = ({ id, title, count, errorCount, selected, onSelect, ariaControls }) => {
- return <div className={clsx('tabbed-pane-tab', selected && 'selected')}
+ return <button className={clsx('tabbed-pane-tab', selected && 'selected')}
onClick={() => onSelect?.(id)}
role='tab'
title={title}
@@ -111,5 +112,5 @@ export const TabbedPaneTab: React.FunctionComponent<{
<div className='tabbed-pane-tab-label'>{title}</div>
{!!count && <div className='tabbed-pane-tab-counter'>{count}</div>}
{!!errorCount && <div className='tabbed-pane-tab-counter error'>{errorCount}</div>}
- </div>;
+ </button>;
};
diff --git a/packages/web/src/components/toolbar.css b/packages/web/src/components/toolbar.css
index 74b1f4664a..b3458a42f6 100644
--- a/packages/web/src/components/toolbar.css
+++ b/packages/web/src/components/toolbar.css
@@ -68,3 +68,8 @@
color: var(--vscode-input-foreground);
background-color: var(--vscode-input-background);
}
+
+.toolbar input:focus-visible, .toolbar select:focus-visible {
+ outline: 1px solid var(--vscode-focusBorder);
+ outline-offset: -1px;
+}
diff --git a/packages/web/src/components/toolbarButton.css b/packages/web/src/components/toolbarButton.css
index 6a11356361..5feeaddfa6 100644
--- a/packages/web/src/components/toolbarButton.css
+++ b/packages/web/src/components/toolbarButton.css
@@ -28,6 +28,11 @@
border-radius: 4px;
}
+.toolbar-button:focus-visible {
+ outline: 1px solid var(--vscode-focusBorder);
+ outline-offset: -1px;
+}
+
.toolbar-button:disabled {
color: var(--vscode-disabledForeground) !important;
cursor: default;