Skip to content

Commit 2a93ca9

Browse files
authored
site: make REPL user menu keyboard accessible (#8831)
1 parent 3576c74 commit 2a93ca9

File tree

4 files changed

+60
-38
lines changed

4 files changed

+60
-38
lines changed

pnpm-lock.yaml

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sites/svelte.dev/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"@resvg/resvg-js": "^2.4.1",
3131
"@sveltejs/adapter-vercel": "^3.0.1",
3232
"@sveltejs/kit": "^1.20.5",
33-
"@sveltejs/site-kit": "6.0.0-next.17",
33+
"@sveltejs/site-kit": "6.0.0-next.18",
3434
"@sveltejs/vite-plugin-svelte": "^2.4.2",
3535
"@types/marked": "^5.0.0",
3636
"@types/node": "^20.3.1",

sites/svelte.dev/src/routes/(authed)/repl/[id]/AppControls.svelte

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ export default app;`
191191
<div class="app-controls">
192192
<input bind:value={name} on:focus={(e) => e.target.select()} use:enter={(e) => e.target.blur()} />
193193

194-
<div style="text-align: right; margin-right:.4rem">
194+
<div class="buttons">
195195
<button class="icon" on:click={() => (zen_mode = !zen_mode)} title="fullscreen editor">
196196
{#if zen_mode}
197197
<Icon name="close" />
@@ -251,23 +251,28 @@ export default app;`
251251
flex: 0;
252252
}
253253
254+
.buttons {
255+
text-align: right;
256+
margin-right: 0.4rem;
257+
display: flex;
258+
align-items: center;
259+
gap: 0.2em;
260+
}
261+
254262
.icon {
255-
position: relative;
256-
top: -0.1rem;
263+
transform: translateY(0.1rem);
257264
display: inline-block;
258265
padding: 0.2em;
259266
opacity: 0.7;
260267
transition: opacity 0.3s;
261268
font-family: var(--sk-font);
262269
font-size: 1.6rem;
263270
color: var(--sk-text-1);
264-
/* width: 1.6em;
265-
height: 1.6em; */
266271
line-height: 1;
267-
margin: 0 0 0 0.2em;
268272
}
269273
270-
.icon:hover {
274+
.icon:hover,
275+
.icon:focus-visible {
271276
opacity: 1;
272277
}
273278
.icon:disabled {

sites/svelte.dev/src/routes/(authed)/repl/[id]/UserMenu.svelte

Lines changed: 43 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<script>
22
import { getContext } from 'svelte';
3-
3+
import { Icon } from '@sveltejs/site-kit/components';
4+
import { click_outside, focus_outside } from '@sveltejs/site-kit/actions';
45
const { logout } = getContext('app');
56
67
export let user;
@@ -11,9 +12,21 @@
1112
$: name = user.github_name || user.github_login;
1213
</script>
1314

14-
<div class="user" on:mouseenter={() => (showMenu = true)} on:mouseleave={() => (showMenu = false)}>
15-
<span>{name}</span>
16-
<img alt="{name} avatar" src={user.github_avatar_url} />
15+
<div
16+
class="user"
17+
use:focus_outside={() => (showMenu = false)}
18+
use:click_outside={() => (showMenu = false)}
19+
>
20+
<button
21+
on:click={() => (showMenu = !showMenu)}
22+
aria-expanded={showMenu}
23+
class="trigger"
24+
aria-label={name}
25+
>
26+
<span class="name">{name}</span>
27+
<img alt="" src={user.github_avatar_url} />
28+
<Icon name={showMenu ? 'chevron-up' : 'chevron-down'} />
29+
</button>
1730

1831
{#if showMenu}
1932
<div class="menu">
@@ -27,43 +40,44 @@
2740
.user {
2841
position: relative;
2942
display: inline-block;
30-
padding: 0em 1.2rem 0 1.6rem;
31-
height: 0.8em;
32-
line-height: 1;
43+
padding: 0em 0 0 0.3rem;
3344
z-index: 99;
3445
}
3546
36-
.user::after {
37-
/* embiggen hit zone, so log out menu doesn't disappear */
38-
position: absolute;
39-
content: '';
40-
width: 100%;
41-
height: 3.2rem;
42-
left: 0;
43-
top: 0;
47+
.trigger {
48+
display: flex;
49+
align-items: center;
50+
gap: 0.75rem;
51+
outline-offset: 2px;
52+
transform: translateY(0.1rem);
53+
--opacity: 0.7;
54+
}
55+
56+
.trigger:hover,
57+
.trigger:focus-visible,
58+
.trigger[aria-expanded='true'] {
59+
--opacity: 1;
4460
}
4561
46-
span {
47-
/* position: relative; padding: 0 2em 0 0; */
62+
.name {
4863
line-height: 1;
4964
display: none;
5065
font-family: var(--sk-font);
5166
font-size: 1.6rem;
52-
opacity: 0.7;
5367
}
5468
55-
.user:hover span {
56-
opacity: 1;
69+
.name,
70+
.trigger :global(.icon) {
71+
display: none;
72+
opacity: var(--opacity);
5773
}
5874
5975
img {
60-
position: absolute;
61-
top: -0.05em;
62-
right: 0;
6376
width: 2.1rem;
6477
height: 2.1rem;
6578
border: 1px solid rgba(255, 255, 255, 0.3);
6679
border-radius: 0.2rem;
80+
transform: translateY(-0.1rem);
6781
}
6882
6983
.menu {
@@ -95,22 +109,25 @@
95109
}
96110
97111
.menu button:hover,
98-
.menu a:hover {
112+
.menu button:focus-visible,
113+
.menu a:hover,
114+
.menu a:focus-visible {
99115
opacity: 1;
100116
color: inherit;
101117
}
102118
103119
@media (min-width: 600px) {
104120
.user {
105-
padding: 0em 3.2rem 0 1.6rem;
121+
padding: 0em 0 0 1.6rem;
106122
}
107123
108124
img {
109125
width: 2.4rem;
110126
height: 2.4rem;
111127
}
112128
113-
span {
129+
.name,
130+
.trigger :global(.icon) {
114131
display: inline-block;
115132
}
116133
}

0 commit comments

Comments
 (0)