Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ import { EnvironmentNameLabel } from '../environment-name-label/environment-name
import { useFocusTrap } from '../dev-tools-indicator/utils'
import { Fader } from '../../fader'
import { Resizer } from '../../resizer'
import { OverlayBackdrop } from '../../overlay'

export interface ErrorOverlayLayoutProps extends ErrorBaseProps {
errorMessage: ErrorMessageType
Expand Down Expand Up @@ -109,7 +110,8 @@ export function ErrorOverlayLayout({
}

return (
<ErrorOverlayOverlay fixed={isBuildError} {...animationProps}>
<ErrorOverlayOverlay {...animationProps}>
<OverlayBackdrop fixed={isBuildError} />
<div
data-nextjs-dialog-root
onTransitionEnd={onTransitionEnd}
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
export { Overlay } from './overlay'
export { OverlayBackdrop } from './overlay-backdrop'
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
export type OverlayBackdropProps = {
fixed?: boolean
} & React.HTMLAttributes<HTMLDivElement>

export function OverlayBackdrop({ fixed, ...props }: OverlayBackdropProps) {
return (
<div
data-nextjs-dialog-backdrop
data-nextjs-dialog-backdrop-fixed={fixed ? true : undefined}
{...props}
/>
)
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ export type OverlayProps = {
const Overlay: React.FC<OverlayProps> = function Overlay({
className,
children,
fixed,
...props
}) {
React.useEffect(() => {
Expand All @@ -22,10 +21,6 @@ const Overlay: React.FC<OverlayProps> = function Overlay({

return (
<div data-nextjs-dialog-overlay className={className} {...props}>
<div
data-nextjs-dialog-backdrop
data-nextjs-dialog-backdrop-fixed={fixed ? true : undefined}
/>
{children}
</div>
)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useState, useMemo, useRef, Suspense } from 'react'
import type { DebugInfo } from '../../shared/types'
import { Overlay } from '../components/overlay'
import { Overlay, OverlayBackdrop } from '../components/overlay'
import { RuntimeError } from './runtime-error'
import { getErrorSource } from '../../../shared/lib/error-source'
import { HotlinkedText } from '../components/hot-linked-text'
Expand Down Expand Up @@ -139,7 +139,11 @@ export function Errors({

if (isLoading) {
// TODO: better loading state
return <Overlay />
return (
<Overlay>
<OverlayBackdrop />
</Overlay>
)
}

if (!activeError) {
Expand Down