mirror of
https://github.com/facebook/react-native.git
synced 2025-11-01 09:14:26 +00:00
62021eb8d1
Summary: Previously published by [grgr-dkrk][2] as [https://github.com/facebook/react-native/issues/31296][3], fixes the following issues: 1) ImportantForAccessibility="no" does not work on Text, Button 2) ImportantForAccessibility="no-hide-descendants" does not work on Text, Button, or ImageBackground. Note: On ImageBackground, focus is prevented on the imageBackground node itself, but focus is not prevented on its descendants. Note: [Button component expected behavior for prop importantForAccessibility][4] >Some components like Button seem like atomic units, but they end up rendering a hierarchy of components for example a wrapper View with a Text inside them. Allowing those descendants to become focusable, breaks the model of these being a single component to consider and forcing no-hide-descendants makes sense here. >The other option is always to render any descendants of these elements with importantForAccessibility="no", so they can never be focusable on their own. This would have the same result, **BUT may potentially cause issues when the descendant content is supposed to automatically get moved up to the focusable ancestor to act as a label** (which is what Talkback does with unfocusable text elements by default). Note: [importantForAccessibility="no" does not allow screenreader focus on nested Text Components with accessibilityRole="link" or inline Images][5] fixes https://github.com/facebook/react-native/issues/30850 related https://github.com/facebook/react-native/pull/33690 ## Changelog [Android] [Fixed] - adding importantForAccessibility for Text, Button, ImageBackground Pull Request resolved: https://github.com/facebook/react-native/pull/34245 Test Plan: 1) testing ImageBackground importantForAccessiblity ([link to test][1]) 2) importantForAccessibility="no" does not allow screenreader focus on nested Text Components with accessibilityRole="link" or inline Images ([link to test][5]) 3) testing ImageBackground importantForAccessiblity ([link to test][6]) 4) Button with importantForAccessibility=no ([link to test][7]) [1]: https://github.com/facebook/react-native/pull/31296#issuecomment-1192341626 "" [2]: https://github.com/grgr-dkrk "grgr-dkrk" [3]: https://github.com/facebook/react-native/pull/31296 "https://github.com/facebook/react-native/issues/31296" [4]: https://github.com/facebook/react-native/pull/31296#discussion_r616184584 "expected behaviour with prop importantForAccessibility in Button component" [5]: https://github.com/facebook/react-native/issues/30850#issuecomment-1192286477 "importantForAccessibility=no does not allow screenreader focus on nested Text Components with accessibilityRole=link or inline Images" [6]: https://github.com/facebook/react-native/pull/34245#issuecomment-1192446124 "testing ImageBackground importantForAccessiblity" [7]: https://github.com/facebook/react-native/pull/34245#issuecomment-1192443589 "Button with importantForAccessibility=no" Reviewed By: cipolleschi Differential Revision: D38121992 Pulled By: dmitryrykun fbshipit-source-id: 368b4dcb47d7940274820aa2e39ed5e2ca068821
112 lines
3.1 KiB
JavaScript
112 lines
3.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
|
|
* @format
|
|
*/
|
|
|
|
'use strict';
|
|
|
|
import Image from './Image';
|
|
import * as React from 'react';
|
|
import StyleSheet from '../StyleSheet/StyleSheet';
|
|
import flattenStyle from '../StyleSheet/flattenStyle';
|
|
import View from '../Components/View/View';
|
|
import type {HostComponent} from '../Renderer/shims/ReactNativeTypes';
|
|
import type {ImageBackgroundProps} from './ImageProps';
|
|
import type {ViewProps} from '../Components/View/ViewPropTypes';
|
|
|
|
/**
|
|
* Very simple drop-in replacement for <Image> which supports nesting views.
|
|
*
|
|
* ```ReactNativeWebPlayer
|
|
* import React, { Component } from 'react';
|
|
* import { AppRegistry, View, ImageBackground, Text } from 'react-native';
|
|
*
|
|
* class DisplayAnImageBackground extends Component {
|
|
* render() {
|
|
* return (
|
|
* <ImageBackground
|
|
* style={{width: 50, height: 50}}
|
|
* source={{uri: 'https://reactnative.dev/img/opengraph.png'}}
|
|
* >
|
|
* <Text>React</Text>
|
|
* </ImageBackground>
|
|
* );
|
|
* }
|
|
* }
|
|
*
|
|
* // App registration and rendering
|
|
* AppRegistry.registerComponent('DisplayAnImageBackground', () => DisplayAnImageBackground);
|
|
* ```
|
|
*/
|
|
class ImageBackground extends React.Component<ImageBackgroundProps> {
|
|
setNativeProps(props: Object) {
|
|
// Work-around flow
|
|
const viewRef = this._viewRef;
|
|
if (viewRef) {
|
|
viewRef.setNativeProps(props);
|
|
}
|
|
}
|
|
|
|
_viewRef: ?React.ElementRef<typeof View> = null;
|
|
|
|
_captureRef = (
|
|
ref: null | React$ElementRef<
|
|
React$AbstractComponent<
|
|
ViewProps,
|
|
React.ElementRef<HostComponent<ViewProps>>,
|
|
>,
|
|
>,
|
|
) => {
|
|
this._viewRef = ref;
|
|
};
|
|
|
|
render(): React.Node {
|
|
const {
|
|
children,
|
|
style,
|
|
imageStyle,
|
|
imageRef,
|
|
importantForAccessibility,
|
|
...props
|
|
} = this.props;
|
|
|
|
const flattenedStyle = flattenStyle(style);
|
|
return (
|
|
<View
|
|
accessibilityIgnoresInvertColors={true}
|
|
importantForAccessibility={importantForAccessibility}
|
|
style={style}
|
|
ref={this._captureRef}>
|
|
<Image
|
|
{...props}
|
|
importantForAccessibility={importantForAccessibility}
|
|
style={[
|
|
StyleSheet.absoluteFill,
|
|
{
|
|
// Temporary Workaround:
|
|
// Current (imperfect yet) implementation of <Image> overwrites width and height styles
|
|
// (which is not quite correct), and these styles conflict with explicitly set styles
|
|
// of <ImageBackground> and with our internal layout model here.
|
|
// So, we have to proxy/reapply these styles explicitly for actual <Image> component.
|
|
// This workaround should be removed after implementing proper support of
|
|
// intrinsic content size of the <Image>.
|
|
width: flattenedStyle?.width,
|
|
height: flattenedStyle?.height,
|
|
},
|
|
imageStyle,
|
|
]}
|
|
ref={imageRef}
|
|
/>
|
|
{children}
|
|
</View>
|
|
);
|
|
}
|
|
}
|
|
|
|
module.exports = ImageBackground;
|