Skip to content
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

polish hydration errors #75632

Merged
merged 2 commits into from
Feb 4, 2025
Merged

polish hydration errors #75632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d00e384
polish hydration errors
huozhi Feb 4, 2025
e008927
add line-height and switch color for nested tag
huozhi Feb 4, 2025
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
4 changes: 3 additions & 1 deletion .../components/react-dev-overlay/_experimental/internal/components/code-frame/code-frame.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,14 +111,16 @@ export const CODE_FRAME_STYLES = css`
font-family: var(--font-stack-monospace);
font-size: 12px;
line-height: 16px;
margin: var(--size-4) var(--size-4) var(--size-2);
border: 1px solid var(--color-gray-400);
border-radius: var(--size-2);
}

[data-nextjs-codeframe] pre {
white-space: pre-wrap;
}

.code-frame-header {
border-top: 1px solid var(--color-gray-400);
border-bottom: 1px solid var(--color-gray-400);
}

Expand Down
8 changes: 3 additions & 5 deletions .../next/src/client/components/react-dev-overlay/_experimental/internal/container/errors.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,14 +203,12 @@ export const styles = css`
bottom: calc(var(--size-gap-double) * 4.5);
}
p.nextjs__container_errors__link {
color: var(--color-text-color-red-1);
font-weight: 600;
font-size: 15px;
font-size: 14px;
}
p.nextjs__container_errors__notes {
color: var(--color-stack-notes);
font-weight: 600;
font-size: 15px;
font-size: 14px;
line-height: 1.5;
}
.nextjs-container-errors-body > h2:not(:first-child) {
margin-top: calc(var(--size-gap-double) + var(--size-gap));
Expand Down
180 changes: 94 additions & 86 deletions ...ev-overlay/_experimental/internal/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 @@ -94,18 +94,12 @@ export function PseudoHtmlDiff({
diffHtmlStack.push(
<span
key={'comp-diff' + index}
data-nextjs-container-errors-pseudo-html-line
data-nextjs-container-errors-pseudo-html--diff={
sign === '+' ? 'add' : 'remove'
}
>
{sign === '+' ? <PlusIcon /> : <MinusIcon />}
<span
className={
isHtmlCollapsed
? 'error-overlay-hydration-error-collapsed'
: ''
}
>
<span>
{/* Slice 2 spaces for the icon */}
{spaces.slice(2)}
{trimmedLine}
Expand All @@ -121,15 +115,21 @@ export function PseudoHtmlDiff({
if (isUserLandComponent || trimmedLine === '...') {
currentComponentIndex--
componentStacks.push(
<span key={'comp-diff' + index}>
<span
data-nextjs-container-errors-pseudo-html-line
key={'comp-diff' + index}
>
{spaces}
{trimmedLine}
{'\n'}
</span>
)
} else if (!isHtmlCollapsed) {
componentStacks.push(
<span key={'comp-diff' + index}>
<span
data-nextjs-container-errors-pseudo-html-line
key={'comp-diff' + index}
>
{spaces}
{trimmedLine}
{'\n'}
Expand All @@ -139,7 +139,10 @@ export function PseudoHtmlDiff({
} else if (!isHtmlCollapsed) {
// In general, if it's not collapsed, show the whole diff
componentStacks.push(
<span key={'comp-diff' + index}>
<span
data-nextjs-container-errors-pseudo-html-line
key={'comp-diff' + index}
>
{spaces}
{trimmedLine}
{'\n'}
Expand Down Expand Up @@ -200,21 +203,16 @@ export function PseudoHtmlDiff({

if ((isHtmlTagsWarning && isAdjacentTag) || isLastFewFrames) {
const codeLine = (
<span>
<span
data-nextjs-container-errors-pseudo-html-line
{...(isHighlightedTag
? {
'data-nextjs-container-errors-pseudo-html-line--error': true,
}
: undefined)}
>
{spaces}
<span
{...adjProps}
{...{
...(isHighlightedTag
? {
'data-nextjs-container-errors-pseudo-html--tag-error':
true,
}
: undefined),
}}
>
{`<${component}>\n`}
</span>
<span {...adjProps}>{`<${component}>\n`}</span>
</span>
)
lastText = component
Expand All @@ -241,15 +239,23 @@ export function PseudoHtmlDiff({

if (!isHtmlCollapsed || isLastFewFrames) {
nestedHtmlStack.push(
<span {...adjProps} key={nestedHtmlStack.length}>
<span
{...adjProps}
key={nestedHtmlStack.length}
data-nextjs-container-errors-pseudo-html-line
>
{spaces}
{'<' + component + '>\n'}
</span>
)
} else if (isHtmlCollapsed && lastText !== '...') {
lastText = '...'
nestedHtmlStack.push(
<span {...adjProps} key={nestedHtmlStack.length}>
<span
{...adjProps}
key={nestedHtmlStack.length}
data-nextjs-container-errors-pseudo-html-line
>
{spaces}
{'...\n'}
</span>
Expand All @@ -265,10 +271,16 @@ export function PseudoHtmlDiff({
// hydration type is "text", represent [server content, client content]
wrappedCodeLine = (
<Fragment key={nestedHtmlStack.length}>
<span data-nextjs-container-errors-pseudo-html--diff="remove">
<span
data-nextjs-container-errors-pseudo-html-line
data-nextjs-container-errors-pseudo-html--diff="remove"
>
{spaces + `"${firstContent}"\n`}
</span>
<span data-nextjs-container-errors-pseudo-html--diff="add">
<span
data-nextjs-container-errors-pseudo-html-line
data-nextjs-container-errors-pseudo-html--diff="add"
>
{spaces + `"${secondContent}"\n`}
</span>
</Fragment>
Expand All @@ -277,10 +289,16 @@ export function PseudoHtmlDiff({
// hydration type is "text-in-tag", represent [parent tag, mismatch content]
wrappedCodeLine = (
<Fragment key={nestedHtmlStack.length}>
<span data-nextjs-container-errors-pseudo-html--tag-adjacent>
<span
data-nextjs-container-errors-pseudo-html-line
data-nextjs-container-errors-pseudo-html--tag-adjacent
>
{spaces + `<${secondContent}>\n`}
</span>
<span data-nextjs-container-errors-pseudo-html--diff="remove">
<span
data-nextjs-container-errors-pseudo-html-line
data-nextjs-container-errors-pseudo-html--diff="remove"
>
{spaces + ` "${firstContent}"\n`}
</span>
</Fragment>
Expand Down Expand Up @@ -318,92 +336,82 @@ export function PseudoHtmlDiff({
)
}

function PlusIcon() {
return (
<svg
width="16"
height="16"
viewBox="0 0 16 16"
fill="none"
xmlns="http://www.w3.org/2000/svg"
className="error-overlay-hydration-error-diff-plus-icon"
>
<path
fillRule="evenodd"
clipRule="evenodd"
d="M7.25 8.75V12H8.75V8.75H12V7.25H8.75V4H7.25V7.25H4V8.75H7.25Z"
fill="currentColor"
/>
</svg>
)
}

function MinusIcon() {
return (
<svg
width="16"
height="16"
viewBox="0 0 16 16"
fill="none"
xmlns="http://www.w3.org/2000/svg"
className="error-overlay-hydration-error-diff-minus-icon"
>
<path
fillRule="evenodd"
clipRule="evenodd"
d="M12 8.75H4V7.25H12V8.75Z"
fill="currentColor"
/>
</svg>
)
}

export const PSEUDO_HTML_DIFF_STYLES = css`
[data-nextjs-container-errors-pseudo-html] {
border-top: 1px solid var(--color-gray-400);
padding: var(--size-3) 0;
margin: var(--size-2) var(--size-4) var(--size-4);
border: 1px solid var(--color-gray-400);
background: var(--color-background-200);
color: var(--color-syntax-constant);
font-family: var(--font-stack-monospace);
font-size: var(--size-font-smaller);
line-height: var(--size-4);
border-radius: var(--size-2);
}
[data-nextjs-container-errors-pseudo-html-line] {
display: inline-block;
width: 100%;
padding-left: var(--size-10);
line-height: calc(5 / 3);
}
[data-nextjs-container-errors-pseudo-html-line--error] {
background: var(--color-amber-300);
font-weight: bold;
}
[data-nextjs-container-errors-pseudo-html-line--error]::before {
content: '>';
color: var(--color-red-900);
float: left;
width: 0;
margin-left: calc(var(--size-6) * -1);
margin-right: var(--size-8);
}

[data-nextjs-container-errors-pseudo-html-collapse] {
all: unset;
padding: var(--size-2);
margin-left: var(--size-3);
&:focus {
outline: none;
}
}
[data-nextjs-container-errors-pseudo-html--diff] {
width: fit-content;
}
[data-nextjs-container-errors-pseudo-html--diff='add'] {
background: var(--color-green-300);
}
[data-nextjs-container-errors-pseudo-html--diff='add']::before {
content: '+';
color: var(--color-green-900);
float: left;
width: 0;
margin-left: calc(var(--size-6) * -1);
margin-right: var(--size-8);
}
[data-nextjs-container-errors-pseudo-html--diff='remove'] {
background: var(--color-red-300);
}
[data-nextjs-container-errors-pseudo-html--tag-error] {
background: var(--color-red-300);
font-weight: bold;
[data-nextjs-container-errors-pseudo-html--diff='remove']::before {
content: '-';
color: var(--color-red-900);
float: left;
width: 0;
margin-left: calc(var(--size-6) * -1);
margin-right: var(--size-8);
}
/* hide but text are still accessible in DOM */
${/* hide but text are still accessible in DOM */ ''}
[data-nextjs-container-errors-pseudo-html--hint] {
display: inline-block;
font-size: 0;
height: 0;
}
[data-nextjs-container-errors-pseudo-html--tag-adjacent='false'] {
color: var(--color-accents-1);
}
[data-nextjs-container-errors-pseudo-html] > pre > code > span {
display: block;
padding: var(--size-1) var(--size-4);
}
.nextjs__container_errors__component-stack {
margin: 0;
}
.error-overlay-hydration-error-collapsed {
padding-left: var(--size-4);
.nextjs__container_errors__component-stack code {
display: block;
width: 100%;
white-space: pre-wrap;
}
.error-overlay-hydration-error-diff-plus-icon {
color: var(--color-green-900);
Expand Down
Loading