Skip to content

Commit 270ecb6

Browse files
authored
Revert "[Fabric] Add accessibilityHint support to UIA tree (#12036)"
This reverts commit 149778f.
1 parent 5fd67d7 commit 270ecb6

File tree

5 files changed

+41
-238
lines changed

5 files changed

+41
-238
lines changed

change/react-native-windows-8bfbad90-8a7d-4225-a86d-620d45e1c6a7.json

Lines changed: 0 additions & 7 deletions
This file was deleted.

packages/playground/windows/playground-composition/packages.lock.json

Lines changed: 0 additions & 181 deletions
This file was deleted.

vnext/Microsoft.ReactNative/Fabric/Composition/CompositionDynamicAutomationProvider.cpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -282,13 +282,6 @@ HRESULT __stdcall CompositionDynamicAutomationProvider::GetPropertyValue(PROPERT
282282
pRetVal->boolVal = (props->accessible && props->accessibilityRole != "none") ? VARIANT_TRUE : VARIANT_FALSE;
283283
break;
284284
}
285-
case UIA_HelpTextPropertyId: {
286-
pRetVal->vt = VT_BSTR;
287-
auto helpText = ::Microsoft::Common::Unicode::Utf8ToUtf16(props->accessibilityHint);
288-
pRetVal->bstrVal = SysAllocString(helpText.c_str());
289-
hr = pRetVal->bstrVal != nullptr ? S_OK : E_OUTOFMEMORY;
290-
break;
291-
}
292285
}
293286

294287
return hr;

vnext/Microsoft.ReactNative/Fabric/Composition/CompositionViewComponentView.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1097,9 +1097,6 @@ void CompositionBaseComponentView::updateAccessibilityProps(
10971097

10981098
winrt::Microsoft::ReactNative::implementation::UpdateUiaProperty(
10991099
provider, UIA_ControlTypePropertyId, oldViewProps.accessibilityRole, newViewProps.accessibilityRole);
1100-
1101-
winrt::Microsoft::ReactNative::implementation::UpdateUiaProperty(
1102-
provider, UIA_HelpTextPropertyId, oldViewProps.accessibilityHint, newViewProps.accessibilityHint);
11031100
}
11041101

11051102
void CompositionBaseComponentView::updateBorderLayoutMetrics(

vnext/Microsoft.ReactNative/packages.lock.json

Lines changed: 41 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,12 @@
2626
},
2727
"Microsoft.UI.Xaml": {
2828
"type": "Direct",
29-
"requested": "[2.7.0-prerelease.210913003, )",
30-
"resolved": "2.7.0-prerelease.210913003",
31-
"contentHash": "eLUEu31PenwzXowSTm/HPRaaEClPd0FKPLirfHLM84wH3nPDHX18l/ngHm1Ny2rnwVyc1cYngPjYEv6DOQmw1A=="
29+
"requested": "[2.8.0, )",
30+
"resolved": "2.8.0",
31+
"contentHash": "vxdHxTr63s5KVtNddMFpgvjBjUH50z7seq/5jLWmmSuf8poxg+sXrywkofUdE8ZstbpO9y3FL/IXXUcPYbeesA==",
32+
"dependencies": {
33+
"Microsoft.Web.WebView2": "1.0.1264.42"
34+
}
3235
},
3336
"Microsoft.Windows.CppWinRT": {
3437
"type": "Direct",
@@ -46,6 +49,11 @@
4649
"resolved": "1.1.1",
4750
"contentHash": "WMcGpWKrmJmzrNeuaEb23bEMnbtR/vLmvZtkAP5qWu7vQsY59GqfRJd65sFpBszbd2k/bQ8cs8eWawQKAabkVg=="
4851
},
52+
"Microsoft.Web.WebView2": {
53+
"type": "Transitive",
54+
"resolved": "1.0.1264.42",
55+
"contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA=="
56+
},
4957
"common": {
5058
"type": "Project"
5159
},
@@ -55,8 +63,8 @@
5563
"folly": {
5664
"type": "Project",
5765
"dependencies": {
58-
"Fmt": "[1.0.0, )",
59-
"boost": "[1.76.0, )"
66+
"boost": "[1.76.0, )",
67+
"fmt": "[1.0.0, )"
6068
}
6169
},
6270
"reactcommon": {
@@ -68,59 +76,52 @@
6876
}
6977
},
7078
"native,Version=v0.0/win10-arm": {
71-
"Microsoft.UI.Xaml": {
72-
"type": "Direct",
73-
"requested": "[2.7.0-prerelease.210913003, )",
74-
"resolved": "2.7.0-prerelease.210913003",
75-
"contentHash": "eLUEu31PenwzXowSTm/HPRaaEClPd0FKPLirfHLM84wH3nPDHX18l/ngHm1Ny2rnwVyc1cYngPjYEv6DOQmw1A=="
79+
"Microsoft.Web.WebView2": {
80+
"type": "Transitive",
81+
"resolved": "1.0.1264.42",
82+
"contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA=="
7683
}
7784
},
7885
"native,Version=v0.0/win10-arm-aot": {
79-
"Microsoft.UI.Xaml": {
80-
"type": "Direct",
81-
"requested": "[2.7.0-prerelease.210913003, )",
82-
"resolved": "2.7.0-prerelease.210913003",
83-
"contentHash": "eLUEu31PenwzXowSTm/HPRaaEClPd0FKPLirfHLM84wH3nPDHX18l/ngHm1Ny2rnwVyc1cYngPjYEv6DOQmw1A=="
86+
"Microsoft.Web.WebView2": {
87+
"type": "Transitive",
88+
"resolved": "1.0.1264.42",
89+
"contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA=="
8490
}
8591
},
8692
"native,Version=v0.0/win10-arm64-aot": {
87-
"Microsoft.UI.Xaml": {
88-
"type": "Direct",
89-
"requested": "[2.7.0-prerelease.210913003, )",
90-
"resolved": "2.7.0-prerelease.210913003",
91-
"contentHash": "eLUEu31PenwzXowSTm/HPRaaEClPd0FKPLirfHLM84wH3nPDHX18l/ngHm1Ny2rnwVyc1cYngPjYEv6DOQmw1A=="
93+
"Microsoft.Web.WebView2": {
94+
"type": "Transitive",
95+
"resolved": "1.0.1264.42",
96+
"contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA=="
9297
}
9398
},
9499
"native,Version=v0.0/win10-x64": {
95-
"Microsoft.UI.Xaml": {
96-
"type": "Direct",
97-
"requested": "[2.7.0-prerelease.210913003, )",
98-
"resolved": "2.7.0-prerelease.210913003",
99-
"contentHash": "eLUEu31PenwzXowSTm/HPRaaEClPd0FKPLirfHLM84wH3nPDHX18l/ngHm1Ny2rnwVyc1cYngPjYEv6DOQmw1A=="
100+
"Microsoft.Web.WebView2": {
101+
"type": "Transitive",
102+
"resolved": "1.0.1264.42",
103+
"contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA=="
100104
}
101105
},
102106
"native,Version=v0.0/win10-x64-aot": {
103-
"Microsoft.UI.Xaml": {
104-
"type": "Direct",
105-
"requested": "[2.7.0-prerelease.210913003, )",
106-
"resolved": "2.7.0-prerelease.210913003",
107-
"contentHash": "eLUEu31PenwzXowSTm/HPRaaEClPd0FKPLirfHLM84wH3nPDHX18l/ngHm1Ny2rnwVyc1cYngPjYEv6DOQmw1A=="
107+
"Microsoft.Web.WebView2": {
108+
"type": "Transitive",
109+
"resolved": "1.0.1264.42",
110+
"contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA=="
108111
}
109112
},
110113
"native,Version=v0.0/win10-x86": {
111-
"Microsoft.UI.Xaml": {
112-
"type": "Direct",
113-
"requested": "[2.7.0-prerelease.210913003, )",
114-
"resolved": "2.7.0-prerelease.210913003",
115-
"contentHash": "eLUEu31PenwzXowSTm/HPRaaEClPd0FKPLirfHLM84wH3nPDHX18l/ngHm1Ny2rnwVyc1cYngPjYEv6DOQmw1A=="
114+
"Microsoft.Web.WebView2": {
115+
"type": "Transitive",
116+
"resolved": "1.0.1264.42",
117+
"contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA=="
116118
}
117119
},
118120
"native,Version=v0.0/win10-x86-aot": {
119-
"Microsoft.UI.Xaml": {
120-
"type": "Direct",
121-
"requested": "[2.7.0-prerelease.210913003, )",
122-
"resolved": "2.7.0-prerelease.210913003",
123-
"contentHash": "eLUEu31PenwzXowSTm/HPRaaEClPd0FKPLirfHLM84wH3nPDHX18l/ngHm1Ny2rnwVyc1cYngPjYEv6DOQmw1A=="
121+
"Microsoft.Web.WebView2": {
122+
"type": "Transitive",
123+
"resolved": "1.0.1264.42",
124+
"contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA=="
124125
}
125126
}
126127
}

0 commit comments

Comments
 (0)