Incubates #7433

nvdaHelper/vbufBackends/mshtml/mshtml.cpp

@@ -1022,7 +1022,7 @@ if(!(formatState&FORMATSTATE_INSERTED)&&nodeName.compare(L"INS")==0) {
 	// Whether the name is the content of this node.
 	bool nameIsContent = (IARole == ROLE_SYSTEM_LINK || IARole == ROLE_SYSTEM_PUSHBUTTON || IARole == ROLE_SYSTEM_MENUITEM || IARole == ROLE_SYSTEM_GRAPHIC || IARole == ROLE_SYSTEM_PAGETAB
 		|| ariaRole == L"heading" || (nodeName[0] == L'H' && iswdigit(nodeName[1]))
-		|| nodeName == L"OBJECT" || nodeName == L"APPLET" || IARole == ROLE_SYSTEM_APPLICATION || IARole == ROLE_SYSTEM_DIALOG);
+		|| nodeName == L"OBJECT" || nodeName == L"APPLET" || (!isRoot && (IARole == ROLE_SYSTEM_APPLICATION || IARole == ROLE_SYSTEM_DIALOG)));
 	// True if the name definitely came from the author.
 	bool nameFromAuthor=false;
 

source/NVDAObjects/IAccessible/ia2Web.py

@@ -13,7 +13,7 @@
 import IAccessibleHandler
 import controlTypes
 from logHandler import log
-from NVDAObjects.behaviors import Dialog
+from NVDAObjects.behaviors import Dialog, WebDialog 
 from . import IAccessible
 from .ia2TextMozilla import MozillaCompoundTextInfo
 
@@ -102,10 +102,11 @@ def findExtraOverlayClasses(obj, clsList, baseClass=Ia2Web, documentClass=None):
 	elif iaRole == oleacc.ROLE_SYSTEM_EQUATION:
 		clsList.append(Math)
 
-	isApp = iaRole in (oleacc.ROLE_SYSTEM_APPLICATION, oleacc.ROLE_SYSTEM_DIALOG)
-	if isApp:
+	if iaRole==oleacc.ROLE_SYSTEM_APPLICATION:
 		clsList.append(Application)
-	if isApp or iaRole == oleacc.ROLE_SYSTEM_DOCUMENT:
+	elif iaRole==oleacc.ROLE_SYSTEM_DIALOG:
+		clsList.append(WebDialog)
+	if iaRole in (oleacc.ROLE_SYSTEM_APPLICATION,oleacc.ROLE_SYSTEM_DIALOG,oleacc.ROLE_SYSTEM_DOCUMENT):
 		clsList.append(documentClass)
 
 	if obj.IA2States & IAccessibleHandler.IA2_STATE_EDITABLE:

source/NVDAObjects/behaviors.py

@@ -660,3 +660,14 @@ def event_suggestionsClosed(self):
 		"""
 		if config.conf["presentation"]["reportAutoSuggestionsWithSound"]:
 			nvwave.playWaveFile(r"waves\suggestionsClosed.wav")
+
+class WebDialog(NVDAObject):
+	"""
+	A dialog that will use a treeInterceptor if its parent currently does.
+	This  can be used to ensure that dialogs on the web get browseMode by default, unless inside an ARIA application
+	"""
+
+	def _get_shouldCreateTreeInterceptor(self):
+		if self.parent.treeInterceptor:
+			return True
+		return False

source/virtualBuffers/MSHTML.py

@@ -164,8 +164,8 @@ class MSHTML(VirtualBuffer):
 	def __init__(self,rootNVDAObject):
 		super(MSHTML,self).__init__(rootNVDAObject,backendName="mshtml")
 		# As virtualBuffers must be created at all times for MSHTML to support live regions,
-		# Force focus mode for anything other than a document (e.g. dialog, application)
-		if rootNVDAObject.role!=controlTypes.ROLE_DOCUMENT:
+		# Force focus mode for applications, and dialogs with no parent treeInterceptor (E.g. a dialog embedded in an application)  
+		if rootNVDAObject.role==controlTypes.ROLE_APPLICATION or (rootNVDAObject.role==controlTypes.ROLE_DIALOG and (not rootNVDAObject.parent or not rootNVDAObject.parent.treeInterceptor or rootNVDAObject.parent.treeInterceptor.passThrough)):
 			self.disableAutoPassThrough=True
 			self.passThrough=True