Skip to content

Commit 15535cb

Browse files
committed
Auto focus on headings level 1 on nav change
1 parent b6190e1 commit 15535cb

File tree

5 files changed

+15
-21
lines changed

5 files changed

+15
-21
lines changed

services/backend-api/client/src/components/AccessibleNavigationAnnouncer/index.tsx

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,14 @@ export const AccessibleNavigationAnnouncer = () => {
1313
// ignore the /
1414
if (location.pathname.slice(1)) {
1515
// make sure navigation has occurred and screen reader is ready
16-
setTimeout(() => setMessage(`Navigated to ${location.pathname.slice(1)} page.`), 500);
16+
setTimeout(() => {
17+
setMessage(`Navigated to ${location.pathname.slice(1)} page.`);
18+
const h1Element = document.querySelector("h1");
19+
20+
if (h1Element) {
21+
h1Element.focus();
22+
}
23+
}, 500);
1724
} else {
1825
// just ignore the / route
1926
setMessage("");

services/backend-api/client/src/components/NewHeader/index.tsx

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import {
44
Box,
55
Button,
66
Flex,
7-
Heading,
87
HStack,
98
Menu,
109
MenuButton,
@@ -65,17 +64,16 @@ export const NewHeader = ({ invertBackground }: Props) => {
6564
marginRight="2"
6665
backgroundColor="transparent"
6766
/>
68-
<Heading
67+
<chakra.span
6968
fontSize="xl"
7069
whiteSpace="nowrap"
7170
overflow="hidden"
7271
textOverflow="ellipsis"
72+
fontWeight="bold"
7373
title="MonitoRSS"
74-
// title={discordBotData.result.username}
7574
>
7675
MonitoRSS
77-
{/* {discordBotData.result.username} */}
78-
</Heading>
76+
</chakra.span>
7977
</Flex>
8078
</Link>
8179
)}

services/backend-api/client/src/pages/ConnectionDiscordChannelSettings.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ export const ConnectionDiscordChannelSettings: React.FC = () => {
164164
</BreadcrumbItem>
165165
</Breadcrumb>
166166
<HStack alignItems="center" justifyContent="space-between">
167-
<Heading size="lg" marginRight={4}>
167+
<Heading size="lg" marginRight={4} tabIndex={-1} as="h1">
168168
{connection?.name}
169169
</Heading>
170170
{connection && (

services/backend-api/client/src/pages/UserFeed.tsx

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ export const UserFeed: React.FC = () => {
9696
const { search: urlSearch } = useLocation();
9797
const { isOpen, onClose, onOpen } = useDisclosure();
9898
const menuButtonRef = useRef<HTMLButtonElement>(null);
99-
const feedsBreadcrumbLinkRef = useRef<HTMLAnchorElement>(null);
10099
const [addConnectionType, setAddConnectionType] = useState<
101100
{ type: "discord-channel" | "discord-webhook"; isChannelThread?: boolean } | undefined
102101
>(undefined);
@@ -139,12 +138,6 @@ export const UserFeed: React.FC = () => {
139138
}
140139
}, [feedTitle]);
141140

142-
useEffect(() => {
143-
if (feedsBreadcrumbLinkRef.current) {
144-
feedsBreadcrumbLinkRef.current?.focus();
145-
}
146-
}, [feedsBreadcrumbLinkRef.current]);
147-
148141
const isAtLimit = dailyLimit ? dailyLimit.current >= dailyLimit.max : false;
149142

150143
const onDeleteFeed = async () => {
@@ -286,11 +279,7 @@ export const UserFeed: React.FC = () => {
286279
<Stack flex={1}>
287280
<Breadcrumb>
288281
<BreadcrumbItem>
289-
<BreadcrumbLink
290-
ref={feedsBreadcrumbLinkRef}
291-
as={RouterLink}
292-
to={pages.userFeeds()}
293-
>
282+
<BreadcrumbLink as={RouterLink} to={pages.userFeeds()}>
294283
Feeds
295284
</BreadcrumbLink>
296285
</BreadcrumbItem>
@@ -302,7 +291,7 @@ export const UserFeed: React.FC = () => {
302291
<HStack alignItems="flex-start" justifyContent="space-between">
303292
<Stack width="fit-content">
304293
<Flex alignItems="center" gap={0}>
305-
<Heading as="h1" size="lg" marginRight={4}>
294+
<Heading as="h1" size="lg" marginRight={4} tabIndex={-1}>
306295
{feed?.title}
307296
</Heading>
308297
{feed && feed?.sharedAccessDetails?.inviteId && (

services/backend-api/client/src/pages/UserFeeds.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ export const UserFeeds: React.FC = () => {
151151
)}
152152
<Flex justifyContent="space-between" alignItems="center" gap="4" flexWrap="wrap">
153153
<Flex alignItems="center" gap={4}>
154-
<Heading as="h1" size="lg">
154+
<Heading as="h1" size="lg" tabIndex={-1}>
155155
{t("pages.userFeeds.title")}
156156
</Heading>
157157
</Flex>

0 commit comments

Comments
 (0)