Playwright is a framework for Web Testing and Automation. It allows testing Chromium, Firefox and WebKit with a single API.
TypeScript automationchromechromiume2e-testingelectronend-to-end-testingfirefoxjavascriptplaywrighttesttest-automationtestingtesting-toolswebwebkit
chore(devtools): UI overhaul (#39366)
Simon Knott8a8159a93950
diff --git a/packages/devtools/src/common.css b/packages/devtools/src/common.cssindex d5a3f7ee95..6ca0d0468c 100644--- a/packages/devtools/src/common.css+++ b/packages/devtools/src/common.css@@ -25,6 +25,40 @@--accent: #8ab4f8;--ok: #81c995;--err: #f28b82;+ --overlay-hover: rgba(255, 255, 255, 0.08);+ --overlay-active: rgba(255, 255, 255, 0.12);+ --selection-bg: #394457;+ --toast-bg: rgba(32, 33, 36, 0.85);+ --toast-border: rgba(255, 255, 255, 0.1);+ --segmented-bg: rgb(255 255 255 / 0.1);+ --segmented-knob: rgb(255 255 255 / 0.2);+ --card-border: transparent;+ --card-shadow: none;+ color-scheme: dark light;+}++@media (prefers-color-scheme: light) {+ :root {+ --bg: #f0f2f5;+ --bg-elevated: #ffffff;+ --bg-card: #ffffff;+ --bg-tab: #e4e6e9;+ --fg: #1a1a1a;+ --fg-dim: #444746;+ --fg-muted: #80868b;+ --accent: #1a73e8;+ --ok: #1e8e3e;+ --err: #d93025;+ --overlay-hover: rgba(0, 0, 0, 0.06);+ --overlay-active: rgba(0, 0, 0, 0.1);+ --selection-bg: #b3d4fc;+ --toast-bg: rgba(255, 255, 255, 0.92);+ --toast-border: rgba(0, 0, 0, 0.12);+ --segmented-bg: rgb(0 0 0 / 0.08);+ --segmented-knob: rgb(0 0 0 / 0.12);+ --card-border: rgba(0, 0, 0, 0.06);+ --card-shadow: 0 1px 3px rgba(0, 0, 0, 0.08);+ }}*,diff --git a/packages/devtools/src/devtools.css b/packages/devtools/src/devtools.cssindex 6e88fe1674..41a5b5c6c7 100644--- a/packages/devtools/src/devtools.css+++ b/packages/devtools/src/devtools.css@@ -15,6 +15,7 @@*/.devtools-view {+ --interactive-orange: 238 134 12;display: flex;flex-direction: column;height: 100%;@@ -27,8 +28,89 @@align-items: flex-end;height: 38px;min-height: 38px;- padding: 0 10px 0 12px;+ padding: 0 4px 0 12px;user-select: none;+ position: relative;+ z-index: 0;+}++@media (prefers-color-scheme: light) {+ .tabbar {+ background: var(--bg-elevated);+ }+}++.devtools-view.interactive .tab.active {+ background: rgb(var(--interactive-orange));+ color: #fff;+}++.devtools-view.interactive .toolbar::after {+ content: '';+ position: absolute;+ top: 0;+ bottom: 0;+ right: 0;+ width: 26%;+ pointer-events: none;+ background: linear-gradient(90deg,+ rgb(var(--interactive-orange) / 0) 0%,+ rgb(255 255 255 / 0.18) 45%,+ rgb(var(--interactive-orange) / 0) 100%);+ transform: translateX(140%);+ animation: interactive-toolbar-shimmer-rtl 0.9s ease-out 1;+ z-index: -1;+}++.devtools-view.interactive .segmented-control::after {+ content: '';+ position: absolute;+ left: 25%;+ top: 50%;+ width: 26px;+ height: 26px;+ border-radius: 50%;+ background: rgb(var(--interactive-orange) / 0.38);+ transform: translate(-50%, -50%) scale(0.35);+ box-shadow: 0 0 0 0 rgb(var(--interactive-orange) / 0.52);+ z-index: -1;+ animation: interactive-track-radial 420ms cubic-bezier(0.12, 0.72, 0.22, 1);+}++.devtools-view.interactive .segmented-control.interactive::after {+ left: 75%;+}++@keyframes interactive-toolbar-shimmer-rtl {+ 0% {+ opacity: 0;+ transform: translateX(140%);+ }+ 16% {+ opacity: 0.9;+ }+ 100% {+ opacity: 0;+ transform: translateX(-420%);+ }+}++@keyframes interactive-track-radial {+ 0% {+ opacity: 1;+ transform: translate(-50%, -50%) scale(0.52);+ box-shadow: 0 0 0 0 rgb(var(--interactive-orange) / 0.65);+ }+ 35% {+ opacity: 0.78;+ transform: translate(-50%, -50%) scale(0.92);+ box-shadow: 0 0 0 34px rgb(var(--interactive-orange) / 0.3);+ }+ 100% {+ opacity: 0;+ transform: translate(-50%, -50%) scale(1.14);+ box-shadow: 0 0 0 74px rgb(var(--interactive-orange) / 0);+ }}.tabbar-back {@@ -54,15 +136,6 @@height: 16px;}-.tabbar-brand span {- font-size: 12px;- color: var(--fg-dim);- font-weight: 600;- letter-spacing: 0.3px;- line-height: 34px;- margin-right: 10px;-}-.tabstrip {display: flex;align-items: flex-end;@@ -105,6 +178,18 @@color: var(--fg);}+@media (prefers-color-scheme: light) {+ .tab {+ background: transparent;+ }+ .tab:hover {+ background: var(--bg);+ }+ .tab.active {+ background: var(--bg);+ }+}+.tab-label {overflow: hidden;text-overflow: ellipsis;@@ -143,7 +228,7 @@}.tab-close:hover {- background: rgba(255, 255, 255, 0.12);+ background: var(--overlay-active);}.new-tab-btn {@@ -163,20 +248,121 @@height: 16px;}-.status {- font-size: 11px;- color: var(--fg-muted);+.interactive-controls {margin-left: auto;- padding-left: 12px;+ margin-right: 0;align-self: center;+ display: inline-flex;+ align-items: center;+ gap: 8px;+ padding: 4px 2px 4px 8px;+}++.segmented-control {+ position: relative;+ height: 28px;+ border-radius: 999px;+ padding: 2px;+ display: inline-flex;+ align-items: center;+ gap: 0;+ background: var(--segmented-bg);+}++.segmented-control::before {+ content: '';+ position: absolute;+ top: 2px;+ bottom: 2px;+ left: 2px;+ width: calc(50% - 2px);+ border-radius: 999px;+ background: var(--segmented-knob);+ transform: translateX(0);+ transition: transform 180ms cubic-bezier(0.2, 0.8, 0.2, 1), background-color 180ms ease;+}++.segmented-control.interactive::before {+ transform: translateX(100%);+ background: rgb(var(--interactive-orange) / 0.95);+}++.segmented-control-option {+ position: relative;+ z-index: 1;+ width: 96px;+ height: 24px;+ border-radius: 999px;+ padding: 0;+ border: none;+ background: transparent;+ color: var(--fg-dim);+ font-size: 11px;+ font-weight: 600;+ letter-spacing: 0.03em;+ text-transform: uppercase;+ white-space: nowrap;+ display: flex;+ align-items: center;+ justify-content: center;+ line-height: 1;+}++.segmented-control-option:hover:not(:disabled) {+ background: transparent;+}++.segmented-control-option.active {+ color: var(--fg);+}++.segmented-control-option:disabled {+ opacity: 0.7;+ cursor: default;+}++.devtools-view.interactive .segmented-control {+ background: rgb(255 255 255 / 0.2);+}++.devtools-view.interactive .segmented-control::before {+ background: rgb(255 255 255 / 0.32);+}++@media (prefers-color-scheme: light) {+ .devtools-view.interactive .segmented-control {+ background: rgb(0 0 0 / 0.1);+ }+ .devtools-view.interactive .segmented-control::before {+ background: rgb(0 0 0 / 0.12);+ }+ .devtools-view.interactive .toolbar .nav-btn:hover {+ background: rgba(255, 255, 255, 0.18);+ }+ .devtools-view.interactive .toolbar .nav-btn:active {+ background: rgba(255, 255, 255, 0.25);+ }+}++.devtools-view.interactive .segmented-control.interactive::before {+ background: rgb(var(--interactive-orange) / 0.95);+}++.devtools-view.interactive .segmented-control-option {+ color: rgb(255 255 255 / 0.74);}-.status.connected {- color: var(--ok);+.devtools-view.interactive .segmented-control-option.active {+ color: #fff;}-.status.error {- color: var(--err);+@media (prefers-color-scheme: light) {+ .devtools-view.interactive .segmented-control-option {+ color: var(--fg-dim);+ }+ .devtools-view.interactive .segmented-control-option.active {+ color: #fff;+ }}/* -- Toolbar -- */@@ -188,6 +374,37 @@min-height: 40px;background: var(--bg-elevated);padding: 0 8px;+ position: relative;+ z-index: 0;+}++@media (prefers-color-scheme: light) {+ .toolbar {+ background: var(--bg);+ }+}++.devtools-view.interactive .toolbar {+ background: rgb(var(--interactive-orange));+ color: #fff;+}++.devtools-view.interactive .toolbar .nav-btn,+.devtools-view.interactive .toolbar .omnibox {+ color: #fff;+}++@media (prefers-color-scheme: light) {+ .devtools-view.interactive .toolbar {+ color: #fff;+ }+ .devtools-view.interactive .toolbar .omnibox {+ background: rgb(0 0 0 / 0.15);+ color: #fff;+ }+ .devtools-view.interactive .toolbar .omnibox::placeholder {+ color: rgb(255 255 255 / 0.6);+ }}.nav-btn {@@ -197,11 +414,11 @@}.nav-btn:hover {- background: rgba(255, 255, 255, 0.08);+ background: var(--overlay-hover);}.nav-btn:active {- background: rgba(255, 255, 255, 0.12);+ background: var(--overlay-active);}.nav-btn:disabled {@@ -232,6 +449,12 @@min-width: 0;}+@media (prefers-color-scheme: light) {+ .omnibox {+ background: var(--bg-elevated);+ }+}+.omnibox:focus {border-color: var(--accent);background: var(--bg-tab);@@ -242,7 +465,7 @@}.omnibox::selection {- background: #394457;+ background: var(--selection-bg);}/* -- Viewport -- */@@ -270,13 +493,14 @@height: 100%;}-.screen.captured {- cursor: default;-}--.screen.captured .display {- outline: 2px solid var(--accent);- outline-offset: -2px;+.screen::after {+ content: '';+ position: absolute;+ inset: 0;+ pointer-events: none;+ opacity: 0;+ box-shadow: inset 0 0 0 1px rgb(var(--interactive-orange) / 0.72), inset 0 0 26px rgb(var(--interactive-orange) / 0.42);+ transition: opacity 180ms ease;}.display {@@ -287,27 +511,45 @@object-fit: contain;}-.no-pages {- display: none;+.devtools-view.interactive .screen::after {+ opacity: 1;+}++.screen-overlay {position: absolute;inset: 0;+ display: flex;align-items: center;justify-content: center;- color: var(--fg-muted);font-size: 14px;+ z-index: 10;+ pointer-events: none;background: #000;+ color: var(--fg-muted);}-.no-pages.visible {- display: flex;+.screen-overlay.has-frame {+ background: rgba(200, 200, 200, 0.5);}-.capture-hint {+.screen-overlay.has-frame > span {+ background: rgba(255, 255, 255, 0.4);+ backdrop-filter: blur(8px);+ -webkit-backdrop-filter: blur(8px);+ color: rgba(0, 0, 0, 0.8);+ padding: 12px 24px;+ border-radius: 12px;+ font-weight: 500;+ border: 1px solid rgba(255, 255, 255, 0.15);+ box-shadow: 0 0 24px 12px rgba(255, 255, 255, 0.2);+}++.screen-toast {position: absolute;bottom: 16px;left: 50%;transform: translateX(-50%);- background: rgba(32, 33, 36, 0.85);+ background: var(--toast-bg);backdrop-filter: blur(8px);color: var(--fg);font-size: 12px;@@ -317,57 +559,21 @@opacity: 0;transition: opacity 0.2s;white-space: nowrap;- border: 1px solid rgba(255, 255, 255, 0.1);+ border: 1px solid var(--toast-border);}-.capture-hint.visible {+.screen-toast.visible {opacity: 1;}-.capture-hint code {+.screen-toast code {color: var(--accent);font-family: 'SF Mono', 'Cascadia Code', 'Fira Code', 'Consolas', monospace;margin-left: 4px;}-.inspector-panel {- width: 50%;- min-width: 300px;- max-width: calc(100% - 320px);- display: flex;- flex-direction: column;- border-left: 1px solid var(--bg-elevated);- flex: none;- overflow: hidden;- position: relative;-}--.inspector-grip {- position: absolute;- left: -4px;- top: 0;- bottom: 0;- width: 8px;- cursor: col-resize;- z-index: 10;- touch-action: none;-}--.inspector-grip::before {- content: '';- position: absolute;- left: 3px;- top: 0;- bottom: 0;- width: 1px;- background: var(--bg-elevated);-}--.inspector-grip:hover::before {- background: var(--accent);-}-.inspector-frame {+ display: block;width: 100%;height: 100%;border: none;@@ -378,3 +584,13 @@color: var(--accent);background: rgba(138, 180, 248, 0.12);}++@media (prefers-color-scheme: light) {+ .nav-btn.active-toggle {+ background: rgba(26, 115, 232, 0.12);+ }+}++++diff --git a/packages/devtools/src/devtools.tsx b/packages/devtools/src/devtools.tsxindex 520f7577db..be616124d2 100644--- a/packages/devtools/src/devtools.tsx+++ b/packages/devtools/src/devtools.tsx@@ -19,9 +19,11 @@ import './devtools.css';import { navigate } from './index';import { DevToolsClient } from './devtoolsClient';import { asLocator } from '@isomorphic/locatorGenerators';+import { SplitView } from '@web/components/splitView';+import { ChevronLeftIcon, ChevronRightIcon, CloseIcon, PlusIcon, ReloadIcon, PickLocatorIcon, InspectorPanelIcon } from './icons';import type { DevToolsClientChannel } from './devtoolsClient';-import type { Tab } from './devtoolsChannel';+import type { Tab, DevToolsChannelEvents } from './devtoolsChannel';function tabFavicon(url: string): string {try {@@ -36,100 +38,81 @@ function tabFavicon(url: string): string {const BUTTONS = ['left', 'middle', 'right'] as const;export const DevTools: React.FC<{ wsUrl?: string }> = ({ wsUrl }) => {- const [status, setStatus] = React.useState<{ text: string; cls: string }>({ text: 'Connecting', cls: '' });+ const [interactive, setInteractive] = React.useState(false);const [tabs, setTabs] = React.useState<Tab[]>([]);const [url, setUrl] = React.useState('');- const [frameSrc, setFrameSrc] = React.useState('');- const [captured, setCaptured] = React.useState(false);- const [hintVisible, setHintVisible] = React.useState(false);+ const [frame, setFrame] = React.useState<DevToolsChannelEvents['frame']>();const [showInspector, setShowInspector] = React.useState(false);const [picking, setPicking] = React.useState(false);- const [toast, setToast] = React.useState<string | null>(null);+ const [locatorToast, setLocatorToast] = React.useState<{ text: string; timer: ReturnType<typeof setTimeout> }>();- const channelRef = React.useRef<DevToolsClientChannel | null>(null);+ const [channel, setChannel] = React.useState<DevToolsClientChannel | undefined>();const displayRef = React.useRef<HTMLImageElement>(null);const screenRef = React.useRef<HTMLDivElement>(null);- const viewportWrapperRef = React.useRef<HTMLDivElement>(null);- const omniboxRef = React.useRef<HTMLInputElement>(null);- const viewportSizeRef = React.useRef<{ width: number; height: number }>({ width: 0, height: 0 });- const resizedRef = React.useRef(false);- const capturedRef = React.useRef(false);+ const tabbarRef = React.useRef<HTMLDivElement>(null);+ const toolbarRef = React.useRef<HTMLDivElement>(null);const moveThrottleRef = React.useRef(0);- const pickingRef = React.useRef(false);- const toastTimerRef = React.useRef<ReturnType<typeof setTimeout>>(0 as any);- const [inspectorWidth, setInspectorWidth] = React.useState<number | undefined>();-- // Keep capturedRef in sync with state.- React.useEffect(() => {- capturedRef.current = captured;- }, [captured]);-- React.useEffect(() => {- pickingRef.current = picking;- }, [picking]);React.useEffect(() => {if (!wsUrl)return;const channel = DevToolsClient.create(wsUrl);- channelRef.current = channel;- channel.onopen = () => setStatus({ text: 'Connected', cls: 'connected' });+ channel.onopen = () => {+ setChannel(channel);+ setInteractive(false);+ setPicking(false);+ };channel.on('tabs', params => {setTabs(params.tabs);const selected = params.tabs.find(t => t.selected);if (selected)setUrl(selected.url);- if (!selected?.inspectorUrl)- setShowInspector(false);});+ let resized = false;+channel.on('frame', params => {- setFrameSrc('data:image/jpeg;base64,' + params.data);- if (params.viewportWidth)- viewportSizeRef.current.width = params.viewportWidth;- if (params.viewportHeight)- viewportSizeRef.current.height = params.viewportHeight;- resizeToFit();+ setFrame(params);+ const tabbar = tabbarRef.current;+ const toolbar = toolbarRef.current;+ if (!resized && tabbar && toolbar && params.viewportWidth && params.viewportHeight) {+ resized = true;+ const chromeHeight = tabbar.offsetHeight + toolbar.offsetHeight;+ const extraW = window.outerWidth - window.innerWidth;+ const extraH = window.outerHeight - window.innerHeight;+ const targetW = Math.min(params.viewportWidth + extraW, screen.availWidth);+ const targetH = Math.min(params.viewportHeight + chromeHeight + extraH, screen.availHeight);+ window.resizeTo(targetW, targetH);+ }});channel.on('elementPicked', params => {const locator = asLocator('javascript', params.selector);navigator.clipboard?.writeText(locator).catch(() => {});setPicking(false);- setToast(locator);- clearTimeout(toastTimerRef.current);- toastTimerRef.current = setTimeout(() => setToast(null), 3000);+ setLocatorToast(old => {+ clearTimeout(old?.timer);+ return { text: locator, timer: setTimeout(() => setLocatorToast(undefined), 3000) };+ });});- channel.onclose = () => setStatus({ text: 'Disconnected', cls: 'error' });+ channel.onclose = () => {+ setChannel(undefined);+ setInteractive(false);+ setPicking(false);+ setShowInspector(false);+ };return () => {- clearTimeout(toastTimerRef.current);channel.close();};}, [wsUrl]);- function resizeToFit() {- const { width: vw, height: vh } = viewportSizeRef.current;- if (!vw || !vh || resizedRef.current)- return;- resizedRef.current = true;- const tabbar = document.querySelector('.tabbar') as HTMLElement;- const toolbar = document.querySelector('.toolbar') as HTMLElement;- if (!tabbar || !toolbar)- return;- const chromeHeight = tabbar.offsetHeight + toolbar.offsetHeight;- const extraW = window.outerWidth - window.innerWidth;- const extraH = window.outerHeight - window.innerHeight;- const targetW = Math.min(vw + extraW, screen.availWidth);- const targetH = Math.min(vh + chromeHeight + extraH, screen.availHeight);- window.resizeTo(targetW, targetH);- }-function imgCoords(e: React.MouseEvent): { x: number; y: number } {- const { width: vw, height: vh } = viewportSizeRef.current;+ const vw = frame?.viewportWidth ?? 0;+ const vh = frame?.viewportHeight ?? 0;if (!vw || !vh)return { x: 0, y: 0 };const display = displayRef.current;@@ -158,107 +141,66 @@ export const DevTools: React.FC<{ wsUrl?: string }> = ({ wsUrl }) => {};}- const isForwardingInput = () => showInspector || capturedRef.current;-function sendMouseEvent(method: 'mousedown' | 'mouseup', e: React.MouseEvent) {const { x, y } = imgCoords(e);- channelRef.current?.[method]({ x, y, button: BUTTONS[e.button] || 'left' });+ channel?.[method]({ x, y, button: BUTTONS[e.button] || 'left' });}function onScreenMouseDown(e: React.MouseEvent) {e.preventDefault();screenRef.current?.focus();- if (!pickingRef.current && !isForwardingInput()) {- setCaptured(true);- setHintVisible(false);+ if (!channel)+ return;+ if (!interactive) {+ setInteractive(true);return;}sendMouseEvent('mousedown', e);}function onScreenMouseUp(e: React.MouseEvent) {- if (!pickingRef.current && !isForwardingInput())+ if (!interactive)return;e.preventDefault();sendMouseEvent('mouseup', e);}function onScreenMouseMove(e: React.MouseEvent) {- if (!pickingRef.current && !isForwardingInput())+ if (!interactive)return;const now = Date.now();if (now - moveThrottleRef.current < 32)return;moveThrottleRef.current = now;const { x, y } = imgCoords(e);- channelRef.current?.mousemove({ x, y });+ channel?.mousemove({ x, y });}function onScreenWheel(e: React.WheelEvent) {- if (!isForwardingInput())+ if (!interactive)return;e.preventDefault();- channelRef.current?.wheel({ deltaX: e.deltaX, deltaY: e.deltaY });+ channel?.wheel({ deltaX: e.deltaX, deltaY: e.deltaY });}function onScreenKeyDown(e: React.KeyboardEvent) {- if (pickingRef.current && e.key === 'Escape') {+ if (picking && e.key === 'Escape') {e.preventDefault();- channelRef.current?.cancelPickLocator();+ channel?.cancelPickLocator();setPicking(false);return;}- if (!isForwardingInput())+ if (!interactive)return;e.preventDefault();- if (e.key === 'Escape' && !(e.metaKey || e.ctrlKey)) {- setCaptured(false);- return;- }- channelRef.current?.keydown({ key: e.key });+ channel?.keydown({ key: e.key });}function onScreenKeyUp(e: React.KeyboardEvent) {- if (!isForwardingInput())+ if (!interactive)return;e.preventDefault();- channelRef.current?.keyup({ key: e.key });- }-- function onScreenBlur() {- setCaptured(false);- }-- function onInspectorGripPointerDown(e: React.PointerEvent<HTMLDivElement>) {- if (e.button !== 0)- return;- const wrapperRect = viewportWrapperRef.current?.getBoundingClientRect();- if (!wrapperRect)- return;- e.preventDefault();- const grip = e.currentTarget;- grip.setPointerCapture(e.pointerId);- const minWidth = 300;- const maxWidth = Math.max(minWidth, wrapperRect.width - 320);- const startX = e.clientX;- const startWidth = inspectorWidth ?? wrapperRect.width * 0.5;- const onPointerMove = (event: PointerEvent) => {- const delta = startX - event.clientX;- const nextWidth = Math.max(minWidth, Math.min(maxWidth, startWidth + delta));- setInspectorWidth(nextWidth);- };- const onPointerUp = () => {- grip.removeEventListener('pointermove', onPointerMove);- grip.removeEventListener('pointerup', onPointerUp);- grip.removeEventListener('lostpointercapture', onPointerUp);- document.body.style.cursor = '';- document.body.style.userSelect = '';- };- document.body.style.cursor = 'col-resize';- document.body.style.userSelect = 'none';- grip.addEventListener('pointermove', onPointerMove);- grip.addEventListener('pointerup', onPointerUp);- grip.addEventListener('lostpointercapture', onPointerUp);+ channel?.keyup({ key: e.key });}function onOmniboxKeyDown(e: React.KeyboardEvent<HTMLInputElement>) {@@ -267,21 +209,26 @@ export const DevTools: React.FC<{ wsUrl?: string }> = ({ wsUrl }) => {if (!/^https?:\/\//i.test(value))value = 'https://' + value;setUrl(value);- channelRef.current?.navigate({ url: value });- omniboxRef.current?.blur();+ channel?.navigate({ url: value });+ e.currentTarget.blur();}}const selectedTab = tabs.find(t => t.selected);const hasPages = !!selectedTab;- return (<div className='devtools-view'>+ let overlayText: string | undefined;+ if (!channel)+ overlayText = 'Disconnected';+ if (channel && !hasPages)+ overlayText = 'No tabs open';++ return (<div className={'devtools-view' + (interactive ? ' interactive' : '')}+ >{/* Tab bar */}- <div className='tabbar'>+ <div ref={tabbarRef} className='tabbar'><a className='tabbar-back' href='#' title='Back to sessions' onClick={e => { e.preventDefault(); navigate('#'); }}>- <svg viewBox='0 0 24 24' fill='none' stroke='currentColor' strokeWidth='2' strokeLinecap='round' strokeLinejoin='round'>- <polyline points='15 18 9 12 15 6'/>- </svg>+ <ChevronLeftIcon /></a><div id='tabstrip' className='tabstrip' role='tablist'>{tabs.map(tab => (@@ -291,7 +238,7 @@ export const DevTools: React.FC<{ wsUrl?: string }> = ({ wsUrl }) => {role='tab'aria-selected={tab.selected}title={tab.url || ''}- onClick={() => channelRef.current?.selectTab({ pageId: tab.pageId })}+ onClick={() => channel?.selectTab({ pageId: tab.pageId })}><span className='tab-favicon' aria-hidden='true'>{tabFavicon(tab.url)}</span><span className='tab-label'>{tab.title || 'New Tab'}</span>@@ -300,46 +247,58 @@ export const DevTools: React.FC<{ wsUrl?: string }> = ({ wsUrl }) => {title='Close tab'onClick={e => {e.stopPropagation();- channelRef.current?.closeTab({ pageId: tab.pageId });+ channel?.closeTab({ pageId: tab.pageId });}}>- <svg viewBox='0 0 12 12' fill='none' stroke='currentColor' strokeWidth='1.5' strokeLinecap='round'>- <line x1='2' y1='2' x2='10' y2='10'/>- <line x1='10' y1='2' x2='2' y2='10'/>- </svg>+ <CloseIcon /></button></div>))}</div>- <button id='new-tab-btn' className='new-tab-btn' title='New Tab' onClick={() => channelRef.current?.newTab()}>- <svg viewBox='0 0 24 24' fill='none' stroke='currentColor' strokeWidth='2' strokeLinecap='round'>- <line x1='12' y1='5' x2='12' y2='19'/>- <line x1='5' y1='12' x2='19' y2='12'/>- </svg>+ <button id='new-tab-btn' className='new-tab-btn' title='New Tab' onClick={() => channel?.newTab()}>+ <PlusIcon /></button>- <div id='status' className={'status ' + status.cls}>{status.text}</div>+ <div className='interactive-controls'>+ <div className={'segmented-control' + (interactive ? ' interactive' : '')} role='group' aria-label='Interaction mode' title={interactive ? 'Interactive mode: page input is forwarded' : 'Read-only mode: page input is blocked'}>+ <button+ className={'segmented-control-option' + (!interactive ? ' active' : '')}+ disabled={!channel}+ aria-pressed={!interactive}+ title='Read-only mode'+ onClick={() => {+ channel?.cancelPickLocator();+ setPicking(false);+ setShowInspector(false);+ setInteractive(false);+ }}+ >+ Read-only+ </button>+ <button+ className={'segmented-control-option' + (interactive ? ' active' : '')}+ disabled={!channel}+ aria-pressed={interactive}+ title='Interactive mode'+ onClick={() => setInteractive(true)}+ >+ Interactive+ </button>+ </div>+ </div></div>{/* Toolbar */}- <div className='toolbar'>- <button className='nav-btn' title='Back' onClick={() => channelRef.current?.back()}>- <svg viewBox='0 0 24 24' fill='none' stroke='currentColor' strokeWidth='2' strokeLinecap='round' strokeLinejoin='round'>- <polyline points='15 18 9 12 15 6'/>- </svg>+ <div ref={toolbarRef} className='toolbar'>+ <button className='nav-btn' title='Back' onClick={() => channel?.back()}>+ <ChevronLeftIcon /></button>- <button className='nav-btn' title='Forward' onClick={() => channelRef.current?.forward()}>- <svg viewBox='0 0 24 24' fill='none' stroke='currentColor' strokeWidth='2' strokeLinecap='round' strokeLinejoin='round'>- <polyline points='9 18 15 12 9 6'/>- </svg>+ <button className='nav-btn' title='Forward' onClick={() => channel?.forward()}>+ <ChevronRightIcon /></button>- <button className='nav-btn' title='Reload' onClick={() => channelRef.current?.reload()}>- <svg viewBox='0 0 24 24' fill='none' stroke='currentColor' strokeWidth='2' strokeLinecap='round' strokeLinejoin='round'>- <polyline points='23 4 23 10 17 10'/>- <path d='M20.49 15a9 9 0 1 1-2.12-9.36L23 10'/>- </svg>+ <button className='nav-btn' title='Reload' onClick={() => channel?.reload()}>+ <ReloadIcon /></button><input- ref={omniboxRef}id='omnibox'className='omnibox'type='text'@@ -351,80 +310,85 @@ export const DevTools: React.FC<{ wsUrl?: string }> = ({ wsUrl }) => {onKeyDown={onOmniboxKeyDown}onFocus={e => e.target.select()}/>- {false && <button+ <buttonclassName={'nav-btn' + (picking ? ' active-toggle' : '')}- title={picking ? 'Cancel pick locator' : 'Pick locator'}- onClick={() => {+ title='Pick locator'+ aria-pressed={picking}+ disabled={!channel}+ onClick={async () => {if (picking) {- channelRef.current?.cancelPickLocator();+ await channel?.cancelPickLocator();setPicking(false);} else {- channelRef.current?.pickLocator();+ setInteractive(true);+ await channel?.pickLocator();setPicking(true);+ screenRef.current?.focus();}}}>- <svg viewBox='0 0 48 48' fill='currentColor'>- <path d='M18 42h-7.5c-3 0-4.5-1.5-4.5-4.5v-27C6 7.5 7.5 6 10.5 6h27C42 6 42 10.404 42 10.5V18h-3V9H9v30h9v3Zm27-15-9 6 9 9-3 3-9-9-6 9-6-24 24 6Z'/>- </svg>+ <PickLocatorIcon /></button>- }- {false && selectedTab?.inspectorUrl && (+ {selectedTab?.inspectorUrl && (<buttonclassName={'nav-btn' + (showInspector ? ' active-toggle' : '')}- title={showInspector ? 'Hide Chrome DevTools' : 'Show Chrome DevTools'}- onClick={() => setShowInspector(!showInspector)}+ title='Chrome DevTools'+ aria-pressed={showInspector}+ disabled={!channel}+ onClick={() => {+ setInteractive(true);+ setShowInspector(!showInspector);+ }}>- <svg viewBox='0 0 24 24' fill='none' stroke='currentColor' strokeWidth='2' strokeLinecap='round' strokeLinejoin='round'>- <rect x='3' y='3' width='18' height='18' rx='2'/>- <line x1='9' y1='3' x2='9' y2='21'/>- </svg>+ <InspectorPanelIcon /></button>)}</div>{/* Viewport */}- <div ref={viewportWrapperRef} className='viewport-wrapper'>- <div className='viewport-main'>- <div- ref={screenRef}- className={'screen' + (captured ? ' captured' : '')}- tabIndex={0}- style={{ display: hasPages ? '' : 'none' }}- onMouseDown={onScreenMouseDown}- onMouseUp={onScreenMouseUp}- onMouseMove={onScreenMouseMove}- onWheel={onScreenWheel}- onKeyDown={onScreenKeyDown}- onKeyUp={onScreenKeyUp}- onBlur={onScreenBlur}- onContextMenu={e => e.preventDefault()}- onMouseEnter={() => {- if (!showInspector && !capturedRef.current)- setHintVisible(true);- }}- onMouseLeave={() => setHintVisible(false)}- >- <img ref={displayRef} id='display' className='display' alt='screencast' src={frameSrc}/>- {toast- ? <div className='capture-hint visible'>Copied: <code>{toast}</code></div>- : picking- ? <div className='capture-hint visible'>Click an element to pick its locator</div>- : !showInspector && <div className={'capture-hint' + (hintVisible ? ' visible' : '')}>Click to interact · Esc to release</div>- }- </div>- <div id='no-pages' className={'no-pages' + (!hasPages ? ' visible' : '')}>No tabs open</div>- </div>- {showInspector && selectedTab?.inspectorUrl && (- <div className='inspector-panel' style={inspectorWidth ? { width: `${inspectorWidth}px` } : undefined}>- <div className='inspector-grip' onPointerDown={onInspectorGripPointerDown} />- <iframe- className='inspector-frame'- src={selectedTab.inspectorUrl}- title='Chrome DevTools'- />- </div>- )}+ <div className='viewport-wrapper'>+ <SplitView+ orientation='horizontal'+ sidebarSize={500}+ minSidebarSize={300}+ settingName='devtoolsInspector'+ sidebarHidden={!showInspector || !selectedTab?.inspectorUrl}+ main={<div className='viewport-main'>+ <div+ ref={screenRef}+ className='screen'+ tabIndex={0}+ style={{ display: frame ? '' : 'none' }}+ onMouseDown={onScreenMouseDown}+ onMouseUp={onScreenMouseUp}+ onMouseMove={onScreenMouseMove}+ onWheel={onScreenWheel}+ onKeyDown={onScreenKeyDown}+ onKeyUp={onScreenKeyUp}+ onContextMenu={e => e.preventDefault()}+ >+ <img+ ref={displayRef}+ id='display'+ className='display'+ alt='screencast'+ src={frame ? 'data:image/jpeg;base64,' + frame.data : undefined}+ />+ {locatorToast+ ? <div className='screen-toast visible'>Copied: <code>{locatorToast.text}</code></div>+ : picking+ ? <div className='screen-toast visible'>Click an element to pick its locator</div>+ : null+ }+ </div>+ {overlayText && <div className={'screen-overlay' + (frame ? ' has-frame' : '')}><span>{overlayText}</span></div>}+ </div>}+ sidebar={<iframe+ className='inspector-frame'+ src={selectedTab?.inspectorUrl || ''}+ title='Chrome DevTools'+ />}+ /></div></div>);};diff --git a/packages/devtools/src/grid.css b/packages/devtools/src/grid.cssindex 2f330dfad8..e4e23da8a2 100644--- a/packages/devtools/src/grid.css+++ b/packages/devtools/src/grid.css@@ -90,7 +90,8 @@flex-direction: column;background: var(--bg-card);border-radius: 8px;- border: 1px solid transparent;+ border: 1px solid var(--card-border);+ box-shadow: var(--card-shadow);min-width: 200px;cursor: pointer;text-decoration: none;@@ -135,7 +136,7 @@}.session-chip-title {- color: var(--fg-muted);+ color: var(--fg-dim);font-weight: 400;}@@ -168,7 +169,7 @@}.session-chip-action:hover {- background: rgba(255, 255, 255, 0.12);+ background: var(--overlay-active);}.screencast-container {diff --git a/packages/devtools/src/icons.tsx b/packages/devtools/src/icons.tsxnew file mode 100644index 0000000000..77a2e09745--- /dev/null+++ b/packages/devtools/src/icons.tsx@@ -0,0 +1,63 @@+/**+ * Copyright (c) Microsoft Corporation.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++import React from 'react';++export const ChevronLeftIcon: React.FC = () => (+ <svg viewBox='0 0 24 24' fill='none' stroke='currentColor' strokeWidth='2' strokeLinecap='round' strokeLinejoin='round'>+ <polyline points='15 18 9 12 15 6'/>+ </svg>+);++export const ChevronRightIcon: React.FC = () => (+ <svg viewBox='0 0 24 24' fill='none' stroke='currentColor' strokeWidth='2' strokeLinecap='round' strokeLinejoin='round'>+ <polyline points='9 18 15 12 9 6'/>+ </svg>+);++export const CloseIcon: React.FC = () => (+ <svg viewBox='0 0 12 12' fill='none' stroke='currentColor' strokeWidth='1.5' strokeLinecap='round'>+ <line x1='2' y1='2' x2='10' y2='10'/>+ <line x1='10' y1='2' x2='2' y2='10'/>+ </svg>+);++export const PlusIcon: React.FC = () => (+ <svg viewBox='0 0 24 24' fill='none' stroke='currentColor' strokeWidth='2' strokeLinecap='round'>+ <line x1='12' y1='5' x2='12' y2='19'/>+ <line x1='5' y1='12' x2='19' y2='12'/>+ </svg>+);++export const ReloadIcon: React.FC = () => (+ <svg viewBox='0 0 24 24' fill='none' stroke='currentColor' strokeWidth='2' strokeLinecap='round' strokeLinejoin='round'>+ <polyline points='23 4 23 10 17 10'/>+ <path d='M20.49 15a9 9 0 1 1-2.12-9.36L23 10'/>+ </svg>+);++export const PickLocatorIcon: React.FC = () => (+ <svg viewBox='0 0 48 48' fill='currentColor'>+ <path d='M18 42h-7.5c-3 0-4.5-1.5-4.5-4.5v-27C6 7.5 7.5 6 10.5 6h27C42 6 42 10.404 42 10.5V18h-3V9H9v30h9v3Zm27-15-9 6 9 9-3 3-9-9-6 9-6-24 24 6Z'/>+ </svg>+);++export const InspectorPanelIcon: React.FC = () => (+ <svg viewBox='0 0 24 24' fill='none' stroke='currentColor' strokeWidth='2' strokeLinecap='round' strokeLinejoin='round'>+ <rect x='3' y='3' width='18' height='18' rx='2'/>+ <line x1='9' y1='3' x2='9' y2='21'/>+ </svg>+);diff --git a/packages/devtools/src/index.tsx b/packages/devtools/src/index.tsxindex e4ca64df8a..10c939d61a 100644--- a/packages/devtools/src/index.tsx+++ b/packages/devtools/src/index.tsx@@ -57,8 +57,7 @@ const App: React.FC = () => {if (socketPath) {const wsUrl = model.wsUrls.get(socketPath);- if (wsUrl)- return <DevTools wsUrl={wsUrl} />;+ return <DevTools wsUrl={wsUrl || undefined} />;}return <Grid model={model} />;};diff --git a/packages/injected/src/recorder/pollingRecorder.ts b/packages/injected/src/recorder/pollingRecorder.tsindex 62aa15b49c..97eb97ee55 100644--- a/packages/injected/src/recorder/pollingRecorder.ts+++ b/packages/injected/src/recorder/pollingRecorder.ts@@ -38,7 +38,7 @@ export class PollingRecorder implements RecorderDelegate {private _pollRecorderModeTimer: number | undefined;private _lastStateJSON: string | undefined;- constructor(injectedScript: InjectedScript, options?: { recorderMode?: 'default' | 'api' }) {+ constructor(injectedScript: InjectedScript, options?: { recorderMode?: 'default' | 'api', hideToolbar?: boolean }) {this._recorder = new Recorder(injectedScript, options);this._embedder = injectedScript.window as any;diff --git a/packages/injected/src/recorder/recorder.ts b/packages/injected/src/recorder/recorder.tsindex 0fd2b0c8dd..60ba1b36c9 100644--- a/packages/injected/src/recorder/recorder.ts+++ b/packages/injected/src/recorder/recorder.ts@@ -1390,7 +1390,7 @@ export class Recorder {readonly document: Document;private _delegate: RecorderDelegate = {};- constructor(injectedScript: InjectedScript, options?: { recorderMode?: 'default' | 'api' }) {+ constructor(injectedScript: InjectedScript, options?: { recorderMode?: 'default' | 'api', hideToolbar?: boolean }) {this.document = injectedScript.document;this.injectedScript = injectedScript;this.highlight = injectedScript.createHighlight();@@ -1407,7 +1407,7 @@ export class Recorder {};this._currentTool = this._tools.none;this._currentTool.install?.();- if (injectedScript.window.top === injectedScript.window) {+ if (injectedScript.window.top === injectedScript.window && !options?.hideToolbar) {this.overlay = new Overlay(this);this.overlay.setUIState(this.state);}diff --git a/packages/playwright-core/src/server/devtoolsController.ts b/packages/playwright-core/src/server/devtoolsController.tsindex 02d8f79be3..35c7f19ce1 100644--- a/packages/playwright-core/src/server/devtoolsController.ts+++ b/packages/playwright-core/src/server/devtoolsController.ts@@ -271,7 +271,7 @@ class DevToolsConnection implements Transport, DevToolsChannel {async pickLocator() {this._cancelPicking();- const recorder = await Recorder.forContext(this._context, { omitCallTracking: true });+ const recorder = await Recorder.forContext(this._context, { omitCallTracking: true, hideToolbar: true });this._recorder = recorder;this._recorderListeners.push(eventsHelper.addEventListener(recorder, RecorderEvent.ElementPicked, (elementInfo: ElementInfo) => {diff --git a/packages/playwright-core/src/server/recorder.ts b/packages/playwright-core/src/server/recorder.tsindex 88c817895a..6828d2c788 100644--- a/packages/playwright-core/src/server/recorder.ts+++ b/packages/playwright-core/src/server/recorder.ts@@ -43,6 +43,7 @@ import type { RegisteredListener } from '../utils';const recorderSymbol = Symbol('recorderSymbol');type BindingSource = { frame: Frame, page: Page };+type RecorderParams = channels.BrowserContextEnableRecorderParams & { hideToolbar?: boolean };export const RecorderEvent = {PausedStateChanged: 'pausedStateChanged',@@ -71,7 +72,7 @@ export type RecorderEventMap = {export class Recorder extends EventEmitter<RecorderEventMap> implements InstrumentationListener {readonly handleSIGINT: boolean | undefined;private _context: BrowserContext;- private _params: channels.BrowserContextEnableRecorderParams;+ private _params: RecorderParams;private _mode: Mode;private _highlightedElement: { selector?: string, ariaTemplate?: AriaTemplateNode } = {};private _overlayState: OverlayState = { offsetX: 0 };@@ -91,7 +92,7 @@ export class Recorder extends EventEmitter<RecorderEventMap> implements Instrumeprivate _enabled: boolean = false;private _callLogs: CallLog[] = [];- static forContext(context: BrowserContext, params: channels.BrowserContextEnableRecorderParams): Promise<Recorder> {+ static forContext(context: BrowserContext, params: RecorderParams): Promise<Recorder> {let recorderPromise = (context as any)[recorderSymbol] as Promise<Recorder>;if (!recorderPromise) {recorderPromise = Recorder._create(context, params);@@ -105,13 +106,13 @@ export class Recorder extends EventEmitter<RecorderEventMap> implements Instrumereturn await recorderPromise;}- private static async _create(context: BrowserContext, params: channels.BrowserContextEnableRecorderParams = {}): Promise<Recorder> {+ private static async _create(context: BrowserContext, params: RecorderParams = {}): Promise<Recorder> {const recorder = new Recorder(context, params);await recorder._install();return recorder;}- constructor(context: BrowserContext, params: channels.BrowserContextEnableRecorderParams) {+ constructor(context: BrowserContext, params: RecorderParams) {super();this._context = context;this._params = params;@@ -242,7 +243,7 @@ export class Recorder extends EventEmitter<RecorderEventMap> implements Instrumeawait this._context.exposeBinding(progress, '__pw_recorderRecordAction', false,(source: BindingSource, action: actions.Action) => this._recordAction(source.frame, action));- await this._context.extendInjectedScript(rawRecorderSource.source, { recorderMode: this._recorderMode });+ await this._context.extendInjectedScript(rawRecorderSource.source, { recorderMode: this._recorderMode, hideToolbar: !!this._params.hideToolbar });});if (this._debugger.isPaused())