Skip to content

Picker - useWheelPicker fix accessibility #3696

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
merged 1 commit into from
Apr 29, 2025
Merged

Picker - useWheelPicker fix accessibility #3696

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 8 additions & 1 deletion src/components/WheelPicker/Item.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ interface InternalProps<T> extends WheelPickerItemProps<T> {
inactiveColor?: string;
style?: TextStyle;
onSelect: (index: number) => void;
onPress?: () => void;
centerH?: boolean;
fakeLabel?: string;
fakeLabelStyle?: TextStyle;
Expand All @@ -42,6 +43,7 @@ const WheelPickerItem = <T extends WheelPickerItemValue = number>(props: Interna
fakeLabelProps,
itemHeight,
onSelect,
onPress,
offset,
activeColor = Colors.$textPrimary,
inactiveColor = Colors.$textNeutralHeavy,
Expand Down Expand Up @@ -76,6 +78,11 @@ const WheelPickerItem = <T extends WheelPickerItemValue = number>(props: Interna
return [animatedColorStyle, style, fakeLabel ? textWithLabelPaddingStyle : styles.textPadding];
}, [style, fakeLabel, animatedColorStyle, textWithLabelPaddingStyle]);

const _onPress = useCallback(() => {
selectItem();
onPress?.();
}, [onPress, selectItem]);

const _fakeLabelStyle = useMemo(() => StyleSheet.flatten([fakeLabelStyle, styles.hidden]), [fakeLabelStyle]);
return (
<AnimatedTouchableOpacity
Expand All @@ -86,7 +93,7 @@ const WheelPickerItem = <T extends WheelPickerItemValue = number>(props: Interna
centerH={align ? align === WheelPickerAlign.CENTER : centerH}
right={align ? align === WheelPickerAlign.RIGHT : !centerH}
left={align === WheelPickerAlign.LEFT}
onPress={selectItem}
onPress={_onPress}
// @ts-ignore reanimated2
index={index}
testID={testID}
Expand Down
13 changes: 12 additions & 1 deletion src/components/picker/PickerItemsList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,10 @@ const PickerItemsList = (props: PickerItemsListProps) => {
);
};

const onDonePress = useCallback(() => {
context.onPress(wheelPickerValue);
}, [context.onPress, wheelPickerValue]);

const renderPickerHeader = () => {
const {cancelButtonProps, cancelLabel, doneLabel, title, titleStyle, containerStyle, onDone, onCancel} =
topBarProps ?? {};
Expand All @@ -138,7 +142,14 @@ const PickerItemsList = (props: PickerItemsListProps) => {
<View row spread padding-page style={containerStyle}>
{(cancelButtonProps || cancelLabel) && renderCancel()}
<Text style={titleStyle}>{title}</Text>
<Text text70 $textPrimary accessibilityRole={'button'} onPress={() => context.onPress(wheelPickerValue)}>
<Text
text70
$textPrimary
accessibilityElementsHidden={useWheelPicker}
importantForAccessibility={useWheelPicker ? 'no' : 'yes'}
accessibilityRole={'button'}
onPress={onDonePress}
>
{doneLabel ?? 'Select'}
</Text>
</View>
Expand Down
14 changes: 11 additions & 3 deletions src/components/picker/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,14 @@ const Picker = React.forwardRef((props: PickerProps, ref) => {
items
});

const accessibleFilteredItems = useMemo(() => {
return filteredItems.map((item: PickerItemProps) => ({
...item,
onPress:
useWheelPicker && Constants.accessibility.isScreenReaderEnabled ? () => onDoneSelecting(item.value) : undefined
}));
}, [useWheelPicker, filteredItems, onDoneSelecting]);

const {label, accessibilityInfo} = usePickerLabel({
value,
items,
Expand Down Expand Up @@ -247,7 +255,7 @@ const Picker = React.forwardRef((props: PickerProps, ref) => {
useWheelPicker={useWheelPicker}
mode={mode}
useDialog={useDialog}
items={useItems ? filteredItems : undefined}
items={useItems ? accessibleFilteredItems : undefined}
topBarProps={{
...topBarProps,
onCancel: cancelSelect,
Expand All @@ -266,7 +274,7 @@ const Picker = React.forwardRef((props: PickerProps, ref) => {
renderCustomTopElement={renderCustomTopElement}
selectionStatus={selectionStatus}
>
{filteredItems}
{accessibleFilteredItems}
</PickerItemsList>
);
}, [
Expand All @@ -285,7 +293,7 @@ const Picker = React.forwardRef((props: PickerProps, ref) => {
renderCustomSearch,
renderHeader,
listProps,
filteredItems,
accessibleFilteredItems,
useSafeArea,
useWheelPicker,
items,
Expand Down