diff --git a/src/view/com/auth/create/CreateAccount.tsx b/src/view/com/auth/create/CreateAccount.tsx index ac03081dff..26bf033864 100644 --- a/src/view/com/auth/create/CreateAccount.tsx +++ b/src/view/com/auth/create/CreateAccount.tsx @@ -75,9 +75,7 @@ export const CreateAccount = observer( + accessibilityRole="button"> Back @@ -87,9 +85,7 @@ export const CreateAccount = observer( + accessibilityRole="button"> {model.isProcessing ? ( ) : ( diff --git a/src/view/com/auth/login/Login.tsx b/src/view/com/auth/login/Login.tsx index cec08192c2..87512287b2 100644 --- a/src/view/com/auth/login/Login.tsx +++ b/src/view/com/auth/login/Login.tsx @@ -241,11 +241,7 @@ const ChooseAccountForm = ({ - + Back @@ -454,11 +450,7 @@ const LoginForm = ({ ) : undefined} - + Back @@ -632,11 +624,7 @@ const ForgotPasswordForm = ({ ) : undefined} - + Back @@ -794,11 +782,7 @@ const SetNewPasswordForm = ({ ) : undefined} - + Back diff --git a/src/view/com/lightbox/Lightbox.web.tsx b/src/view/com/lightbox/Lightbox.web.tsx index 1d4a9c2153..3388b54b20 100644 --- a/src/view/com/lightbox/Lightbox.web.tsx +++ b/src/view/com/lightbox/Lightbox.web.tsx @@ -106,8 +106,8 @@ function LightboxInner({ onPress={onPressLeft} style={[styles.btn, styles.leftBtn]} accessibilityRole="button" - accessibilityLabel="Go back" - accessibilityHint="Navigates to previous image in viewer"> + accessibilityLabel="Previous image" + accessibilityHint=""> + accessibilityLabel="Next image" + accessibilityHint=""> + accessibilityLabel="Back" + accessibilityHint=""> + accessibilityLabel="Back" + accessibilityHint=""> + accessibilityLabel="Back" + accessibilityHint=""> @@ -472,7 +472,7 @@ const ProfileHeaderLoaded = observer( onPress={onPressAvi} accessibilityRole="image" accessibilityLabel={`View ${view.handle}'s avatar`} - accessibilityHint={`Opens ${view.handle}'s avatar in an image viewer`}> + accessibilityHint=""> + accessibilityRole="button" + accessibilityLabel="Back" + accessibilityHint=""> {query ? ( + accessibilityLabel={canGoBack ? 'Back' : 'Menu'} + accessibilityHint=""> {canGoBack ? ( } accessibilityRole="button" - accessibilityLabel="Compose" - accessibilityHint="Opens post composer" + accessibilityLabel="Compose post" + accessibilityHint="" /> ) diff --git a/src/view/shell/Drawer.tsx b/src/view/shell/Drawer.tsx index 404374b95c..1b8983e83a 100644 --- a/src/view/shell/Drawer.tsx +++ b/src/view/shell/Drawer.tsx @@ -171,7 +171,7 @@ export const DrawerContent = observer(() => { } label="Search" accessibilityLabel="Search" - accessibilityHint="Search through users and posts" + accessibilityHint="" bold={isAtSearch} onPress={onPressSearch} /> @@ -193,7 +193,7 @@ export const DrawerContent = observer(() => { } label="Home" accessibilityLabel="Home" - accessibilityHint="Navigates to default feed" + accessibilityHint="" bold={isAtHome} onPress={onPressHome} /> @@ -214,12 +214,8 @@ export const DrawerContent = observer(() => { ) } label="Notifications" - accessibilityLabel={ - notifications.unreadCountLabel === '1' - ? 'Notifications: 1 unread notification' - : `Notifications: ${notifications.unreadCountLabel} unread notifications` - } - accessibilityHint="Opens notification feed" + accessibilityLabel="Notifications" + accessibilityHint={`${store.me.notifications.unreadCountLabel} unread`} count={notifications.unreadCountLabel} bold={isAtNotifications} onPress={onPressNotifications} @@ -242,7 +238,7 @@ export const DrawerContent = observer(() => { } label="Profile" accessibilityLabel="Profile" - accessibilityHint="See profile display name, avatar, description, and other profile items" + accessibilityHint="" onPress={onPressProfile} /> { } label="Settings" accessibilityLabel="Settings" - accessibilityHint="Manage settings for your account, like handle, content moderation, and app passwords" + accessibilityHint="" onPress={onPressSettings} /> @@ -332,7 +328,7 @@ function MenuItem({ testID={`menuItemButton-${label}`} style={styles.menuItem} onPress={onPress} - accessibilityRole="menuitem" + accessibilityRole="tab" accessibilityLabel={accessibilityLabel} accessibilityHint=""> diff --git a/src/view/shell/bottom-bar/BottomBar.tsx b/src/view/shell/bottom-bar/BottomBar.tsx index b32072d5a6..c11a0128c6 100644 --- a/src/view/shell/bottom-bar/BottomBar.tsx +++ b/src/view/shell/bottom-bar/BottomBar.tsx @@ -94,8 +94,9 @@ export const BottomBar = observer(({navigation}: BottomTabBarProps) => { ) } onPress={onPressHome} - accessibilityLabel="Go home" - accessibilityHint="Navigates to feed home" + accessibilityRole="tab" + accessibilityLabel="Home" + accessibilityHint="" /> { } onPress={onPressSearch} accessibilityRole="search" + accessibilityLabel="Search" + accessibilityHint="" /> { } onPress={onPressNotifications} notificationCount={store.me.notifications.unreadCountLabel} + accessible={true} + accessibilityRole="tab" accessibilityLabel="Notifications" - accessibilityHint="Navigates to notifications" + accessibilityHint={`${store.me.notifications.unreadCountLabel} unread`} /> { } onPress={onPressProfile} + accessibilityRole="tab" accessibilityLabel="Profile" - accessibilityHint="Navigates to profile" + accessibilityHint="" /> ) @@ -169,7 +175,10 @@ export const BottomBar = observer(({navigation}: BottomTabBarProps) => { interface BtnProps extends Pick< ComponentProps, - 'accessibilityRole' | 'accessibilityHint' | 'accessibilityLabel' + | 'accessible' + | 'accessibilityRole' + | 'accessibilityHint' + | 'accessibilityLabel' > { testID?: string icon: JSX.Element @@ -184,6 +193,7 @@ function Btn({ notificationCount, onPress, onLongPress, + accessible, accessibilityHint, accessibilityLabel, }: BtnProps) { @@ -194,6 +204,7 @@ function Btn({ onPress={onLongPress ? onPress : undefined} onPressIn={onLongPress ? undefined : onPress} onLongPress={onLongPress} + accessible={accessible} accessibilityLabel={accessibilityLabel} accessibilityHint={accessibilityHint}> {notificationCount ? ( diff --git a/src/view/shell/desktop/LeftNav.tsx b/src/view/shell/desktop/LeftNav.tsx index 86f1a3ef37..17d078dc51 100644 --- a/src/view/shell/desktop/LeftNav.tsx +++ b/src/view/shell/desktop/LeftNav.tsx @@ -66,7 +66,7 @@ function BackBtn() { style={styles.backBtn} accessibilityRole="button" accessibilityLabel="Go back" - accessibilityHint="Navigates to the previous screen"> + accessibilityHint=""> + accessibilityHint=""> {isCurrent ? iconFilled : icon} {typeof count === 'string' && count ? ( @@ -129,8 +130,8 @@ function ComposeBtn() { style={[styles.newPostBtn]} onPress={onPressCompose} accessibilityRole="button" - accessibilityLabel="New post" - accessibilityHint="Opens post composer"> + accessibilityLabel="Compose post" + accessibilityHint=""> {query ? (