Skip to content

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

feat(dashboard): use browser brand icons in sidebar (#40267)

Simon Knott761ece1c8ade
diff --git a/package-lock.json b/package-lock.json
index 29efbb5aa5..b1ce8d7e90 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -959,6 +959,56 @@
"node": ">=6.9.0"
}
},
+ "node_modules/@browser-logos/chrome": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/@browser-logos/chrome/-/chrome-2.0.0.tgz",
+ "integrity": "sha512-JDr78z/3x4zTtBgZ0bunFq9D4QhjT5gPBy90rpJQ5VlJugK/7xGFUgwUIkVT5vfU7lTi2F0wB/5XeOPrV67ErA=="
+ },
+ "node_modules/@browser-logos/chrome-beta": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/@browser-logos/chrome-beta/-/chrome-beta-3.0.0.tgz",
+ "integrity": "sha512-dfzzUd/ptnuWu5oVRMlEgCBiWSBsiK88DCc7O7CMZKPE5ECI2KOEEQRUUOGbF7O/XhGGKkne+8QNM9ENmhrExg=="
+ },
+ "node_modules/@browser-logos/chrome-canary": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/@browser-logos/chrome-canary/-/chrome-canary-2.0.0.tgz",
+ "integrity": "sha512-v1/+LivvuF4KPPzecaRNs5a6+ujSfwVz1YpUF4DOyQN+2W5irEtgQVjREIJ9knGWKDmx9mk+FGxBspoOXzL91Q=="
+ },
+ "node_modules/@browser-logos/chrome-dev": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/@browser-logos/chrome-dev/-/chrome-dev-3.0.0.tgz",
+ "integrity": "sha512-IowF8LYx6djAlE5YqfVALQi6Eb+eX7enIpxM+PSX05uftwBuIPa+ceGslVRdBMEaFKVmRx9hn4qyOTIrXId8yA=="
+ },
+ "node_modules/@browser-logos/chromium": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/@browser-logos/chromium/-/chromium-2.0.1.tgz",
+ "integrity": "sha512-Zhov3w5ITmwJYX2IJgSlA2sW9Qu/YMaAKGs8vRrN0tf1OtVybpI81gXKpWIsuYaQc5u97/mqUKa2x9xJsk7Djg=="
+ },
+ "node_modules/@browser-logos/edge": {
+ "version": "2.0.7",
+ "resolved": "https://registry.npmjs.org/@browser-logos/edge/-/edge-2.0.7.tgz",
+ "integrity": "sha512-hH7CXLY5kCqSCF5ZJdJ+kkzd/0kj8E+wfBIQyLcX6VHugSBhJiRU5y1njIOSkZxMUgXSO3HjV1i4LnBDFHCkzg=="
+ },
+ "node_modules/@browser-logos/firefox": {
+ "version": "3.0.10",
+ "resolved": "https://registry.npmjs.org/@browser-logos/firefox/-/firefox-3.0.10.tgz",
+ "integrity": "sha512-Bys3b02btUOvZyt02fFXfqPiNhYX6ukCtdvs4ERCSYnf6BVqCqeBR8niRYgyaECTdZwzqNCaUUKwQ0JX7lV1/A=="
+ },
+ "node_modules/@browser-logos/firefox-beta": {
+ "version": "4.1.4",
+ "resolved": "https://registry.npmjs.org/@browser-logos/firefox-beta/-/firefox-beta-4.1.4.tgz",
+ "integrity": "sha512-Mn/wFXQg5m/z1z/xWNKxrXEYJzTG+GODZRGVv8uqugxKYsKQgTyItrJoes4jNdJZ9boXmNwmH8NhAZRw1fdFqw=="
+ },
+ "node_modules/@browser-logos/firefox-nightly": {
+ "version": "3.0.6",
+ "resolved": "https://registry.npmjs.org/@browser-logos/firefox-nightly/-/firefox-nightly-3.0.6.tgz",
+ "integrity": "sha512-EDpPnd2kYJ8KIbnDPe9DSfyXo/gQIWZEYjx29A3UEEXOU8eokivkvkX1RGGSvtdG6466pR5amyjt7oyGcS6GUA=="
+ },
+ "node_modules/@browser-logos/safari": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/@browser-logos/safari/-/safari-2.1.0.tgz",
+ "integrity": "sha512-diidPiK62E4hlAh0dyLfWQDZXi2SSAGiOuw6iqD1x8ztw7L/Sz3He46FhcxEzYa1hKi1blCkjnKDjqw6rQfgcA=="
+ },
"node_modules/@electron/get": {
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/@electron/get/-/get-2.0.3.tgz",
@@ -9608,7 +9658,19 @@
},
"packages/dashboard": {
"name": "@playwright/dashboard",
- "version": "0.0.0"
+ "version": "0.0.0",
+ "dependencies": {
+ "@browser-logos/chrome": "2.0.0",
+ "@browser-logos/chrome-beta": "3.0.0",
+ "@browser-logos/chrome-canary": "2.0.0",
+ "@browser-logos/chrome-dev": "3.0.0",
+ "@browser-logos/chromium": "2.0.1",
+ "@browser-logos/edge": "2.0.7",
+ "@browser-logos/firefox": "3.0.10",
+ "@browser-logos/firefox-beta": "4.1.4",
+ "@browser-logos/firefox-nightly": "3.0.6",
+ "@browser-logos/safari": "2.1.0"
+ }
},
"packages/devtools": {
"name": "@playwright/devtools",
diff --git a/packages/dashboard/package.json b/packages/dashboard/package.json
index 0654986212..7777cf8c76 100644
--- a/packages/dashboard/package.json
+++ b/packages/dashboard/package.json
@@ -2,5 +2,17 @@
"name": "@playwright/dashboard",
"private": true,
"version": "0.0.0",
- "type": "module"
+ "type": "module",
+ "dependencies": {
+ "@browser-logos/chrome": "2.0.0",
+ "@browser-logos/chrome-beta": "3.0.0",
+ "@browser-logos/chrome-canary": "2.0.0",
+ "@browser-logos/chrome-dev": "3.0.0",
+ "@browser-logos/chromium": "2.0.1",
+ "@browser-logos/edge": "2.0.7",
+ "@browser-logos/firefox": "3.0.10",
+ "@browser-logos/firefox-beta": "4.1.4",
+ "@browser-logos/firefox-nightly": "3.0.6",
+ "@browser-logos/safari": "2.1.0"
+ }
}
diff --git a/packages/dashboard/src/icons.tsx b/packages/dashboard/src/icons.tsx
index 93ebc1cdb1..5c88e270c6 100644
--- a/packages/dashboard/src/icons.tsx
+++ b/packages/dashboard/src/icons.tsx
@@ -16,6 +16,53 @@
import React from 'react';
+import chromeSvg from '@browser-logos/chrome/chrome.svg';
+import chromeBetaSvg from '@browser-logos/chrome-beta/chrome-beta.svg';
+import chromeCanarySvg from '@browser-logos/chrome-canary/chrome-canary.svg';
+import chromeDevSvg from '@browser-logos/chrome-dev/chrome-dev.svg';
+import chromiumSvg from '@browser-logos/chromium/chromium.svg';
+import firefoxSvg from '@browser-logos/firefox/firefox.svg';
+import firefoxBetaSvg from '@browser-logos/firefox-beta/firefox-beta.svg';
+import firefoxNightlySvg from '@browser-logos/firefox-nightly/firefox-nightly.svg';
+import safariSvg from '@browser-logos/safari/safari.svg';
+import edgeSvg from '@browser-logos/edge/edge.svg';
+
+// Keys include both browserName values ('chromium' | 'firefox' | 'webkit') and
+// LaunchOptions.channel values accepted by Playwright.
+export const browserIconUrls: Record<string, string> = {
+ // Open-source Chromium (plus the headless shell + chrome-for-testing variants).
+ 'chromium': chromiumSvg,
+ 'chromium-headless-shell': chromiumSvg,
+ 'chrome-for-testing': chromiumSvg,
+ // Google Chrome stable + per-channel icons.
+ 'chrome': chromeSvg,
+ 'chrome-beta': chromeBetaSvg,
+ 'chrome-dev': chromeDevSvg,
+ 'chrome-canary': chromeCanarySvg,
+ // Firefox: stable (bundled + moz-firefox) + dedicated beta/nightly icons.
+ 'firefox': firefoxSvg,
+ 'moz-firefox': firefoxSvg,
+ 'firefox-beta': firefoxBetaSvg,
+ 'moz-firefox-beta': firefoxBetaSvg,
+ 'moz-firefox-nightly': firefoxNightlySvg,
+ // Safari / WebKit.
+ 'webkit': safariSvg,
+ // Microsoft Edge — the @browser-logos packages only ship SVG for stable, so use it for all channels.
+ 'msedge': edgeSvg,
+ 'msedge-beta': edgeSvg,
+ 'msedge-dev': edgeSvg,
+ 'msedge-canary': edgeSvg,
+};
+
+export const BrowserIcon: React.FC<{ browserName?: string, channel?: string }> = ({ browserName, channel }) => {
+ const key = channel && browserIconUrls[channel] ? channel : browserName;
+ const url = key ? browserIconUrls[key] : undefined;
+ if (url)
+ return <img className='browser-icon-img' src={url} alt='' aria-hidden='true' />;
+ const initial = browserName ? browserName[0].toUpperCase() : '?';
+ return <span className='browser-icon-fallback' aria-hidden='true'>{initial}</span>;
+};
+
export const ChevronLeftIcon: React.FC = () => (
<svg viewBox='0 0 24 24' fill='none' stroke='currentColor' strokeWidth='2' strokeLinecap='round' strokeLinejoin='round' aria-hidden='true'>
<polyline points='15 18 9 12 15 6'/>
diff --git a/packages/dashboard/src/sessionSidebar.css b/packages/dashboard/src/sessionSidebar.css
index 9aaad8852d..9c06160033 100644
--- a/packages/dashboard/src/sessionSidebar.css
+++ b/packages/dashboard/src/sessionSidebar.css
@@ -135,6 +135,22 @@
}
.session-browser-icon {
+ width: 100%;
+ height: 100%;
+ border-radius: 50%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ transition: opacity 120ms ease;
+}
+
+.session-browser-icon .browser-icon-img {
+ width: 80%;
+ height: 80%;
+ display: block;
+}
+
+.session-browser-icon .browser-icon-fallback {
width: 100%;
height: 100%;
border-radius: 50%;
@@ -145,7 +161,6 @@
justify-content: center;
font-size: 10px;
font-weight: 700;
- transition: opacity 120ms ease;
}
.session-browser-close {
diff --git a/packages/dashboard/src/sessionSidebar.tsx b/packages/dashboard/src/sessionSidebar.tsx
index d2771cd81e..b8c51835f3 100644
--- a/packages/dashboard/src/sessionSidebar.tsx
+++ b/packages/dashboard/src/sessionSidebar.tsx
@@ -18,6 +18,7 @@ import React from 'react';
import './sessionSidebar.css';
import { DashboardClientContext } from './dashboardContext';
import { SettingsButton } from './settingsView';
+import { BrowserIcon } from './icons';
import { ToolbarButton } from '@web/components/toolbarButton';
import type { Tab, DashboardChannelEvents } from './dashboardChannel';
@@ -123,12 +124,14 @@ export const SessionSidebar: React.FC<SessionSidebarProps> = ({ model, onSelectT
{entries.map(session => {
const guid = session.browser.guid;
const browserType = session.browser.browserName;
- const browserInitial = browserType ? browserType[0].toUpperCase() : '?';
+ const channel = session.browser.launchOptions?.channel;
const tabs = allTabs === null ? undefined : (tabsByBrowser.get(guid) ?? []);
return <div key={guid} className='session-chip sidebar-session' role='listitem' title={session.title}>
<div className='sidebar-session-row'>
- <div className='session-browser-icon-wrap' title={browserType}>
- <span className='session-browser-icon' aria-hidden='true'>{browserInitial}</span>
+ <div className='session-browser-icon-wrap' title={channel || browserType}>
+ <span className='session-browser-icon' aria-hidden='true'>
+ <BrowserIcon browserName={browserType} channel={channel} />
+ </span>
<ToolbarButton
className='session-browser-close'
icon='close'