Skip to content

Commit 2324866

Browse files
authored
Subtract min from the accessibilityValue percentage on iOS
## Summary: Fixes #60015. On iOS the value of a view with `accessibilityValue={{ min, max, now }}` was `now / (max - min)`: `{ min: 10, max: 20, now: 15 }` was read as "150%", and `min == max` gave "+∞". It is now `(now - min) / (max - min)`. There is no value when the range is empty or `now` is outside it, the same condition as on Android and in the old architecture. ## Changelog: [IOS] [FIXED] - The `accessibilityValue` percentage takes `min` into account ## Test Plan: Added tests to `RCTViewComponentViewTests`; they fail without this change and pass with it. Checked on iOS with https://github.com/faciledictu/rn-a11y-value-percentage-repro: V2 is "50%", V3 "0%", and V5, V6 and V7 have no value. Differential Revision: D132239979 Pull Request resolved: #60016
1 parent 7a5d4de commit 2324866

2 files changed

Lines changed: 51 additions & 5 deletions

File tree

‎packages/react-native/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -574,11 +574,16 @@ - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &
574574
} else if (
575575
newViewProps.accessibilityValue.now.has_value() && newViewProps.accessibilityValue.min.has_value() &&
576576
newViewProps.accessibilityValue.max.has_value()) {
577-
CGFloat val = (CGFloat)(newViewProps.accessibilityValue.now.value()) /
578-
(newViewProps.accessibilityValue.max.value() - newViewProps.accessibilityValue.min.value());
579-
self.accessibilityElement.accessibilityValue =
580-
[NSNumberFormatter localizedStringFromNumber:@(val) numberStyle:NSNumberFormatterPercentStyle];
581-
;
577+
CGFloat min = newViewProps.accessibilityValue.min.value();
578+
CGFloat max = newViewProps.accessibilityValue.max.value();
579+
CGFloat now = newViewProps.accessibilityValue.now.value();
580+
if (min < max && min <= now && now <= max) {
581+
self.accessibilityElement.accessibilityValue =
582+
[NSNumberFormatter localizedStringFromNumber:@((now - min) / (max - min))
583+
numberStyle:NSNumberFormatterPercentStyle];
584+
} else {
585+
self.accessibilityElement.accessibilityValue = nil;
586+
}
582587
} else {
583588
self.accessibilityElement.accessibilityValue = nil;
584589
}

‎packages/react-native/React/Tests/Mounting/RCTViewComponentViewTests.mm‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -324,6 +324,47 @@ - (void)testAccessibilityValueIsNilWithoutExpandedState
324324
XCTAssertNil(view.accessibilityValue);
325325
}
326326

327+
#pragma mark - accessibilityValue for a range
328+
329+
static RCTViewComponentView *makeViewWithValueRange(int min, int max, int now)
330+
{
331+
RCTViewComponentView *view = [RCTViewComponentView new];
332+
auto props = std::make_shared<ViewProps>();
333+
props->accessible = true;
334+
AccessibilityValue accessibilityValue;
335+
accessibilityValue.min = min;
336+
accessibilityValue.max = max;
337+
accessibilityValue.now = now;
338+
props->accessibilityValue = accessibilityValue;
339+
[view updateProps:props oldProps:ViewShadowNode::defaultSharedProps()];
340+
return view;
341+
}
342+
343+
static NSString *percentString(double fraction)
344+
{
345+
return [NSNumberFormatter localizedStringFromNumber:@(fraction) numberStyle:NSNumberFormatterPercentStyle];
346+
}
347+
348+
- (void)testAccessibilityValueIsThePositionInTheRange
349+
{
350+
XCTAssertEqualObjects(makeViewWithValueRange(0, 10, 5).accessibilityValue, percentString(0.5));
351+
XCTAssertEqualObjects(makeViewWithValueRange(10, 20, 15).accessibilityValue, percentString(0.5));
352+
XCTAssertEqualObjects(makeViewWithValueRange(10, 20, 10).accessibilityValue, percentString(0));
353+
XCTAssertEqualObjects(makeViewWithValueRange(-10, 10, 10).accessibilityValue, percentString(1));
354+
}
355+
356+
- (void)testAccessibilityValueIsNilForAnEmptyRange
357+
{
358+
XCTAssertNil(makeViewWithValueRange(5, 5, 5).accessibilityValue);
359+
XCTAssertNil(makeViewWithValueRange(20, 10, 15).accessibilityValue);
360+
}
361+
362+
- (void)testAccessibilityValueIsNilOutsideTheRange
363+
{
364+
XCTAssertNil(makeViewWithValueRange(0, 10, 15).accessibilityValue);
365+
XCTAssertNil(makeViewWithValueRange(10, 20, 5).accessibilityValue);
366+
}
367+
327368
#pragma mark - outline style on square corners (#57841)
328369

329370
static RCTViewComponentView *makeViewWithOutlineStyle(OutlineStyle outlineStyle)

0 commit comments

Comments
 (0)