diff --git a/change/react-native-windows-2020-04-16-17-40-26-removeAccessibilityStates.json b/change/react-native-windows-2020-04-16-17-40-26-removeAccessibilityStates.json new file mode 100644 index 00000000000..5339bf2015e --- /dev/null +++ b/change/react-native-windows-2020-04-16-17-40-26-removeAccessibilityStates.json @@ -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" +} \ No newline at end of file diff --git a/vnext/ReactUWP/Views/FrameworkElementViewManager.cpp b/vnext/ReactUWP/Views/FrameworkElementViewManager.cpp index 4beb3492efc..47a929e3a41 100644 --- a/vnext/ReactUWP/Views/FrameworkElementViewManager.cpp +++ b/vnext/ReactUWP/Views/FrameworkElementViewManager.cpp @@ -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; } @@ -394,45 +393,6 @@ bool FrameworkElementViewManager::UpdateProperty( } else if (propertyValue.isNull()) { element.ClearValue(DynamicAutomationProperties::AccessibilityRoleProperty()); } - } else if (propertyName == "accessibilityStates") { - bool states[static_cast(winrt::react::uwp::AccessibilityStates::CountStates)] = {}; - - if (propertyValue.isArray()) { - for (const auto &state : propertyValue) { - if (!state.isString()) - continue; - - if (state.getString() == "selected") - states[static_cast(winrt::react::uwp::AccessibilityStates::Selected)] = true; - else if (state.getString() == "disabled") - states[static_cast(winrt::react::uwp::AccessibilityStates::Disabled)] = true; - else if (state.getString() == "checked") - states[static_cast(winrt::react::uwp::AccessibilityStates::Checked)] = true; - else if (state.getString() == "unchecked") - states[static_cast(winrt::react::uwp::AccessibilityStates::Unchecked)] = true; - else if (state.getString() == "busy") - states[static_cast(winrt::react::uwp::AccessibilityStates::Busy)] = true; - else if (state.getString() == "expanded") - states[static_cast(winrt::react::uwp::AccessibilityStates::Expanded)] = true; - else if (state.getString() == "collapsed") - states[static_cast(winrt::react::uwp::AccessibilityStates::Collapsed)] = true; - } - } - - DynamicAutomationProperties::SetAccessibilityStateSelected( - element, states[static_cast(winrt::react::uwp::AccessibilityStates::Selected)]); - DynamicAutomationProperties::SetAccessibilityStateDisabled( - element, states[static_cast(winrt::react::uwp::AccessibilityStates::Disabled)]); - DynamicAutomationProperties::SetAccessibilityStateChecked( - element, states[static_cast(winrt::react::uwp::AccessibilityStates::Checked)]); - DynamicAutomationProperties::SetAccessibilityStateUnchecked( - element, states[static_cast(winrt::react::uwp::AccessibilityStates::Unchecked)]); - DynamicAutomationProperties::SetAccessibilityStateBusy( - element, states[static_cast(winrt::react::uwp::AccessibilityStates::Busy)]); - DynamicAutomationProperties::SetAccessibilityStateExpanded( - element, states[static_cast(winrt::react::uwp::AccessibilityStates::Expanded)]); - DynamicAutomationProperties::SetAccessibilityStateCollapsed( - element, states[static_cast(winrt::react::uwp::AccessibilityStates::Collapsed)]); } else if (propertyName == "accessibilityState") { bool states[static_cast(winrt::react::uwp::AccessibilityStates::CountStates)] = {};