Unverified Commit 67c3d7a5 authored by Jiwon Choi's avatar Jiwon Choi Committed by GitHub

[DevOverlay] Floating Header and Bottom Stacks (#74581)

This PR moved existing pagination and version info to a floating header above the overlay.
Moved the Bottom Stacks inside the dialog component and modified position as well.

![CleanShot 2025-01-07 at 20 31 24](https://github.com/user-attachments/assets/5da08731-5bdc-4978-89e8-a258744cdfa7)

Closes NDX-634
parent d2c45d0d
...@@ -13,7 +13,7 @@ const styles = css` ...@@ -13,7 +13,7 @@ const styles = css`
border-radius: var(--rounded-xl); border-radius: var(--rounded-xl);
box-shadow: var(--shadow-md); box-shadow: var(--shadow-md);
max-height: calc(100% - 56px); max-height: calc(100% - 56px);
overflow-y: hidden; position: relative;
} }
@media (max-height: 812px) { @media (max-height: 812px) {
......
...@@ -37,9 +37,10 @@ export const styles = css` ...@@ -37,9 +37,10 @@ export const styles = css`
display: flex; display: flex;
flex-direction: column; flex-direction: column;
width: 100%; width: 100%;
margin-right: auto;
margin-left: auto;
outline: none; outline: none;
position: absolute;
bottom: -10px;
z-index: -1;
@media (min-width: 576px) { @media (min-width: 576px) {
max-width: 540px; max-width: 540px;
...@@ -56,25 +57,26 @@ export const styles = css` ...@@ -56,25 +57,26 @@ export const styles = css`
.error-overlay-bottom-stack-1, .error-overlay-bottom-stack-1,
.error-overlay-bottom-stack-2 { .error-overlay-bottom-stack-2 {
padding: 0.75rem; padding: 12px;
align-self: center; align-self: center;
border: 1px solid var(--color-gray-400); border: 1px solid var(--color-gray-400);
border-radius: var(--rounded-xl); border-radius: var(--rounded-xl);
margin-top: -1rem; /* 16px */
box-shadow: var(--shadow-md); box-shadow: var(--shadow-md);
background: var(--color-background-200); background: var(--color-background-200);
animation: stack-slide-down 0.3s ease-out forwards; animation: stack-slide-down 0.3s ease-out forwards;
transform-origin: top center; transform-origin: top center;
position: relative;
} }
.error-overlay-bottom-stack-1 { .error-overlay-bottom-stack-1 {
z-index: 49; width: calc(100% - 24px);
width: calc(100% - 1.5rem); /* 24px */
} }
.error-overlay-bottom-stack-2 { .error-overlay-bottom-stack-2 {
z-index: 48; z-index: -2;
width: calc(100% - 3rem); /* 48px */ position: absolute;
top: 10px;
width: calc(100% - 48px);
} }
@keyframes stack-slide-down { @keyframes stack-slide-down {
......
import type { Meta, StoryObj } from '@storybook/react'
import { ErrorOverlayFloatingHeader } from './error-overlay-floating-header'
import { withShadowPortal } from '../../../storybook/with-shadow-portal'
const meta: Meta<typeof ErrorOverlayFloatingHeader> = {
title: 'ErrorOverlayFloatingHeader',
component: ErrorOverlayFloatingHeader,
parameters: {
layout: 'fullscreen',
},
decorators: [withShadowPortal],
}
export default meta
type Story = StoryObj<typeof ErrorOverlayFloatingHeader>
export const Default: Story = {
args: {
readyErrors: [
{
id: 0,
runtime: true,
error: new Error('First error message'),
frames: [],
},
{
id: 1,
runtime: true,
error: new Error('Second error message'),
frames: [],
},
{
id: 2,
runtime: true,
error: new Error('Third error message'),
frames: [],
},
],
activeIdx: 1,
versionInfo: {
installed: '15.0.0',
staleness: 'stale-major',
},
},
}
import type { ReadyRuntimeError } from '../../../helpers/get-error-by-type'
import type { VersionInfo } from '../../../../../../../../server/dev/parse-version-info'
import { ErrorPagination } from '../ErrorPagination/ErrorPagination'
import { VersionStalenessInfo } from '../../VersionStalenessInfo'
import { noop as css } from '../../../helpers/noop-template'
type ErrorOverlayFloatingHeaderProps = {
readyErrors?: ReadyRuntimeError[]
activeIdx?: number
setActiveIndex?: (index: number) => void
versionInfo?: VersionInfo
}
export function ErrorOverlayFloatingHeader({
readyErrors,
activeIdx,
setActiveIndex,
versionInfo,
}: ErrorOverlayFloatingHeaderProps) {
return (
<div className="error-overlay-floating-header">
{/* TODO: better passing data instead of nullish coalescing */}
<ErrorPagination
readyErrors={readyErrors ?? []}
activeIdx={activeIdx ?? 0}
onActiveIndexChange={setActiveIndex ?? (() => {})}
/>
<VersionStalenessInfo versionInfo={versionInfo} />
</div>
)
}
export const styles = css`
.error-overlay-floating-header {
display: flex;
justify-content: space-between;
align-items: center;
width: 100%;
position: absolute;
transform: translateY(-32px);
outline: none;
@media (min-width: 576px) {
max-width: 540px;
}
@media (min-width: 768px) {
max-width: 720px;
}
@media (min-width: 992px) {
max-width: 960px;
}
}
`
...@@ -12,12 +12,10 @@ import { ...@@ -12,12 +12,10 @@ import {
DialogFooter, DialogFooter,
} from '../../Dialog' } from '../../Dialog'
import { Overlay } from '../../Overlay' import { Overlay } from '../../Overlay'
import { ErrorPagination } from '../ErrorPagination/ErrorPagination'
import { import {
ErrorOverlayToolbar, ErrorOverlayToolbar,
styles as toolbarStyles, styles as toolbarStyles,
} from '../error-overlay-toolbar/error-overlay-toolbar' } from '../error-overlay-toolbar/error-overlay-toolbar'
import { VersionStalenessInfo } from '../../VersionStalenessInfo'
import { ErrorOverlayBottomStacks } from '../error-overlay-bottom-stacks/error-overlay-bottom-stacks' import { ErrorOverlayBottomStacks } from '../error-overlay-bottom-stacks/error-overlay-bottom-stacks'
import { ErrorOverlayFooter } from '../error-overlay-footer/error-overlay-footer' import { ErrorOverlayFooter } from '../error-overlay-footer/error-overlay-footer'
import { noop as css } from '../../../helpers/noop-template' import { noop as css } from '../../../helpers/noop-template'
...@@ -29,6 +27,10 @@ import { ...@@ -29,6 +27,10 @@ import {
ErrorTypeLabel, ErrorTypeLabel,
styles as errorTypeLabelStyles, styles as errorTypeLabelStyles,
} from '../error-type-label/error-type-label' } from '../error-type-label/error-type-label'
import {
ErrorOverlayFloatingHeader,
styles as floatingHeaderStyles,
} from '../error-overlay-floating-header/error-overlay-floating-header'
type ErrorOverlayLayoutProps = { type ErrorOverlayLayoutProps = {
errorMessage: ErrorMessageType errorMessage: ErrorMessageType
...@@ -70,14 +72,14 @@ export function ErrorOverlayLayout({ ...@@ -70,14 +72,14 @@ export function ErrorOverlayLayout({
aria-describedby="nextjs__container_errors_desc" aria-describedby="nextjs__container_errors_desc"
onClose={onClose} onClose={onClose}
> >
<ErrorOverlayFloatingHeader
readyErrors={readyErrors}
activeIdx={activeIdx}
setActiveIndex={setActiveIndex}
versionInfo={versionInfo}
/>
<DialogContent> <DialogContent>
<DialogHeader className="nextjs-container-errors-header"> <DialogHeader className="nextjs-container-errors-header">
{/* TODO: better passing data instead of nullish coalescing */}
<ErrorPagination
readyErrors={readyErrors ?? []}
activeIdx={activeIdx ?? 0}
onActiveIndexChange={setActiveIndex ?? (() => {})}
/>
<div <div
className="nextjs__container_errors__error_title" className="nextjs__container_errors__error_title"
// allow assertion in tests before error rating is implemented // allow assertion in tests before error rating is implemented
...@@ -86,7 +88,6 @@ export function ErrorOverlayLayout({ ...@@ -86,7 +88,6 @@ export function ErrorOverlayLayout({
<ErrorTypeLabel errorType={errorType} /> <ErrorTypeLabel errorType={errorType} />
<ErrorOverlayToolbar error={error} debugInfo={debugInfo} /> <ErrorOverlayToolbar error={error} debugInfo={debugInfo} />
</div> </div>
<VersionStalenessInfo versionInfo={versionInfo} />
<ErrorMessage errorMessage={errorMessage} /> <ErrorMessage errorMessage={errorMessage} />
</DialogHeader> </DialogHeader>
<DialogBody className="nextjs-container-errors-body"> <DialogBody className="nextjs-container-errors-body">
...@@ -100,16 +101,17 @@ export function ErrorOverlayLayout({ ...@@ -100,16 +101,17 @@ export function ErrorOverlayLayout({
/> />
</DialogFooter> </DialogFooter>
</DialogContent> </DialogContent>
<ErrorOverlayBottomStacks
errorsCount={readyErrors?.length ?? 0}
activeIdx={activeIdx ?? 0}
/>
</Dialog> </Dialog>
<ErrorOverlayBottomStacks
errorsCount={readyErrors?.length ?? 0}
activeIdx={activeIdx ?? 0}
/>
</Overlay> </Overlay>
) )
} }
export const styles = css` export const styles = css`
${floatingHeaderStyles}
${errorTypeLabelStyles} ${errorTypeLabelStyles}
${errorMessageStyles} ${errorMessageStyles}
${toolbarStyles} ${toolbarStyles}
......
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