Skip to content

Commit 0e5d4c5

Browse files
committed
[devtools] port overlay baackdrop out of overlay
1 parent 65455d9 commit 0e5d4c5

File tree

5 files changed

+24
-8
lines changed

5 files changed

+24
-8
lines changed

packages/next/src/next-devtools/dev-overlay/components/errors/error-overlay-layout/error-overlay-layout.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ import { EnvironmentNameLabel } from '../environment-name-label/environment-name
3737
import { useFocusTrap } from '../dev-tools-indicator/utils'
3838
import { Fader } from '../../fader'
3939
import { Resizer } from '../../resizer'
40+
import { OverlayBackdrop } from '../../overlay'
4041

4142
export interface ErrorOverlayLayoutProps extends ErrorBaseProps {
4243
errorMessage: ErrorMessageType
@@ -109,7 +110,8 @@ export function ErrorOverlayLayout({
109110
}
110111

111112
return (
112-
<ErrorOverlayOverlay fixed={isBuildError} {...animationProps}>
113+
<ErrorOverlayOverlay {...animationProps}>
114+
<OverlayBackdrop fixed={isBuildError} />
113115
<div
114116
data-nextjs-dialog-root
115117
onTransitionEnd={onTransitionEnd}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
export { Overlay } from './overlay'
2+
export { OverlayBackdrop } from './overlay-backdrop'
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
export type OverlayBackDropProps = {
2+
className?: string
3+
fixed?: boolean
4+
}
5+
6+
export function OverlayBackdrop({ fixed, ...props }: OverlayBackDropProps) {
7+
return (
8+
<div
9+
data-nextjs-dialog-backdrop
10+
data-nextjs-dialog-backdrop-fixed={fixed ? true : undefined}
11+
{...props}
12+
/>
13+
)
14+
}

packages/next/src/next-devtools/dev-overlay/components/overlay/overlay.tsx

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ export type OverlayProps = {
1010
const Overlay: React.FC<OverlayProps> = function Overlay({
1111
className,
1212
children,
13-
fixed,
1413
...props
1514
}) {
1615
React.useEffect(() => {
@@ -22,10 +21,6 @@ const Overlay: React.FC<OverlayProps> = function Overlay({
2221

2322
return (
2423
<div data-nextjs-dialog-overlay className={className} {...props}>
25-
<div
26-
data-nextjs-dialog-backdrop
27-
data-nextjs-dialog-backdrop-fixed={fixed ? true : undefined}
28-
/>
2924
{children}
3025
</div>
3126
)

packages/next/src/next-devtools/dev-overlay/container/errors.tsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { useState, useMemo, useRef, Suspense } from 'react'
22
import type { DebugInfo } from '../../shared/types'
3-
import { Overlay } from '../components/overlay'
3+
import { Overlay, OverlayBackdrop } from '../components/overlay'
44
import { RuntimeError } from './runtime-error'
55
import { getErrorSource } from '../../../shared/lib/error-source'
66
import { HotlinkedText } from '../components/hot-linked-text'
@@ -139,7 +139,11 @@ export function Errors({
139139

140140
if (isLoading) {
141141
// TODO: better loading state
142-
return <Overlay />
142+
return (
143+
<Overlay>
144+
<OverlayBackdrop />
145+
</Overlay>
146+
)
143147
}
144148

145149
if (!activeError) {

0 commit comments

Comments
 (0)