Skip to content

Delegate TouchableNativeFeedback accessibility to its child (#59391) #59391

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

Open
javache wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Delegate TouchableNativeFeedback accessibility to its child (#59391) #59391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fe342ac
Avoid synthesising accessibilityState in pressable wrappers (#59399)
javache Oct 23, 2026
3c842b5
Exercise View normalisation in the Jest preset (#59398)
javache Oct 23, 2026
9f86d40
Delegate Pressable accessibility normalisation to View
javache Oct 23, 2026
17e6a06
Delegate TouchableHighlight accessibility to View (#59402)
javache Oct 23, 2026
f0196ac
Delegate TouchableOpacity accessibility to View
javache Oct 23, 2026
098c01b
Delegate TouchableNativeFeedback accessibility to its child (#59391)
javache Oct 23, 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
27 changes: 0 additions & 27 deletions packages/jest-preset/jest/mocks/View.js
View file
Open in desktop

This file was deleted.

11 changes: 11 additions & 0 deletions packages/jest-preset/jest/mocks/ViewNativeComponent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,21 @@

import type {ViewProps} from 'react-native';

import MockNativeMethods from '../MockNativeMethods';
import * as React from 'react';
import {createElement} from 'react';

export default class View extends React.Component<ViewProps> {
measure: typeof MockNativeMethods.measure = MockNativeMethods.measure;
measureInWindow: typeof MockNativeMethods.measureInWindow =
MockNativeMethods.measureInWindow;
measureLayout: typeof MockNativeMethods.measureLayout =
MockNativeMethods.measureLayout;
setNativeProps: typeof MockNativeMethods.setNativeProps =
MockNativeMethods.setNativeProps;
focus: typeof MockNativeMethods.focus = MockNativeMethods.focus;
blur: typeof MockNativeMethods.blur = MockNativeMethods.blur;

render(): React.Node {
// $FlowFixMe[not-a-function]
return createElement('View', this.props, this.props.children);
Expand Down
2 changes: 0 additions & 2 deletions packages/jest-preset/jest/setup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,6 @@ mock(
'm#react-native/Libraries/Components/TextInput/TextInput',
'm#./mocks/TextInput',
);
// $FlowFixMe[cannot-resolve-module]
mock('m#react-native/Libraries/Components/View/View', 'm#./mocks/View');
mock(
// $FlowFixMe[cannot-resolve-module]
'm#react-native/Libraries/Components/View/ViewNativeComponent',
Expand Down
61 changes: 15 additions & 46 deletions packages/react-native/Libraries/Components/Pressable/Pressable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,16 +203,8 @@ function Pressable({
}): React.Node {
const {
accessible,
accessibilityState,
'aria-live': ariaLive,
android_disableSound,
android_ripple,
'aria-busy': ariaBusy,
'aria-checked': ariaChecked,
'aria-disabled': ariaDisabled,
'aria-expanded': ariaExpanded,
'aria-label': ariaLabel,
'aria-selected': ariaSelected,
blockNativeResponder,
cancelable,
children,
Expand Down Expand Up @@ -248,43 +240,7 @@ function Pressable({
const shouldUpdatePressed =
typeof children === 'function' || typeof style === 'function';

let _accessibilityState = {
busy: ariaBusy ?? accessibilityState?.busy,
checked: ariaChecked ?? accessibilityState?.checked,
disabled: ariaDisabled ?? accessibilityState?.disabled,
expanded: ariaExpanded ?? accessibilityState?.expanded,
selected: ariaSelected ?? accessibilityState?.selected,
};

_accessibilityState =
disabled != null ? {..._accessibilityState, disabled} : _accessibilityState;

const accessibilityValue = {
max: props['aria-valuemax'] ?? props.accessibilityValue?.max,
min: props['aria-valuemin'] ?? props.accessibilityValue?.min,
now: props['aria-valuenow'] ?? props.accessibilityValue?.now,
text: props['aria-valuetext'] ?? props.accessibilityValue?.text,
};

const accessibilityLiveRegion =
ariaLive === 'off' ? 'none' : (ariaLive ?? props.accessibilityLiveRegion);

const accessibilityLabel = ariaLabel ?? props.accessibilityLabel;
const restPropsWithDefaults: React.ComponentProps<typeof View> = {
...restProps,
...android_rippleConfig?.viewProps,
accessible: accessible !== false,
accessibilityViewIsModal:
restProps['aria-modal'] ?? restProps.accessibilityViewIsModal,
accessibilityLiveRegion,
accessibilityLabel,
accessibilityState: _accessibilityState,
focusable: focusable !== false,
accessibilityValue,
hitSlop,
};

const config = useMemo(
const pressabilityConfig = useMemo(
() => ({
cancelable,
disabled,
Expand Down Expand Up @@ -353,7 +309,20 @@ function Pressable({
],
);

const eventHandlers = usePressability(config);
const eventHandlers = usePressability(pressabilityConfig);

const restPropsWithDefaults: {...React.ComponentProps<typeof View>} = {
...restProps,
...android_rippleConfig?.viewProps,
accessible: accessible !== false,
focusable: focusable !== false,
hitSlop,
};

if (pressabilityConfig.disabled != null) {
// Expose Pressability's resolved disabled state to accessibility through View.
restPropsWithDefaults['aria-disabled'] = pressabilityConfig.disabled;
}

return (
<View
Expand Down
Loading
Loading