Unverified Commit 20a90c55 authored by Jiwon Choi's avatar Jiwon Choi Committed by GitHub

[dev-overlay] fix: do not open error overlay when click indicator (#75404)

### Why?

As we added back the "open/dismiss issues" label next to the indicator at https://github.com/vercel/next.js/pull/74975, no need to open error overlay when clicked the indicator.

### Before

https://github.com/user-attachments/assets/52fac449-7f92-4793-84d5-599f85b4a8bf

### After

https://github.com/user-attachments/assets/962bb3e2-9b25-4d16-88d7-1e5d05cc9a38

Closes https://linear.app/vercel/issue/NDX-721/fix-toggle-behavior-for-collapsed-pill-and-issue-button
parent 0383d0be
...@@ -157,7 +157,7 @@ function DevToolsPopover({ ...@@ -157,7 +157,7 @@ function DevToolsPopover({
} }
} }
function onIssuesClick() { function openErrorOverlay() {
if (issueCount > 0) { if (issueCount > 0) {
setIsErrorOverlayOpen(true) setIsErrorOverlayOpen(true)
} }
...@@ -165,7 +165,6 @@ function DevToolsPopover({ ...@@ -165,7 +165,6 @@ function DevToolsPopover({
function onTriggerClick() { function onTriggerClick() {
setIsMenuOpen((prev) => !prev) setIsMenuOpen((prev) => !prev)
onIssuesClick()
} }
function closeMenu() { function closeMenu() {
...@@ -193,9 +192,9 @@ function DevToolsPopover({ ...@@ -193,9 +192,9 @@ function DevToolsPopover({
aria-label={`${isMenuOpen ? 'Close' : 'Open'} Next.js Dev Tools`} aria-label={`${isMenuOpen ? 'Close' : 'Open'} Next.js Dev Tools`}
data-nextjs-dev-tools-button data-nextjs-dev-tools-button
issueCount={issueCount} issueCount={issueCount}
onClick={onTriggerClick} onTriggerClick={onTriggerClick}
onKeyDown={onTriggerKeydown} onKeyDown={onTriggerKeydown}
onIssuesClick={onIssuesClick} openErrorOverlay={openErrorOverlay}
isDevBuilding={useIsDevBuilding()} isDevBuilding={useIsDevBuilding()}
isDevRendering={useIsDevRendering()} isDevRendering={useIsDevRendering()}
/> />
...@@ -231,7 +230,7 @@ function DevToolsPopover({ ...@@ -231,7 +230,7 @@ function DevToolsPopover({
index={0} index={0}
label="Issues" label="Issues"
value={<IssueCount>{issueCount}</IssueCount>} value={<IssueCount>{issueCount}</IssueCount>}
onClick={onIssuesClick} onClick={openErrorOverlay}
/> />
<MenuItem <MenuItem
label="Route" label="Route"
......
...@@ -7,8 +7,8 @@ interface Props extends React.ComponentProps<'button'> { ...@@ -7,8 +7,8 @@ interface Props extends React.ComponentProps<'button'> {
issueCount: number issueCount: number
isDevBuilding: boolean isDevBuilding: boolean
isDevRendering: boolean isDevRendering: boolean
onClick: () => void onTriggerClick: () => void
onIssuesClick: () => void openErrorOverlay: () => void
} }
const SIZE = 36 const SIZE = 36
...@@ -18,8 +18,8 @@ export const NextLogo = forwardRef(function NextLogo( ...@@ -18,8 +18,8 @@ export const NextLogo = forwardRef(function NextLogo(
issueCount, issueCount,
isDevBuilding, isDevBuilding,
isDevRendering, isDevRendering,
onClick, onTriggerClick,
onIssuesClick, openErrorOverlay,
...props ...props
}: Props, }: Props,
propRef: React.Ref<HTMLButtonElement> propRef: React.Ref<HTMLButtonElement>
...@@ -32,7 +32,6 @@ export const NextLogo = forwardRef(function NextLogo( ...@@ -32,7 +32,6 @@ export const NextLogo = forwardRef(function NextLogo(
const isLoading = useMinimumLoadingTimeMultiple( const isLoading = useMinimumLoadingTimeMultiple(
isDevBuilding || isDevRendering isDevBuilding || isDevRendering
) )
return ( return (
<div <div
data-next-badge-root data-next-badge-root
...@@ -287,7 +286,7 @@ export const NextLogo = forwardRef(function NextLogo( ...@@ -287,7 +286,7 @@ export const NextLogo = forwardRef(function NextLogo(
<button <button
ref={mergeRefs(triggerRef, propRef)} ref={mergeRefs(triggerRef, propRef)}
data-next-mark data-next-mark
onClick={onClick} onClick={onTriggerClick}
{...props} {...props}
> >
<NextMark isLoading={isLoading} /> <NextMark isLoading={isLoading} />
...@@ -297,7 +296,7 @@ export const NextLogo = forwardRef(function NextLogo( ...@@ -297,7 +296,7 @@ export const NextLogo = forwardRef(function NextLogo(
<button <button
data-issues-open data-issues-open
aria-label="Open issues overlay" aria-label="Open issues overlay"
onClick={onIssuesClick} onClick={openErrorOverlay}
> >
<span data-issues-count>{issueCount}</span>{' '} <span data-issues-count>{issueCount}</span>{' '}
{issueCount === 1 ? 'Issue' : 'Issues'} {issueCount === 1 ? 'Issue' : 'Issues'}
......
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