Skip to content

Commit 79a49cb

Browse files
authored
fix: move from react-aria-live to @react-aria/live-announcer (#868)
1 parent d9783f5 commit 79a49cb

File tree

5 files changed

+40
-39
lines changed

5 files changed

+40
-39
lines changed

.changeset/tender-timers-vanish.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'@sajari/react-search-ui': patch
3+
'sajari-sdk-docs': patch
4+
---
5+
6+
fix: move from react-aria-live to @react-aria/live-announcer

packages/search-ui/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@
2626
"react-dom": ">=17"
2727
},
2828
"dependencies": {
29+
"@react-aria/live-announcer": "^3.1.1",
2930
"@react-aria/utils": "3.5.0",
3031
"@sajari/react-components": "^2.0.0",
3132
"@sajari/react-hooks": "^4.0.1",
3233
"@sajari/react-sdk-utils": "^2.0.0",
3334
"dayjs": "^1.10.5",
3435
"i18next": "19.8.7",
3536
"i18next-browser-languagedetector": "^6.0.1",
36-
"react-aria-live": "^2.0.5",
3737
"react-error-boundary": "^3.1.3",
3838
"react-i18next": "^11.8.5",
3939
"tempura": "^0.4.0"

packages/search-ui/src/ContextProvider/index.tsx

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { SearchProvider } from '@sajari/react-hooks';
22
import { createContext, getSearchParams, ThemeProvider } from '@sajari/react-sdk-utils';
33
import React, { useEffect, useState } from 'react';
4-
import { LiveAnnouncer } from 'react-aria-live';
54
import { I18nextProvider } from 'react-i18next';
65

76
import i18n from '../i18n';
@@ -84,13 +83,11 @@ const ContextProvider: React.FC<ContextProviderValues> = ({
8483
: syncURLState
8584
}
8685
>
87-
<LiveAnnouncer>
88-
<I18nextProvider i18n={i18n}>
89-
<ThemeProvider theme={theme} importantStyles={importantStyles}>
90-
{children}
91-
</ThemeProvider>
92-
</I18nextProvider>
93-
</LiveAnnouncer>
86+
<I18nextProvider i18n={i18n}>
87+
<ThemeProvider theme={theme} importantStyles={importantStyles}>
88+
{children}
89+
</ThemeProvider>
90+
</I18nextProvider>
9491
</SearchProvider>
9592
</Provider>
9693
);

packages/search-ui/src/Summary/index.tsx

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
/* eslint-disable react/jsx-one-expression-per-line */
2+
import { announce } from '@react-aria/live-announcer';
23
import { Box, Button, Text } from '@sajari/react-components';
34
import { useAutocomplete, useSearchContext } from '@sajari/react-hooks';
45
import { escapeHTML, pluralize } from '@sajari/react-sdk-utils';
56
import * as React from 'react';
6-
import { LiveMessage } from 'react-aria-live';
7+
import { useEffect } from 'react';
78
import { useTranslation } from 'react-i18next';
89
import tw from 'twin.macro';
910

@@ -18,28 +19,27 @@ const Summary = (props: SummaryProps) => {
1819
const { completion } = useAutocomplete();
1920
const { t } = useTranslation(['common', 'summary']);
2021

22+
useEffect(() => {
23+
announce(
24+
query === ''
25+
? t('summary:noQueryResults', {
26+
count: totalResults,
27+
object: pluralize(totalResults, t('common:item'), t('common:items')),
28+
})
29+
: t('summary:results', {
30+
count: totalResults,
31+
object: pluralize(totalResults, t('common:result'), t('common:results')),
32+
query,
33+
}),
34+
);
35+
}, [queryValues?.get('q')]);
36+
2137
if (!searched) {
2238
return null;
2339
}
2440

2541
return (
2642
<React.Fragment>
27-
<LiveMessage
28-
message={
29-
query === ''
30-
? t('summary:noQueryResults', {
31-
count: totalResults,
32-
object: pluralize(totalResults, t('common:item'), t('common:items')),
33-
})
34-
: t('summary:results', {
35-
count: totalResults,
36-
object: pluralize(totalResults, t('common:result'), t('common:results')),
37-
query,
38-
})
39-
}
40-
aria-live="polite"
41-
/>
42-
4343
<Text {...rest} disableDefaultStyles={disableDefaultStyles}>
4444
<Box
4545
as="span"

yarn.lock

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4788,6 +4788,15 @@ __metadata:
47884788
languageName: node
47894789
linkType: hard
47904790

4791+
"@react-aria/live-announcer@npm:^3.1.1":
4792+
version: 3.1.1
4793+
resolution: "@react-aria/live-announcer@npm:3.1.1"
4794+
dependencies:
4795+
"@babel/runtime": ^7.6.2
4796+
checksum: feb02fe339ed1ce005b3fc6f07366ea100fbdfc3e42688f52d4e6704f6e09724b37f4e6b0c121578081940af11004421aab1b1a91f99c7193c4c2945ff43f92c
4797+
languageName: node
4798+
linkType: hard
4799+
47914800
"@react-aria/progress@npm:^3.1.1":
47924801
version: 3.1.1
47934802
resolution: "@react-aria/progress@npm:3.1.1"
@@ -5299,6 +5308,7 @@ __metadata:
52995308
version: 0.0.0-use.local
53005309
resolution: "@sajari/react-search-ui@workspace:packages/search-ui"
53015310
dependencies:
5311+
"@react-aria/live-announcer": ^3.1.1
53025312
"@react-aria/utils": 3.5.0
53035313
"@sajari/react-components": ^2.0.0
53045314
"@sajari/react-hooks": ^4.0.1
@@ -5309,7 +5319,6 @@ __metadata:
53095319
i18next: 19.8.7
53105320
i18next-browser-languagedetector: ^6.0.1
53115321
jest: ^26.6.3
5312-
react-aria-live: ^2.0.5
53135322
react-error-boundary: ^3.1.3
53145323
react-i18next: ^11.8.5
53155324
tempura: ^0.4.0
@@ -16148,17 +16157,6 @@ __metadata:
1614816157
languageName: node
1614916158
linkType: hard
1615016159

16151-
"react-aria-live@npm:^2.0.5":
16152-
version: 2.0.5
16153-
resolution: "react-aria-live@npm:2.0.5"
16154-
dependencies:
16155-
uuid: ^3.2.1
16156-
peerDependencies:
16157-
react: ^16.3.x
16158-
checksum: 9b3761292464cedd38a409257f09c679b67720832a024666da285fe46861cb4ff55e1f1aa8df6e71148567f840e9c69c0f821639d79b7be9a0bf12bc96f2f3b2
16159-
languageName: node
16160-
linkType: hard
16161-
1616216160
"react-clientside-effect@npm:^1.2.2":
1616316161
version: 1.2.2
1616416162
resolution: "react-clientside-effect@npm:1.2.2"
@@ -19509,7 +19507,7 @@ __metadata:
1950919507
languageName: node
1951019508
linkType: hard
1951119509

19512-
"uuid@npm:^3.2.1, uuid@npm:^3.3.2":
19510+
"uuid@npm:^3.3.2":
1951319511
version: 3.4.0
1951419512
resolution: "uuid@npm:3.4.0"
1951519513
bin:

0 commit comments

Comments
 (0)