Merge c302339 into 04ef2f1

SaschaCowley · web-flow · commit ae04cadee161 · 2024-03-05T23:41:04.000Z
diff --git a/source/NVDAObjects/IAccessible/ia2Web.py b/source/NVDAObjects/IAccessible/ia2Web.py
@@ -170,6 +170,7 @@ def _get_detailsRole(self) -> Optional[controlTypes.Role]:
 		return self.annotations.roles[0]
 
 	def _get_isCurrent(self) -> controlTypes.IsCurrent:
+		log.debugWarning("impl required for: %s" % repr(self), stack_info=True)
 		ia2attrCurrent: str = self.IA2Attributes.get("current", "false")
 		try:
 			return controlTypes.IsCurrent(ia2attrCurrent)
@@ -251,6 +252,11 @@ def _get_liveRegionPoliteness(self) -> aria.AriaLivePoliteness:
 		except ValueError:
 			log.error(f"Unknown live politeness of {politeness}", exc_info=True)
 			super().liveRegionPoliteness
+	
+	def _get_role(self):
+		if self.IA2Attributes.get("tag", "").casefold() == "figure":
+			return controlTypes.Role.FIGURE
+		return super()._get_role()
 
 
 class Document(Ia2Web):
diff --git a/source/virtualBuffers/gecko_ia2.py b/source/virtualBuffers/gecko_ia2.py
@@ -128,12 +128,16 @@ def _normalizeControlField(self, attrs):  # noqa: C901
 			attrs['placeholder']= placeholder
 
 		role = IAccessibleHandler.NVDARoleFromAttr(attrs['IAccessible::role'])
+		
 		if attrs.get('IAccessible2::attribute_tag',"").lower()=="blockquote":
 			role=controlTypes.Role.BLOCKQUOTE
+		elif attrs.get('IAccessible2::attribute_tag',"").lower()=="figure":
+			role = controlTypes.Role.FIGURE
 
 		states = IAccessibleHandler.getStatesSetFromIAccessibleAttrs(attrs)
 		states |= IAccessibleHandler.getStatesSetFromIAccessible2Attrs(attrs)
 		role, states = controlTypes.transformRoleStates(role, states)
+		if role == controlTypes.Role.GROUPING: log.debug("Found a grouping")
 
 		if role == controlTypes.Role.EDITABLETEXT and not (controlTypes.State.FOCUSABLE in states or controlTypes.State.UNAVAILABLE in states or controlTypes.State.EDITABLE in states):
 			# This is a text leaf.
