I6358 support aria current

nvdaHelper/vbufBackends/mshtml/mshtml.cpp

@@ -489,6 +489,7 @@ inline void getAttributesFromHTMLDOMNode(IHTMLDOMNode* pHTMLDOMNode,wstring& nod
 	macro_addHTMLAttributeToMap(L"aria-relevant",false,pHTMLAttributeCollection2,attribsMap,tempVar,tempAttribNode);
 	macro_addHTMLAttributeToMap(L"aria-busy",false,pHTMLAttributeCollection2,attribsMap,tempVar,tempAttribNode);
 	macro_addHTMLAttributeToMap(L"aria-atomic",false,pHTMLAttributeCollection2,attribsMap,tempVar,tempAttribNode);
+	macro_addHTMLAttributeToMap(L"aria-current",false,pHTMLAttributeCollection2,attribsMap,tempVar,tempAttribNode);
 	pHTMLAttributeCollection2->Release();
 }
 

source/NVDAObjects/IAccessible/MSHTML.py

@@ -511,6 +511,9 @@ def _get_treeInterceptorClass(self):
 			return virtualBuffers.MSHTML.MSHTML
 		return super(MSHTML,self).treeInterceptorClass
 
+	def getValueForAriaCurrent(self):
+		return self.HTMLAttributes["aria-current"]
+
 	def _get_HTMLAttributes(self):
 		return HTMLAttribCache(self.HTMLNode)
 

source/NVDAObjects/IAccessible/ia2Web.py

@@ -26,6 +26,10 @@ def _get_positionInfo(self):
 				info['level']=level
 		return info
 
+	def getValueForAriaCurrent(self):
+		current = self.IA2Attributes.get("current", False)
+		return current
+
 class Document(Ia2Web):
 	value = None
 

source/NVDAObjects/UIA/edge.py

@@ -11,11 +11,11 @@
 import config
 import controlTypes
 import cursorManager
+import re
 import aria
 import textInfos
 import UIAHandler
 from UIABrowseMode import UIABrowseModeDocument, UIABrowseModeDocumentTextInfo
-import aria
 from UIAUtils import *
 from . import UIA, UIATextInfo
 
@@ -147,6 +147,8 @@ def _getControlFieldForObject(self,obj,isEmbedded=False,startOfNode=False,endOfN
 		# Combo boxes with a text pattern are editable
 		if obj.role==controlTypes.ROLE_COMBOBOX and obj.UIATextPattern:
 			field['states'].add(controlTypes.STATE_EDITABLE)
+		# report if the field is 'current'
+		field['current']=obj.getValueForAriaCurrent()
 		# For certain controls, if ARIA overrides the label, then force the field's content (value) to the label
 		# Later processing in Edge's getTextWithFields will remove descendant content from fields with a content attribute.
 		ariaProperties=obj.UIAElement.currentAriaProperties
@@ -387,6 +389,16 @@ def _get_description(self):
 				pass
 		return super(EdgeNode,self).description
 
+	def getValueForAriaCurrent(self):
+		ariaProperties=self.UIAElement.currentAriaProperties
+		match = re.match("current=(\w+);", ariaProperties)
+		log.debug("aria props = %s" % ariaProperties)
+		if match:
+			valueOfAriaCurrent = match.group(1)
+			log.debug("aria current value = %s" % valueOfAriaCurrent)
+			return valueOfAriaCurrent
+		return False
+
 class EdgeList(EdgeNode):
 
 	# non-focusable lists are readonly lists (ensures correct NVDA presentation category)

source/NVDAObjects/__init__.py

@@ -798,6 +798,12 @@ def _get_statusBar(self):
 		"""
 		return None
 
+	def getValueForAriaCurrent(self):
+		"""Gets the value for aria-current. Normally returns False. If this object is current
+		it will return one of the following values: True, "page", "step", "location", "date", "time"
+		"""
+		return False
+
 	def reportFocus(self):
 		"""Announces this object in a way suitable such that it gained focus.
 		"""

source/speech.py

@@ -307,6 +307,7 @@ def speakObjectProperties(obj,reason=controlTypes.REASON_QUERY,index=None,**allo
 			newPropertyValues["_tableID"]=obj.tableID
 		except NotImplementedError:
 			pass
+	newPropertyValues['current']=obj.getValueForAriaCurrent()
 	#Get the speech text for the properties we want to speak, and then speak it
 	text=getSpeechTextForProperties(reason,**newPropertyValues)
 	if text:
@@ -1001,6 +1002,20 @@ def getSpeechTextForProperties(reason=controlTypes.REASON_QUERY,**propertyValues
 	if rowCount or columnCount:
 		# The caller is entering a table, so ensure that it is treated as a new table, even if the previous table was the same.
 		oldTableID = None
+	ariaCurrent = propertyValues.get('current', False)
+	if ariaCurrent is not None and ariaCurrent != False:
+		if ariaCurrent=="page":
+			textList.append(_("current page"))
+		elif ariaCurrent=="step":
+			textList.append(_("current step"))
+		elif ariaCurrent=="location":
+			textList.append(_("current location"))
+		elif ariaCurrent=="date":
+			textList.append(_("current date"))
+		elif ariaCurrent=="time":
+			textList.append(_("current time"))
+		else:
+			textList.append(_("current"))
 	indexInGroup=propertyValues.get('positionInfo_indexInGroup',0)
 	similarItemsInGroup=propertyValues.get('positionInfo_similarItemsInGroup',0)
 	if 0<indexInGroup<=similarItemsInGroup:
@@ -1035,6 +1050,7 @@ def getControlFieldSpeech(attrs,ancestorAttrs,fieldType,formatConfig=None,extraD
 	role=attrs.get('role',controlTypes.ROLE_UNKNOWN)
 	states=attrs.get('states',set())
 	keyboardShortcut=attrs.get('keyboardShortcut', "")
+	ariaCurrent=attrs.get('current', None)
 	value=attrs.get('value',"")
 	if reason==controlTypes.REASON_FOCUS or attrs.get('alwaysReportDescription',False):
 		description=attrs.get('description',"")
@@ -1050,6 +1066,7 @@ def getControlFieldSpeech(attrs,ancestorAttrs,fieldType,formatConfig=None,extraD
 	roleText=getSpeechTextForProperties(reason=reason,role=role)
 	stateText=getSpeechTextForProperties(reason=reason,states=states,_role=role)
 	keyboardShortcutText=getSpeechTextForProperties(reason=reason,keyboardShortcut=keyboardShortcut) if config.conf["presentation"]["reportKeyboardShortcuts"] else ""
+	ariaCurrentText=getSpeechTextForProperties(reason=reason,current=ariaCurrent)
 	nameText=getSpeechTextForProperties(reason=reason,name=name)
 	valueText=getSpeechTextForProperties(reason=reason,value=value)
 	descriptionText=(getSpeechTextForProperties(reason=reason,description=description)
@@ -1112,7 +1129,7 @@ def getControlFieldSpeech(attrs,ancestorAttrs,fieldType,formatConfig=None,extraD
 		content = attrs.get("content")
 		if content and speakContentFirst:
 			out.append(content)
-		out.extend(x for x in (nameText,(stateText if speakStatesFirst else roleText),(roleText if speakStatesFirst else stateText),valueText,descriptionText,levelText,keyboardShortcutText) if x)
+		out.extend(x for x in (nameText,(stateText if speakStatesFirst else roleText),(roleText if speakStatesFirst else stateText),ariaCurrentText,valueText,descriptionText,levelText,keyboardShortcutText) if x)
 		if content and not speakContentFirst:
 			out.append(content)
 		return CHUNK_SEPARATOR.join(out)

source/virtualBuffers/MSHTML.py

@@ -50,6 +50,9 @@ def _normalizeFormatField(self, attrs):
 
 	def _normalizeControlField(self,attrs):
 		level=None
+		ariaCurrent = attrs.get('HTMLAttrib::aria-current', None)
+		if ariaCurrent is not None:
+			attrs['current']=ariaCurrent
 		accRole=attrs.get('IAccessible::role',0)
 		accRole=int(accRole) if isinstance(accRole,basestring) and accRole.isdigit() else accRole
 		nodeName=attrs.get('IHTMLDOMNode::nodeName',"")

source/virtualBuffers/__init__.py

@@ -257,6 +257,12 @@ def _getParagraphOffsets(self,offset):
 		return lineStart.value,lineEnd.value
 
 	def _normalizeControlField(self,attrs):
+
+		ariaCurrent = attrs.get("IAccessible2::attribute_current")
+		if ariaCurrent != None:
+			attrs['current']= ariaCurrent
+			del attrs["IAccessible2::attribute_current"]
+
 		tableLayout=attrs.get('table-layout')
 		if tableLayout:
 			attrs['table-layout']=tableLayout=="1"