Skip to content

Commit 6b27a28

Browse files
Jacob Wirthmeta-codesync[bot]
authored andcommitted
Revert D125438453: Fix View accessibility payloads that Props 2.0 sends wrong or drops
Differential Revision: D125438453 Original commit changeset: f838e23cbde9 Original Phabricator Diff: D125438453 fbshipit-source-id: 89403c538078dd31565853fe929e7298437c2ec1
1 parent 1829aec commit 6b27a28

17 files changed

Lines changed: 75 additions & 111 deletions

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ static BOOL RCTViewIsInteractiveAccessibilityElement(UIView *view, const ViewPro
6767

6868
// `role` wins over the legacy `accessibilityRole` when both are set, matching
6969
// how the traits themselves are resolved.
70-
if (props.role.value_or(Role::None) != Role::None) {
70+
if (props.role != Role::None) {
7171
static const std::unordered_set<Role> interactiveRoles{
7272
Role::Button,
7373
Role::Checkbox,
@@ -82,7 +82,7 @@ static BOOL RCTViewIsInteractiveAccessibilityElement(UIView *view, const ViewPro
8282
Role::Switch,
8383
Role::Tab,
8484
Role::Treeitem};
85-
return interactiveRoles.contains(*props.role);
85+
return interactiveRoles.contains(props.role);
8686
}
8787

8888
static const std::unordered_set<std::string_view> interactiveAccessibilityRoles{
@@ -1690,9 +1690,8 @@ - (NSString *)accessibilityValue
16901690
}
16911691

16921692
NSMutableArray *valueComponents = [NSMutableArray new];
1693-
NSString *roleString = (props.role.value_or(Role::None) != Role::None)
1694-
? [NSString stringWithUTF8String:toString(*props.role).c_str()]
1695-
: [NSString stringWithUTF8String:props.accessibilityRole.c_str()];
1693+
NSString *roleString = (props.role != Role::None) ? [NSString stringWithUTF8String:toString(props.role).c_str()]
1694+
: [NSString stringWithUTF8String:props.accessibilityRole.c_str()];
16961695

16971696
// In iOS, checkbox and radio buttons aren't recognized as traits. However,
16981697
// because our apps use checkbox and radio buttons often, we should announce

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ namespace facebook::react {
1818
// members. This makes accessibilityTraits the single source of truth.
1919
// See: github.com/facebook/react-native/issues/57515
2020
static AccessibilityTraits deriveAccessibilityTraits(
21-
std::optional<Role> role,
21+
Role role,
2222
const std::string& accessibilityRole,
2323
const std::optional<AccessibilityState>& accessibilityState) {
2424
AccessibilityTraits traits = AccessibilityTraits::None;
25-
if (role.value_or(Role::None) != Role::None) {
26-
fromString(toString(*role), traits);
25+
if (role != Role::None) {
26+
fromString(toString(role), traits);
2727
} else if (!accessibilityRole.empty()) {
2828
fromString(accessibilityRole, traits);
2929
}
@@ -179,15 +179,16 @@ AccessibilityProps::AccessibilityProps(
179179
auto* accessibilityRoleValue = rawProps.at("accessibilityRole");
180180
auto* roleValue = rawProps.at("role");
181181

182-
if (accessibilityRoleValue == nullptr) {
182+
if (accessibilityRoleValue == nullptr ||
183+
!accessibilityRoleValue->hasValue()) {
183184
accessibilityRole = sourceProps.accessibilityRole;
184-
} else if (accessibilityRoleValue->hasValue()) {
185+
} else {
185186
fromRawValue(context, *accessibilityRoleValue, accessibilityRole);
186187
}
187188

188-
if (roleValue == nullptr) {
189+
if (roleValue == nullptr || !roleValue->hasValue()) {
189190
role = sourceProps.role;
190-
} else if (roleValue->hasValue()) {
191+
} else {
191192
fromRawValue(context, *roleValue, role);
192193
}
193194

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class AccessibilityProps {
5656
bool onAccessibilityEscape{};
5757
bool onAccessibilityAction{};
5858
ImportantForAccessibility importantForAccessibility{ImportantForAccessibility::Auto};
59-
std::optional<Role> role{};
59+
Role role{Role::None};
6060
std::string testId;
6161

6262
#pragma mark - DebugStringConvertible

‎packages/react-native/ReactCommon/react/renderer/components/view/platform/android/react/renderer/components/view/HostPlatformViewProps.cpp‎

Lines changed: 50 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -395,39 +395,58 @@ inline static void updateNativeDrawableProp(
395395
result[propName] = nativeDrawableResult;
396396
}
397397

398-
static folly::dynamic toDynamic(const AccessibilityState& state) {
399-
folly::dynamic result = folly::dynamic::object();
400-
result["disabled"] = state.disabled;
398+
inline static void updateAccessibilityStateProp(
399+
folly::dynamic& result,
400+
const std::optional<AccessibilityState>& newState,
401+
const std::optional<AccessibilityState>& oldState) {
402+
folly::dynamic resultState = folly::dynamic::object();
403+
404+
if (!newState.has_value() && oldState.has_value()) {
405+
result["accessibilityState"] = resultState;
406+
return;
407+
}
401408

402-
// Omitting the key when `selected` is unset is what tells the platform the
403-
// component is not selectable. BaseViewManager#setViewState falls back to
404-
// `setSelected(false)` for an absent key, so the rendered result is
405-
// unchanged from when this was a plain `bool`.
406-
if (state.selected.has_value()) {
407-
result["selected"] = state.selected.value();
409+
if (!oldState.has_value() || newState->disabled != oldState->disabled) {
410+
resultState["disabled"] = newState->disabled;
408411
}
409412

410-
result["busy"] = state.busy;
413+
if (!oldState.has_value() || newState->selected != oldState->selected) {
414+
// Omitting the key when `selected` is unset is what tells the platform the
415+
// component is not selectable. BaseViewManager#setViewState falls back to
416+
// `setSelected(false)` for an absent key, so the rendered result is
417+
// unchanged from when this was a plain `bool`.
418+
if (newState->selected.has_value()) {
419+
resultState["selected"] = newState->selected.value();
420+
}
421+
}
411422

412-
if (state.expanded.has_value()) {
413-
result["expanded"] = state.expanded.value();
423+
if (!oldState.has_value() || newState->busy != oldState->busy) {
424+
resultState["busy"] = newState->busy;
414425
}
415426

416-
switch (state.checked) {
417-
case AccessibilityState::Unchecked:
418-
result["checked"] = false;
419-
break;
420-
case AccessibilityState::Checked:
421-
result["checked"] = true;
422-
break;
423-
case AccessibilityState::Mixed:
424-
result["checked"] = "mixed";
425-
break;
426-
case AccessibilityState::None:
427-
result["checked"] = "none";
428-
break;
427+
if (!oldState.has_value() || newState->expanded != oldState->expanded) {
428+
if (newState->expanded.has_value()) {
429+
resultState["expanded"] = newState->expanded.value();
430+
}
429431
}
430-
return result;
432+
433+
if (!oldState.has_value() || newState->checked != oldState->checked) {
434+
switch (newState->checked) {
435+
case AccessibilityState::Unchecked:
436+
resultState["checked"] = false;
437+
break;
438+
case AccessibilityState::Checked:
439+
resultState["checked"] = true;
440+
break;
441+
case AccessibilityState::Mixed:
442+
resultState["checked"] = "mixed";
443+
break;
444+
case AccessibilityState::None:
445+
resultState["checked"] = "none";
446+
break;
447+
}
448+
}
449+
result["accessibilityState"] = resultState;
431450
}
432451

433452
static folly::dynamic toDynamic(
@@ -521,8 +540,7 @@ folly::dynamic HostPlatformViewProps::getDiffProps(
521540
}
522541

523542
if (role != oldProps->role) {
524-
result["role"] =
525-
role.has_value() ? toString(*role) : folly::dynamic(nullptr);
543+
result["role"] = toString(role);
526544
}
527545

528546
if (opacity != oldProps->opacity) {
@@ -889,9 +907,8 @@ folly::dynamic HostPlatformViewProps::getDiffProps(
889907
// Accessibility
890908

891909
if (accessibilityState != oldProps->accessibilityState) {
892-
result["accessibilityState"] = accessibilityState.has_value()
893-
? toDynamic(*accessibilityState)
894-
: folly::dynamic::object();
910+
updateAccessibilityStateProp(
911+
result, accessibilityState, oldProps->accessibilityState);
895912
}
896913

897914
if (accessibilityLabel != oldProps->accessibilityLabel) {
@@ -924,9 +941,7 @@ folly::dynamic HostPlatformViewProps::getDiffProps(
924941
}
925942

926943
if (accessibilityRole != oldProps->accessibilityRole) {
927-
result["accessibilityRole"] = accessibilityRole.empty()
928-
? folly::dynamic(nullptr)
929-
: folly::dynamic(accessibilityRole);
944+
result["accessibilityRole"] = accessibilityRole;
930945
}
931946

932947
if (accessibilityLanguage != oldProps->accessibilityLanguage) {
@@ -947,9 +962,7 @@ folly::dynamic HostPlatformViewProps::getDiffProps(
947962
if (accessibilityValue.text.has_value()) {
948963
accessibilityValueObject["text"] = accessibilityValue.text.value();
949964
}
950-
result["accessibilityValue"] = accessibilityValueObject.empty()
951-
? folly::dynamic(nullptr)
952-
: accessibilityValueObject;
965+
result["accessibilityValue"] = accessibilityValueObject;
953966
}
954967

955968
if (accessibilityActions != oldProps->accessibilityActions) {

‎packages/react-native/ReactCommon/react/renderer/components/view/tests/ViewPropsDiffTest.cpp‎

Lines changed: 0 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -103,55 +103,6 @@ TEST(ViewPropsDiffTest, gradientColorHintEmitsNullColor) {
103103
"position", nullptr)))))}});
104104
}
105105

106-
// BaseViewManager.setViewState replaces the whole state: an absent `selected`
107-
// deselects the view and an absent `disabled` re-enables it. Props 2.0 sends an
108-
// unset `checked` as "none", which Java ignores.
109-
TEST(ViewPropsDiffTest, emitsTheWholeAccessibilityStateWhenOneMemberChanges) {
110-
auto state = [](bool busy) {
111-
return dynamic::object("selected", true)("disabled", true)("busy", busy);
112-
};
113-
auto sentState = [&](bool busy) {
114-
return dynamic::object(
115-
"accessibilityState", state(busy)("checked", "none"));
116-
};
117-
expectPayloads({
118-
{dynamic::object("accessibilityState", state(false)), sentState(false)},
119-
{dynamic::object("accessibilityState", state(true)), sentState(true)},
120-
});
121-
}
122-
123-
// React sends a removed prop as null on top of the previous props.
124-
// BaseViewManager clears the role only for null, and
125-
// AccessibilityRole.fromValue("") throws.
126-
TEST(ViewPropsDiffTest, removingAccessibilityRoleEmitsNull) {
127-
expectPayloads({
128-
{dynamic::object("accessibilityRole", "button")},
129-
{dynamic::object("accessibilityRole", nullptr)},
130-
});
131-
}
132-
133-
// BaseViewManager falls back to accessibilityRole only for a null role.
134-
TEST(ViewPropsDiffTest, removingRoleEmitsNull) {
135-
expectPayloads({
136-
{dynamic::object("role", "button")},
137-
{dynamic::object("role", nullptr)},
138-
});
139-
}
140-
141-
// An explicit role="none" overrides accessibilityRole.
142-
TEST(ViewPropsDiffTest, emitsAnExplicitRoleNone) {
143-
expectPayloads(
144-
{{dynamic::object("role", "none")("accessibilityRole", "button")}});
145-
}
146-
147-
// BaseViewManager clears the value and the content description only for null.
148-
TEST(ViewPropsDiffTest, removingAccessibilityValueEmitsNull) {
149-
expectPayloads({
150-
{dynamic::object("accessibilityValue", dynamic::object("text", "50%"))},
151-
{dynamic::object("accessibilityValue", nullptr)},
152-
});
153-
}
154-
155106
} // namespace facebook::react
156107

157108
#endif

‎scripts/cxx-api/api-snapshots/ReactAndroidDebugCxx.api‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -700,8 +700,8 @@ class facebook::react::AccessibilityProps {
700700
public facebook::react::AccessibilityTraits accessibilityTraits;
701701
public facebook::react::AccessibilityValue accessibilityValue;
702702
public facebook::react::ImportantForAccessibility importantForAccessibility;
703+
public facebook::react::Role role;
703704
public std::optional<facebook::react::AccessibilityState> accessibilityState;
704-
public std::optional<facebook::react::Role> role;
705705
public std::string accessibilityHint;
706706
public std::string accessibilityLabel;
707707
public std::string accessibilityLanguage;

‎scripts/cxx-api/api-snapshots/ReactAndroidFrameworksCxx.api‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1016,8 +1016,8 @@ class facebook::react::AccessibilityProps {
10161016
public facebook::react::AccessibilityTraits accessibilityTraits;
10171017
public facebook::react::AccessibilityValue accessibilityValue;
10181018
public facebook::react::ImportantForAccessibility importantForAccessibility;
1019+
public facebook::react::Role role;
10191020
public std::optional<facebook::react::AccessibilityState> accessibilityState;
1020-
public std::optional<facebook::react::Role> role;
10211021
public std::string accessibilityHint;
10221022
public std::string accessibilityLabel;
10231023
public std::string accessibilityLanguage;

‎scripts/cxx-api/api-snapshots/ReactAndroidNewarchCxx.api‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -700,8 +700,8 @@ class facebook::react::AccessibilityProps {
700700
public facebook::react::AccessibilityTraits accessibilityTraits;
701701
public facebook::react::AccessibilityValue accessibilityValue;
702702
public facebook::react::ImportantForAccessibility importantForAccessibility;
703+
public facebook::react::Role role;
703704
public std::optional<facebook::react::AccessibilityState> accessibilityState;
704-
public std::optional<facebook::react::Role> role;
705705
public std::string accessibilityHint;
706706
public std::string accessibilityLabel;
707707
public std::string accessibilityLanguage;

‎scripts/cxx-api/api-snapshots/ReactAndroidReleaseCxx.api‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -700,8 +700,8 @@ class facebook::react::AccessibilityProps {
700700
public facebook::react::AccessibilityTraits accessibilityTraits;
701701
public facebook::react::AccessibilityValue accessibilityValue;
702702
public facebook::react::ImportantForAccessibility importantForAccessibility;
703+
public facebook::react::Role role;
703704
public std::optional<facebook::react::AccessibilityState> accessibilityState;
704-
public std::optional<facebook::react::Role> role;
705705
public std::string accessibilityHint;
706706
public std::string accessibilityLabel;
707707
public std::string accessibilityLanguage;

‎scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3432,8 +3432,8 @@ class facebook::react::AccessibilityProps {
34323432
public facebook::react::AccessibilityTraits accessibilityTraits;
34333433
public facebook::react::AccessibilityValue accessibilityValue;
34343434
public facebook::react::ImportantForAccessibility importantForAccessibility;
3435+
public facebook::react::Role role;
34353436
public std::optional<facebook::react::AccessibilityState> accessibilityState;
3436-
public std::optional<facebook::react::Role> role;
34373437
public std::string accessibilityHint;
34383438
public std::string accessibilityLabel;
34393439
public std::string accessibilityLanguage;

0 commit comments

Comments
 (0)