Unverified Commit 3fdf51cf authored by Jiwon Choi's avatar Jiwon Choi Committed by GitHub

[dev-overlay] HOTFIX: clicking nav escapes the overlay (#75876)

Following up of #75679

### Why?

Clicking the navigation escapes the overlay. It is because the
navigation component is outside of the dialog component.

#### Before


https://github.com/user-attachments/assets/e7c63261-c44b-4af7-936d-1750dff07527

#### After


https://github.com/user-attachments/assets/979421fa-fb71-481d-bd58-6703298db28b

### How?

Since we already have logic to prevent closing overlay when clicked
outside the component for dev indicator, add the header to this CSS
selectors list as well.
parent 2e47628e
...@@ -16,6 +16,7 @@ const CSS_SELECTORS_TO_EXCLUDE_ON_CLICK_OUTSIDE = [ ...@@ -16,6 +16,7 @@ const CSS_SELECTORS_TO_EXCLUDE_ON_CLICK_OUTSIDE = [
'[data-next-mark]', '[data-next-mark]',
'[data-issues-open]', '[data-issues-open]',
'#nextjs-dev-tools-menu', '#nextjs-dev-tools-menu',
'[data-nextjs-error-overlay-nav]',
] ]
const Dialog: React.FC<DialogProps> = function Dialog({ const Dialog: React.FC<DialogProps> = function Dialog({
......
...@@ -41,11 +41,16 @@ export const DIALOG_STYLES = css` ...@@ -41,11 +41,16 @@ export const DIALOG_STYLES = css`
border-color: var(--color-gray-400); border-color: var(--color-gray-400);
} }
&:has(~ .error-overlay-nav .error-overlay-notch[data-side='left']) { &:has(
~ [data-nextjs-error-overlay-nav] .error-overlay-notch[data-side='left']
) {
border-top-left-radius: 0; border-top-left-radius: 0;
} }
&:has(~ .error-overlay-nav .error-overlay-notch[data-side='right']) { &:has(
~ [data-nextjs-error-overlay-nav]
.error-overlay-notch[data-side='right']
) {
border-top-right-radius: 0; border-top-right-radius: 0;
} }
} }
......
...@@ -21,7 +21,7 @@ export function ErrorOverlayNav({ ...@@ -21,7 +21,7 @@ export function ErrorOverlayNav({
isTurbopack, isTurbopack,
}: ErrorOverlayNavProps) { }: ErrorOverlayNavProps) {
return ( return (
<div className="error-overlay-nav"> <div data-nextjs-error-overlay-nav>
<Notch side="left"> <Notch side="left">
{/* TODO: better passing data instead of nullish coalescing */} {/* TODO: better passing data instead of nullish coalescing */}
<ErrorOverlayPagination <ErrorOverlayPagination
...@@ -43,7 +43,7 @@ export function ErrorOverlayNav({ ...@@ -43,7 +43,7 @@ export function ErrorOverlayNav({
} }
export const styles = css` export const styles = css`
.error-overlay-nav { [data-nextjs-error-overlay-nav] {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
......
...@@ -994,9 +994,11 @@ export function getRedboxNavText(browser: BrowserInterface): Promise<string> { ...@@ -994,9 +994,11 @@ export function getRedboxNavText(browser: BrowserInterface): Promise<string> {
return browser.eval(() => { return browser.eval(() => {
const portal = [].slice const portal = [].slice
.call(document.querySelectorAll('nextjs-portal')) .call(document.querySelectorAll('nextjs-portal'))
.find((p) => p.shadowRoot.querySelector('.error-overlay-nav')) .find((p) =>
p.shadowRoot.querySelector('[data-nextjs-error-overlay-nav]')
)
const root = portal.shadowRoot const root = portal.shadowRoot
return root.querySelector('.error-overlay-nav')?.innerText return root.querySelector('[data-nextjs-error-overlay-nav]')?.innerText
}) })
} }
......
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