mirror of
https://github.com/facebook/react-native.git
synced 2026-11-18 20:19:07 +00:00
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
This commit is contained in:
1 parent
1829aec2bf
commit
6b27a28c5d
17 files changed
+76
-112
No files matched your search
+4
-5
@@ -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<Role> 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<std::string_view> 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
|
||||
|
||||
+8
-7
@@ -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 role,
|
||||
const std::string& accessibilityRole,
|
||||
const std::optional<AccessibilityState>& 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);
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -56,7 +56,7 @@ class AccessibilityProps {
|
||||
bool onAccessibilityEscape{};
|
||||
bool onAccessibilityAction{};
|
||||
ImportantForAccessibility importantForAccessibility{ImportantForAccessibility::Auto};
|
||||
std::optional<Role> role{};
|
||||
Role role{Role::None};
|
||||
std::string testId;
|
||||
|
||||
#pragma mark - DebugStringConvertible
|
||||
|
||||
+51
-38
@@ -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<AccessibilityState>& newState,
|
||||
const std::optional<AccessibilityState>& 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) {
|
||||
|
||||
-49
@@ -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
|
||||
@@ -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<facebook::react::AccessibilityState> accessibilityState;
|
||||
public std::optional<facebook::react::Role> role;
|
||||
public std::string accessibilityHint;
|
||||
public std::string accessibilityLabel;
|
||||
public std::string accessibilityLanguage;
|
||||
|
||||
@@ -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<facebook::react::AccessibilityState> accessibilityState;
|
||||
public std::optional<facebook::react::Role> role;
|
||||
public std::string accessibilityHint;
|
||||
public std::string accessibilityLabel;
|
||||
public std::string accessibilityLanguage;
|
||||
|
||||
@@ -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<facebook::react::AccessibilityState> accessibilityState;
|
||||
public std::optional<facebook::react::Role> role;
|
||||
public std::string accessibilityHint;
|
||||
public std::string accessibilityLabel;
|
||||
public std::string accessibilityLanguage;
|
||||
|
||||
@@ -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<facebook::react::AccessibilityState> accessibilityState;
|
||||
public std::optional<facebook::react::Role> role;
|
||||
public std::string accessibilityHint;
|
||||
public std::string accessibilityLabel;
|
||||
public std::string accessibilityLanguage;
|
||||
|
||||
@@ -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<facebook::react::AccessibilityState> accessibilityState;
|
||||
public std::optional<facebook::react::Role> role;
|
||||
public std::string accessibilityHint;
|
||||
public std::string accessibilityLabel;
|
||||
public std::string accessibilityLanguage;
|
||||
|
||||
@@ -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<facebook::react::AccessibilityState> accessibilityState;
|
||||
public std::optional<facebook::react::Role> role;
|
||||
public std::string accessibilityHint;
|
||||
public std::string accessibilityLabel;
|
||||
public std::string accessibilityLanguage;
|
||||
|
||||
@@ -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<facebook::react::AccessibilityState> accessibilityState;
|
||||
public std::optional<facebook::react::Role> role;
|
||||
public std::string accessibilityHint;
|
||||
public std::string accessibilityLabel;
|
||||
public std::string accessibilityLanguage;
|
||||
|
||||
@@ -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<facebook::react::AccessibilityState> accessibilityState;
|
||||
public std::optional<facebook::react::Role> role;
|
||||
public std::string accessibilityHint;
|
||||
public std::string accessibilityLabel;
|
||||
public std::string accessibilityLanguage;
|
||||
|
||||
@@ -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<facebook::react::AccessibilityState> accessibilityState;
|
||||
public std::optional<facebook::react::Role> role;
|
||||
public std::string accessibilityHint;
|
||||
public std::string accessibilityLabel;
|
||||
public std::string accessibilityLanguage;
|
||||
|
||||
@@ -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<facebook::react::AccessibilityState> accessibilityState;
|
||||
public std::optional<facebook::react::Role> role;
|
||||
public std::string accessibilityHint;
|
||||
public std::string accessibilityLabel;
|
||||
public std::string accessibilityLanguage;
|
||||
|
||||
@@ -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<facebook::react::AccessibilityState> accessibilityState;
|
||||
public std::optional<facebook::react::Role> role;
|
||||
public std::string accessibilityHint;
|
||||
public std::string accessibilityLabel;
|
||||
public std::string accessibilityLanguage;
|
||||
|
||||
@@ -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<facebook::react::AccessibilityState> accessibilityState;
|
||||
public std::optional<facebook::react::Role> role;
|
||||
public std::string accessibilityHint;
|
||||
public std::string accessibilityLabel;
|
||||
public std::string accessibilityLanguage;
|
||||
|
||||
Reference in new issue
Block a user