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 8a074cd2b60..bdd0bb5af23 100644 --- a/packages/react-native/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm +++ b/packages/react-native/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm @@ -67,7 +67,7 @@ static BOOL RCTViewIsInteractiveAccessibilityElement(UIView *view, const ViewPro // `role` wins over the legacy `accessibilityRole` when both are set, matching // how the traits themselves are resolved. - if (props.role.value_or(Role::None) != Role::None) { + if (props.role != Role::None) { static const std::unordered_set interactiveRoles{ Role::Button, Role::Checkbox, @@ -82,7 +82,7 @@ static BOOL RCTViewIsInteractiveAccessibilityElement(UIView *view, const ViewPro Role::Switch, Role::Tab, Role::Treeitem}; - return interactiveRoles.contains(*props.role); + return interactiveRoles.contains(props.role); } static const std::unordered_set interactiveAccessibilityRoles{ @@ -1690,9 +1690,8 @@ static NSString *RCTRecursiveAccessibilityLabel(UIView *view) } NSMutableArray *valueComponents = [NSMutableArray new]; - NSString *roleString = (props.role.value_or(Role::None) != Role::None) - ? [NSString stringWithUTF8String:toString(*props.role).c_str()] - : [NSString stringWithUTF8String:props.accessibilityRole.c_str()]; + NSString *roleString = (props.role != Role::None) ? [NSString stringWithUTF8String:toString(props.role).c_str()] + : [NSString stringWithUTF8String:props.accessibilityRole.c_str()]; // In iOS, checkbox and radio buttons aren't recognized as traits. However, // because our apps use checkbox and radio buttons often, we should announce diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/AccessibilityProps.cpp b/packages/react-native/ReactCommon/react/renderer/components/view/AccessibilityProps.cpp index 4bc58608d2a..b204a3fd3c5 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/view/AccessibilityProps.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/view/AccessibilityProps.cpp @@ -18,12 +18,12 @@ namespace facebook::react { // members. This makes accessibilityTraits the single source of truth. // See: github.com/facebook/react-native/issues/57515 static AccessibilityTraits deriveAccessibilityTraits( - std::optional role, + Role role, const std::string& accessibilityRole, const std::optional& accessibilityState) { AccessibilityTraits traits = AccessibilityTraits::None; - if (role.value_or(Role::None) != Role::None) { - fromString(toString(*role), traits); + if (role != Role::None) { + fromString(toString(role), traits); } else if (!accessibilityRole.empty()) { fromString(accessibilityRole, traits); } @@ -179,15 +179,16 @@ AccessibilityProps::AccessibilityProps( auto* accessibilityRoleValue = rawProps.at("accessibilityRole"); auto* roleValue = rawProps.at("role"); - if (accessibilityRoleValue == nullptr) { + if (accessibilityRoleValue == nullptr || + !accessibilityRoleValue->hasValue()) { accessibilityRole = sourceProps.accessibilityRole; - } else if (accessibilityRoleValue->hasValue()) { + } else { fromRawValue(context, *accessibilityRoleValue, accessibilityRole); } - if (roleValue == nullptr) { + if (roleValue == nullptr || !roleValue->hasValue()) { role = sourceProps.role; - } else if (roleValue->hasValue()) { + } else { fromRawValue(context, *roleValue, role); } diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/AccessibilityProps.h b/packages/react-native/ReactCommon/react/renderer/components/view/AccessibilityProps.h index 0b055d60f9b..53524bb4a01 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/view/AccessibilityProps.h +++ b/packages/react-native/ReactCommon/react/renderer/components/view/AccessibilityProps.h @@ -56,7 +56,7 @@ class AccessibilityProps { bool onAccessibilityEscape{}; bool onAccessibilityAction{}; ImportantForAccessibility importantForAccessibility{ImportantForAccessibility::Auto}; - std::optional role{}; + Role role{Role::None}; std::string testId; #pragma mark - DebugStringConvertible diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/platform/android/react/renderer/components/view/HostPlatformViewProps.cpp b/packages/react-native/ReactCommon/react/renderer/components/view/platform/android/react/renderer/components/view/HostPlatformViewProps.cpp index 2f282042216..d2417698a5f 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/view/platform/android/react/renderer/components/view/HostPlatformViewProps.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/view/platform/android/react/renderer/components/view/HostPlatformViewProps.cpp @@ -395,39 +395,58 @@ inline static void updateNativeDrawableProp( result[propName] = nativeDrawableResult; } -static folly::dynamic toDynamic(const AccessibilityState& state) { - folly::dynamic result = folly::dynamic::object(); - result["disabled"] = state.disabled; +inline static void updateAccessibilityStateProp( + folly::dynamic& result, + const std::optional& newState, + const std::optional& oldState) { + folly::dynamic resultState = folly::dynamic::object(); - // Omitting the key when `selected` is unset is what tells the platform the - // component is not selectable. BaseViewManager#setViewState falls back to - // `setSelected(false)` for an absent key, so the rendered result is - // unchanged from when this was a plain `bool`. - if (state.selected.has_value()) { - result["selected"] = state.selected.value(); + if (!newState.has_value() && oldState.has_value()) { + result["accessibilityState"] = resultState; + return; } - result["busy"] = state.busy; - - if (state.expanded.has_value()) { - result["expanded"] = state.expanded.value(); + if (!oldState.has_value() || newState->disabled != oldState->disabled) { + resultState["disabled"] = newState->disabled; } - switch (state.checked) { - case AccessibilityState::Unchecked: - result["checked"] = false; - break; - case AccessibilityState::Checked: - result["checked"] = true; - break; - case AccessibilityState::Mixed: - result["checked"] = "mixed"; - break; - case AccessibilityState::None: - result["checked"] = "none"; - break; + if (!oldState.has_value() || newState->selected != oldState->selected) { + // Omitting the key when `selected` is unset is what tells the platform the + // component is not selectable. BaseViewManager#setViewState falls back to + // `setSelected(false)` for an absent key, so the rendered result is + // unchanged from when this was a plain `bool`. + if (newState->selected.has_value()) { + resultState["selected"] = newState->selected.value(); + } } - return result; + + if (!oldState.has_value() || newState->busy != oldState->busy) { + resultState["busy"] = newState->busy; + } + + if (!oldState.has_value() || newState->expanded != oldState->expanded) { + if (newState->expanded.has_value()) { + resultState["expanded"] = newState->expanded.value(); + } + } + + if (!oldState.has_value() || newState->checked != oldState->checked) { + switch (newState->checked) { + case AccessibilityState::Unchecked: + resultState["checked"] = false; + break; + case AccessibilityState::Checked: + resultState["checked"] = true; + break; + case AccessibilityState::Mixed: + resultState["checked"] = "mixed"; + break; + case AccessibilityState::None: + resultState["checked"] = "none"; + break; + } + } + result["accessibilityState"] = resultState; } static folly::dynamic toDynamic( @@ -521,8 +540,7 @@ folly::dynamic HostPlatformViewProps::getDiffProps( } if (role != oldProps->role) { - result["role"] = - role.has_value() ? toString(*role) : folly::dynamic(nullptr); + result["role"] = toString(role); } if (opacity != oldProps->opacity) { @@ -889,9 +907,8 @@ folly::dynamic HostPlatformViewProps::getDiffProps( // Accessibility if (accessibilityState != oldProps->accessibilityState) { - result["accessibilityState"] = accessibilityState.has_value() - ? toDynamic(*accessibilityState) - : folly::dynamic::object(); + updateAccessibilityStateProp( + result, accessibilityState, oldProps->accessibilityState); } if (accessibilityLabel != oldProps->accessibilityLabel) { @@ -924,9 +941,7 @@ folly::dynamic HostPlatformViewProps::getDiffProps( } if (accessibilityRole != oldProps->accessibilityRole) { - result["accessibilityRole"] = accessibilityRole.empty() - ? folly::dynamic(nullptr) - : folly::dynamic(accessibilityRole); + result["accessibilityRole"] = accessibilityRole; } if (accessibilityLanguage != oldProps->accessibilityLanguage) { @@ -947,9 +962,7 @@ folly::dynamic HostPlatformViewProps::getDiffProps( if (accessibilityValue.text.has_value()) { accessibilityValueObject["text"] = accessibilityValue.text.value(); } - result["accessibilityValue"] = accessibilityValueObject.empty() - ? folly::dynamic(nullptr) - : accessibilityValueObject; + result["accessibilityValue"] = accessibilityValueObject; } if (accessibilityActions != oldProps->accessibilityActions) { diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/tests/ViewPropsDiffTest.cpp b/packages/react-native/ReactCommon/react/renderer/components/view/tests/ViewPropsDiffTest.cpp index 7fe5a6dfdab..0c328359c85 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/view/tests/ViewPropsDiffTest.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/view/tests/ViewPropsDiffTest.cpp @@ -103,55 +103,6 @@ TEST(ViewPropsDiffTest, gradientColorHintEmitsNullColor) { "position", nullptr)))))}}); } -// BaseViewManager.setViewState replaces the whole state: an absent `selected` -// deselects the view and an absent `disabled` re-enables it. Props 2.0 sends an -// unset `checked` as "none", which Java ignores. -TEST(ViewPropsDiffTest, emitsTheWholeAccessibilityStateWhenOneMemberChanges) { - auto state = [](bool busy) { - return dynamic::object("selected", true)("disabled", true)("busy", busy); - }; - auto sentState = [&](bool busy) { - return dynamic::object( - "accessibilityState", state(busy)("checked", "none")); - }; - expectPayloads({ - {dynamic::object("accessibilityState", state(false)), sentState(false)}, - {dynamic::object("accessibilityState", state(true)), sentState(true)}, - }); -} - -// React sends a removed prop as null on top of the previous props. -// BaseViewManager clears the role only for null, and -// AccessibilityRole.fromValue("") throws. -TEST(ViewPropsDiffTest, removingAccessibilityRoleEmitsNull) { - expectPayloads({ - {dynamic::object("accessibilityRole", "button")}, - {dynamic::object("accessibilityRole", nullptr)}, - }); -} - -// BaseViewManager falls back to accessibilityRole only for a null role. -TEST(ViewPropsDiffTest, removingRoleEmitsNull) { - expectPayloads({ - {dynamic::object("role", "button")}, - {dynamic::object("role", nullptr)}, - }); -} - -// An explicit role="none" overrides accessibilityRole. -TEST(ViewPropsDiffTest, emitsAnExplicitRoleNone) { - expectPayloads( - {{dynamic::object("role", "none")("accessibilityRole", "button")}}); -} - -// BaseViewManager clears the value and the content description only for null. -TEST(ViewPropsDiffTest, removingAccessibilityValueEmitsNull) { - expectPayloads({ - {dynamic::object("accessibilityValue", dynamic::object("text", "50%"))}, - {dynamic::object("accessibilityValue", nullptr)}, - }); -} - } // namespace facebook::react #endif diff --git a/scripts/cxx-api/api-snapshots/ReactAndroidDebugCxx.api b/scripts/cxx-api/api-snapshots/ReactAndroidDebugCxx.api index e845dc3de35..374d6ab4e82 100644 --- a/scripts/cxx-api/api-snapshots/ReactAndroidDebugCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAndroidDebugCxx.api @@ -700,8 +700,8 @@ class facebook::react::AccessibilityProps { public facebook::react::AccessibilityTraits accessibilityTraits; public facebook::react::AccessibilityValue accessibilityValue; public facebook::react::ImportantForAccessibility importantForAccessibility; + public facebook::react::Role role; public std::optional accessibilityState; - public std::optional role; public std::string accessibilityHint; public std::string accessibilityLabel; public std::string accessibilityLanguage; diff --git a/scripts/cxx-api/api-snapshots/ReactAndroidFrameworksCxx.api b/scripts/cxx-api/api-snapshots/ReactAndroidFrameworksCxx.api index 02764f509d5..b15017d872b 100644 --- a/scripts/cxx-api/api-snapshots/ReactAndroidFrameworksCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAndroidFrameworksCxx.api @@ -1016,8 +1016,8 @@ class facebook::react::AccessibilityProps { public facebook::react::AccessibilityTraits accessibilityTraits; public facebook::react::AccessibilityValue accessibilityValue; public facebook::react::ImportantForAccessibility importantForAccessibility; + public facebook::react::Role role; public std::optional accessibilityState; - public std::optional role; public std::string accessibilityHint; public std::string accessibilityLabel; public std::string accessibilityLanguage; diff --git a/scripts/cxx-api/api-snapshots/ReactAndroidNewarchCxx.api b/scripts/cxx-api/api-snapshots/ReactAndroidNewarchCxx.api index 0ecfc663afb..ceafbff61af 100644 --- a/scripts/cxx-api/api-snapshots/ReactAndroidNewarchCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAndroidNewarchCxx.api @@ -700,8 +700,8 @@ class facebook::react::AccessibilityProps { public facebook::react::AccessibilityTraits accessibilityTraits; public facebook::react::AccessibilityValue accessibilityValue; public facebook::react::ImportantForAccessibility importantForAccessibility; + public facebook::react::Role role; public std::optional accessibilityState; - public std::optional role; public std::string accessibilityHint; public std::string accessibilityLabel; public std::string accessibilityLanguage; diff --git a/scripts/cxx-api/api-snapshots/ReactAndroidReleaseCxx.api b/scripts/cxx-api/api-snapshots/ReactAndroidReleaseCxx.api index 0ecfc663afb..ceafbff61af 100644 --- a/scripts/cxx-api/api-snapshots/ReactAndroidReleaseCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAndroidReleaseCxx.api @@ -700,8 +700,8 @@ class facebook::react::AccessibilityProps { public facebook::react::AccessibilityTraits accessibilityTraits; public facebook::react::AccessibilityValue accessibilityValue; public facebook::react::ImportantForAccessibility importantForAccessibility; + public facebook::react::Role role; public std::optional accessibilityState; - public std::optional role; public std::string accessibilityHint; public std::string accessibilityLabel; public std::string accessibilityLanguage; diff --git a/scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api b/scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api index da60ec79262..cd7cd6ba81f 100644 --- a/scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api @@ -3432,8 +3432,8 @@ class facebook::react::AccessibilityProps { public facebook::react::AccessibilityTraits accessibilityTraits; public facebook::react::AccessibilityValue accessibilityValue; public facebook::react::ImportantForAccessibility importantForAccessibility; + public facebook::react::Role role; public std::optional accessibilityState; - public std::optional role; public std::string accessibilityHint; public std::string accessibilityLabel; public std::string accessibilityLanguage; diff --git a/scripts/cxx-api/api-snapshots/ReactAppleFrameworksCxx.api b/scripts/cxx-api/api-snapshots/ReactAppleFrameworksCxx.api index 535f7407c0a..86fe29de9b6 100644 --- a/scripts/cxx-api/api-snapshots/ReactAppleFrameworksCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAppleFrameworksCxx.api @@ -3791,8 +3791,8 @@ class facebook::react::AccessibilityProps { public facebook::react::AccessibilityTraits accessibilityTraits; public facebook::react::AccessibilityValue accessibilityValue; public facebook::react::ImportantForAccessibility importantForAccessibility; + public facebook::react::Role role; public std::optional accessibilityState; - public std::optional role; public std::string accessibilityHint; public std::string accessibilityLabel; public std::string accessibilityLanguage; diff --git a/scripts/cxx-api/api-snapshots/ReactAppleNewarchCxx.api b/scripts/cxx-api/api-snapshots/ReactAppleNewarchCxx.api index 2ed16ed0b2e..aab9559c8f3 100644 --- a/scripts/cxx-api/api-snapshots/ReactAppleNewarchCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAppleNewarchCxx.api @@ -3424,8 +3424,8 @@ class facebook::react::AccessibilityProps { public facebook::react::AccessibilityTraits accessibilityTraits; public facebook::react::AccessibilityValue accessibilityValue; public facebook::react::ImportantForAccessibility importantForAccessibility; + public facebook::react::Role role; public std::optional accessibilityState; - public std::optional role; public std::string accessibilityHint; public std::string accessibilityLabel; public std::string accessibilityLanguage; diff --git a/scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api b/scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api index d7823badcb2..47e70d959eb 100644 --- a/scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api @@ -3432,8 +3432,8 @@ class facebook::react::AccessibilityProps { public facebook::react::AccessibilityTraits accessibilityTraits; public facebook::react::AccessibilityValue accessibilityValue; public facebook::react::ImportantForAccessibility importantForAccessibility; + public facebook::react::Role role; public std::optional accessibilityState; - public std::optional role; public std::string accessibilityHint; public std::string accessibilityLabel; public std::string accessibilityLanguage; diff --git a/scripts/cxx-api/api-snapshots/ReactCommonDebugCxx.api b/scripts/cxx-api/api-snapshots/ReactCommonDebugCxx.api index 918f2d116b8..b8735f0528a 100644 --- a/scripts/cxx-api/api-snapshots/ReactCommonDebugCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactCommonDebugCxx.api @@ -321,8 +321,8 @@ class facebook::react::AccessibilityProps { public facebook::react::AccessibilityTraits accessibilityTraits; public facebook::react::AccessibilityValue accessibilityValue; public facebook::react::ImportantForAccessibility importantForAccessibility; + public facebook::react::Role role; public std::optional accessibilityState; - public std::optional role; public std::string accessibilityHint; public std::string accessibilityLabel; public std::string accessibilityLanguage; diff --git a/scripts/cxx-api/api-snapshots/ReactCommonFrameworksCxx.api b/scripts/cxx-api/api-snapshots/ReactCommonFrameworksCxx.api index e85fe6f6fe5..7cd2395b5ba 100644 --- a/scripts/cxx-api/api-snapshots/ReactCommonFrameworksCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactCommonFrameworksCxx.api @@ -570,8 +570,8 @@ class facebook::react::AccessibilityProps { public facebook::react::AccessibilityTraits accessibilityTraits; public facebook::react::AccessibilityValue accessibilityValue; public facebook::react::ImportantForAccessibility importantForAccessibility; + public facebook::react::Role role; public std::optional accessibilityState; - public std::optional role; public std::string accessibilityHint; public std::string accessibilityLabel; public std::string accessibilityLanguage; diff --git a/scripts/cxx-api/api-snapshots/ReactCommonNewarchCxx.api b/scripts/cxx-api/api-snapshots/ReactCommonNewarchCxx.api index 67a08398c5d..6b1ebcc6d52 100644 --- a/scripts/cxx-api/api-snapshots/ReactCommonNewarchCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactCommonNewarchCxx.api @@ -321,8 +321,8 @@ class facebook::react::AccessibilityProps { public facebook::react::AccessibilityTraits accessibilityTraits; public facebook::react::AccessibilityValue accessibilityValue; public facebook::react::ImportantForAccessibility importantForAccessibility; + public facebook::react::Role role; public std::optional accessibilityState; - public std::optional role; public std::string accessibilityHint; public std::string accessibilityLabel; public std::string accessibilityLanguage; diff --git a/scripts/cxx-api/api-snapshots/ReactCommonReleaseCxx.api b/scripts/cxx-api/api-snapshots/ReactCommonReleaseCxx.api index 67a08398c5d..6b1ebcc6d52 100644 --- a/scripts/cxx-api/api-snapshots/ReactCommonReleaseCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactCommonReleaseCxx.api @@ -321,8 +321,8 @@ class facebook::react::AccessibilityProps { public facebook::react::AccessibilityTraits accessibilityTraits; public facebook::react::AccessibilityValue accessibilityValue; public facebook::react::ImportantForAccessibility importantForAccessibility; + public facebook::react::Role role; public std::optional accessibilityState; - public std::optional role; public std::string accessibilityHint; public std::string accessibilityLabel; public std::string accessibilityLanguage;