Merge 2752fa9 into 383b204

SaschaCowley · web-flow · commit c8c78749813c · 2024-05-15T01:25:10.000Z
diff --git a/source/eventHandler.py b/source/eventHandler.py
@@ -49,9 +49,6 @@ def queueEvent(eventName,obj,**kwargs):
 	@param eventName: the name of the event type (e.g. 'gainFocus', 'nameChange')
 	@type eventName: string
 	"""
-	# Allow NVDAObjects to redirect focus events to another object of their choosing.
-	if eventName == "gainFocus" and obj.focusRedirect:
-		obj = obj.focusRedirect
 	_trackFocusObject(eventName, obj)
 	with _pendingEventCountsLock:
 		_pendingEventCountsByName[eventName]=_pendingEventCountsByName.get(eventName,0)+1
@@ -242,7 +239,7 @@ def isForegroundObject(self):
 	def isMenuItemOfCurrentFocus(self) -> bool:
 		"""
 		Checks if the current object is a menu item of the current focus.
-		The only known case where this returns True is the following (see #12624):
+		The only known case where this returns True is the following (see #12624, #14550):
 		
 		When opening a submenu in certain applications (like Thunderbird 78.12),
 		NVDA can process a menu start event after the first item in the menu is focused.
@@ -253,24 +250,39 @@ def isMenuItemOfCurrentFocus(self) -> bool:
 		The focus event order after activating the menu item's sub menu is (submenu item, submenu).
 		"""
 		from NVDAObjects import IAccessible
+		from comInterfaces import IAccessible2Lib as IA2
+
 		lastFocus = api.getFocusObject()
-		_isMenuItemOfCurrentFocus = (
-			self._obj.parent
-			and isinstance(self._obj, IAccessible.IAccessible)
-			and isinstance(lastFocus, IAccessible.IAccessible)
-			and self._obj.IAccessibleRole == oleacc.ROLE_SYSTEM_MENUITEM
-			and lastFocus.IAccessibleRole == oleacc.ROLE_SYSTEM_MENUPOPUP
-			and self._obj.parent == lastFocus
-		)
-		if _isMenuItemOfCurrentFocus:
-			# Change this to log.error for easy debugging
-			log.debugWarning(
-				"This parent menu was not announced properly, "
-				"and should have been focused before the submenu item.\n"
-				f"Object info: {self._obj.devInfo}\n"
-				f"Object parent info: {self._obj.parent.devInfo}\n"
-			)
-		return _isMenuItemOfCurrentFocus
+		
+		# This case can only occur when:
+		# 1. the old and new focus targets are instances of IAccessible; and
+		# 2. the old focus is a menuitem, menuitemradio or menuitemcheckbox; and
+		# 3. the new focus is a menu; and
+		# 4. the old focus has a parent.
+		if not (
+				isinstance(self._obj, IAccessible.IAccessible)
+				and isinstance(lastFocus, IAccessible.IAccessible)
+				and self._obj.IAccessibleRole in (
+					oleacc.ROLE_SYSTEM_MENUITEM, IA2.IA2_ROLE_CHECK_MENU_ITEM, IA2.IA2_ROLE_RADIO_MENU_ITEM)
+				and lastFocus.IAccessibleRole == oleacc.ROLE_SYSTEM_MENUPOPUP
+				and self._obj.parent):
+			return False
+
+		# Check that the old focus is a descendant of the new focus.
+		ancestor = self._obj.parent
+		while ancestor is not None:
+			if ancestor == lastFocus:
+				log.debugWarning(
+					"This ancestor menu was not announced properly, and should have been focused before the submenu item.\n"
+					"Object info: %s\n"
+					f"Ancestor info: %s\n",
+					self._obj.devInfo, ancestor.devInfo
+				)
+				return True
+			
+			ancestor = ancestor.parent
+		
+		return False
 
 
 def _getFocusLossCancellableSpeechCommand(
@@ -306,6 +318,9 @@ def executeEvent(
 	try:
 		global _virtualDesktopName
 		isGainFocus = eventName == "gainFocus"
+		# Allow NVDAObjects to redirect focus events to another object of their choosing.
+		if isGainFocus and obj.focusRedirect:
+			obj = obj.focusRedirect
 		sleepMode = obj.sleepMode
 		# Handle possible virtual desktop name change event.
 		# More effective in Windows 10 Version 1903 and later.
diff --git a/user_docs/en/changes.md b/user_docs/en/changes.md
@@ -26,6 +26,7 @@
 * Windows 11 fixes:
   * In emoji panel, NVDA will no longer appear to get stuck when closing clipboard history. (#16347, @josephsl)
   * NVDA will once again announce visible candidates when opening Windows 11 IME interface. (#14023, @josephsl)
+* NVDA will correctly announce radio and checkbox menuitems when first entering submenues in Google Chrome and Mozilla Firefox. (14550)
 
 ### Changes for Developers
 
