From 2facea6e209e5d6d75b3a4edf7d67ef3e9fe8e23 Mon Sep 17 00:00:00 2001 From: Joe Vilches Date: Wed, 19 Mar 2025 09:50:10 -0700 Subject: [PATCH] Rename accessibilityElements to accessibilityOrder for iOS (#50135) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/50135 We settled on a different name here so gotta change some code with the old name. This is not exposed yet so this change is chill Changelog: [Internal] Reviewed By: jorge-cab Differential Revision: D71471884 fbshipit-source-id: c30384802ef51e5aae830b27299859db05f2520b --- .../ComponentViews/View/RCTViewComponentView.mm | 4 ++-- .../renderer/components/view/AccessibilityProps.cpp | 10 +++++----- .../renderer/components/view/AccessibilityProps.h | 2 +- .../react/renderer/components/view/ViewShadowNode.cpp | 2 +- 4 files changed, 9 insertions(+), 9 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 2e3985968ad..2679c8695f6 100644 --- a/packages/react-native/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm +++ b/packages/react-native/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm @@ -391,9 +391,9 @@ const CGFloat BACKGROUND_COLOR_ZPOSITION = -1024.0f; } } - if (oldViewProps.accessibilityElements != newViewProps.accessibilityElements) { + if (oldViewProps.accessibilityOrder != newViewProps.accessibilityOrder) { _accessibleElementsNativeIds = [NSMutableArray new]; - for (const std::string &childId : newViewProps.accessibilityElements) { + for (const std::string &childId : newViewProps.accessibilityOrder) { [_accessibleElementsNativeIds addObject:RCTNSStringFromString(childId)]; } } 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 f8d90c2f1d2..1b4f8dcffdb 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/view/AccessibilityProps.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/view/AccessibilityProps.cpp @@ -46,14 +46,14 @@ AccessibilityProps::AccessibilityProps( "accessibilityLabel", sourceProps.accessibilityLabel, "")), - accessibilityElements( + accessibilityOrder( ReactNativeFeatureFlags::enableCppPropsIteratorSetter() - ? sourceProps.accessibilityElements + ? sourceProps.accessibilityOrder : convertRawProp( context, rawProps, - "accessibilityElements", - sourceProps.accessibilityElements, + "accessibilityOrder", + sourceProps.accessibilityOrder, {})), accessibilityLabelledBy( ReactNativeFeatureFlags::enableCppPropsIteratorSetter() @@ -255,7 +255,7 @@ void AccessibilityProps::setProp( RAW_SET_PROP_SWITCH_CASE_BASIC(accessible); RAW_SET_PROP_SWITCH_CASE_BASIC(accessibilityState); RAW_SET_PROP_SWITCH_CASE_BASIC(accessibilityLabel); - RAW_SET_PROP_SWITCH_CASE_BASIC(accessibilityElements); + RAW_SET_PROP_SWITCH_CASE_BASIC(accessibilityOrder); RAW_SET_PROP_SWITCH_CASE_BASIC(accessibilityLabelledBy); RAW_SET_PROP_SWITCH_CASE_BASIC(accessibilityHint); RAW_SET_PROP_SWITCH_CASE_BASIC(accessibilityLanguage); 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 d9bfe23f634..6583ec389b4 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/view/AccessibilityProps.h +++ b/packages/react-native/ReactCommon/react/renderer/components/view/AccessibilityProps.h @@ -34,7 +34,7 @@ class AccessibilityProps { bool accessible{false}; std::optional accessibilityState{std::nullopt}; std::string accessibilityLabel{""}; - std::vector accessibilityElements{}; + std::vector accessibilityOrder{}; AccessibilityLabelledBy accessibilityLabelledBy{}; AccessibilityLiveRegion accessibilityLiveRegion{ AccessibilityLiveRegion::None}; diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/ViewShadowNode.cpp b/packages/react-native/ReactCommon/react/renderer/components/view/ViewShadowNode.cpp index a520b8032e9..19e6f2106e0 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/view/ViewShadowNode.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/view/ViewShadowNode.cpp @@ -63,7 +63,7 @@ void ViewShadowNode::initialize() noexcept { viewProps.mixBlendMode != BlendMode::Normal || viewProps.isolation == Isolation::Isolate || HostPlatformViewTraitsInitializer::formsStackingContext(viewProps) || - !viewProps.accessibilityElements.empty(); + !viewProps.accessibilityOrder.empty(); bool formsView = formsStackingContext || isColorMeaningful(viewProps.backgroundColor) || hasBorder() ||