Skip to content

fix: Screen Reader: Workspace: 3-dot More button in Workspace container not focusable or operable #84124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yuwenmemon merged 5 commits into from
Mar 5, 2026
Merged

fix: Screen Reader: Workspace: 3-dot More button in Workspace container not focusable or operable #84124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e5e2d77
fix: Screen Reader: Workspace: 3-dot More button in Workspace contain…
TaduJR Mar 4, 2026
d3af0b5
fix: Remove orphaned role=cell from action column outside role=row
TaduJR Mar 4, 2026
79daf5c
Merge branch 'main' of https://github.com/TaduJR/App into fix-Accessi…
TaduJR Mar 4, 2026
8202c60
Merge branch 'main' of https://github.com/TaduJR/App into fix-Accessi…
TaduJR Mar 4, 2026
7d580c2
Merge branch 'main' of https://github.com/TaduJR/App into fix-Accessi…
TaduJR Mar 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/CONST/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8750,6 +8750,8 @@ const CONST = {
NEW_WORKSPACE_BUTTON: 'WorkspaceList-NewWorkspaceButton',
NEW_DOMAIN_BUTTON: 'WorkspaceList-NewDomainButton',
THREE_DOT_MENU: 'WorkspaceList-ThreeDotMenu',
ROW: 'WorkspaceList-Row',
ROW_ARROW: 'WorkspaceList-RowArrow',
},
INITIAL: {
PROFILE: 'WorkspaceInitial-Profile',
Expand Down
17 changes: 3 additions & 14 deletions src/pages/workspace/WorkspacesListPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ import {
getConnectionExporters,
getPolicyBrickRoadIndicatorStatus,
getUberConnectionErrorDirectlyFromPolicy,
getUserFriendlyWorkspaceType,
isPendingDeletePolicy,
isPolicyAdmin,
isPolicyAuditor,
Expand Down Expand Up @@ -431,17 +430,6 @@ function WorkspacesListPage() {
});
}

const ownerDisplayName = personalDetails?.[item.ownerAccountID ?? CONST.DEFAULT_NUMBER_ID]?.displayName ?? '';
const workspaceType = item.type ? getUserFriendlyWorkspaceType(item.type, translate) : '';
const accessibilityLabel = [
`${translate('workspace.common.workspace')}: ${item.title}`,
isDefault ? translate('common.default') : '',
`${translate('workspace.common.workspaceOwner')}: ${ownerDisplayName}`,
`${translate('workspace.common.workspaceType')}: ${workspaceType}`,
]
.filter(Boolean)
.join(', ');

return (
<OfflineWithFeedback
key={`${item.title}_${index}`}
Expand All @@ -454,8 +442,7 @@ function WorkspacesListPage() {
shouldHideOnDelete={false}
>
<PressableWithoutFeedback
role={isLessThanMediumScreen ? CONST.ROLE.BUTTON : CONST.ROLE.ROW}
accessibilityLabel={accessibilityLabel}
accessible={false}
style={[styles.mh5]}
disabled={item.disabled}
onPress={item.action}
Expand All @@ -480,6 +467,8 @@ function WorkspacesListPage() {
isLoadingBill={isLoadingBill}
resetLoadingSpinnerIconIndex={resetLoadingSpinnerIconIndex}
isHovered={hovered}
disabled={item.disabled}
onPress={item.action}
/>
)}
</PressableWithoutFeedback>
Expand Down
151 changes: 99 additions & 52 deletions src/pages/workspace/WorkspacesListRow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import Avatar from '@components/Avatar';
import Badge from '@components/Badge';
import Icon from '@components/Icon';
import type {PopoverMenuItem} from '@components/PopoverMenu';
import PressableWithoutFeedback from '@components/Pressable/PressableWithoutFeedback';
import Text from '@components/Text';
import TextWithTooltip from '@components/TextWithTooltip';
import ThreeDotsMenu from '@components/ThreeDotsMenu';
Expand Down Expand Up @@ -84,6 +85,12 @@ type WorkspacesListRowProps = WithCurrentUserPersonalDetailsProps & {

/** Whether the list item is hovered */
isHovered?: boolean;

/** Whether the row press is disabled */
disabled?: boolean;

/** Callback when the row is pressed */
onPress?: () => void;
};

type BrickRoadIndicatorIconProps = {
Expand Down Expand Up @@ -122,6 +129,8 @@ function WorkspacesListRow({
isLoadingBill,
resetLoadingSpinnerIconIndex,
isHovered,
disabled,
onPress,
}: WorkspacesListRowProps) {
const styles = useThemeStyles();
const {translate} = useLocalize();
Expand Down Expand Up @@ -177,58 +186,92 @@ function WorkspacesListRow({

const isDeleted = style && Array.isArray(style) ? style.includes(styles.offlineFeedbackDeleted) : false;

const ownerName = ownerDetails ? getDisplayNameOrDefault(ownerDetails) : '';
const workspaceTypeName = workspaceType ? getUserFriendlyWorkspaceType(workspaceType, translate) : '';
const accessibilityLabel = [
`${translate('workspace.common.workspaceName')}: ${title}`,
isDefault ? translate('common.default') : '',
isJoinRequestPending ? translate('workspace.common.requested') : '',
ownerName ? `${translate('workspace.common.workspaceOwner')}: ${ownerName}` : '',
workspaceTypeName ? `${translate('workspace.common.workspaceType')}: ${workspaceTypeName}` : '',
]
.filter(Boolean)
.join(', ');

const RequestedBadge = isJoinRequestPending ? (
<View style={[styles.flexRow, styles.gap2, styles.alignItemsCenter, styles.justifyContentEnd]}>
<Badge
text={translate('workspace.common.requested')}
textStyles={styles.textStrong}
badgeStyles={styles.alignSelfCenter}
icon={icons.Hourglass}
/>
</View>
) : null;

const DefaultBadge = isDefault ? (
<Tooltip
maxWidth={variables.w184}
text={translate('workspace.common.defaultNote')}
numberOfLines={4}
>
<View style={[styles.flexRow, styles.gap2, styles.alignItemsCenter, styles.justifyContentEnd]}>
<Badge
text={translate('common.default')}
textStyles={styles.textStrong}
badgeStyles={styles.alignSelfCenter}
/>
</View>
</Tooltip>
) : null;

const ThreeDotsSection = !isJoinRequestPending ? (
<View style={[styles.flexRow, styles.gap1, !isNarrow && styles.ml2, isNarrow && styles.alignItemsCenter]}>
<View style={[styles.flexRow, styles.gap2, styles.alignItemsCenter, isNarrow && styles.workspaceListRBR]}>
<BrickRoadIndicatorIcon brickRoadIndicator={brickRoadIndicator} />
</View>
<ThreeDotsMenu
isContainerFocused={isFocused}
shouldSelfPosition
menuItems={menuItems}
anchorAlignment={{horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.RIGHT, vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.TOP}}
shouldOverlay
disabled={shouldDisableThreeDotsMenu}
isNested
threeDotsMenuRef={threeDotsMenuRef}
sentryLabel={CONST.SENTRY_LABEL.WORKSPACE.LIST.THREE_DOT_MENU}
/>
</View>
) : null;

const NarrowBadges =
isJoinRequestPending || isDefault ? (
<View style={[styles.flexRow, styles.gap1, styles.alignItemsCenter]}>
{RequestedBadge}
{DefaultBadge}
</View>
) : null;

const ThreeDotMenuOrPendingIcon = (
<View style={[styles.flexRow, !shouldUseNarrowLayout && styles.workspaceThreeDotMenu]}>
{!!isJoinRequestPending && (
<View style={[styles.flexRow, styles.gap2, styles.alignItemsCenter, styles.justifyContentEnd]}>
<Badge
text={translate('workspace.common.requested')}
textStyles={styles.textStrong}
badgeStyles={styles.alignSelfCenter}
icon={icons.Hourglass}
/>
</View>
)}
{!!isDefault && (
<Tooltip
maxWidth={variables.w184}
text={translate('workspace.common.defaultNote')}
numberOfLines={4}
>
<View style={[styles.flexRow, styles.gap2, styles.alignItemsCenter, styles.justifyContentEnd]}>
<Badge
text={translate('common.default')}
textStyles={styles.textStrong}
badgeStyles={styles.alignSelfCenter}
/>
</View>
</Tooltip>
)}
{!isJoinRequestPending && (
<View style={[styles.flexRow, styles.ml2, styles.gap1]}>
<View style={[styles.flexRow, styles.gap2, styles.alignItemsCenter, isNarrow && styles.workspaceListRBR]}>
<BrickRoadIndicatorIcon brickRoadIndicator={brickRoadIndicator} />
</View>
<ThreeDotsMenu
isContainerFocused={isFocused}
shouldSelfPosition
menuItems={menuItems}
anchorAlignment={{horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.RIGHT, vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.TOP}}
shouldOverlay
disabled={shouldDisableThreeDotsMenu}
isNested
threeDotsMenuRef={threeDotsMenuRef}
sentryLabel={CONST.SENTRY_LABEL.WORKSPACE.LIST.THREE_DOT_MENU}
/>
</View>
)}
{RequestedBadge}
{DefaultBadge}
{ThreeDotsSection}
</View>
);

return (
<View style={[styles.flexRow, styles.highlightBG, rowStyles, style, styles.br3]}>
<Animated.View style={[styles.flex1, styles.flexRow, styles.bgTransparent, isWide && styles.gap5, styles.p5, styles.pr3, animatedHighlightStyle]}>
<View style={[isWide ? styles.flexRow : styles.flexColumn, styles.flex1, isWide && styles.gap5]}>
<PressableWithoutFeedback
accessible
accessibilityLabel={accessibilityLabel}
role={isWide ? CONST.ROLE.ROW : CONST.ROLE.BUTTON}
onPress={onPress}
disabled={disabled}
style={[isWide ? styles.flexRow : styles.flexColumn, styles.flex1, isWide && styles.gap5]}
sentryLabel={CONST.SENTRY_LABEL.WORKSPACE.LIST.ROW}
>
<View
role={isWide ? CONST.ROLE.CELL : undefined}
style={[styles.flexRow, styles.justifyContentBetween, styles.flex2, isNarrow && styles.mb3, styles.alignItemsCenter]}
Expand All @@ -249,7 +292,7 @@ function WorkspacesListRow({
style={[styles.flex1, styles.flexGrow1, styles.textStrong, isDeleted ? styles.offlineFeedbackDeleted : {}]}
/>
</View>
{isNarrow && ThreeDotMenuOrPendingIcon}
{isNarrow && NarrowBadges}
</View>
<View
role={isWide ? CONST.ROLE.CELL : undefined}
Expand Down Expand Up @@ -306,23 +349,27 @@ function WorkspacesListRow({
</Text>
</View>
</View>
</View>
</PressableWithoutFeedback>

<View
role={isWide ? CONST.ROLE.CELL : undefined}
style={[styles.flexRow, styles.alignItemsCenter]}
>
<View style={[styles.flexRow, styles.alignItemsCenter, isNarrow && styles.alignSelfStart]}>
{isNarrow && ThreeDotsSection}
{!isNarrow && ThreeDotMenuOrPendingIcon}
{!isNarrow && (
<View style={[styles.justifyContentCenter, styles.alignItemsCenter, styles.touchableButtonImage]}>
<PressableWithoutFeedback
onPress={onPress}
disabled={disabled}
accessible={false}
sentryLabel={CONST.SENTRY_LABEL.WORKSPACE.LIST.ROW_ARROW}
style={[styles.justifyContentCenter, styles.alignItemsCenter, styles.touchableButtonImage]}
>
<Icon
src={icons.ArrowRight}
fill={theme.icon}
additionalStyles={[styles.alignSelfCenter, !isHovered && styles.opacitySemiTransparent]}
isButtonIcon
medium
/>
</View>
</PressableWithoutFeedback>
)}
</View>
</Animated.View>
Expand Down
Loading