mirror of
https://github.com/facebook/react-native.git
synced 2025-11-01 09:14:26 +00:00
7b2d8178b1
Summary: This issue fixes https://github.com/facebook/react-native/issues/30937 fixes https://github.com/facebook/react-native/issues/30947 fixes https://github.com/facebook/react-native/issues/30840 ([Test Case 7.1][7.1], [Test Case 7.3][7.3], [Test Case 7.5][7.5]) . The issue is caused by: 1) The missing javascript logic on the `accessibilityState` in the Text component https://github.com/fabriziobertoglio1987/react-native/commit/6ab7ab34e56411a7e87f396feb2f7ece1c4f98dd (as previously implemented in [Button][20]). 2) The missing setter for prop `accessible` in `ReactTextAnchorViewManager` https://github.com/fabriziobertoglio1987/react-native/commit/17095c6615107695f44af262846da446868b4cd8 (More information in previous PR https://github.com/facebook/react-native/pull/31252) Related PR https://github.com/facebook/react-native/pull/33070 PR https://github.com/callstack/react-native-slider/pull/354 [20]: https://github.com/facebook/react-native/pull/31001/files#diff-4f225d043edf4cf5b8288285b6a957e2187fc0242f240bde396e41c4c25e4124R281-R289 ## Changelog [Android] [Fixed] - Text Component does not announce disabled and disables click functionality when disabled Pull Request resolved: https://github.com/facebook/react-native/pull/33076 Test Plan: [1]. Text has `disabled` and `accessibilityState={{disabled: false}}` ([link][1]) [2]. Text has `disabled` ([link][2]) [3]. Text has `accessibilityState={{disabled: true}}` ([link][3]) [4]. Text has `accessibilityState={{disabled:false}}` ([link][4]) [5]. Text has `disabled={false}` and `accessibilityState={{disabled:true}}` ([link][5]) [6]. Text has `accessibilityState={{disabled:true}}` and method `setAccessible` in `ReactTextAnchorViewManager` (tested on commit [b4cd8][10]) ([link][6]) 7. Test Cases on the main branch [7.1]. Text has `disabled` and `accessibilityState={{disabled: false}}` ([link][7.1]) [7.3] Text has `accessibilityState={{disabled: true}}` ([link][7.3]) [7.5] Text has `disabled={false}` and `accessibilityState={{disabled:true}}` ([link][7.5]) [7.6] Text has `onPress callback` and `accessibilityState={{disabled: true}}` ([link][7.6]) [7.7] Text has `accessibilityState={{disabled:true}}` and no method `setAccessible` in `ReactTextAnchorViewManager` (tested on commit [c4f98dd][11]) ([link][7.7]) [1]: https://github.com/fabriziobertoglio1987/react-native-notes/issues/1#issuecomment-1033465424 [2]: https://github.com/fabriziobertoglio1987/react-native-notes/issues/1#issuecomment-1033465631 [3]: https://github.com/fabriziobertoglio1987/react-native-notes/issues/1#issuecomment-1033465706 [4]: https://github.com/fabriziobertoglio1987/react-native-notes/issues/1#issuecomment-1033465755 [5]: https://github.com/fabriziobertoglio1987/react-native-notes/issues/1#issuecomment-1033465813 [6]: https://github.com/fabriziobertoglio1987/react-native-notes/issues/1#issuecomment-1038473783 [7.1]: https://github.com/fabriziobertoglio1987/react-native-notes/issues/1#issuecomment-1033465874 [7.3]: https://github.com/fabriziobertoglio1987/react-native-notes/issues/1#issuecomment-1033465961 [7.5]: https://github.com/fabriziobertoglio1987/react-native-notes/issues/1#issuecomment-1033466018 [7.6]: https://github.com/fabriziobertoglio1987/react-native-notes/issues/1#issuecomment-1033321965 [7.7]: https://github.com/fabriziobertoglio1987/react-native-notes/issues/1#issuecomment-1038471984 [10]: https://github.com/facebook/react-native/pull/33076/commits/17095c6615107695f44af262846da446868b4cd8 [11]: https://github.com/facebook/react-native/pull/33076/commits/6ab7ab34e56411a7e87f396feb2f7ece1c4f98dd Reviewed By: blavalla Differential Revision: D34211793 Pulled By: ShikaSD fbshipit-source-id: e153fb48c194f5884e30beb9172e66aca7ce1a41
217 lines
6.1 KiB
JavaScript
217 lines
6.1 KiB
JavaScript
/**
|
|
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
|
*
|
|
* This source code is licensed under the MIT license found in the
|
|
* LICENSE file in the root directory of this source tree.
|
|
*
|
|
* @flow strict-local
|
|
* @format
|
|
*/
|
|
|
|
import * as PressabilityDebug from '../Pressability/PressabilityDebug';
|
|
import usePressability from '../Pressability/usePressability';
|
|
import StyleSheet from '../StyleSheet/StyleSheet';
|
|
import processColor from '../StyleSheet/processColor';
|
|
import TextAncestor from './TextAncestor';
|
|
import {NativeText, NativeVirtualText} from './TextNativeComponent';
|
|
import {type TextProps} from './TextProps';
|
|
import * as React from 'react';
|
|
import {useContext, useMemo, useState} from 'react';
|
|
|
|
/**
|
|
* Text is the fundamental component for displaying text.
|
|
*
|
|
* @see https://reactnative.dev/docs/text
|
|
*/
|
|
const Text: React.AbstractComponent<
|
|
TextProps,
|
|
React.ElementRef<typeof NativeText | typeof NativeVirtualText>,
|
|
> = React.forwardRef((props: TextProps, forwardedRef) => {
|
|
const {
|
|
accessible,
|
|
allowFontScaling,
|
|
ellipsizeMode,
|
|
onLongPress,
|
|
onPress,
|
|
onPressIn,
|
|
onPressOut,
|
|
onResponderGrant,
|
|
onResponderMove,
|
|
onResponderRelease,
|
|
onResponderTerminate,
|
|
onResponderTerminationRequest,
|
|
onStartShouldSetResponder,
|
|
pressRetentionOffset,
|
|
suppressHighlighting,
|
|
...restProps
|
|
} = props;
|
|
|
|
const [isHighlighted, setHighlighted] = useState(false);
|
|
|
|
const _disabled =
|
|
restProps.disabled != null
|
|
? restProps.disabled
|
|
: props.accessibilityState?.disabled;
|
|
const _accessibilityState =
|
|
_disabled !== props.accessibilityState?.disabled
|
|
? {...props.accessibilityState, disabled: _disabled}
|
|
: props.accessibilityState;
|
|
|
|
const isPressable =
|
|
(onPress != null ||
|
|
onLongPress != null ||
|
|
onStartShouldSetResponder != null) &&
|
|
_disabled !== true;
|
|
|
|
const initialized = useLazyInitialization(isPressable);
|
|
const config = useMemo(
|
|
() =>
|
|
initialized
|
|
? {
|
|
disabled: !isPressable,
|
|
pressRectOffset: pressRetentionOffset,
|
|
onLongPress,
|
|
onPress,
|
|
onPressIn(event) {
|
|
setHighlighted(!suppressHighlighting);
|
|
onPressIn?.(event);
|
|
},
|
|
onPressOut(event) {
|
|
setHighlighted(false);
|
|
onPressOut?.(event);
|
|
},
|
|
onResponderTerminationRequest_DEPRECATED:
|
|
onResponderTerminationRequest,
|
|
onStartShouldSetResponder_DEPRECATED: onStartShouldSetResponder,
|
|
}
|
|
: null,
|
|
[
|
|
initialized,
|
|
isPressable,
|
|
pressRetentionOffset,
|
|
onLongPress,
|
|
onPress,
|
|
onPressIn,
|
|
onPressOut,
|
|
onResponderTerminationRequest,
|
|
onStartShouldSetResponder,
|
|
suppressHighlighting,
|
|
],
|
|
);
|
|
|
|
const eventHandlers = usePressability(config);
|
|
const eventHandlersForText = useMemo(
|
|
() =>
|
|
eventHandlers == null
|
|
? null
|
|
: {
|
|
onResponderGrant(event) {
|
|
eventHandlers.onResponderGrant(event);
|
|
if (onResponderGrant != null) {
|
|
onResponderGrant(event);
|
|
}
|
|
},
|
|
onResponderMove(event) {
|
|
eventHandlers.onResponderMove(event);
|
|
if (onResponderMove != null) {
|
|
onResponderMove(event);
|
|
}
|
|
},
|
|
onResponderRelease(event) {
|
|
eventHandlers.onResponderRelease(event);
|
|
if (onResponderRelease != null) {
|
|
onResponderRelease(event);
|
|
}
|
|
},
|
|
onResponderTerminate(event) {
|
|
eventHandlers.onResponderTerminate(event);
|
|
if (onResponderTerminate != null) {
|
|
onResponderTerminate(event);
|
|
}
|
|
},
|
|
onResponderTerminationRequest:
|
|
eventHandlers.onResponderTerminationRequest,
|
|
onStartShouldSetResponder: eventHandlers.onStartShouldSetResponder,
|
|
},
|
|
[
|
|
eventHandlers,
|
|
onResponderGrant,
|
|
onResponderMove,
|
|
onResponderRelease,
|
|
onResponderTerminate,
|
|
],
|
|
);
|
|
|
|
// TODO: Move this processing to the view configuration.
|
|
const selectionColor =
|
|
restProps.selectionColor == null
|
|
? null
|
|
: processColor(restProps.selectionColor);
|
|
|
|
let style = restProps.style;
|
|
if (__DEV__) {
|
|
if (PressabilityDebug.isEnabled() && onPress != null) {
|
|
style = StyleSheet.compose(restProps.style, {
|
|
color: 'magenta',
|
|
});
|
|
}
|
|
}
|
|
|
|
let numberOfLines = restProps.numberOfLines;
|
|
if (numberOfLines != null && !(numberOfLines >= 0)) {
|
|
console.error(
|
|
`'numberOfLines' in <Text> must be a non-negative number, received: ${numberOfLines}. The value will be set to 0.`,
|
|
);
|
|
numberOfLines = 0;
|
|
}
|
|
|
|
const hasTextAncestor = useContext(TextAncestor);
|
|
|
|
return hasTextAncestor ? (
|
|
<NativeVirtualText
|
|
{...restProps}
|
|
{...eventHandlersForText}
|
|
isHighlighted={isHighlighted}
|
|
isPressable={isPressable}
|
|
numberOfLines={numberOfLines}
|
|
selectionColor={selectionColor}
|
|
style={style}
|
|
ref={forwardedRef}
|
|
/>
|
|
) : (
|
|
<TextAncestor.Provider value={true}>
|
|
<NativeText
|
|
{...restProps}
|
|
{...eventHandlersForText}
|
|
disabled={_disabled}
|
|
accessible={accessible !== false}
|
|
accessibilityState={_accessibilityState}
|
|
allowFontScaling={allowFontScaling !== false}
|
|
ellipsizeMode={ellipsizeMode ?? 'tail'}
|
|
isHighlighted={isHighlighted}
|
|
numberOfLines={numberOfLines}
|
|
selectionColor={selectionColor}
|
|
style={style}
|
|
ref={forwardedRef}
|
|
/>
|
|
</TextAncestor.Provider>
|
|
);
|
|
});
|
|
|
|
Text.displayName = 'Text';
|
|
|
|
/**
|
|
* Returns false until the first time `newValue` is true, after which this will
|
|
* always return true. This is necessary to lazily initialize `Pressability` so
|
|
* we do not eagerly create one for every pressable `Text` component.
|
|
*/
|
|
function useLazyInitialization(newValue: boolean): boolean {
|
|
const [oldValue, setValue] = useState(newValue);
|
|
if (!oldValue && newValue) {
|
|
setValue(newValue);
|
|
}
|
|
return oldValue;
|
|
}
|
|
|
|
module.exports = Text;
|