From 5b8da7f136d35a110e891bcf9a5bbf7fe40d38d7 Mon Sep 17 00:00:00 2001 From: Dmitry Zhigulin <104712148+faciledictu@users.noreply.github.com> Date: Mon, 16 Nov 2026 03:15:05 +0400 Subject: [PATCH] Subtract min from the accessibilityValue percentage on iOS --- .../View/RCTViewComponentView.mm | 15 ++++--- .../Mounting/RCTViewComponentViewTests.mm | 41 +++++++++++++++++++ 2 files changed, 51 insertions(+), 5 deletions(-) diff --git a/packages/react-native/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm b/packages/react-native/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm index ce85971d0b8f..8d1295d8db36 100644 --- a/packages/react-native/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm +++ b/packages/react-native/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm @@ -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; } diff --git a/packages/react-native/React/Tests/Mounting/RCTViewComponentViewTests.mm b/packages/react-native/React/Tests/Mounting/RCTViewComponentViewTests.mm index 2828481a744a..5c00390702c8 100644 --- a/packages/react-native/React/Tests/Mounting/RCTViewComponentViewTests.mm +++ b/packages/react-native/React/Tests/Mounting/RCTViewComponentViewTests.mm @@ -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(); + 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)