Merge 26d03c1 into 52bf1ed

josephsl · web-flow · commit f3a275b085db · 2021-03-16T04:21:14.000+10:00
diff --git a/source/appModules/searchui.py b/source/appModules/searchui.py
@@ -1,5 +1,5 @@
 # A part of NonVisual Desktop Access (NVDA)
-# Copyright (C) 2015-2019 NV Access Limited, Joseph Lee
+# Copyright (C) 2015-2020 NV Access Limited, Joseph Lee
 # This file is covered by the GNU General Public License.
 # See the file COPYING for more details.
 
@@ -18,6 +18,15 @@ class StartMenuSearchField(SearchField):
 
 class AppModule(appModuleHandler.AppModule):
 
+	def event_NVDAObject_init(self, obj):
+		if isinstance(obj, UIA):
+			# #10341: Build 18363 introduces modern search experience in File Explorer.
+			# As part of this, suggestion count is part of a live region.
+			# Although it is geared for Narrator, it is applicable to other screen readers as well.
+			# The live region itself is a child of the one shown here.
+			if obj.UIAAutomationId == "suggestionCountForNarrator" and obj.firstChild is not None:
+				obj.name = obj.firstChild.name
+
 	def chooseNVDAObjectOverlayClasses(self,obj,clsList):
 		if isinstance(obj, IAccessible):
 			try:
@@ -27,7 +36,7 @@ def chooseNVDAObjectOverlayClasses(self,obj,clsList):
 			except ValueError:
 				pass
 		elif isinstance(obj, UIA):
-			if obj.UIAElement.cachedAutomationID == "SearchTextBox":
+			if obj.UIAAutomationId == "SearchTextBox":
 				clsList.insert(0, StartMenuSearchField)
 			# #10329: Since 2019, some suggestion items are grouped inside another suggestions list item.
 			# Because of this, result details will not be announced like in the past.
