-
Notifications
You must be signed in to change notification settings - Fork 27.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[DevOverlay] Decouple Dialog component from Error Overlay #74638
Merged
devjiwonchoi
merged 2 commits into
canary
from
01-08-_devoverlay_decouple_dialog_component_from_error_overlay
Jan 10, 2025
+127
−69
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
17 changes: 17 additions & 0 deletions
17
...ent/components/react-dev-overlay/_experimental/internal/components/Errors/dialog/body.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| import { noop as css } from '../../../helpers/noop-template' | ||
| import { DialogBody } from '../../Dialog' | ||
|
|
||
| type ErrorOverlayDialogBodyProps = { | ||
| children?: React.ReactNode | ||
| onClose?: () => void | ||
| } | ||
|
|
||
| export function ErrorOverlayDialogBody({ | ||
| children, | ||
| }: ErrorOverlayDialogBodyProps) { | ||
| return ( | ||
| <DialogBody className="nextjs-container-errors-body">{children}</DialogBody> | ||
| ) | ||
| } | ||
|
|
||
| export const DIALOG_BODY_STYLES = css`` |
34 changes: 34 additions & 0 deletions
34
...t/components/react-dev-overlay/_experimental/internal/components/Errors/dialog/dialog.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| import { Dialog } from '../../Dialog/Dialog' | ||
| import { noop as css } from '../../../helpers/noop-template' | ||
|
|
||
| type ErrorOverlayDialogProps = { | ||
| children?: React.ReactNode | ||
| onClose?: () => void | ||
| } | ||
|
|
||
| export function ErrorOverlayDialog({ | ||
| children, | ||
| onClose, | ||
| }: ErrorOverlayDialogProps) { | ||
| return ( | ||
| <Dialog | ||
| type="error" | ||
| aria-labelledby="nextjs__container_errors_label" | ||
| aria-describedby="nextjs__container_errors_desc" | ||
| onClose={onClose} | ||
| className="error-overlay-dialog" | ||
| > | ||
| {children} | ||
| </Dialog> | ||
| ) | ||
| } | ||
|
|
||
| export const DIALOG_STYLES = css` | ||
| .error-overlay-dialog { | ||
| background: var(--color-background-100); | ||
| border: 1px solid var(--color-gray-400); | ||
| border-radius: var(--rounded-xl); | ||
| box-shadow: var(--shadow-md); | ||
| position: relative; | ||
| } | ||
| ` |
51 changes: 51 additions & 0 deletions
51
...t/components/react-dev-overlay/_experimental/internal/components/Errors/dialog/header.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| import { DialogHeader } from '../../Dialog/DialogHeader' | ||
| import { noop as css } from '../../../helpers/noop-template' | ||
|
|
||
| type ErrorOverlayDialogHeaderProps = { | ||
| children?: React.ReactNode | ||
| } | ||
|
|
||
| export function ErrorOverlayDialogHeader({ | ||
| children, | ||
| }: ErrorOverlayDialogHeaderProps) { | ||
| return ( | ||
| <DialogHeader className="nextjs-container-errors-header"> | ||
| {children} | ||
| </DialogHeader> | ||
| ) | ||
| } | ||
|
|
||
| export const DIALOG_HEADER_STYLES = css` | ||
| .nextjs-container-errors-header { | ||
| position: relative; | ||
| } | ||
| .nextjs-container-errors-header > h1 { | ||
| font-size: var(--size-font-big); | ||
| line-height: var(--size-font-bigger); | ||
| font-weight: bold; | ||
| margin: calc(var(--size-gap-double) * 1.5) 0; | ||
| color: var(--color-title-h1); | ||
| } | ||
| .nextjs-container-errors-header small { | ||
| font-size: var(--size-font-small); | ||
| color: var(--color-accents-1); | ||
| margin-left: var(--size-gap-double); | ||
| } | ||
| .nextjs-container-errors-header small > span { | ||
| font-family: var(--font-stack-monospace); | ||
| } | ||
| .nextjs-container-errors-header > div > small { | ||
| margin: 0; | ||
| margin-top: var(--size-gap-half); | ||
| } | ||
| .nextjs-container-errors-header > p > a { | ||
| color: inherit; | ||
| font-weight: bold; | ||
| } | ||
| .nextjs-container-errors-header | ||
| > .nextjs-container-build-error-version-status { | ||
| position: absolute; | ||
| top: var(--size-4); | ||
| right: var(--size-4); | ||
| } | ||
| ` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
z-index is always a good example for extraction into variables. But no need to follow-up. Just good to keep in mind when we add more layering.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yea probably good to have some constants z-indexes, so we can order them easily. I've seen z-index: 2, 48 and 50 in error overlay which vary a lot
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks, will follow up!