Disable TouchableOpacity when accessibility disabled is set (#31108)

Summary: When using a screen reader the TouchableOpacity component disables click functionality. Fixes Issue #30951 ## Changelog  [Android] [Changed] - Message Pull Request resolved: #31108 Test Plan: Added Exmple to Accessibility Reviewed By: yungsters Differential Revision: D28334356 Pulled By: kacieb fbshipit-source-id: 3a3e8efaf57272d2091392f6d7d3e0ba0f2a9adc
facebook · May 18, 2021 · ea609de · ea609de
1 parent cdd0256
commit ea609de
Show file tree

Hide file tree

Showing 4 changed files with 105 additions and 6 deletions.
diff --git a/Libraries/Components/Touchable/TouchableOpacity.js b/Libraries/Components/Touchable/TouchableOpacity.js
@@ -137,7 +137,7 @@ class TouchableOpacity extends React.Component<Props, State> {
   _createPressabilityConfig(): PressabilityConfig {
     return {
       cancelable: !this.props.rejectResponderTermination,
-      disabled: this.props.disabled,
+      disabled: this.props.disabled ?? this.props.accessibilityState?.disabled,
       hitSlop: this.props.hitSlop,
       delayLongPress: this.props.delayLongPress,
       delayPressIn: this.props.delayPressIn,
@@ -215,13 +215,21 @@ class TouchableOpacity extends React.Component<Props, State> {
       ...eventHandlersWithoutBlurAndFocus
     } = this.state.pressability.getEventHandlers();
 
+    const accessibilityState =
+      this.props.disabled != null
+        ? {
+            ...this.props.accessibilityState,
+            disabled: this.props.disabled,
+          }
+        : this.props.accessibilityState;
+
     return (
       <Animated.View
         accessible={this.props.accessible !== false}
         accessibilityLabel={this.props.accessibilityLabel}
         accessibilityHint={this.props.accessibilityHint}
         accessibilityRole={this.props.accessibilityRole}
-        accessibilityState={this.props.accessibilityState}
+        accessibilityState={accessibilityState}
         accessibilityActions={this.props.accessibilityActions}
         onAccessibilityAction={this.props.onAccessibilityAction}
         accessibilityValue={this.props.accessibilityValue}

diff --git a/Libraries/Components/Touchable/__tests__/TouchableOpacity-test.js b/Libraries/Components/Touchable/__tests__/TouchableOpacity-test.js
@@ -11,15 +11,34 @@
 'use strict';
 
 const React = require('react');
+const ReactTestRenderer = require('react-test-renderer');
 const Text = require('../../../Text/Text');
 const TouchableOpacity = require('../TouchableOpacity');
 
-const render = require('../../../../jest/renderer');
-
 describe('TouchableOpacity', () => {
   it('renders correctly', () => {
-    const instance = render.create(
-      <TouchableOpacity style={{}}>
+    const instance = ReactTestRenderer.create(
+      <TouchableOpacity>
+        <Text>Touchable</Text>
+      </TouchableOpacity>,
+    );
+
+    expect(instance.toJSON()).toMatchSnapshot();
+  });
+
+  it('renders in disabled state when a disabled prop is passed', () => {
+    const instance = ReactTestRenderer.create(
+      <TouchableOpacity disabled={true}>
+        <Text>Touchable</Text>
+      </TouchableOpacity>,
+    );
+
+    expect(instance.toJSON()).toMatchSnapshot();
+  });
+
+  it('renders in disabled state when a key disabled in accessibilityState is passed', () => {
+    const instance = ReactTestRenderer.create(
+      <TouchableOpacity accessibilityState={{disabled: true}}>
         <Text>Touchable</Text>
       </TouchableOpacity>,
     );

diff --git a/Libraries/Components/Touchable/__tests__/__snapshots__/TouchableOpacity-test.js.snap b/Libraries/Components/Touchable/__tests__/__snapshots__/TouchableOpacity-test.js.snap
@@ -24,3 +24,63 @@ exports[`TouchableOpacity renders correctly 1`] = `
   </Text>
 </View>
 `;
+
+exports[`TouchableOpacity renders in disabled state when a disabled prop is passed 1`] = `
+<View
+  accessibilityState={
+    Object {
+      "disabled": true,
+    }
+  }
+  accessible={true}
+  collapsable={false}
+  focusable={false}
+  nativeID="animatedComponent"
+  onClick={[Function]}
+  onResponderGrant={[Function]}
+  onResponderMove={[Function]}
+  onResponderRelease={[Function]}
+  onResponderTerminate={[Function]}
+  onResponderTerminationRequest={[Function]}
+  onStartShouldSetResponder={[Function]}
+  style={
+    Object {
+      "opacity": 1,
+    }
+  }
+>
+  <Text>
+    Touchable
+  </Text>
+</View>
+`;
+
+exports[`TouchableOpacity renders in disabled state when a key disabled in accessibilityState is passed 1`] = `
+<View
+  accessibilityState={
+    Object {
+      "disabled": true,
+    }
+  }
+  accessible={true}
+  collapsable={false}
+  focusable={false}
+  nativeID="animatedComponent"
+  onClick={[Function]}
+  onResponderGrant={[Function]}
+  onResponderMove={[Function]}
+  onResponderRelease={[Function]}
+  onResponderTerminate={[Function]}
+  onResponderTerminationRequest={[Function]}
+  onStartShouldSetResponder={[Function]}
+  style={
+    Object {
+      "opacity": 1,
+    }
+  }
+>
+  <Text>
+    Touchable
+  </Text>
+</View>
+`;
diff --git a/packages/rn-tester/js/examples/Accessibility/AccessibilityExample.js b/packages/rn-tester/js/examples/Accessibility/AccessibilityExample.js
@@ -161,6 +161,18 @@ class AccessibilityExample extends React.Component<{}> {
           </TouchableOpacity>
         </RNTesterBlock>
 
+        <RNTesterBlock title="Disabled TouchableOpacity">
+          <TouchableOpacity
+            onPress={() => Alert.alert('Disabled Button has been pressed!')}
+            accessibilityLabel={'You are pressing Disabled TouchableOpacity'}
+            accessibilityState={{disabled: true}}>
+            <View>
+              <Text>
+                I am disabled. Clicking me will not trigger any action.
+              </Text>
+            </View>
+          </TouchableOpacity>
+        </RNTesterBlock>
         <RNTesterBlock title="View with multiple states">
           <View
             accessible={true}