3042407|Facebook Github Bot|Add accessibilityValue prop on Touchables (…

…facebook#26752)
UnPourTous · Apr 21, 2020 · 5445411 · 5445411
1 parent fa50c08
commit 5445411
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 3 deletions.
diff --git a/Libraries/Components/Touchable/TouchableBounce.js b/Libraries/Components/Touchable/TouchableBounce.js
@@ -168,6 +168,7 @@ var TouchableBounce = createReactClass({
         accessibilityState={this.props.accessibilityState}
         accessibilityActions={this.props.accessibilityActions}
         onAccessibilityAction={this.props.onAccessibilityAction}
+        accessibilityValue={this.props.accessibilityValue}
         /* $FlowFixMe(>=0.53.0 site=react_native_fb,react_native_oss) This
          * comment suppresses an error when upgrading Flow's support for React.
          * To see the error delete this comment and run Flow. */

diff --git a/Libraries/Components/Touchable/TouchableHighlight.js b/Libraries/Components/Touchable/TouchableHighlight.js
@@ -373,6 +373,7 @@ const TouchableHighlight = ((createReactClass({
         accessibilityLabel={this.props.accessibilityLabel}
         accessibilityRole={this.props.accessibilityRole}
         accessibilityState={this.props.accessibilityState}
+        accessibilityValue={this.props.accessibilityValue}
         accessibilityActions={this.props.accessibilityActions}
         onAccessibilityAction={this.props.onAccessibilityAction}
         ref={UNDERLAY_REF}

diff --git a/Libraries/Components/Touchable/TouchableNativeFeedback.android.js b/Libraries/Components/Touchable/TouchableNativeFeedback.android.js
@@ -244,6 +244,7 @@ var TouchableNativeFeedback = createReactClass({
       accessibilityState: this.props.accessibilityState,
       accessibilityActions: this.props.accessibilityActions,
       onAccessibilityAction: this.props.onAccessibilityAction,
+      accessibilityValue: this.props.accessibilityValue,
       children,
       testID: this.props.testID,
       onLayout: this.props.onLayout,

diff --git a/Libraries/Components/Touchable/TouchableOpacity.js b/Libraries/Components/Touchable/TouchableOpacity.js
@@ -249,6 +249,7 @@ var TouchableOpacity = createReactClass({
         accessibilityState={this.props.accessibilityState}
         accessibilityActions={this.props.accessibilityActions}
         onAccessibilityAction={this.props.onAccessibilityAction}
+        accessibilityValue={this.props.accessibilityValue}
         style={[this.props.style, {opacity: this.state.anim}]}
         nativeID={this.props.nativeID}
         testID={this.props.testID}

diff --git a/Libraries/Components/Touchable/TouchableWithoutFeedback.js b/Libraries/Components/Touchable/TouchableWithoutFeedback.js
@@ -32,6 +32,7 @@ import type {
   AccessibilityState,
   AccessibilityActionInfo,
   AccessibilityActionEvent,
+  AccessibilityValue,
 } from '../View/ViewAccessibility';
 
 const PRESS_RETENTION_OFFSET = {top: 20, left: 20, right: 20, bottom: 30};
@@ -44,6 +45,7 @@ const OVERRIDE_PROPS = [
   'accessibilityState',
   'accessibilityActions',
   'onAccessibilityAction',
+  'accessibilityValue',
   'hitSlop',
   'nativeID',
   'onBlur',
@@ -64,6 +66,7 @@ export type Props = $ReadOnly<{|
   accessibilityRole?: ?AccessibilityRole,
   accessibilityState?: ?AccessibilityState,
   accessibilityActions?: ?$ReadOnlyArray<AccessibilityActionInfo>,
+  accessibilityValue?: ?AccessibilityValue,
   children?: ?React.Node,
   delayLongPress?: ?number,
   delayPressIn?: ?number,
@@ -101,6 +104,7 @@ const TouchableWithoutFeedback = ((createReactClass({
     accessibilityState: PropTypes.object,
     accessibilityActions: PropTypes.array,
     onAccessibilityAction: PropTypes.func,
+    accessibilityValue: PropTypes.object,
     /**
      * If true, disable all interactions for this component.
      */

diff --git a/RNTester/js/AccessibilityExample.js b/RNTester/js/AccessibilityExample.js
@@ -564,7 +564,7 @@ class FakeSliderExample extends React.Component {
           }}>
           <Text>Fake Slider</Text>
         </View>
-        <View
+        <TouchableWithoutFeedback
           accessible={true}
           accessibilityLabel="Equalizer"
           accessibilityRole="adjustable"
@@ -588,8 +588,10 @@ class FakeSliderExample extends React.Component {
             }
           }}
           accessibilityValue={{text: this.state.textualValue}}>
-          <Text>Equalizer</Text>
-        </View>
+          <View>
+            <Text>Equalizer</Text>
+          </View>
+        </TouchableWithoutFeedback>
       </View>
     );
   }