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

Jump to bottom

fix: a11y issues in the overlay component (HMR) #49782

Merged
merged 3 commits into from
Jun 2, 2023
Merged

fix: a11y issues in the overlay component (HMR) #49782

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
de6a22e
fix: a11y issues in HMR overlay
koba04 May 14, 2023
fdccbab
Merge branch 'canary' into fix-a11y-issues-in-all-overlay
shuding May 19, 2023
b264d3c
Merge branch 'canary' into fix-a11y-issues-in-all-overlay
styfle Jun 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions ...nts/react-dev-overlay/internal/components/LeftRightDialogHeader/LeftRightDialogHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ const LeftRightDialogHeader: React.FC<LeftRightDialogHeaderProps> =
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<title>previous</title>
<path
d="M6.99996 1.16666L1.16663 6.99999L6.99996 12.8333M12.8333 6.99999H1.99996H12.8333Z"
stroke="currentColor"
Expand All @@ -135,6 +136,7 @@ const LeftRightDialogHeader: React.FC<LeftRightDialogHeaderProps> =
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<title>next</title>
<path
d="M6.99996 1.16666L12.8333 6.99999L6.99996 12.8333M1.16663 6.99999H12H1.16663Z"
stroke="currentColor"
Expand Down
5 changes: 3 additions & 2 deletions packages/next/src/client/components/react-dev-overlay/internal/container/Errors.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,11 +308,12 @@ export const styles = css`
color: var(--color-ansi-red);
}

.nextjs-container-errors-body > h5:not(:first-child) {
.nextjs-container-errors-body > h2:not(:first-child) {
margin-top: calc(var(--size-gap-double) + var(--size-gap));
}
.nextjs-container-errors-body > h5 {
.nextjs-container-errors-body > h2 {
margin-bottom: var(--size-gap);
font-size: var(--size-font-big);
}

.nextjs-toast-errors-parent {
Expand Down
4 changes: 2 additions & 2 deletions ...rc/client/components/react-dev-overlay/internal/container/RuntimeError/CallStackFrame.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ export const CallStackFrame: React.FC<{

return (
<div data-nextjs-call-stack-frame>
<h6 data-nextjs-frame-expanded={Boolean(frame.expanded)}>
<h3 data-nextjs-frame-expanded={Boolean(frame.expanded)}>
{f.methodName}
</h6>
</h3>
<div
data-has-source={hasSource ? 'true' : undefined}
tabIndex={hasSource ? 10 : undefined}
Expand Down
2 changes: 1 addition & 1 deletion ...t/components/react-dev-overlay/internal/container/RuntimeError/ComponentStackFrameRow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export function ComponentStackFrameRow({

return (
<div data-nextjs-component-stack-frame>
<h6>{component}</h6>
<h3>{component}</h3>
{file ? (
<div
tabIndex={10} // match CallStackFrame
Expand Down
15 changes: 8 additions & 7 deletions ...es/next/src/client/components/react-dev-overlay/internal/container/RuntimeError/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ const RuntimeError: React.FC<RuntimeErrorProps> = function RuntimeError({
<React.Fragment>
{firstFrame ? (
<React.Fragment>
<h5>Source</h5>
<h2>Source</h2>
{leadingFrames.map((frame, index) => (
<CallStackFrame
key={`leading-frame-${index}-${all}`}
Expand All @@ -88,7 +88,7 @@ const RuntimeError: React.FC<RuntimeErrorProps> = function RuntimeError({

{error.componentStackFrames ? (
<>
<h5>Component Stack</h5>
<h2>Component Stack</h2>
{error.componentStackFrames.map((componentStackFrame, index) => (
<ComponentStackFrameRow
key={index}
Expand All @@ -100,7 +100,7 @@ const RuntimeError: React.FC<RuntimeErrorProps> = function RuntimeError({

{stackFramesGroupedByFramework.length ? (
<React.Fragment>
<h5>Call Stack</h5>
<h2>Call Stack</h2>
<GroupedStackFrames
groupedStackFrames={stackFramesGroupedByFramework}
all={all}
Expand Down Expand Up @@ -138,14 +138,15 @@ export const styles = css`
margin-bottom: var(--size-gap-double);
}

[data-nextjs-call-stack-frame] > h6,
[data-nextjs-component-stack-frame] > h6 {
[data-nextjs-call-stack-frame] > h3,
[data-nextjs-component-stack-frame] > h3 {
margin-top: 0;
margin-bottom: var(--size-gap);
font-family: var(--font-stack-monospace);
font-size: var(--size-font);
color: #222;
}
[data-nextjs-call-stack-frame] > h6[data-nextjs-frame-expanded='false'] {
[data-nextjs-call-stack-frame] > h3[data-nextjs-frame-expanded='false'] {
color: #666;
}
[data-nextjs-call-stack-frame] > div,
Expand Down Expand Up @@ -201,7 +202,7 @@ export const styles = css`
display: none;
}

[data-nextjs-collapsed-call-stack-details] h6 {
[data-nextjs-collapsed-call-stack-details] h3 {
color: #666;
}
[data-nextjs-collapsed-call-stack-details] [data-nextjs-call-stack-frame] {
Expand Down