File tree Expand file tree Collapse file tree 4 files changed +9
-9
lines changed
ReactCommon/react/renderer/components/view
React/Fabric/Mounting/ComponentViews/View Expand file tree Collapse file tree 4 files changed +9
-9
lines changed Original file line number Diff line number Diff line change @@ -391,9 +391,9 @@ - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &
391
391
}
392
392
}
393
393
394
- if (oldViewProps.accessibilityElements != newViewProps.accessibilityElements ) {
394
+ if (oldViewProps.accessibilityOrder != newViewProps.accessibilityOrder ) {
395
395
_accessibleElementsNativeIds = [NSMutableArray new ];
396
- for (const std::string &childId : newViewProps.accessibilityElements ) {
396
+ for (const std::string &childId : newViewProps.accessibilityOrder ) {
397
397
[_accessibleElementsNativeIds addObject: RCTNSStringFromString (childId)];
398
398
}
399
399
}
Original file line number Diff line number Diff line change @@ -46,14 +46,14 @@ AccessibilityProps::AccessibilityProps(
46
46
" accessibilityLabel" ,
47
47
sourceProps.accessibilityLabel,
48
48
" " )),
49
- accessibilityElements (
49
+ accessibilityOrder (
50
50
ReactNativeFeatureFlags::enableCppPropsIteratorSetter ()
51
- ? sourceProps.accessibilityElements
51
+ ? sourceProps.accessibilityOrder
52
52
: convertRawProp(
53
53
context,
54
54
rawProps,
55
- " accessibilityElements " ,
56
- sourceProps.accessibilityElements ,
55
+ " accessibilityOrder " ,
56
+ sourceProps.accessibilityOrder ,
57
57
{})),
58
58
accessibilityLabelledBy(
59
59
ReactNativeFeatureFlags::enableCppPropsIteratorSetter ()
@@ -255,7 +255,7 @@ void AccessibilityProps::setProp(
255
255
RAW_SET_PROP_SWITCH_CASE_BASIC (accessible);
256
256
RAW_SET_PROP_SWITCH_CASE_BASIC (accessibilityState);
257
257
RAW_SET_PROP_SWITCH_CASE_BASIC (accessibilityLabel);
258
- RAW_SET_PROP_SWITCH_CASE_BASIC (accessibilityElements );
258
+ RAW_SET_PROP_SWITCH_CASE_BASIC (accessibilityOrder );
259
259
RAW_SET_PROP_SWITCH_CASE_BASIC (accessibilityLabelledBy);
260
260
RAW_SET_PROP_SWITCH_CASE_BASIC (accessibilityHint);
261
261
RAW_SET_PROP_SWITCH_CASE_BASIC (accessibilityLanguage);
Original file line number Diff line number Diff line change @@ -34,7 +34,7 @@ class AccessibilityProps {
34
34
bool accessible{false };
35
35
std::optional<AccessibilityState> accessibilityState{std::nullopt};
36
36
std::string accessibilityLabel{" " };
37
- std::vector<std::string> accessibilityElements {};
37
+ std::vector<std::string> accessibilityOrder {};
38
38
AccessibilityLabelledBy accessibilityLabelledBy{};
39
39
AccessibilityLiveRegion accessibilityLiveRegion{
40
40
AccessibilityLiveRegion::None};
Original file line number Diff line number Diff line change @@ -63,7 +63,7 @@ void ViewShadowNode::initialize() noexcept {
63
63
viewProps.mixBlendMode != BlendMode::Normal ||
64
64
viewProps.isolation == Isolation::Isolate ||
65
65
HostPlatformViewTraitsInitializer::formsStackingContext (viewProps) ||
66
- !viewProps.accessibilityElements .empty ();
66
+ !viewProps.accessibilityOrder .empty ();
67
67
68
68
bool formsView = formsStackingContext ||
69
69
isColorMeaningful (viewProps.backgroundColor ) || hasBorder () ||
You can’t perform that action at this time.
0 commit comments