Unverified Commit 56fe93b1 authored by Zack Tanner's avatar Zack Tanner Committed by GitHub

[dev-overlay]: add preference panel (#76522)

Adds user preferences for:

- Toggling theme (localstorage)
- Position (localstorage)
- Hiding the overlay (existing dev session heuristic)



https://github.com/user-attachments/assets/0f08ce66-4107-4751-80d3-a42d3315966a


![CleanShot 2025-02-25 at 17 59
11@2x](https://github.com/user-attachments/assets/e65fdfb0-23b3-4c47-b8af-f55dd60e7b95)

![CleanShot 2025-02-25 at 17 59
15@2x](https://github.com/user-attachments/assets/86d33590-18f7-44f6-acd2-9639c098476a)
parent 6bba4ba4
...@@ -38,6 +38,9 @@ export const ACTION_UNHANDLED_REJECTION = 'unhandled-rejection' ...@@ -38,6 +38,9 @@ export const ACTION_UNHANDLED_REJECTION = 'unhandled-rejection'
export const ACTION_DEBUG_INFO = 'debug-info' export const ACTION_DEBUG_INFO = 'debug-info'
export const ACTION_DEV_INDICATOR = 'dev-indicator' export const ACTION_DEV_INDICATOR = 'dev-indicator'
export const STORAGE_KEY_THEME = '__nextjs-dev-tools-theme'
export const STORAGE_KEY_POSITION = '__nextjs-dev-tools-position'
interface StaticIndicatorAction { interface StaticIndicatorAction {
type: typeof ACTION_STATIC_INDICATOR type: typeof ACTION_STATIC_INDICATOR
staticIndicator: boolean staticIndicator: boolean
......
...@@ -9,13 +9,7 @@ const meta: Meta<typeof DevToolsIndicator> = { ...@@ -9,13 +9,7 @@ const meta: Meta<typeof DevToolsIndicator> = {
parameters: { parameters: {
layout: 'centered', layout: 'centered',
}, },
argTypes: { argTypes: {},
position: {
control: 'select',
options: ['top-left', 'top-right', 'bottom-left', 'bottom-right'],
defaultValue: 'bottom-left',
},
},
decorators: [ decorators: [
withShadowPortal, withShadowPortal,
// Test for high z-index // Test for high z-index
......
import type { Dispatch, SetStateAction } from 'react' import type { Dispatch, SetStateAction } from 'react'
import type { OverlayState } from '../../../../shared' import { STORAGE_KEY_POSITION, type OverlayState } from '../../../../shared'
import { useState, useEffect, useRef, createContext, useContext } from 'react' import { useState, useEffect, useRef, createContext, useContext } from 'react'
import { Toast } from '../../toast' import { Toast } from '../../toast'
...@@ -9,7 +9,8 @@ import { useIsDevRendering } from '../../../../utils/dev-indicator/dev-render-in ...@@ -9,7 +9,8 @@ import { useIsDevRendering } from '../../../../utils/dev-indicator/dev-render-in
import { useDelayedRender } from '../../../hooks/use-delayed-render' import { useDelayedRender } from '../../../hooks/use-delayed-render'
import { TurbopackInfo } from './dev-tools-info/turbopack-info' import { TurbopackInfo } from './dev-tools-info/turbopack-info'
import { RouteInfo } from './dev-tools-info/route-info' import { RouteInfo } from './dev-tools-info/route-info'
import { StopIcon } from '../../../icons/stop-icon' import GearIcon from '../../../icons/gear-icon'
import { UserPreferences } from './dev-tools-info/user-preferences'
// TODO: add E2E tests to cover different scenarios // TODO: add E2E tests to cover different scenarios
...@@ -18,14 +19,13 @@ const INDICATOR_POSITION = ...@@ -18,14 +19,13 @@ const INDICATOR_POSITION =
.__NEXT_DEV_INDICATOR_POSITION as typeof window.__NEXT_DEV_INDICATOR_POSITION) || .__NEXT_DEV_INDICATOR_POSITION as typeof window.__NEXT_DEV_INDICATOR_POSITION) ||
'bottom-left' 'bottom-left'
type DevToolsIndicatorPosition = typeof INDICATOR_POSITION export type DevToolsIndicatorPosition = typeof INDICATOR_POSITION
export function DevToolsIndicator({ export function DevToolsIndicator({
state, state,
errorCount, errorCount,
isBuildError, isBuildError,
setIsErrorOverlayOpen, setIsErrorOverlayOpen,
position = INDICATOR_POSITION,
}: { }: {
state: OverlayState state: OverlayState
errorCount: number errorCount: number
...@@ -33,8 +33,6 @@ export function DevToolsIndicator({ ...@@ -33,8 +33,6 @@ export function DevToolsIndicator({
setIsErrorOverlayOpen: ( setIsErrorOverlayOpen: (
isErrorOverlayOpen: boolean | ((prev: boolean) => boolean) isErrorOverlayOpen: boolean | ((prev: boolean) => boolean)
) => void ) => void
// Technically this prop isn't needed, but useful for testing.
position?: DevToolsIndicatorPosition
}) { }) {
const [isDevToolsIndicatorVisible, setIsDevToolsIndicatorVisible] = const [isDevToolsIndicatorVisible, setIsDevToolsIndicatorVisible] =
useState(true) useState(true)
...@@ -53,7 +51,6 @@ export function DevToolsIndicator({ ...@@ -53,7 +51,6 @@ export function DevToolsIndicator({
}} }}
setIsErrorOverlayOpen={setIsErrorOverlayOpen} setIsErrorOverlayOpen={setIsErrorOverlayOpen}
isTurbopack={!!process.env.TURBOPACK} isTurbopack={!!process.env.TURBOPACK}
position={position}
disabled={state.disableDevIndicator || !isDevToolsIndicatorVisible} disabled={state.disableDevIndicator || !isDevToolsIndicatorVisible}
isBuildError={isBuildError} isBuildError={isBuildError}
/> />
...@@ -73,13 +70,25 @@ interface C { ...@@ -73,13 +70,25 @@ interface C {
const Context = createContext({} as C) const Context = createContext({} as C)
function getInitialPosition() {
if (
typeof localStorage !== 'undefined' &&
localStorage.getItem(STORAGE_KEY_POSITION)
) {
return localStorage.getItem(
STORAGE_KEY_POSITION
) as DevToolsIndicatorPosition
}
return INDICATOR_POSITION
}
function DevToolsPopover({ function DevToolsPopover({
routerType, routerType,
disabled, disabled,
issueCount, issueCount,
isStaticRoute, isStaticRoute,
isTurbopack, isTurbopack,
position,
isBuildError, isBuildError,
hide, hide,
setIsErrorOverlayOpen, setIsErrorOverlayOpen,
...@@ -90,7 +99,6 @@ function DevToolsPopover({ ...@@ -90,7 +99,6 @@ function DevToolsPopover({
isStaticRoute: boolean isStaticRoute: boolean
semver: string | undefined semver: string | undefined
isTurbopack: boolean isTurbopack: boolean
position: DevToolsIndicatorPosition
isBuildError: boolean isBuildError: boolean
hide: () => void hide: () => void
setIsErrorOverlayOpen: ( setIsErrorOverlayOpen: (
...@@ -103,10 +111,14 @@ function DevToolsPopover({ ...@@ -103,10 +111,14 @@ function DevToolsPopover({
const triggerTurbopackRef = useRef<HTMLButtonElement | null>(null) const triggerTurbopackRef = useRef<HTMLButtonElement | null>(null)
const routeInfoRef = useRef<HTMLElement>(null) const routeInfoRef = useRef<HTMLElement>(null)
const triggerRouteInfoRef = useRef<HTMLButtonElement | null>(null) const triggerRouteInfoRef = useRef<HTMLButtonElement | null>(null)
const preferencesRef = useRef<HTMLElement>(null)
const triggerPreferencesRef = useRef<HTMLButtonElement | null>(null)
const [isMenuOpen, setIsMenuOpen] = useState(false) const [isMenuOpen, setIsMenuOpen] = useState(false)
const [isTurbopackInfoOpen, setIsTurbopackInfoOpen] = useState(false) const [isTurbopackInfoOpen, setIsTurbopackInfoOpen] = useState(false)
const [isRouteInfoOpen, setIsRouteInfoOpen] = useState(false) const [isRouteInfoOpen, setIsRouteInfoOpen] = useState(false)
const [isPreferencesOpen, setIsPreferencesOpen] = useState(false)
const [selectedIndex, setSelectedIndex] = useState(-1) const [selectedIndex, setSelectedIndex] = useState(-1)
const [position, setPosition] = useState(getInitialPosition())
// This hook lets us do an exit animation before unmounting the component // This hook lets us do an exit animation before unmounting the component
const { mounted: menuMounted, rendered: menuRendered } = useDelayedRender( const { mounted: menuMounted, rendered: menuRendered } = useDelayedRender(
...@@ -128,6 +140,11 @@ function DevToolsPopover({ ...@@ -128,6 +140,11 @@ function DevToolsPopover({
enterDelay: 0, enterDelay: 0,
exitDelay: ANIMATE_OUT_DURATION_MS, exitDelay: ANIMATE_OUT_DURATION_MS,
}) })
const { mounted: preferencesMounted, rendered: preferencesRendered } =
useDelayedRender(isPreferencesOpen, {
enterDelay: 0,
exitDelay: ANIMATE_OUT_DURATION_MS,
})
// Features to make the menu accessible // Features to make the menu accessible
useFocusTrap(menuRef, triggerRef, isMenuOpen) useFocusTrap(menuRef, triggerRef, isMenuOpen)
...@@ -146,7 +163,13 @@ function DevToolsPopover({ ...@@ -146,7 +163,13 @@ function DevToolsPopover({
isRouteInfoOpen, isRouteInfoOpen,
closeRouteInfo closeRouteInfo
) )
useFocusTrap(preferencesRef, triggerPreferencesRef, isPreferencesOpen)
useClickOutside(
preferencesRef,
triggerPreferencesRef,
isPreferencesOpen,
closePreferences
)
function select(index: number | 'first' | 'last') { function select(index: number | 'first' | 'last') {
if (index === 'first') { if (index === 'first') {
const all = menuRef.current?.querySelectorAll('[role="menuitem"]') const all = menuRef.current?.querySelectorAll('[role="menuitem"]')
...@@ -254,6 +277,15 @@ function DevToolsPopover({ ...@@ -254,6 +277,15 @@ function DevToolsPopover({
setIsRouteInfoOpen(false) setIsRouteInfoOpen(false)
} }
function closePreferences() {
setIsPreferencesOpen(false)
}
function handleHideDevtools() {
closePreferences()
hide()
}
const [vertical, horizontal] = position.split('-', 2) const [vertical, horizontal] = position.split('-', 2)
return ( return (
...@@ -316,6 +348,21 @@ function DevToolsPopover({ ...@@ -316,6 +348,21 @@ function DevToolsPopover({
/> />
)} )}
{preferencesMounted && (
<UserPreferences
ref={preferencesRef}
isOpen={isPreferencesOpen}
hide={handleHideDevtools}
setPosition={setPosition}
position={position}
style={{
[vertical]: 'calc(100% + 8px)',
[horizontal]: 0,
}}
data-rendered={preferencesRendered}
/>
)}
{menuMounted && ( {menuMounted && (
<div <div
ref={menuRef} ref={menuRef}
...@@ -381,11 +428,10 @@ function DevToolsPopover({ ...@@ -381,11 +428,10 @@ function DevToolsPopover({
<div className="dev-tools-indicator-footer"> <div className="dev-tools-indicator-footer">
<MenuItem <MenuItem
data-hide-dev-tools data-preferences
title="Hide Dev Tools for the current server session or a day." label="Preferences"
label="Hide for Dev Session" value={<GearIcon />}
value={<StopIcon />} onClick={() => setIsPreferencesOpen(true)}
onClick={hide}
index={isTurbopack ? 2 : 3} index={isTurbopack ? 2 : 3}
/> />
</div> </div>
......
...@@ -8,34 +8,40 @@ export function DevToolsInfo({ ...@@ -8,34 +8,40 @@ export function DevToolsInfo({
}: { }: {
title: string title: string
children: React.ReactNode children: React.ReactNode
learnMoreLink: string learnMoreLink?: string
setIsOpen: (isOpen: boolean) => void setIsOpen?: (isOpen: boolean) => void
setPreviousOpen: (isOpen: boolean) => void setPreviousOpen?: (isOpen: boolean) => void
}) { }) {
const hasActionButtons = Boolean(
learnMoreLink && setIsOpen && setPreviousOpen
)
return ( return (
<div data-info-popover {...props}> <div data-info-popover {...props}>
<div className="dev-tools-info-container"> <div className="dev-tools-info-container">
<h1 className="dev-tools-info-title">{title}</h1> <h1 className="dev-tools-info-title">{title}</h1>
{children} {children}
<div className="dev-tools-info-button-container"> {hasActionButtons && (
<button <div className="dev-tools-info-button-container">
className="dev-tools-info-close-button" <button
onClick={() => { className="dev-tools-info-close-button"
setIsOpen(false) onClick={() => {
setPreviousOpen(true) setIsOpen?.(false)
}} setPreviousOpen?.(true)
> }}
Close >
</button> Close
<a </button>
className="dev-tools-info-learn-more-button" <a
href={learnMoreLink} className="dev-tools-info-learn-more-button"
target="_blank" href={learnMoreLink}
rel="noreferrer noopener" target="_blank"
> rel="noreferrer noopener"
Learn More >
</a> Learn More
</div> </a>
</div>
)}
</div> </div>
</div> </div>
) )
...@@ -69,14 +75,14 @@ export const DEV_TOOLS_INFO_STYLES = ` ...@@ -69,14 +75,14 @@ export const DEV_TOOLS_INFO_STYLES = `
} }
.dev-tools-info-container { .dev-tools-info-container {
padding: 6px; padding: 12px;
} }
.dev-tools-info-title { .dev-tools-info-title {
padding: 8px 6px; padding: 8px 6px;
color: var(--color-gray-1000); color: var(--color-gray-1000);
font-size: var(--size-14); font-size: var(--size-16);
font-weight: 500; font-weight: 600;
line-height: var(--size-20); line-height: var(--size-20);
margin: 0; margin: 0;
} }
......
...@@ -146,7 +146,4 @@ export function RouteInfo({ ...@@ -146,7 +146,4 @@ export function RouteInfo({
) )
} }
export const DEV_TOOLS_INFO_ROUTE_INFO_STYLES = ` export const DEV_TOOLS_INFO_ROUTE_INFO_STYLES = ``
.dev-tools-info-link {
}
`
import { useState } from 'react'
import { DevToolsInfo } from './dev-tools-info'
import { css } from '../../../../../utils/css'
import type { DevToolsIndicatorPosition } from '../dev-tools-indicator'
import EyeIcon from '../../../../icons/eye-icon'
import { STORAGE_KEY_POSITION, STORAGE_KEY_THEME } from '../../../../../shared'
import LightIcon from '../../../../icons/light-icon'
import DarkIcon from '../../../../icons/dark-icon'
function getInitialPreference() {
if (typeof localStorage === 'undefined') {
return 'system'
}
const theme = localStorage.getItem(STORAGE_KEY_THEME)
return theme === 'dark' || theme === 'light' ? theme : 'system'
}
export function UserPreferences({
isOpen,
setPosition,
position,
hide,
...props
}: {
isOpen: boolean
setPosition: (position: DevToolsIndicatorPosition) => void
position: DevToolsIndicatorPosition
hide: () => void
style?: React.CSSProperties
ref?: React.RefObject<HTMLElement | null>
}) {
// derive initial theme from system preference
const [theme, setTheme] = useState(getInitialPreference())
const handleThemeChange = (e: React.ChangeEvent<HTMLSelectElement>) => {
const portal = document.querySelector('nextjs-portal')
if (!portal) return
setTheme(e.target.value)
if (e.target.value === 'system') {
portal.classList.remove('dark')
portal.classList.remove('light')
localStorage.removeItem(STORAGE_KEY_THEME)
return
}
if (e.target.value === 'dark') {
portal.classList.add('dark')
portal.classList.remove('light')
localStorage.setItem(STORAGE_KEY_THEME, 'dark')
} else {
portal.classList.remove('dark')
portal.classList.add('light')
localStorage.setItem(STORAGE_KEY_THEME, 'light')
}
}
function handlePositionChange(e: React.ChangeEvent<HTMLSelectElement>) {
setPosition(e.target.value as DevToolsIndicatorPosition)
localStorage.setItem(STORAGE_KEY_POSITION, e.target.value)
}
return (
<DevToolsInfo title="Preferences" {...props}>
<div className="preferences-container">
<div className="preference-section">
<div className="preference-header">
<h2>Theme</h2>
<p className="preference-description">
Select your theme preference.
</p>
</div>
<div className="preference-control-select">
<div className="preference-icon">
<ThemeIcon theme={theme as 'dark' | 'light' | 'system'} />
</div>
<select
className="select-button"
value={theme}
onChange={handleThemeChange}
>
<option value="system">System</option>
<option value="light">Light</option>
<option value="dark">Dark</option>
</select>
</div>
</div>
<div className="preference-section">
<div className="preference-header">
<h2>Position</h2>
<p className="preference-description">
Adjust the placement of your dev tools.
</p>
</div>
<div className="preference-control-select">
<select
className="select-button"
value={position}
onChange={handlePositionChange}
>
<option value="bottom-left">Bottom Left</option>
<option value="bottom-right">Bottom Right</option>
<option value="top-left">Top Left</option>
<option value="top-right">Top Right</option>
</select>
</div>
</div>
<div className="preference-section">
<div className="preference-header">
<h2>Hide Dev Tools for this session</h2>
<p className="preference-description">
Hide Dev Tools until you restart your dev server, or 1 day.
</p>
</div>
<div className="preference-control">
<button
data-hide-dev-tools
className="action-button"
onClick={hide}
>
<div className="preference-icon">
<EyeIcon />
</div>
<span>Hide</span>
</button>
</div>
</div>
<div className="preference-section">
<div className="preference-header">
<h2>Disable Dev Tools for this project</h2>
<p className="preference-description">
To disable this UI completely, set{' '}
<code className="dev-tools-info-code">devIndicators: false</code>{' '}
in your <code className="dev-tools-info-code">next.config</code>{' '}
file.
</p>
</div>
</div>
</div>
</DevToolsInfo>
)
}
function ThemeIcon({ theme }: { theme: 'dark' | 'light' | 'system' }) {
const activeTheme =
theme === 'system'
? window.matchMedia('(prefers-color-scheme: dark)').matches
? 'dark'
: 'light'
: theme
return activeTheme === 'dark' ? <DarkIcon /> : <LightIcon />
}
export const DEV_TOOLS_INFO_USER_PREFERENCES_STYLES = css`
.preferences-container {
padding: 8px 6px;
width: 100%;
}
@media (min-width: 576px) {
.preferences-container {
width: 480px;
}
}
.preference-section:first-child {
padding-top: 0;
}
.preference-section {
padding: 12px 0;
border-bottom: 1px solid var(--color-gray-400);
display: flex;
justify-content: space-between;
align-items: center;
gap: 24px;
}
.preference-section:last-child {
border-bottom: none;
}
.preference-header {
margin-bottom: 0;
flex: 1;
}
.preference-header h2 {
font-size: var(--size-14);
font-weight: 500;
color: var(--color-gray-1000);
margin: 0;
}
.preference-description {
color: var(--color-gray-900);
font-size: var(--size-14);
margin: 0;
}
.preference-icon {
display: flex;
align-items: center;
width: 16px;
height: 16px;
}
.select-button,
.action-button {
display: flex;
align-items: center;
gap: 8px;
background: var(--color-background-100);
border: 1px solid var(--color-gray-400);
border-radius: var(--rounded-lg);
font-weight: 400;
font-size: var(--size-14);
color: var(--color-gray-1000);
padding: 6px 8px;
&:hover {
background: var(--color-gray-100);
}
}
.preference-control-select {
padding: 6px 8px;
display: flex;
align-items: center;
gap: 8px;
border-radius: var(--rounded-lg);
border: 1px solid var(--color-gray-400);
&:hover {
background: var(--color-gray-100);
}
&:focus-within {
outline: 5px auto -webkit-focus-ring-color;
}
}
.preference-control-select select {
font-size: var(--size-14);
font-weight: 400;
border: none;
padding: 0 6px 0 0;
border-radius: 0;
outline: none;
}
:global(.icon) {
width: 18px;
height: 18px;
color: #666;
}
`
import * as React from 'react' import * as React from 'react'
import { createPortal } from 'react-dom' import { createPortal } from 'react-dom'
import { STORAGE_KEY_THEME } from '../../shared'
export function ShadowPortal({ children }: { children: React.ReactNode }) { export function ShadowPortal({ children }: { children: React.ReactNode }) {
let portalNode = React.useRef<HTMLElement | null>(null) let portalNode = React.useRef<HTMLElement | null>(null)
...@@ -9,6 +10,18 @@ export function ShadowPortal({ children }: { children: React.ReactNode }) { ...@@ -9,6 +10,18 @@ export function ShadowPortal({ children }: { children: React.ReactNode }) {
React.useLayoutEffect(() => { React.useLayoutEffect(() => {
const ownerDocument = document const ownerDocument = document
portalNode.current = ownerDocument.createElement('nextjs-portal') portalNode.current = ownerDocument.createElement('nextjs-portal')
// load default color preference from localstorage
if (typeof localStorage !== 'undefined') {
const theme = localStorage.getItem(STORAGE_KEY_THEME)
if (theme === 'dark') {
portalNode.current.classList.add('dark')
portalNode.current.classList.remove('light')
} else if (theme === 'light') {
portalNode.current.classList.remove('dark')
portalNode.current.classList.add('light')
}
}
shadowNode.current = portalNode.current.attachShadow({ mode: 'open' }) shadowNode.current = portalNode.current.attachShadow({ mode: 'open' })
ownerDocument.body.appendChild(portalNode.current) ownerDocument.body.appendChild(portalNode.current)
forceUpdate({}) forceUpdate({})
......
export default function DarkIcon() {
return (
<svg
data-testid="geist-icon"
height="16"
strokeLinejoin="round"
viewBox="0 0 16 16"
width="16"
>
<path
fillRule="evenodd"
clipRule="evenodd"
d="M1.5 8.00005C1.5 5.53089 2.99198 3.40932 5.12349 2.48889C4.88136 3.19858 4.75 3.95936 4.75 4.7501C4.75 8.61609 7.88401 11.7501 11.75 11.7501C11.8995 11.7501 12.048 11.7454 12.1953 11.7361C11.0955 13.1164 9.40047 14.0001 7.5 14.0001C4.18629 14.0001 1.5 11.3138 1.5 8.00005ZM6.41706 0.577759C2.78784 1.1031 0 4.22536 0 8.00005C0 12.1422 3.35786 15.5001 7.5 15.5001C10.5798 15.5001 13.2244 13.6438 14.3792 10.9921L13.4588 9.9797C12.9218 10.155 12.3478 10.2501 11.75 10.2501C8.71243 10.2501 6.25 7.78767 6.25 4.7501C6.25 3.63431 6.58146 2.59823 7.15111 1.73217L6.41706 0.577759ZM13.25 1V1.75V2.75L14.25 2.75H15V4.25H14.25H13.25V5.25V6H11.75V5.25V4.25H10.75L10 4.25V2.75H10.75L11.75 2.75V1.75V1H13.25Z"
fill="currentColor"
></path>
</svg>
)
}
export default function EyeIcon() {
return (
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none">
<path
fill="currentColor"
fillRule="evenodd"
d="m.191 2.063.56.498 13.5 12 .561.498.997-1.121-.56-.498-1.81-1.608 2.88-3.342v-.98l-3.204-3.72C10.645.923 6.365.686 3.594 3.08L1.748 1.44 1.188.94.19 2.063ZM14.761 8l-2.442 2.836-1.65-1.466a3.001 3.001 0 0 0-4.342-3.86l-1.6-1.422a5.253 5.253 0 0 1 7.251.682L14.76 8ZM7.526 6.576l1.942 1.727a1.499 1.499 0 0 0-1.942-1.727Zm-7.845.935 1.722-2 1.137.979L1.24 8l2.782 3.23A5.25 5.25 0 0 0 9.9 12.703l.54 1.4a6.751 6.751 0 0 1-7.555-1.892L-.318 8.49v-.98Z"
clipRule="evenodd"
/>
</svg>
)
}
export default function GearIcon() {
return (
<svg
xmlns="http://www.w3.org/2000/svg"
width="16"
height="16"
viewBox="0 0 20 20"
fill="none"
>
<path
fill="currentColor"
fillRule="evenodd"
d="m9.7 3.736.045-.236h.51l.044.236a2.024 2.024 0 0 0 1.334 1.536c.19.066.375.143.554.23.618.301 1.398.29 2.03-.143l.199-.136.36.361-.135.199a2.024 2.024 0 0 0-.143 2.03c.087.179.164.364.23.554.224.65.783 1.192 1.536 1.334l.236.044v.51l-.236.044a2.024 2.024 0 0 0-1.536 1.334 4.95 4.95 0 0 1-.23.554 2.024 2.024 0 0 0 .143 2.03l.136.199-.361.36-.199-.135a2.024 2.024 0 0 0-2.03-.143c-.179.087-.364.164-.554.23a2.024 2.024 0 0 0-1.334 1.536l-.044.236h-.51l-.044-.236a2.024 2.024 0 0 0-1.334-1.536 4.952 4.952 0 0 1-.554-.23 2.024 2.024 0 0 0-2.03.143l-.199.136-.36-.361.135-.199a2.024 2.024 0 0 0 .143-2.03 4.958 4.958 0 0 1-.23-.554 2.024 2.024 0 0 0-1.536-1.334l-.236-.044v-.51l.236-.044a2.024 2.024 0 0 0 1.536-1.334 4.96 4.96 0 0 1 .23-.554 2.024 2.024 0 0 0-.143-2.03l-.136-.199.361-.36.199.135a2.024 2.024 0 0 0 2.03.143c.179-.087.364-.164.554-.23a2.024 2.024 0 0 0 1.334-1.536ZM8.5 2h3l.274 1.46c.034.185.17.333.348.394.248.086.49.186.722.3.17.082.37.074.526-.033l1.226-.839 2.122 2.122-.84 1.226a.524.524 0 0 0-.032.526c.114.233.214.474.3.722.061.177.21.314.394.348L18 8.5v3l-1.46.274a.524.524 0 0 0-.394.348 6.47 6.47 0 0 1-.3.722.524.524 0 0 0 .033.526l.839 1.226-2.122 2.122-1.226-.84a.524.524 0 0 0-.526-.032 6.477 6.477 0 0 1-.722.3.524.524 0 0 0-.348.394L11.5 18h-3l-.274-1.46a.524.524 0 0 0-.348-.394 6.477 6.477 0 0 1-.722-.3.524.524 0 0 0-.526.033l-1.226.839-2.122-2.122.84-1.226a.524.524 0 0 0 .032-.526 6.453 6.453 0 0 1-.3-.722.524.524 0 0 0-.394-.348L2 11.5v-3l1.46-.274a.524.524 0 0 0 .394-.348c.086-.248.186-.49.3-.722a.524.524 0 0 0-.033-.526l-.839-1.226 2.122-2.122 1.226.84a.524.524 0 0 0 .526.032 6.46 6.46 0 0 1 .722-.3.524.524 0 0 0 .348-.394L8.5 2Zm3 8a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0Zm1.5 0a3 3 0 1 1-6 0 3 3 0 0 1 6 0Z"
clipRule="evenodd"
/>
</svg>
)
}
export default function LightIcon() {
return (
<svg
xmlns="http://www.w3.org/2000/svg"
width="20"
height="16"
viewBox="0 0 16 16"
fill="none"
>
<g clipPath="url(#a)">
<path
fill="currentColor"
fillRule="evenodd"
d="M8.75.75V0h-1.5v2h1.5V.75ZM3.26 4.32l-.53-.53-.354-.353-.53-.53 1.06-1.061.53.53.354.354.53.53-1.06 1.06Zm8.42-1.06.53-.53.353-.354.53-.53 1.061 1.06-.53.53-.354.354-.53.53-1.06-1.06ZM8 11.25a3.25 3.25 0 1 0 0-6.5 3.25 3.25 0 0 0 0 6.5Zm0 1.5a4.75 4.75 0 1 0 0-9.5 4.75 4.75 0 0 0 0 9.5Zm6-5.5h2v1.5h-2v-1.5Zm-13.25 0H0v1.5h2v-1.5H.75Zm1.62 5.32-.53.53 1.06 1.06.53-.53.354-.353.53-.53-1.06-1.061-.53.53-.354.354Zm10.2 1.06.53.53 1.06-1.06-.53-.53-.354-.354-.53-.53-1.06 1.06.53.53.353.354ZM8.75 14v2h-1.5v-2h1.5Z"
clipRule="evenodd"
/>
</g>
<defs>
<clipPath id="a">
<path fill="currentColor" d="M0 0h16v16H0z" />
</clipPath>
</defs>
</svg>
)
}
import { css } from '../../utils/css' import { css } from '../../utils/css'
const darkTheme = css`
--color-font: white;
--color-backdrop: rgba(0, 0, 0, 0.8);
--color-border-shadow: rgba(255, 255, 255, 0.145);
--color-title-color: #fafafa;
--color-stack-notes: #a9a9a9;
`
export function Base() { export function Base() {
return ( return (
<style> <style>
...@@ -114,14 +123,13 @@ export function Base() { ...@@ -114,14 +123,13 @@ export function Base() {
} }
} }
@media (prefers-color-scheme: dark) { :host(.dark) {
:host { ${darkTheme}
--color-font: white; }
--color-backdrop: rgb(0, 0, 0, 0.8);
--color-border-shadow: rgba(255, 255, 255, 0.145);
--color-title-color: #fafafa; @media (prefers-color-scheme: dark) {
--color-stack-notes: #a9a9a9; :host(:not(.light)) {
${darkTheme}
} }
} }
......
import { css } from '../../utils/css' import { css } from '../../utils/css'
const darkTheme = css`
/* Background Dark */
--color-background-100: #0a0a0a;
--color-background-200: #000000;
/* Syntax Dark */
--color-syntax-comment: #a0a0a0;
--color-syntax-constant: #ededed;
--color-syntax-function: #52a9ff;
--color-syntax-keyword: #f76191;
--color-syntax-link: #0ac5b2;
--color-syntax-parameter: #f1a10d;
--color-syntax-punctuation: #ededed;
--color-syntax-string: #0ac5b2;
--color-syntax-string-expression: #0ac5b2;
/* Gray Scale Dark */
--color-gray-100: #1a1a1a;
--color-gray-200: #1f1f1f;
--color-gray-300: #292929;
--color-gray-400: #2e2e2e;
--color-gray-500: #454545;
--color-gray-600: #878787;
--color-gray-700: #8f8f8f;
--color-gray-800: #7d7d7d;
--color-gray-900: #a0a0a0;
--color-gray-1000: #ededed;
/* Gray Alpha Scale Dark */
--color-gray-alpha-100: rgba(255, 255, 255, 0.066);
--color-gray-alpha-200: rgba(255, 255, 255, 0.087);
--color-gray-alpha-300: rgba(255, 255, 255, 0.125);
--color-gray-alpha-400: rgba(255, 255, 255, 0.145);
--color-gray-alpha-500: rgba(255, 255, 255, 0.239);
--color-gray-alpha-600: rgba(255, 255, 255, 0.506);
--color-gray-alpha-700: rgba(255, 255, 255, 0.54);
--color-gray-alpha-800: rgba(255, 255, 255, 0.47);
--color-gray-alpha-900: rgba(255, 255, 255, 0.61);
--color-gray-alpha-1000: rgba(255, 255, 255, 0.923);
/* Blue Scale Dark */
--color-blue-100: #0f1b2d;
--color-blue-200: #10243e;
--color-blue-300: #0f3058;
--color-blue-400: #0d3868;
--color-blue-500: #0a4481;
--color-blue-600: #0091ff;
--color-blue-700: #0070f3;
--color-blue-800: #0060d1;
--color-blue-900: #52a9ff;
--color-blue-1000: #eaf6ff;
/* Red Scale Dark */
--color-red-100: #2a1314;
--color-red-200: #3d1719;
--color-red-300: #551a1e;
--color-red-400: #671e22;
--color-red-500: #822025;
--color-red-600: #e5484d;
--color-red-700: #e5484d;
--color-red-800: #da3036;
--color-red-900: #ff6369;
--color-red-1000: #ffecee;
/* Amber Scale Dark */
--color-amber-100: #271700;
--color-amber-200: #341c00;
--color-amber-300: #4a2900;
--color-amber-400: #573300;
--color-amber-500: #693f05;
--color-amber-600: #e79c13;
--color-amber-700: #ffb224;
--color-amber-800: #ff990a;
--color-amber-900: #f1a10d;
--color-amber-1000: #fef3dd;
/* Green Scale Dark */
--color-green-100: #0b2211;
--color-green-200: #0f2c17;
--color-green-300: #11351b;
--color-green-400: #0c461b;
--color-green-500: #126427;
--color-green-600: #1a9338;
--color-green-700: #46a758;
--color-green-800: #388e4a;
--color-green-900: #63c174;
--color-green-1000: #e5fbeb;
/* Turbopack Dark - Temporary */
--color-turbopack-text-red: #ff6d92;
--color-turbopack-text-blue: #45b2ff;
--color-turbopack-border-red: #6e293b;
--color-turbopack-border-blue: #284f80;
--color-turbopack-background-red: #250d12;
--color-turbopack-background-blue: #0a1723;
`
// TODO: Replace the existing colors in Base.tsx. // TODO: Replace the existing colors in Base.tsx.
export function Colors() { export function Colors() {
return ( return (
...@@ -141,102 +238,13 @@ export function Colors() { ...@@ -141,102 +238,13 @@ export function Colors() {
--color-turbopack-background-blue: #f6fbff; --color-turbopack-background-blue: #f6fbff;
} }
:host(.dark) {
${darkTheme}
}
@media (prefers-color-scheme: dark) { @media (prefers-color-scheme: dark) {
:host { :host(:not(.light)) {
/* Background Dark */ ${darkTheme}
--color-background-100: #0a0a0a;
--color-background-200: #000000;
/* Syntax Dark */
--color-syntax-comment: #a0a0a0;
--color-syntax-constant: #ededed;
--color-syntax-function: #52a9ff;
--color-syntax-keyword: #f76191;
--color-syntax-link: #0ac5b2;
--color-syntax-parameter: #f1a10d;
--color-syntax-punctuation: #ededed;
--color-syntax-string: #0ac5b2;
--color-syntax-string-expression: #0ac5b2;
/* Gray Scale Dark */
--color-gray-100: #1a1a1a;
--color-gray-200: #1f1f1f;
--color-gray-300: #292929;
--color-gray-400: #2e2e2e;
--color-gray-500: #454545;
--color-gray-600: #878787;
--color-gray-700: #8f8f8f;
--color-gray-800: #7d7d7d;
--color-gray-900: #a0a0a0;
--color-gray-1000: #ededed;
/* Gray Alpha Scale Dark */
--color-gray-alpha-100: rgba(255, 255, 255, 0.066);
--color-gray-alpha-200: rgba(255, 255, 255, 0.087);
--color-gray-alpha-300: rgba(255, 255, 255, 0.125);
--color-gray-alpha-400: rgba(255, 255, 255, 0.145);
--color-gray-alpha-500: rgba(255, 255, 255, 0.239);
--color-gray-alpha-600: rgba(255, 255, 255, 0.506);
--color-gray-alpha-700: rgba(255, 255, 255, 0.54);
--color-gray-alpha-800: rgba(255, 255, 255, 0.47);
--color-gray-alpha-900: rgba(255, 255, 255, 0.61);
--color-gray-alpha-1000: rgba(255, 255, 255, 0.923);
/* Blue Scale Dark */
--color-blue-100: #0f1b2d;
--color-blue-200: #10243e;
--color-blue-300: #0f3058;
--color-blue-400: #0d3868;
--color-blue-500: #0a4481;
--color-blue-600: #0091ff;
--color-blue-700: #0070f3;
--color-blue-800: #0060d1;
--color-blue-900: #52a9ff;
--color-blue-1000: #eaf6ff;
/* Red Scale Dark */
--color-red-100: #2a1314;
--color-red-200: #3d1719;
--color-red-300: #551a1e;
--color-red-400: #671e22;
--color-red-500: #822025;
--color-red-600: #e5484d;
--color-red-700: #e5484d;
--color-red-800: #da3036;
--color-red-900: #ff6369;
--color-red-1000: #ffecee;
/* Amber Scale Dark */
--color-amber-100: #271700;
--color-amber-200: #341c00;
--color-amber-300: #4a2900;
--color-amber-400: #573300;
--color-amber-500: #693f05;
--color-amber-600: #e79c13;
--color-amber-700: #ffb224;
--color-amber-800: #ff990a;
--color-amber-900: #f1a10d;
--color-amber-1000: #fef3dd;
/* Green Scale Dark */
--color-green-100: #0b2211;
--color-green-200: #0f2c17;
--color-green-300: #11351b;
--color-green-400: #0c461b;
--color-green-500: #126427;
--color-green-600: #1a9338;
--color-green-700: #46a758;
--color-green-800: #388e4a;
--color-green-900: #63c174;
--color-green-1000: #e5fbeb;
/* Turbopack Dark - Temporary */
--color-turbopack-text-red: #ff6d92;
--color-turbopack-text-blue: #45b2ff;
--color-turbopack-border-red: #6e293b;
--color-turbopack-border-blue: #284f80;
--color-turbopack-background-red: #250d12;
--color-turbopack-background-blue: #0a1723;
} }
} }
`} `}
......
...@@ -20,6 +20,7 @@ import { ENVIRONMENT_NAME_LABEL_STYLES } from '../components/errors/environment- ...@@ -20,6 +20,7 @@ import { ENVIRONMENT_NAME_LABEL_STYLES } from '../components/errors/environment-
import { DEV_TOOLS_INFO_STYLES } from '../components/errors/dev-tools-indicator/dev-tools-info/dev-tools-info' import { DEV_TOOLS_INFO_STYLES } from '../components/errors/dev-tools-indicator/dev-tools-info/dev-tools-info'
import { DEV_TOOLS_INFO_TURBOPACK_INFO_STYLES } from '../components/errors/dev-tools-indicator/dev-tools-info/turbopack-info' import { DEV_TOOLS_INFO_TURBOPACK_INFO_STYLES } from '../components/errors/dev-tools-indicator/dev-tools-info/turbopack-info'
import { DEV_TOOLS_INFO_ROUTE_INFO_STYLES } from '../components/errors/dev-tools-indicator/dev-tools-info/route-info' import { DEV_TOOLS_INFO_ROUTE_INFO_STYLES } from '../components/errors/dev-tools-indicator/dev-tools-info/route-info'
import { DEV_TOOLS_INFO_USER_PREFERENCES_STYLES } from '../components/errors/dev-tools-indicator/dev-tools-info/user-preferences'
export function ComponentStyles() { export function ComponentStyles() {
return ( return (
...@@ -46,6 +47,7 @@ export function ComponentStyles() { ...@@ -46,6 +47,7 @@ export function ComponentStyles() {
${DEV_TOOLS_INFO_STYLES} ${DEV_TOOLS_INFO_STYLES}
${DEV_TOOLS_INFO_TURBOPACK_INFO_STYLES} ${DEV_TOOLS_INFO_TURBOPACK_INFO_STYLES}
${DEV_TOOLS_INFO_ROUTE_INFO_STYLES} ${DEV_TOOLS_INFO_ROUTE_INFO_STYLES}
${DEV_TOOLS_INFO_USER_PREFERENCES_STYLES}
`} `}
</style> </style>
) )
......
...@@ -20,6 +20,7 @@ describe('dev indicator - Hide DevTools Button', () => { ...@@ -20,6 +20,7 @@ describe('dev indicator - Hide DevTools Button', () => {
const browser = await next.browser('/') const browser = await next.browser('/')
await openDevToolsIndicatorPopover(browser) await openDevToolsIndicatorPopover(browser)
await browser.elementByCss('[data-preferences]').click()
await browser.elementByCss('[data-hide-dev-tools]').click() await browser.elementByCss('[data-hide-dev-tools]').click()
await assertNoDevToolsIndicator(browser) await assertNoDevToolsIndicator(browser)
...@@ -36,6 +37,7 @@ describe('dev indicator - Hide DevTools Button', () => { ...@@ -36,6 +37,7 @@ describe('dev indicator - Hide DevTools Button', () => {
const browser = await next.browser('/') const browser = await next.browser('/')
await openDevToolsIndicatorPopover(browser) await openDevToolsIndicatorPopover(browser)
await browser.elementByCss('[data-preferences]').click()
await browser.elementByCss('[data-hide-dev-tools]').click() await browser.elementByCss('[data-hide-dev-tools]').click()
await assertNoDevToolsIndicator(browser) await assertNoDevToolsIndicator(browser)
...@@ -51,6 +53,7 @@ describe('dev indicator - Hide DevTools Button', () => { ...@@ -51,6 +53,7 @@ describe('dev indicator - Hide DevTools Button', () => {
const browser = await next.browser('/') const browser = await next.browser('/')
await openDevToolsIndicatorPopover(browser) await openDevToolsIndicatorPopover(browser)
await browser.elementByCss('[data-preferences]').click()
await browser.elementByCss('[data-hide-dev-tools]').click() await browser.elementByCss('[data-hide-dev-tools]').click()
await assertNoDevToolsIndicator(browser) await assertNoDevToolsIndicator(browser)
......
...@@ -37,6 +37,7 @@ describe('client-dev-overlay', () => { ...@@ -37,6 +37,7 @@ describe('client-dev-overlay', () => {
popover: '[data-nextjs-dev-tools-button]', popover: '[data-nextjs-dev-tools-button]',
indicator: '[data-next-badge-root]', indicator: '[data-next-badge-root]',
minimizeButton: 'body', minimizeButton: 'body',
preferencesButton: '[data-preferences]',
hideButton: '[data-hide-dev-tools]', hideButton: '[data-hide-dev-tools]',
} }
function getToast() { function getToast() {
...@@ -51,6 +52,9 @@ describe('client-dev-overlay', () => { ...@@ -51,6 +52,9 @@ describe('client-dev-overlay', () => {
function getHideButton() { function getHideButton() {
return browser.elementByCss(selectors.hideButton) return browser.elementByCss(selectors.hideButton)
} }
function getPreferencesButton() {
return browser.elementByCss(selectors.preferencesButton)
}
it('should be able to fullscreen the minimized overlay', async () => { it('should be able to fullscreen the minimized overlay', async () => {
await getMinimizeButton().click() await getMinimizeButton().click()
...@@ -73,6 +77,7 @@ describe('client-dev-overlay', () => { ...@@ -73,6 +77,7 @@ describe('client-dev-overlay', () => {
it('should keep the error indicator visible when there are errors', async () => { it('should keep the error indicator visible when there are errors', async () => {
await getMinimizeButton().click() await getMinimizeButton().click()
await getPopover().click() await getPopover().click()
await getPreferencesButton().click()
await getHideButton().click() await getHideButton().click()
await retry(async () => { await retry(async () => {
...@@ -92,6 +97,7 @@ describe('client-dev-overlay', () => { ...@@ -92,6 +97,7 @@ describe('client-dev-overlay', () => {
await getMinimizeButton().click() await getMinimizeButton().click()
await getPopover().click() await getPopover().click()
await getPreferencesButton().click()
await getHideButton().click() await getHideButton().click()
await retry(async () => { await retry(async () => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment