Merge 4a0cff6 into 6668e22

LeonarddeR · web-flow · commit 6132c6c28723 · 2020-11-09T12:40:59.000+01:00
diff --git a/source/IAccessibleHandler/__init__.py b/source/IAccessibleHandler/__init__.py
@@ -990,6 +990,13 @@ def processMenuStartWinEvent(eventID, window, objectID, childID, validFocus):
 	if obj.IAccessibleRole != oleacc.ROLE_SYSTEM_MENUPOPUP:
 		# menuStart on anything other than a menu is silly.
 		return
+	elif not obj.shouldAllowIAccessibleMenuStartEvent:
+		if isMSAADebugLoggingEnabled():
+			log.debug(
+				f"Ignoring menuStart winEvent: {getWinEventLogInfo(window, objectID, childID)}, "
+				f"shouldAllowIAccessibleMenuStartEvent {obj.shouldAllowIAccessibleMenuStartEvent}"
+			)
+		return
 	processFocusNVDAEvent(obj, force=True)
 
 
diff --git a/source/NVDAObjects/IAccessible/__init__.py b/source/NVDAObjects/IAccessible/__init__.py
@@ -694,6 +694,13 @@ def _get_shouldAllowIAccessibleFocusEvent(self):
 			return False
 		return True
 
+	def _get_shouldAllowIAccessibleMenuStartEvent(self) -> bool:
+		"""Determine whether an IAccessible menu start or menu popup start event should be allowed
+		for this object.
+		@return: C{True} if the event should be allowed.
+		"""
+		return True
+
 	def _get_TextInfo(self):
 		if hasattr(self,'IAccessibleTextObject'):
 			return IA2TextTextInfo
diff --git a/source/appModules/teams.py b/source/appModules/teams.py
@@ -0,0 +1,27 @@
+# A part of NonVisual Desktop Access (NVDA)
+# Copyright (C) 2020 NV Access Limited, Leonard de Ruijter
+# This file is covered by the GNU General Public License.
+# See the file COPYING for more details.
+
+""" App module for Microsoft Teams.
+"""
+
+import appModuleHandler
+from NVDAObjects.IAccessible.ia2Web import Ia2Web
+
+
+class PopOverMenu(Ia2Web):
+	shouldAllowIAccessibleMenuStartEvent = False
+
+
+class AppModule(appModuleHandler.AppModule):
+
+	def chooseNVDAObjectOverlayClasses(self, obj, clsList):
+		if (
+			Ia2Web in clsList
+			and obj.IA2Attributes.get("xml-roles") == "menu"
+			and obj.parent
+			and obj.parent.parent
+			and "message-actions-popover-container" in obj.parent.parent.IA2Attributes.get("class", "")
+		):
+			clsList.insert(0, PopOverMenu)
