Merge c319a50 into 96d59ec

SaschaCowley · web-flow · commit ee6178bbfd36 · 2024-03-06T17:16:41.000+11:00
diff --git a/source/NVDAObjects/IAccessible/chromium.py b/source/NVDAObjects/IAccessible/chromium.py
@@ -65,6 +65,12 @@ def _normalizeControlField(self, attrs):
 		if attrs['role'] == controlTypes.Role.TOGGLEBUTTON and controlTypes.State.CHECKABLE in attrs['states']:
 			# In Chromium, the checkable state is exposed erroneously on toggle buttons.
 			attrs['states'].discard(controlTypes.State.CHECKABLE)
+
+		if (
+			attrs['role'] == controlTypes.Role.GROUPING
+			and attrs.get('IAccessible2::attribute_tag', "").lower() == "figure"):
+			# Chromium doesn't expose the `<figure>` element as a figure.
+			attrs['role'] = controlTypes.Role.FIGURE
 		return attrs
 
 
@@ -154,6 +160,12 @@ def _get_states(self):
 		return states
 
 
+class Figure(ia2Web.Ia2Web):
+	def _get_role(self):
+		return controlTypes.Role.FIGURE
+		# return super()._get_role()
+
+
 def findExtraOverlayClasses(obj, clsList):
 	"""Determine the most appropriate class(es) for Chromium objects.
 	This works similarly to L{NVDAObjects.NVDAObject.findOverlayClasses} except that it never calls any other findOverlayClasses method.
@@ -164,5 +176,7 @@ def findExtraOverlayClasses(obj, clsList):
 		clsList.append(ToggleButton)
 	elif obj.role == controlTypes.Role.LIST and obj.IA2Attributes.get('tag') in ('ul', 'dl', 'ol'):
 		clsList.append(PresentationalList)
+	elif obj.role == controlTypes.Role.GROUPING and obj.IA2Attributes.get("tag", "").casefold() == "figure":
+		clsList.append(Figure)
 	ia2Web.findExtraOverlayClasses(obj, clsList,
 		documentClass=Document)
diff --git a/source/virtualBuffers/gecko_ia2.py b/source/virtualBuffers/gecko_ia2.py
@@ -552,7 +552,9 @@ def _searchableAttribsForNodeType(self,nodeType):
 		elif nodeType == "figure":
 			attrs = [
 				{"Iaccessible::role": [oleacc.ROLE_SYSTEM_GROUPING]},
-				{"IAccessible2::attribute_xml-roles": [VBufStorage_findMatch_word("figure")]}
+				{"IAccessible2::attribute_xml-roles": [VBufStorage_findMatch_word("figure")]},
+				# Needed so that navigation by figure works for HTML figures in Chromium
+				{"IAccessible2::attribute_tag": self._searchableTagValues(["figure"])}
 			]
 		else:
 			return None
