Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -574,11 +574,16 @@ - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &
} else if (
newViewProps.accessibilityValue.now.has_value() && newViewProps.accessibilityValue.min.has_value() &&
newViewProps.accessibilityValue.max.has_value()) {
CGFloat val = (CGFloat)(newViewProps.accessibilityValue.now.value()) /
(newViewProps.accessibilityValue.max.value() - newViewProps.accessibilityValue.min.value());
self.accessibilityElement.accessibilityValue =
[NSNumberFormatter localizedStringFromNumber:@(val) numberStyle:NSNumberFormatterPercentStyle];
;
CGFloat min = newViewProps.accessibilityValue.min.value();
CGFloat max = newViewProps.accessibilityValue.max.value();
CGFloat now = newViewProps.accessibilityValue.now.value();
if (min < max && min <= now && now <= max) {
self.accessibilityElement.accessibilityValue =
[NSNumberFormatter localizedStringFromNumber:@((now - min) / (max - min))
numberStyle:NSNumberFormatterPercentStyle];
} else {
self.accessibilityElement.accessibilityValue = nil;
}
} else {
self.accessibilityElement.accessibilityValue = nil;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,47 @@ - (void)testAccessibilityValueIsNilWithoutExpandedState
XCTAssertNil(view.accessibilityValue);
}

#pragma mark - accessibilityValue for a range

static RCTViewComponentView *makeViewWithValueRange(int min, int max, int now)
{
RCTViewComponentView *view = [RCTViewComponentView new];
auto props = std::make_shared<ViewProps>();
props->accessible = true;
AccessibilityValue accessibilityValue;
accessibilityValue.min = min;
accessibilityValue.max = max;
accessibilityValue.now = now;
props->accessibilityValue = accessibilityValue;
[view updateProps:props oldProps:ViewShadowNode::defaultSharedProps()];
return view;
}

static NSString *percentString(double fraction)
{
return [NSNumberFormatter localizedStringFromNumber:@(fraction) numberStyle:NSNumberFormatterPercentStyle];
}

- (void)testAccessibilityValueIsThePositionInTheRange
{
XCTAssertEqualObjects(makeViewWithValueRange(0, 10, 5).accessibilityValue, percentString(0.5));
XCTAssertEqualObjects(makeViewWithValueRange(10, 20, 15).accessibilityValue, percentString(0.5));
XCTAssertEqualObjects(makeViewWithValueRange(10, 20, 10).accessibilityValue, percentString(0));
XCTAssertEqualObjects(makeViewWithValueRange(-10, 10, 10).accessibilityValue, percentString(1));
}

- (void)testAccessibilityValueIsNilForAnEmptyRange
{
XCTAssertNil(makeViewWithValueRange(5, 5, 5).accessibilityValue);
XCTAssertNil(makeViewWithValueRange(20, 10, 15).accessibilityValue);
}

- (void)testAccessibilityValueIsNilOutsideTheRange
{
XCTAssertNil(makeViewWithValueRange(0, 10, 15).accessibilityValue);
XCTAssertNil(makeViewWithValueRange(10, 20, 5).accessibilityValue);
}

#pragma mark - outline style on square corners (#57841)

static RCTViewComponentView *makeViewWithOutlineStyle(OutlineStyle outlineStyle)
Expand Down
Loading