Skip to content

[pull] canary from vercel:canary #728

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.

Sign up for GitHub

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

Merged
pull merged 1 commit into from
Jan 23, 2026
+43 −8
Merged

[pull] canary from vercel:canary #728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 18 additions & 8 deletions packages/next/src/next-devtools/dev-overlay/components/hydration-diff/diff-view.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,14 +118,24 @@ export function PseudoHtmlDiff({
data-nextjs-container-errors-pseudo-html
data-nextjs-container-errors-pseudo-html-collapse={isDiffCollapsed}
>
<button
aria-expanded={!isDiffCollapsed}
aria-label="complete Component Stack"
data-nextjs-container-errors-pseudo-html-collapse-button
onClick={() => toggleCollapseHtml(!isDiffCollapsed)}
>
<CollapseIcon collapsed={isDiffCollapsed} />
</button>
<div data-nextjs-hydration-diff-header>
<button
aria-expanded={!isDiffCollapsed}
aria-label="complete Component Stack"
data-nextjs-container-errors-pseudo-html-collapse-button
onClick={() => toggleCollapseHtml(!isDiffCollapsed)}
>
<CollapseIcon collapsed={isDiffCollapsed} />
</button>
<div data-nextjs-hydration-diff-badge>
<span data-nextjs-hydration-diff-badge-item="client">
<span>+</span> Client
</span>
<span data-nextjs-hydration-diff-badge-item="server">
<span>-</span> Server
</span>
</div>
</div>
<pre className="nextjs__container_errors__component-stack">
<code>{htmlComponents}</code>
</pre>
Expand Down
25 changes: 25 additions & 0 deletions ...ext/src/next-devtools/dev-overlay/container/runtime-error/component-stack-pseudo-html.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,4 +89,29 @@ export const PSEUDO_HTML_DIFF_STYLES = `
.error-overlay-hydration-error-diff-minus-icon {
color: var(--color-red-900);
}
[data-nextjs-hydration-diff-header] {
display: flex;
align-items: center;
justify-content: space-between;
padding: 0 12px 0 0;
}
[data-nextjs-hydration-diff-badge] {
display: flex;
gap: 8px;
font-size: var(--size-12);
}
[data-nextjs-hydration-diff-badge-item] {
display: flex;
align-items: center;
gap: 4px;
color: var(--color-gray-900);
}
[data-nextjs-hydration-diff-badge-item='client'] span:first-child {
color: var(--color-green-900);
font-weight: bold;
}
[data-nextjs-hydration-diff-badge-item='server'] span:first-child {
color: var(--color-red-900);
font-weight: bold;
}
`
Loading