mirror of
https://github.com/facebook/react-native.git
synced 2025-11-01 09:14:26 +00:00
4d1357918a
Summary: The current implementation of `AccessibilityInfo.announceForAccessibility` will immediately interrupt any existing in progress speech with the announcement. Sometimes this is desirable behaviour, but often you will want to wait until existing speech is finished before reading the new announcement. This change gives us that option. My personal use case for this feature is a custom text input. When typing on iOS with voiceover enabled, each character is read out after being selected. I wanted to add some additional information after each character to help with the context of what has changed in the input, but I didn't want to override the reading of the character itself. This feature is supported natively on iOS by constructing an `NSAttributedString` with the property [`accessibilitySpeechQueueAnnouncement`](https://developer.apple.com/documentation/foundation/nsattributedstring/key/2865770-accessibilityspeechqueueannounce), so this change just adds an extra parameter to `AccessibilityInfo.announceForAccessibility` which controls the value of that property on the native side. Adding this as an extra optional parameter with false as the default ensures that existing uses of the function won't be affected. Unfortunately, this feature doesn't appear to be supported on Android, so the new second property will be iOS only. ## Changelog [iOS] [Added] - add new argument to announceForAccessibility to allow queueing on iOS Pull Request resolved: https://github.com/facebook/react-native/pull/32637 Test Plan: I've updated the `announceForAccessibility` section in RNTester with multiple buttons to demonstrate the difference between `queue: false` (default) and `queue: true` and show they work as intended. Here's the expectation for each button: - "Announce for Accessibility Immediately": on press, should start reading the button label, then be interrupted by the announcement - "Announce for Accessibility Queued": on press, should read the button label then read the announcement afterwards - "Announce for Accessibility Queue Multiple": on press, should read the button label, then read three announcements sequentially, no interruptions You can see the realisation of those expectations in the following video recorded on an iPhone 12 running iOS 15.0.2: https://user-images.githubusercontent.com/14826539/142770536-d57bfd69-eba5-444d-9c89-4bf4851ea062.mov I've also tested the same way on an iPhone 8 running iOS 13.4 and it works exactly the same. Reviewed By: yungsters Differential Revision: D32637989 Pulled By: philIip fbshipit-source-id: 3e90add523f11eb0eb34ea623211249263f257e2
411 lines
14 KiB
JavaScript
411 lines
14 KiB
JavaScript
/**
|
|
* Copyright (c) Facebook, Inc. and its 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 RCTDeviceEventEmitter from '../../EventEmitter/RCTDeviceEventEmitter';
|
|
import {sendAccessibilityEvent} from '../../Renderer/shims/ReactNative';
|
|
import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes';
|
|
import Platform from '../../Utilities/Platform';
|
|
import type EventEmitter from '../../vendor/emitter/EventEmitter';
|
|
import type {EventSubscription} from '../../vendor/emitter/EventEmitter';
|
|
import NativeAccessibilityInfoAndroid from './NativeAccessibilityInfo';
|
|
import NativeAccessibilityManagerIOS from './NativeAccessibilityManager';
|
|
import legacySendAccessibilityEvent from './legacySendAccessibilityEvent';
|
|
import type {ElementRef} from 'react';
|
|
|
|
// Events that are only supported on Android.
|
|
type AccessibilityEventDefinitionsAndroid = {
|
|
accessibilityServiceChanged: [boolean],
|
|
};
|
|
|
|
// Events that are only supported on iOS.
|
|
type AccessibilityEventDefinitionsIOS = {
|
|
announcementFinished: [{announcement: string, success: boolean}],
|
|
boldTextChanged: [boolean],
|
|
grayscaleChanged: [boolean],
|
|
invertColorsChanged: [boolean],
|
|
reduceTransparencyChanged: [boolean],
|
|
};
|
|
|
|
type AccessibilityEventDefinitions = {
|
|
...AccessibilityEventDefinitionsAndroid,
|
|
...AccessibilityEventDefinitionsIOS,
|
|
change: [boolean], // screenReaderChanged
|
|
reduceMotionChanged: [boolean],
|
|
screenReaderChanged: [boolean],
|
|
};
|
|
|
|
type AccessibilityEventTypes = 'click' | 'focus';
|
|
|
|
// Mapping of public event names to platform-specific event names.
|
|
const EventNames: Map<
|
|
$Keys<AccessibilityEventDefinitions>,
|
|
string,
|
|
> = Platform.OS === 'android'
|
|
? new Map([
|
|
['change', 'touchExplorationDidChange'],
|
|
['reduceMotionChanged', 'reduceMotionDidChange'],
|
|
['screenReaderChanged', 'touchExplorationDidChange'],
|
|
['accessibilityServiceChanged', 'accessibilityServiceDidChange'],
|
|
])
|
|
: new Map([
|
|
['announcementFinished', 'announcementFinished'],
|
|
['boldTextChanged', 'boldTextChanged'],
|
|
['change', 'screenReaderChanged'],
|
|
['grayscaleChanged', 'grayscaleChanged'],
|
|
['invertColorsChanged', 'invertColorsChanged'],
|
|
['reduceMotionChanged', 'reduceMotionChanged'],
|
|
['reduceTransparencyChanged', 'reduceTransparencyChanged'],
|
|
['screenReaderChanged', 'screenReaderChanged'],
|
|
]);
|
|
|
|
/**
|
|
* Sometimes it's useful to know whether or not the device has a screen reader
|
|
* that is currently active. The `AccessibilityInfo` API is designed for this
|
|
* purpose. You can use it to query the current state of the screen reader as
|
|
* well as to register to be notified when the state of the screen reader
|
|
* changes.
|
|
*
|
|
* See https://reactnative.dev/docs/accessibilityinfo
|
|
*/
|
|
const AccessibilityInfo = {
|
|
/**
|
|
* Query whether bold text is currently enabled.
|
|
*
|
|
* Returns a promise which resolves to a boolean.
|
|
* The result is `true` when bold text is enabled and `false` otherwise.
|
|
*
|
|
* See https://reactnative.dev/docs/accessibilityinfo#isBoldTextEnabled
|
|
*/
|
|
isBoldTextEnabled(): Promise<boolean> {
|
|
if (Platform.OS === 'android') {
|
|
return Promise.resolve(false);
|
|
} else {
|
|
return new Promise((resolve, reject) => {
|
|
if (NativeAccessibilityManagerIOS != null) {
|
|
NativeAccessibilityManagerIOS.getCurrentBoldTextState(
|
|
resolve,
|
|
reject,
|
|
);
|
|
} else {
|
|
reject(null);
|
|
}
|
|
});
|
|
}
|
|
},
|
|
|
|
/**
|
|
* Query whether grayscale is currently enabled.
|
|
*
|
|
* Returns a promise which resolves to a boolean.
|
|
* The result is `true` when grayscale is enabled and `false` otherwise.
|
|
*
|
|
* See https://reactnative.dev/docs/accessibilityinfo#isGrayscaleEnabled
|
|
*/
|
|
isGrayscaleEnabled(): Promise<boolean> {
|
|
if (Platform.OS === 'android') {
|
|
return Promise.resolve(false);
|
|
} else {
|
|
return new Promise((resolve, reject) => {
|
|
if (NativeAccessibilityManagerIOS != null) {
|
|
NativeAccessibilityManagerIOS.getCurrentGrayscaleState(
|
|
resolve,
|
|
reject,
|
|
);
|
|
} else {
|
|
reject(null);
|
|
}
|
|
});
|
|
}
|
|
},
|
|
|
|
/**
|
|
* Query whether inverted colors are currently enabled.
|
|
*
|
|
* Returns a promise which resolves to a boolean.
|
|
* The result is `true` when invert color is enabled and `false` otherwise.
|
|
*
|
|
* See https://reactnative.dev/docs/accessibilityinfo#isInvertColorsEnabled
|
|
*/
|
|
isInvertColorsEnabled(): Promise<boolean> {
|
|
if (Platform.OS === 'android') {
|
|
return Promise.resolve(false);
|
|
} else {
|
|
return new Promise((resolve, reject) => {
|
|
if (NativeAccessibilityManagerIOS != null) {
|
|
NativeAccessibilityManagerIOS.getCurrentInvertColorsState(
|
|
resolve,
|
|
reject,
|
|
);
|
|
} else {
|
|
reject(null);
|
|
}
|
|
});
|
|
}
|
|
},
|
|
|
|
/**
|
|
* Query whether reduced motion is currently enabled.
|
|
*
|
|
* Returns a promise which resolves to a boolean.
|
|
* The result is `true` when a reduce motion is enabled and `false` otherwise.
|
|
*
|
|
* See https://reactnative.dev/docs/accessibilityinfo#isReduceMotionEnabled
|
|
*/
|
|
isReduceMotionEnabled(): Promise<boolean> {
|
|
return new Promise((resolve, reject) => {
|
|
if (Platform.OS === 'android') {
|
|
if (NativeAccessibilityInfoAndroid != null) {
|
|
NativeAccessibilityInfoAndroid.isReduceMotionEnabled(resolve);
|
|
} else {
|
|
reject(null);
|
|
}
|
|
} else {
|
|
if (NativeAccessibilityManagerIOS != null) {
|
|
NativeAccessibilityManagerIOS.getCurrentReduceMotionState(
|
|
resolve,
|
|
reject,
|
|
);
|
|
} else {
|
|
reject(null);
|
|
}
|
|
}
|
|
});
|
|
},
|
|
|
|
/**
|
|
* Query whether reduced transparency is currently enabled.
|
|
*
|
|
* Returns a promise which resolves to a boolean.
|
|
* The result is `true` when a reduce transparency is enabled and `false` otherwise.
|
|
*
|
|
* See https://reactnative.dev/docs/accessibilityinfo#isReduceTransparencyEnabled
|
|
*/
|
|
isReduceTransparencyEnabled(): Promise<boolean> {
|
|
if (Platform.OS === 'android') {
|
|
return Promise.resolve(false);
|
|
} else {
|
|
return new Promise((resolve, reject) => {
|
|
if (NativeAccessibilityManagerIOS != null) {
|
|
NativeAccessibilityManagerIOS.getCurrentReduceTransparencyState(
|
|
resolve,
|
|
reject,
|
|
);
|
|
} else {
|
|
reject(null);
|
|
}
|
|
});
|
|
}
|
|
},
|
|
|
|
/**
|
|
* Query whether a screen reader is currently enabled.
|
|
*
|
|
* Returns a promise which resolves to a boolean.
|
|
* The result is `true` when a screen reader is enabled and `false` otherwise.
|
|
*
|
|
* See https://reactnative.dev/docs/accessibilityinfo#isScreenReaderEnabled
|
|
*/
|
|
isScreenReaderEnabled(): Promise<boolean> {
|
|
return new Promise((resolve, reject) => {
|
|
if (Platform.OS === 'android') {
|
|
if (NativeAccessibilityInfoAndroid != null) {
|
|
NativeAccessibilityInfoAndroid.isTouchExplorationEnabled(resolve);
|
|
} else {
|
|
reject(null);
|
|
}
|
|
} else {
|
|
if (NativeAccessibilityManagerIOS != null) {
|
|
NativeAccessibilityManagerIOS.getCurrentVoiceOverState(
|
|
resolve,
|
|
reject,
|
|
);
|
|
} else {
|
|
reject(null);
|
|
}
|
|
}
|
|
});
|
|
},
|
|
|
|
/**
|
|
* Query whether Accessibility Service is currently enabled.
|
|
*
|
|
* Returns a promise which resolves to a boolean.
|
|
* The result is `true` when any service is enabled and `false` otherwise.
|
|
*
|
|
* @platform android
|
|
*
|
|
* See https://reactnative.dev/docs/accessibilityinfo/#isaccessibilityserviceenabled-android
|
|
*/
|
|
isAccessibilityServiceEnabled(): Promise<boolean> {
|
|
return new Promise((resolve, reject) => {
|
|
if (Platform.OS === 'android') {
|
|
if (
|
|
NativeAccessibilityInfoAndroid != null &&
|
|
NativeAccessibilityInfoAndroid.isAccessibilityServiceEnabled != null
|
|
) {
|
|
NativeAccessibilityInfoAndroid.isAccessibilityServiceEnabled(resolve);
|
|
} else {
|
|
reject(null);
|
|
}
|
|
} else {
|
|
reject(null);
|
|
}
|
|
});
|
|
},
|
|
|
|
/**
|
|
* Add an event handler. Supported events:
|
|
*
|
|
* - `reduceMotionChanged`: Fires when the state of the reduce motion toggle changes.
|
|
* The argument to the event handler is a boolean. The boolean is `true` when a reduce
|
|
* motion is enabled (or when "Transition Animation Scale" in "Developer options" is
|
|
* "Animation off") and `false` otherwise.
|
|
* - `screenReaderChanged`: Fires when the state of the screen reader changes. The argument
|
|
* to the event handler is a boolean. The boolean is `true` when a screen
|
|
* reader is enabled and `false` otherwise.
|
|
*
|
|
* These events are only supported on iOS:
|
|
*
|
|
* - `boldTextChanged`: iOS-only event. Fires when the state of the bold text toggle changes.
|
|
* The argument to the event handler is a boolean. The boolean is `true` when a bold text
|
|
* is enabled and `false` otherwise.
|
|
* - `grayscaleChanged`: iOS-only event. Fires when the state of the gray scale toggle changes.
|
|
* The argument to the event handler is a boolean. The boolean is `true` when a gray scale
|
|
* is enabled and `false` otherwise.
|
|
* - `invertColorsChanged`: iOS-only event. Fires when the state of the invert colors toggle
|
|
* changes. The argument to the event handler is a boolean. The boolean is `true` when a invert
|
|
* colors is enabled and `false` otherwise.
|
|
* - `reduceTransparencyChanged`: iOS-only event. Fires when the state of the reduce transparency
|
|
* toggle changes. The argument to the event handler is a boolean. The boolean is `true`
|
|
* when a reduce transparency is enabled and `false` otherwise.
|
|
* - `announcementFinished`: iOS-only event. Fires when the screen reader has
|
|
* finished making an announcement. The argument to the event handler is a
|
|
* dictionary with these keys:
|
|
* - `announcement`: The string announced by the screen reader.
|
|
* - `success`: A boolean indicating whether the announcement was
|
|
* successfully made.
|
|
*
|
|
* See https://reactnative.dev/docs/accessibilityinfo#addeventlistener
|
|
*/
|
|
addEventListener<K: $Keys<AccessibilityEventDefinitions>>(
|
|
eventName: K,
|
|
handler: (...$ElementType<AccessibilityEventDefinitions, K>) => void,
|
|
): EventSubscription {
|
|
const deviceEventName = EventNames.get(eventName);
|
|
return deviceEventName == null
|
|
? {remove(): void {}}
|
|
: RCTDeviceEventEmitter.addListener(deviceEventName, handler);
|
|
},
|
|
|
|
/**
|
|
* Set accessibility focus to a React component.
|
|
*
|
|
* See https://reactnative.dev/docs/accessibilityinfo#setaccessibilityfocus
|
|
*/
|
|
setAccessibilityFocus(reactTag: number): void {
|
|
legacySendAccessibilityEvent(reactTag, 'focus');
|
|
},
|
|
|
|
/**
|
|
* Send a named accessibility event to a HostComponent.
|
|
*/
|
|
sendAccessibilityEvent_unstable(
|
|
handle: ElementRef<HostComponent<mixed>>,
|
|
eventType: AccessibilityEventTypes,
|
|
) {
|
|
// iOS only supports 'focus' event types
|
|
if (Platform.OS === 'ios' && eventType === 'click') {
|
|
return;
|
|
}
|
|
// route through React renderer to distinguish between Fabric and non-Fabric handles
|
|
sendAccessibilityEvent(handle, eventType);
|
|
},
|
|
|
|
/**
|
|
* Post a string to be announced by the screen reader.
|
|
*
|
|
* See https://reactnative.dev/docs/accessibilityinfo#announceforaccessibility
|
|
*/
|
|
announceForAccessibility(announcement: string): void {
|
|
if (Platform.OS === 'android') {
|
|
NativeAccessibilityInfoAndroid?.announceForAccessibility(announcement);
|
|
} else {
|
|
NativeAccessibilityManagerIOS?.announceForAccessibility(announcement);
|
|
}
|
|
},
|
|
|
|
/**
|
|
* Post a string to be announced by the screen reader.
|
|
* - `announcement`: The string announced by the screen reader.
|
|
* - `options`: An object that configures the reading options.
|
|
* - `queue`: The announcement will be queued behind existing announcements. iOS only.
|
|
*/
|
|
announceForAccessibilityWithOptions(
|
|
announcement: string,
|
|
options: {queue?: boolean},
|
|
): void {
|
|
if (Platform.OS === 'android') {
|
|
NativeAccessibilityInfoAndroid?.announceForAccessibility(announcement);
|
|
} else {
|
|
if (NativeAccessibilityManagerIOS?.announceForAccessibilityWithOptions) {
|
|
NativeAccessibilityManagerIOS?.announceForAccessibilityWithOptions(
|
|
announcement,
|
|
options,
|
|
);
|
|
} else {
|
|
NativeAccessibilityManagerIOS?.announceForAccessibility(announcement);
|
|
}
|
|
}
|
|
},
|
|
|
|
/**
|
|
* @deprecated Use `remove` on the EventSubscription from `addEventListener`.
|
|
*/
|
|
removeEventListener<K: $Keys<AccessibilityEventDefinitions>>(
|
|
eventName: K,
|
|
handler: (...$ElementType<AccessibilityEventDefinitions, K>) => void,
|
|
): void {
|
|
// NOTE: This will report a deprecation notice via `console.error`.
|
|
const deviceEventName = EventNames.get(eventName);
|
|
if (deviceEventName != null) {
|
|
// $FlowIgnore[incompatible-cast]
|
|
(RCTDeviceEventEmitter: EventEmitter<$FlowFixMe>).removeListener(
|
|
'deviceEventName',
|
|
// $FlowFixMe[invalid-tuple-arity]
|
|
handler,
|
|
);
|
|
}
|
|
},
|
|
|
|
/**
|
|
* Get the recommended timeout for changes to the UI needed by this user.
|
|
*
|
|
* See https://reactnative.dev/docs/accessibilityinfo#getrecommendedtimeoutmillis
|
|
*/
|
|
getRecommendedTimeoutMillis(originalTimeout: number): Promise<number> {
|
|
if (Platform.OS === 'android') {
|
|
return new Promise((resolve, reject) => {
|
|
if (NativeAccessibilityInfoAndroid?.getRecommendedTimeoutMillis) {
|
|
NativeAccessibilityInfoAndroid.getRecommendedTimeoutMillis(
|
|
originalTimeout,
|
|
resolve,
|
|
);
|
|
} else {
|
|
resolve(originalTimeout);
|
|
}
|
|
});
|
|
} else {
|
|
return Promise.resolve(originalTimeout);
|
|
}
|
|
},
|
|
};
|
|
|
|
export default AccessibilityInfo;
|