[Fabric] Add accessible Prop Functionality to Remove/Add Elements fro…

…m Content Tree (#11719) * Add accessible Functionality * Change files * Add accessibilityRole None * Format
microsoft · Jun 8, 2023 · 2a3578d · 2a3578d
1 parent cdd75ae
commit 2a3578d
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 0 deletions.
diff --git a/change/react-native-windows-d6c69c85-73dc-44fd-bcea-e4a8833b29a8.json b/change/react-native-windows-d6c69c85-73dc-44fd-bcea-e4a8833b29a8.json
@@ -0,0 +1,7 @@
+{
+  "type": "prerelease",
+  "comment": "Add accessible Functionality",
+  "packageName": "react-native-windows",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}
diff --git a/vnext/Microsoft.ReactNative/Fabric/Composition/CompositionDynamicAutomationProvider.cpp b/vnext/Microsoft.ReactNative/Fabric/Composition/CompositionDynamicAutomationProvider.cpp
@@ -247,6 +247,16 @@ HRESULT __stdcall CompositionDynamicAutomationProvider::GetPropertyValue(PROPERT
       pRetVal->boolVal = !props->accessibilityState.disabled ? VARIANT_TRUE : VARIANT_FALSE;
       break;
     }
+    case UIA_IsContentElementPropertyId: {
+      pRetVal->vt = VT_BOOL;
+      pRetVal->boolVal = (props->accessible && props->accessibilityRole != "none") ? VARIANT_TRUE : VARIANT_FALSE;
+      break;
+    }
+    case UIA_IsControlElementPropertyId: {
+      pRetVal->vt = VT_BOOL;
+      pRetVal->boolVal = (props->accessible && props->accessibilityRole != "none") ? VARIANT_TRUE : VARIANT_FALSE;
+      break;
+    }
   }
 
   return hr;

diff --git a/vnext/Microsoft.ReactNative/Fabric/Composition/CompositionViewComponentView.cpp b/vnext/Microsoft.ReactNative/Fabric/Composition/CompositionViewComponentView.cpp
@@ -1056,6 +1056,18 @@ void CompositionBaseComponentView::updateAccessibilityProps(
   winrt::Microsoft::ReactNative::implementation::UpdateUiaProperty(
       provider, UIA_NamePropertyId, oldViewProps.accessibilityLabel, newViewProps.accessibilityLabel);
 
+  winrt::Microsoft::ReactNative::implementation::UpdateUiaProperty(
+      provider,
+      UIA_IsContentElementPropertyId,
+      (oldViewProps.accessible && oldViewProps.accessibilityRole != "none"),
+      (newViewProps.accessible && newViewProps.accessibilityRole != "none"));
+
+  winrt::Microsoft::ReactNative::implementation::UpdateUiaProperty(
+      provider,
+      UIA_IsControlElementPropertyId,
+      (oldViewProps.accessible && oldViewProps.accessibilityRole != "none"),
+      (newViewProps.accessible && newViewProps.accessibilityRole != "none"));
+
   winrt::Microsoft::ReactNative::implementation::UpdateUiaProperty(
       provider,
       UIA_IsEnabledPropertyId,