Add Support for AccessibilityState:Busy (#13952)

chiaramooney · web-flow · commit 37e15f19e906 · 2024-10-14T13:57:07.000-07:00
* Support AccessibilityState: Busy

* Change files

* Add Testing

* Update Snapshots

* Update for Leak
diff --git a/change/react-native-windows-0d909f6f-4b48-46c7-97ec-c61c5f2b8087.json b/change/react-native-windows-0d909f6f-4b48-46c7-97ec-c61c5f2b8087.json
@@ -0,0 +1,7 @@
+{
+  "type": "prerelease",
+  "comment": "Support AccessibilityState: Busy",
+  "packageName": "react-native-windows",
+  "email": "34109996+chiaramooney@users.noreply.github.com",
+  "dependentChangeType": "patch"
+}
diff --git a/packages/@react-native-windows/tester/src/js/examples/View/ViewExample.windows.js b/packages/@react-native-windows/tester/src/js/examples/View/ViewExample.windows.js
@@ -565,7 +565,7 @@ class AccessibilityExample extends React.Component<
           {name: 'expand', label: 'expand'},
           {name: 'collapse', label: 'collapse'},
         ]}
-        accessibilityState={{expanded: this.state.expanded}}
+        accessibilityState={{expanded: this.state.expanded, busy: true}}
         accessibilityPosInSet={1}
         accessibilitySetSize={1}
         accessibilityLiveRegion='polite'
diff --git a/packages/e2e-test-app-fabric/test/__snapshots__/ViewComponentTest.test.ts.snap b/packages/e2e-test-app-fabric/test/__snapshots__/ViewComponentTest.test.ts.snap
@@ -1097,6 +1097,7 @@ exports[`View Tests Views can have customized accessibility 1`] = `
     "ExpandCollapsePattern.ExpandCollapseState": "Expanded",
     "HelpText": "Accessibility Hint",
     "IsKeyboardFocusable": true,
+    "ItemStatus": "Busy",
     "LiveSetting": "Polite",
     "LocalizedControlType": "button",
     "Name": "A View with accessibility values",
diff --git a/packages/e2e-test-app-fabric/test/__snapshots__/snapshotPages.test.js.snap b/packages/e2e-test-app-fabric/test/__snapshots__/snapshotPages.test.js.snap
@@ -77780,6 +77780,7 @@ exports[`snapshotAllPages View 22`] = `
   accessibilitySetSize={1}
   accessibilityState={
     {
+      "busy": true,
       "expanded": true,
     }
   }
diff --git a/packages/e2e-test-app-fabric/windows/RNTesterApp-Fabric/RNTesterApp-Fabric.cpp b/packages/e2e-test-app-fabric/windows/RNTesterApp-Fabric/RNTesterApp-Fabric.cpp
@@ -411,6 +411,7 @@ winrt::Windows::Data::Json::JsonObject DumpUIATreeRecurse(
   int positionInSet = 0;
   int sizeOfSet = 0;
   LiveSetting liveSetting = LiveSetting::Off;
+  BSTR itemStatus;
 
   pTarget->get_CurrentAutomationId(&automationId);
   pTarget->get_CurrentControlType(&controlType);
@@ -419,6 +420,7 @@ winrt::Windows::Data::Json::JsonObject DumpUIATreeRecurse(
   pTarget->get_CurrentIsKeyboardFocusable(&isKeyboardFocusable);
   pTarget->get_CurrentLocalizedControlType(&localizedControlType);
   pTarget->get_CurrentName(&name);
+  pTarget->get_CurrentItemStatus(&itemStatus);
   IUIAutomationElement4 *pTarget4;
   HRESULT hr = pTarget->QueryInterface(__uuidof(IUIAutomationElement4), reinterpret_cast<void **>(&pTarget4));
   if (SUCCEEDED(hr) && pTarget4) {
@@ -438,6 +440,7 @@ winrt::Windows::Data::Json::JsonObject DumpUIATreeRecurse(
   InsertIntValueIfNotDefault(result, L"PositionInSet", positionInSet);
   InsertIntValueIfNotDefault(result, L"SizeofSet", sizeOfSet);
   InsertLiveSettingValueIfNotDefault(result, L"LiveSetting", liveSetting);
+  InsertStringValueIfNotEmpty(result, L"ItemStatus", itemStatus);
   DumpUIAPatternInfo(pTarget, result);
 
   IUIAutomationElement *pChild;
@@ -453,6 +456,11 @@ winrt::Windows::Data::Json::JsonObject DumpUIATreeRecurse(
   if (children.Size() > 0) {
     result.Insert(L"__Children", children);
   }
+  ::SysFreeString(automationId);
+  ::SysFreeString(helpText);
+  ::SysFreeString(localizedControlType);
+  ::SysFreeString(name);
+  ::SysFreeString(itemStatus);
   return result;
 }
 
diff --git a/packages/e2e-test-app/test/__snapshots__/ViewComponentTest.test.ts.snap b/packages/e2e-test-app/test/__snapshots__/ViewComponentTest.test.ts.snap
@@ -363,6 +363,7 @@ exports[`ViewTests Views can have a custom nativeID 1`] = `
 exports[`ViewTests Views can have accessibility customization 1`] = `
 {
   "AccessibilityRole": "Button",
+  "AccessibilityStateBusy": true,
   "AccessibilityStateExpanded": true,
   "AutomationId": "accessibility",
   "AutomationPositionInSet": 1,
diff --git a/vnext/Microsoft.ReactNative/Fabric/Composition/CompositionDynamicAutomationProvider.cpp b/vnext/Microsoft.ReactNative/Fabric/Composition/CompositionDynamicAutomationProvider.cpp
@@ -370,6 +370,13 @@ HRESULT __stdcall CompositionDynamicAutomationProvider::GetPropertyValue(PROPERT
       pRetVal->lVal = GetLiveSetting(props->accessibilityLiveRegion);
       break;
     }
+    case UIA_ItemStatusPropertyId: {
+      pRetVal->vt = VT_BSTR;
+      pRetVal->bstrVal = (props->accessibilityState.has_value() && props->accessibilityState->busy)
+          ? SysAllocString(L"Busy")
+          : SysAllocString(L"");
+      break;
+    }
   }
 
   return hr;
diff --git a/vnext/Microsoft.ReactNative/Fabric/Composition/CompositionViewComponentView.cpp b/vnext/Microsoft.ReactNative/Fabric/Composition/CompositionViewComponentView.cpp
@@ -1321,6 +1321,12 @@ void ComponentView::updateAccessibilityProps(
       !(oldViewProps.accessibilityState && oldViewProps.accessibilityState->disabled),
       !(newViewProps.accessibilityState && newViewProps.accessibilityState->disabled));
 
+  winrt::Microsoft::ReactNative::implementation::UpdateUiaProperty(
+      m_uiaProvider,
+      UIA_IsEnabledPropertyId,
+      !(oldViewProps.accessibilityState && oldViewProps.accessibilityState->busy),
+      !(newViewProps.accessibilityState && newViewProps.accessibilityState->busy));
+
   winrt::Microsoft::ReactNative::implementation::UpdateUiaProperty(
       m_uiaProvider, UIA_ControlTypePropertyId, oldViewProps.accessibilityRole, newViewProps.accessibilityRole);
 

Original file line number	Diff line number	Diff line change
@@ -77780,6 +77780,7 @@ exports[`snapshotAllPages View 22`] = `
`77780`	`77780`	`accessibilitySetSize={1}`
`77781`	`77781`	`accessibilityState={`
`77782`	`77782`	`{`
	`77783`	`+ "busy": true,`
`77783`	`77784`	`"expanded": true,`
`77784`	`77785`	`}`
`77785`	`77786`	`}`
Original file line number	Diff line number	Diff line change
@@ -363,6 +363,7 @@ exports[`ViewTests Views can have a custom nativeID 1`] = `
`363`	`363`	exports[`ViewTests Views can have accessibility customization 1`] = `
`364`	`364`	`{`
`365`	`365`	`"AccessibilityRole": "Button",`
	`366`	`+ "AccessibilityStateBusy": true,`
`366`	`367`	`"AccessibilityStateExpanded": true,`
`367`	`368`	`"AutomationId": "accessibility",`
`368`	`369`	`"AutomationPositionInSet": 1,`
Original file line number	Diff line number	Diff line change
`@@ -370,6 +370,13 @@ HRESULT __stdcall CompositionDynamicAutomationProvider::GetPropertyValue(PROPERT`
`370`	`370`	`pRetVal->lVal = GetLiveSetting(props->accessibilityLiveRegion);`
`371`	`371`	`break;`
`372`	`372`	`}`
	`373`	`+ case UIA_ItemStatusPropertyId: {`
	`374`	`+ pRetVal->vt = VT_BSTR;`
	`375`	`+ pRetVal->bstrVal = (props->accessibilityState.has_value() && props->accessibilityState->busy)`
	`376`	`+ ? SysAllocString(L"Busy")`
	`377`	`+ : SysAllocString(L"");`
	`378`	`+ break;`
	`379`	`+ }`
`373`	`380`	`}`
`374`	`381`
`375`	`382`	`return hr;`