Skip to content

Remove AccessibilityStates #4625

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
2 commits merged into from
Apr 17, 2020
Merged

Remove AccessibilityStates #4625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c3839d3
remove AccessibilityStates
kmelmon Apr 17, 2020
307598f
Change files
kmelmon Apr 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions change/react-native-windows-2020-04-16-17-40-26-removeAccessibilityStates.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"type": "prerelease",
"comment": "remove AccessibilityStates",
"packageName": "react-native-windows",
"email": "kmelmon@microsoft.com",
"dependentChangeType": "patch",
"date": "2020-04-17T00:40:26.842Z"
}
46 changes: 3 additions & 43 deletions vnext/ReactUWP/Views/FrameworkElementViewManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,10 +152,9 @@ static folly::dynamic GetAccessibilityStateProps() {
folly::dynamic FrameworkElementViewManager::GetNativeProps() const {
folly::dynamic props = Super::GetNativeProps();
props.update(folly::dynamic::object("accessible", "boolean")("accessibilityRole", "string")(
"accessibilityStates", "array")("accessibilityState", GetAccessibilityStateProps())(
"accessibilityHint", "string")("accessibilityLabel", "string")("accessibilityPosInSet", "number")(
"accessibilitySetSize", "number")("testID", "string")("tooltip", "string")("accessibilityActions", "array")(
"accessibilityLiveRegion", "string"));
"accessibilityState", GetAccessibilityStateProps())("accessibilityHint", "string")(
"accessibilityLabel", "string")("accessibilityPosInSet", "number")("accessibilitySetSize", "number")(
"testID", "string")("tooltip", "string")("accessibilityActions", "array")("accessibilityLiveRegion", "string"));
return props;
}

Expand Down Expand Up @@ -394,45 +393,6 @@ bool FrameworkElementViewManager::UpdateProperty(
} else if (propertyValue.isNull()) {
element.ClearValue(DynamicAutomationProperties::AccessibilityRoleProperty());
}
} else if (propertyName == "accessibilityStates") {
bool states[static_cast<int32_t>(winrt::react::uwp::AccessibilityStates::CountStates)] = {};

if (propertyValue.isArray()) {
for (const auto &state : propertyValue) {
if (!state.isString())
continue;

if (state.getString() == "selected")
states[static_cast<int32_t>(winrt::react::uwp::AccessibilityStates::Selected)] = true;
else if (state.getString() == "disabled")
states[static_cast<int32_t>(winrt::react::uwp::AccessibilityStates::Disabled)] = true;
else if (state.getString() == "checked")
states[static_cast<int32_t>(winrt::react::uwp::AccessibilityStates::Checked)] = true;
else if (state.getString() == "unchecked")
states[static_cast<int32_t>(winrt::react::uwp::AccessibilityStates::Unchecked)] = true;
else if (state.getString() == "busy")
states[static_cast<int32_t>(winrt::react::uwp::AccessibilityStates::Busy)] = true;
else if (state.getString() == "expanded")
states[static_cast<int32_t>(winrt::react::uwp::AccessibilityStates::Expanded)] = true;
else if (state.getString() == "collapsed")
states[static_cast<int32_t>(winrt::react::uwp::AccessibilityStates::Collapsed)] = true;
}
}

DynamicAutomationProperties::SetAccessibilityStateSelected(
element, states[static_cast<int32_t>(winrt::react::uwp::AccessibilityStates::Selected)]);
DynamicAutomationProperties::SetAccessibilityStateDisabled(
element, states[static_cast<int32_t>(winrt::react::uwp::AccessibilityStates::Disabled)]);
DynamicAutomationProperties::SetAccessibilityStateChecked(
element, states[static_cast<int32_t>(winrt::react::uwp::AccessibilityStates::Checked)]);
DynamicAutomationProperties::SetAccessibilityStateUnchecked(
element, states[static_cast<int32_t>(winrt::react::uwp::AccessibilityStates::Unchecked)]);
DynamicAutomationProperties::SetAccessibilityStateBusy(
element, states[static_cast<int32_t>(winrt::react::uwp::AccessibilityStates::Busy)]);
DynamicAutomationProperties::SetAccessibilityStateExpanded(
element, states[static_cast<int32_t>(winrt::react::uwp::AccessibilityStates::Expanded)]);
DynamicAutomationProperties::SetAccessibilityStateCollapsed(
element, states[static_cast<int32_t>(winrt::react::uwp::AccessibilityStates::Collapsed)]);
} else if (propertyName == "accessibilityState") {
bool states[static_cast<int32_t>(winrt::react::uwp::AccessibilityStates::CountStates)] = {};

Expand Down