Rename accessibilityValueDescription to accessibilityValue.

Author: Marc Mulcahy

Libraries/Components/View/ReactNativeViewAttributes.js

@@ -21,7 +21,7 @@ const UIView = {
   accessibilityRole: true,
   accessibilityStates: true,
   accessibilityState: true,
-  accessibilityValueDescription: true,
+  accessibilityValue: true,
   accessibilityHint: true,
   importantForAccessibility: true,
   nativeID: true,

Libraries/Components/View/ReactNativeViewViewConfig.js

@@ -123,7 +123,7 @@ const ReactNativeViewConfig = {
     accessibilityRole: true,
     accessibilityStates: true,
     accessibilityState: true,
-    accessibilityValueDescription: true,
+    accessibilityValue: true,
     accessibilityViewIsModal: true,
     accessible: true,
     alignContent: true,

Libraries/Components/View/ViewAccessibility.js

@@ -75,24 +75,24 @@ export type AccessibilityState = {
   expanded?: boolean,
 };
 
-export type AccessibilityValueDescription = {
+export type AccessibilityValue = $ReadOnly<{|
   /**
    * The minimum value of this component's range. (should be an integer)
    */
-  minimum?: number,
+  min?: number,
 
   /**
-   * The current value of this component's range. (should be an integer)
+   * The maximum value of this component's range. (should be an integer)
    */
-  current?: number,
+  max?: number,
 
   /**
-   * The maximum value of this component's range. (should be an integer)
+   * The current value of this component's range. (should be an integer)
    */
-  maximum?: number,
+  now?: number,
 
   /**
    * A textual description of this component's value. (will override minimum, current, and maximum if set)
    */
   text?: string,
-};
+|}>;

Libraries/Components/View/ViewPropTypes.js

@@ -19,7 +19,7 @@ import type {
   AccessibilityRole,
   AccessibilityStates,
   AccessibilityState,
-  AccessibilityValueDescription,
+  AccessibilityValue,
   AccessibilityActionEvent,
   AccessibilityActionInfo,
 } from './ViewAccessibility';
@@ -416,7 +416,7 @@ export type ViewProps = $ReadOnly<{|
    */
   accessibilityStates?: ?AccessibilityStates,
   accessibilityState?: ?AccessibilityState,
-  accessibilityValueDescription?: ?AccessibilityValueDescription,
+  accessibilityValue?: ?AccessibilityValue,
 
   /**
    * Provides an array of custom actions available for accessibility.

Libraries/DeprecatedPropTypes/DeprecatedViewPropTypes.js

@@ -122,7 +122,7 @@ module.exports = {
     >,
   >),
   accessibilityState: PropTypes.object,
-  accessibilityValueDescription: PropTypes.object,
+  accessibilityValue: PropTypes.object,
   /**
    * Indicates to accessibility services whether the user should be notified
    * when this view changes. Works for Android API >= 19 only.

RNTester/js/examples/Accessibility/AccessibilityExample.js

@@ -557,10 +557,10 @@ class FakeSliderExample extends React.Component {
                 break;
             }
           }}
-          accessibilityValueDescription={{
-            minimum: 0,
-            current: this.state.current,
-            maximum: 100,
+          accessibilityValue={{
+            min: 0,
+            now: this.state.current,
+            max: 100,
           }}>
           <Text>Fake Slider</Text>
         </View>
@@ -587,7 +587,7 @@ class FakeSliderExample extends React.Component {
                 break;
             }
           }}
-          accessibilityValueDescription={{text: this.state.textualValue}}>
+          accessibilityValue={{text: this.state.textualValue}}>
           <Text>Equalizer</Text>
         </View>
       </View>

React/Views/RCTView.m

@@ -285,21 +285,21 @@ - (NSString *)accessibilityValue
     }
   }
 
-  // handle accessibilityValueDescription
+  // handle accessibilityValue
 
-  if (self.accessibilityValueDescription) {
-    id minimum = self.accessibilityValueDescription[@"minimum"];
-    id current = self.accessibilityValueDescription[@"current"];
-    id maximum = self.accessibilityValueDescription[@"maximum"];
-    id text = self.accessibilityValueDescription[@"text"];
+  if (self.accessibilityValueInternal) {
+    id min = self.accessibilityValueInternal[@"min"];
+    id now = self.accessibilityValueInternal[@"now"];
+    id max = self.accessibilityValueInternal[@"max"];
+    id text = self.accessibilityValueInternal[@"text"];
     if (text && [text isKindOfClass:[NSString class]]) {
       [valueComponents addObject:text];
-    } else if ([minimum isKindOfClass:[NSNumber class]] &&
-        [current isKindOfClass:[NSNumber class]] &&
-        [maximum isKindOfClass:[NSNumber class]] &&
-        ([minimum intValue] < [maximum intValue]) &&
-        ([minimum intValue] <= [current intValue] && [current intValue] <= [maximum intValue])) {
-      int val = ([current intValue]*100)/([maximum intValue]-[minimum intValue]);
+    } else if ([min isKindOfClass:[NSNumber class]] &&
+        [now isKindOfClass:[NSNumber class]] &&
+        [max isKindOfClass:[NSNumber class]] &&
+        ([min intValue] < [max intValue]) &&
+        ([min intValue] <= [now intValue] && [now intValue] <= [max intValue])) {
+      int val = ([now intValue]*100)/([max intValue]-[min intValue]);
       [valueComponents addObject:[NSString stringWithFormat:@"%d percent", val]];
     }
   }

React/Views/RCTViewManager.m

@@ -126,7 +126,7 @@ - (RCTShadowView *)shadowView
 RCT_REMAP_VIEW_PROPERTY(accessibilityActions, reactAccessibilityElement.accessibilityActions, NSDictionaryArray)
 RCT_REMAP_VIEW_PROPERTY(accessibilityLabel, reactAccessibilityElement.accessibilityLabel, NSString)
 RCT_REMAP_VIEW_PROPERTY(accessibilityHint, reactAccessibilityElement.accessibilityHint, NSString)
-RCT_REMAP_VIEW_PROPERTY(accessibilityValueDescription, reactAccessibilityElement.accessibilityValueDescription, NSDictionary)
+RCT_REMAP_VIEW_PROPERTY(accessibilityValue, reactAccessibilityElement.accessibilityValueInternal, NSDictionary)
 RCT_REMAP_VIEW_PROPERTY(accessibilityViewIsModal, reactAccessibilityElement.accessibilityViewIsModal, BOOL)
 RCT_REMAP_VIEW_PROPERTY(accessibilityElementsHidden, reactAccessibilityElement.accessibilityElementsHidden, BOOL)
 RCT_REMAP_VIEW_PROPERTY(accessibilityIgnoresInvertColors, reactAccessibilityElement.shouldAccessibilityIgnoresInvertColors, BOOL)

React/Views/UIView+React.h

@@ -120,7 +120,7 @@
 @property (nonatomic, copy) NSArray <NSString *> *accessibilityStates;
 @property (nonatomic, copy) NSDictionary<NSString *, id> *accessibilityState;
 @property (nonatomic, copy) NSArray <NSDictionary *> *accessibilityActions;
-@property (nonatomic, copy) NSDictionary *accessibilityValueDescription;
+@property (nonatomic, copy) NSDictionary *accessibilityValueInternal;
 
 /**
  * Used in debugging to get a description of the view hierarchy rooted at

React/Views/UIView+React.m

@@ -337,14 +337,13 @@ - (void)setAccessibilityState:(NSDictionary<NSString *, id> *)accessibilityState
   objc_setAssociatedObject(self, @selector(accessibilityState), accessibilityState, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
 }
 
-- (NSDictionary<NSString *, id> *)accessibilityValueDescription
+- (NSDictionary<NSString *, id> *)accessibilityValueInternal
 {
   return objc_getAssociatedObject(self, _cmd);
 }
-
-- (void)setAccessibilityValueDescription:(NSDictionary<NSString *, id> *)accessibilityValueDescription
+- (void)setAccessibilityValueInternal:(NSDictionary<NSString *, id> *)accessibilityValue
 {
-  objc_setAssociatedObject(self, @selector(accessibilityValueDescription), accessibilityValueDescription, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+  objc_setAssociatedObject(self, @selector(accessibilityValueInternal), accessibilityValue, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
 }
 
 #pragma mark - Debug