From 58703678588f3f11d323fb119937e5cc4c2ec681 Mon Sep 17 00:00:00 2001 From: Eric Rozell Date: Mon, 4 Mar 2024 21:52:22 -0500 Subject: [PATCH] Fixes a few issues with previous mappings --- .../Views/DynamicAutomationPeer.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/vnext/Microsoft.ReactNative/Views/DynamicAutomationPeer.cpp b/vnext/Microsoft.ReactNative/Views/DynamicAutomationPeer.cpp index 4a1b129f0a8..49047f5e21a 100644 --- a/vnext/Microsoft.ReactNative/Views/DynamicAutomationPeer.cpp +++ b/vnext/Microsoft.ReactNative/Views/DynamicAutomationPeer.cpp @@ -61,7 +61,7 @@ std::optional DynamicAutomationPeer::GetAutomation // "none": Group (based on "presentation") // "rowgroup": Group (based on "group" mapping) // "searchbox": Group (based on "group" mapping) - // "summary": Unknown (based on missing ARIA documentation) + // "summary": N/A (based on missing ARIA documentation) // "switch": CheckBox (based on "checkbox" mapping) // "table": Grid (based on "grid" mapping) // "term": Group (based on "definition" mapping) @@ -171,13 +171,13 @@ std::optional DynamicAutomationPeer::GetAutomation case winrt::Microsoft::ReactNative::AriaRole::Status: return winrt::AutomationControlType::StatusBar; case winrt::Microsoft::ReactNative::AriaRole::Summary: - return winrt::AutomationControlType::Unknown; + return std::nullopt; case winrt::Microsoft::ReactNative::AriaRole::Switch: return winrt::AutomationControlType::CheckBox; case winrt::Microsoft::ReactNative::AriaRole::Tab: return winrt::AutomationControlType::TabItem; case winrt::Microsoft::ReactNative::AriaRole::Table: - return winrt::AutomationControlType::Grid; + return winrt::AutomationControlType::DataGrid; case winrt::Microsoft::ReactNative::AriaRole::TabList: return winrt::AutomationControlType::Tab; case winrt::Microsoft::ReactNative::AriaRole::TabPanel: @@ -196,9 +196,10 @@ std::optional DynamicAutomationPeer::GetAutomation return winrt::AutomationControlType::DataGrid; case winrt::Microsoft::ReactNative::AriaRole::TreeItem: return winrt::AutomationControlType::TreeItem; + default: + assert(false); + return std::nullopt; } - - return std::nullopt; } winrt::AutomationControlType DynamicAutomationPeer::GetAutomationControlTypeFromAccessibilityRole() const {