diff --git a/src/components/MenuItem.tsx b/src/components/MenuItem.tsx index e8f2f699be65a..f5a8360dac73a 100644 --- a/src/components/MenuItem.tsx +++ b/src/components/MenuItem.tsx @@ -766,10 +766,10 @@ function MenuItem({ disabledStyle={shouldUseDefaultCursorWhenDisabled && [styles.cursorDefault]} disabled={disabled || isExecuting} ref={mergeRefs(ref, popoverAnchor)} - role={role} + role={interactive ? role : undefined} accessibilityLabel={accessibilityLabel ?? defaultAccessibilityLabel} accessible={shouldBeAccessible} - tabIndex={tabIndex} + tabIndex={interactive ? tabIndex : -1} onFocus={onFocus} sentryLabel={sentryLabel} > diff --git a/src/pages/workspace/duplicate/WorkspaceDuplicateSelectFeaturesForm.tsx b/src/pages/workspace/duplicate/WorkspaceDuplicateSelectFeaturesForm.tsx index 14d9af1b012e6..f3fde50abca93 100644 --- a/src/pages/workspace/duplicate/WorkspaceDuplicateSelectFeaturesForm.tsx +++ b/src/pages/workspace/duplicate/WorkspaceDuplicateSelectFeaturesForm.tsx @@ -346,21 +346,22 @@ function WorkspaceDuplicateSelectFeaturesForm({policyID}: WorkspaceDuplicateForm {translate('workspace.duplicateWorkspace.whichFeatures')} - + 0 && selectedItems.length !== items.length} onPress={toggleAllItems} disabled={items.length === 0} + shouldSelectOnPressEnter /> {translate('workspace.common.selectAll')}