Skip to content

Commit 2facea6

Browse files
joevilchesfacebook-github-bot
authored andcommitted
Rename accessibilityElements to accessibilityOrder for iOS (facebook#50135)
Summary: Pull Request resolved: facebook#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
1 parent 65bcfda commit 2facea6

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -391,9 +391,9 @@ - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &
391391
}
392392
}
393393

394-
if (oldViewProps.accessibilityElements != newViewProps.accessibilityElements) {
394+
if (oldViewProps.accessibilityOrder != newViewProps.accessibilityOrder) {
395395
_accessibleElementsNativeIds = [NSMutableArray new];
396-
for (const std::string &childId : newViewProps.accessibilityElements) {
396+
for (const std::string &childId : newViewProps.accessibilityOrder) {
397397
[_accessibleElementsNativeIds addObject:RCTNSStringFromString(childId)];
398398
}
399399
}

packages/react-native/ReactCommon/react/renderer/components/view/AccessibilityProps.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,14 @@ AccessibilityProps::AccessibilityProps(
4646
"accessibilityLabel",
4747
sourceProps.accessibilityLabel,
4848
"")),
49-
accessibilityElements(
49+
accessibilityOrder(
5050
ReactNativeFeatureFlags::enableCppPropsIteratorSetter()
51-
? sourceProps.accessibilityElements
51+
? sourceProps.accessibilityOrder
5252
: convertRawProp(
5353
context,
5454
rawProps,
55-
"accessibilityElements",
56-
sourceProps.accessibilityElements,
55+
"accessibilityOrder",
56+
sourceProps.accessibilityOrder,
5757
{})),
5858
accessibilityLabelledBy(
5959
ReactNativeFeatureFlags::enableCppPropsIteratorSetter()
@@ -255,7 +255,7 @@ void AccessibilityProps::setProp(
255255
RAW_SET_PROP_SWITCH_CASE_BASIC(accessible);
256256
RAW_SET_PROP_SWITCH_CASE_BASIC(accessibilityState);
257257
RAW_SET_PROP_SWITCH_CASE_BASIC(accessibilityLabel);
258-
RAW_SET_PROP_SWITCH_CASE_BASIC(accessibilityElements);
258+
RAW_SET_PROP_SWITCH_CASE_BASIC(accessibilityOrder);
259259
RAW_SET_PROP_SWITCH_CASE_BASIC(accessibilityLabelledBy);
260260
RAW_SET_PROP_SWITCH_CASE_BASIC(accessibilityHint);
261261
RAW_SET_PROP_SWITCH_CASE_BASIC(accessibilityLanguage);

packages/react-native/ReactCommon/react/renderer/components/view/AccessibilityProps.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class AccessibilityProps {
3434
bool accessible{false};
3535
std::optional<AccessibilityState> accessibilityState{std::nullopt};
3636
std::string accessibilityLabel{""};
37-
std::vector<std::string> accessibilityElements{};
37+
std::vector<std::string> accessibilityOrder{};
3838
AccessibilityLabelledBy accessibilityLabelledBy{};
3939
AccessibilityLiveRegion accessibilityLiveRegion{
4040
AccessibilityLiveRegion::None};

packages/react-native/ReactCommon/react/renderer/components/view/ViewShadowNode.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ void ViewShadowNode::initialize() noexcept {
6363
viewProps.mixBlendMode != BlendMode::Normal ||
6464
viewProps.isolation == Isolation::Isolate ||
6565
HostPlatformViewTraitsInitializer::formsStackingContext(viewProps) ||
66-
!viewProps.accessibilityElements.empty();
66+
!viewProps.accessibilityOrder.empty();
6767

6868
bool formsView = formsStackingContext ||
6969
isColorMeaningful(viewProps.backgroundColor) || hasBorder() ||

0 commit comments

Comments
 (0)