Skip to content

Commit

Permalink
Add a11y context (#4586)
Browse files Browse the repository at this point in the history
* Add a11y context

* Feedback
  • Loading branch information
estrattonbailey authored Jun 20, 2024
1 parent 4d8537b commit 4bba597
Show file tree
Hide file tree
Showing 3 changed files with 111 additions and 40 deletions.
45 changes: 24 additions & 21 deletions src/App.native.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import {
import {s} from '#/lib/styles'
import {ThemeProvider} from '#/lib/ThemeContext'
import {logger} from '#/logger'
import {Provider as A11yProvider} from '#/state/a11y'
import {Provider as MutedThreadsProvider} from '#/state/cache/thread-mutes'
import {Provider as DialogStateProvider} from '#/state/dialogs'
import {Provider as InvitesStateProvider} from '#/state/invites'
Expand Down Expand Up @@ -152,27 +153,29 @@ function App() {
* that is set up in the InnerApp component above.
*/
return (
<KeyboardProvider enabled={false} statusBarTranslucent={true}>
<SessionProvider>
<ShellStateProvider>
<PrefsStateProvider>
<InvitesStateProvider>
<ModalStateProvider>
<DialogStateProvider>
<LightboxStateProvider>
<I18nProvider>
<PortalProvider>
<InnerApp />
</PortalProvider>
</I18nProvider>
</LightboxStateProvider>
</DialogStateProvider>
</ModalStateProvider>
</InvitesStateProvider>
</PrefsStateProvider>
</ShellStateProvider>
</SessionProvider>
</KeyboardProvider>
<A11yProvider>
<KeyboardProvider enabled={false} statusBarTranslucent={true}>
<SessionProvider>
<ShellStateProvider>
<PrefsStateProvider>
<InvitesStateProvider>
<ModalStateProvider>
<DialogStateProvider>
<LightboxStateProvider>
<I18nProvider>
<PortalProvider>
<InnerApp />
</PortalProvider>
</I18nProvider>
</LightboxStateProvider>
</DialogStateProvider>
</ModalStateProvider>
</InvitesStateProvider>
</PrefsStateProvider>
</ShellStateProvider>
</SessionProvider>
</KeyboardProvider>
</A11yProvider>
)
}

Expand Down
41 changes: 22 additions & 19 deletions src/App.web.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import {QueryProvider} from '#/lib/react-query'
import {Provider as StatsigProvider} from '#/lib/statsig/statsig'
import {ThemeProvider} from '#/lib/ThemeContext'
import {logger} from '#/logger'
import {Provider as A11yProvider} from '#/state/a11y'
import {Provider as MutedThreadsProvider} from '#/state/cache/thread-mutes'
import {Provider as DialogStateProvider} from '#/state/dialogs'
import {Provider as InvitesStateProvider} from '#/state/invites'
Expand Down Expand Up @@ -135,25 +136,27 @@ function App() {
* that is set up in the InnerApp component above.
*/
return (
<SessionProvider>
<ShellStateProvider>
<PrefsStateProvider>
<InvitesStateProvider>
<ModalStateProvider>
<DialogStateProvider>
<LightboxStateProvider>
<I18nProvider>
<PortalProvider>
<InnerApp />
</PortalProvider>
</I18nProvider>
</LightboxStateProvider>
</DialogStateProvider>
</ModalStateProvider>
</InvitesStateProvider>
</PrefsStateProvider>
</ShellStateProvider>
</SessionProvider>
<A11yProvider>
<SessionProvider>
<ShellStateProvider>
<PrefsStateProvider>
<InvitesStateProvider>
<ModalStateProvider>
<DialogStateProvider>
<LightboxStateProvider>
<I18nProvider>
<PortalProvider>
<InnerApp />
</PortalProvider>
</I18nProvider>
</LightboxStateProvider>
</DialogStateProvider>
</ModalStateProvider>
</InvitesStateProvider>
</PrefsStateProvider>
</ShellStateProvider>
</SessionProvider>
</A11yProvider>
)
}

Expand Down
65 changes: 65 additions & 0 deletions src/state/a11y.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
import React from 'react'
import {AccessibilityInfo} from 'react-native'
import {isReducedMotion} from 'react-native-reanimated'

import {isWeb} from '#/platform/detection'

const Context = React.createContext({
reduceMotionEnabled: false,
screenReaderEnabled: false,
})

export function useA11y() {
return React.useContext(Context)
}

export function Provider({children}: React.PropsWithChildren<{}>) {
const [reduceMotionEnabled, setReduceMotionEnabled] = React.useState(() =>
isReducedMotion(),
)
const [screenReaderEnabled, setScreenReaderEnabled] = React.useState(false)

React.useEffect(() => {
const reduceMotionChangedSubscription = AccessibilityInfo.addEventListener(
'reduceMotionChanged',
enabled => {
setReduceMotionEnabled(enabled)
},
)
const screenReaderChangedSubscription = AccessibilityInfo.addEventListener(
'screenReaderChanged',
enabled => {
setScreenReaderEnabled(enabled)
},
)

;(async () => {
const [_reduceMotionEnabled, _screenReaderEnabled] = await Promise.all([
AccessibilityInfo.isReduceMotionEnabled(),
AccessibilityInfo.isScreenReaderEnabled(),
])
setReduceMotionEnabled(_reduceMotionEnabled)
setScreenReaderEnabled(_screenReaderEnabled)
})()

return () => {
reduceMotionChangedSubscription.remove()
screenReaderChangedSubscription.remove()
}
}, [])

const ctx = React.useMemo(() => {
return {
reduceMotionEnabled,
/**
* Always returns true on web. For now, we're using this for mobile a11y,
* so we reset to false on web.
*
* @see https://github.com/necolas/react-native-web/discussions/2072
*/
screenReaderEnabled: isWeb ? false : screenReaderEnabled,
}
}, [reduceMotionEnabled, screenReaderEnabled])

return <Context.Provider value={ctx}>{children}</Context.Provider>
}

0 comments on commit 4bba597

Please sign in to comment.