Merge 9d2e583 into 841925b

mwhapples · web-flow · commit d7c3f943d440 · 2022-06-01T23:04:19.000+10:00
diff --git a/source/NVDAObjects/JAB/__init__.py b/source/NVDAObjects/JAB/__init__.py
@@ -97,13 +97,17 @@
 }
 
 
+re_simpleXmlTag = re.compile(r"(\<[^>]+\>)+")
 
-re_simpleXmlTag=re.compile(r"\<[^>]+\>")
 
+def _subHtmlTag(match: re.match) -> str:
+	startIndex, endIndex = match.span()
+	return "" if startIndex == 0 or match.string[startIndex - 1].isspace() \
+	or endIndex == len(match.string) or match.string[endIndex].isspace() else " "
 
-def _processHtml(text):
+def _processHtml(text: str) -> str:
 	""" Strips HTML tags from text if it is HTML """
-	return re_simpleXmlTag.sub(" ", text) if text.startswith("<html>") else text
+	return re_simpleXmlTag.sub(_subHtmlTag, text) if text.startswith("<html>") else text
 
 
 class JABTextInfo(textInfos.offsets.OffsetsTextInfo):
@@ -320,6 +324,9 @@ def _get_states(self):
 		for state in stateStrings:
 			if state in JABStatesToNVDAStates:
 				stateSet.add(JABStatesToNVDAStates[state])
+		if self.role is controlTypes.Role.TOGGLEBUTTON and controlTypes.State.CHECKED in stateSet:
+			stateSet.discard(controlTypes.State.CHECKED)
+			stateSet.add(controlTypes.State.PRESSED)
 		if "editable" not in stateStrings and self._JABAccContextInfo.accessibleText:
 			stateSet.add(controlTypes.State.READONLY)
 		if "visible" not in stateStrings:
@@ -333,7 +340,15 @@ def _get_states(self):
 		return stateSet
 
 	def _get_value(self):
-		if self.role not in [controlTypes.Role.CHECKBOX,controlTypes.Role.MENU,controlTypes.Role.MENUITEM,controlTypes.Role.RADIOBUTTON,controlTypes.Role.BUTTON] and self._JABAccContextInfo.accessibleValue and not self._JABAccContextInfo.accessibleText:
+		if (
+			self.role not in [
+				controlTypes.Role.TOGGLEBUTTON, controlTypes.Role.CHECKBOX,
+				controlTypes.Role.MENU, controlTypes.Role.MENUITEM,
+				controlTypes.Role.RADIOBUTTON, controlTypes.Role.BUTTON
+			]
+			and self._JABAccContextInfo.accessibleValue
+			and not self._JABAccContextInfo.accessibleText
+		):
 			return self.jabContext.getCurrentAccessibleValueFromContext()
 
 	def _get_description(self):
@@ -372,7 +387,14 @@ def _get_positionInfo(self):
 				return info
 
 		parent=self.parent
-		if isinstance(parent,JAB) and self.role in (controlTypes.Role.TREEVIEWITEM,controlTypes.Role.LISTITEM):
+		if (
+			isinstance(parent, JAB)
+			and self.role in (
+				controlTypes.Role.TREEVIEWITEM,
+				controlTypes.Role.LISTITEM,
+				controlTypes.Role.TAB
+			)
+		):
 			index=self._JABAccContextInfo.indexInParent+1
 			childCount=parent._JABAccContextInfo.childrenCount
 			info['indexInGroup']=index
@@ -389,7 +411,7 @@ def _get_activeChild(self):
 	def _get_parent(self):
 		if not hasattr(self,'_parent'):
 			jabContext=self.jabContext.getAccessibleParentFromContext()
-			if jabContext:
+			if jabContext and self.indexInParent is not None:
 				self._parent=JAB(jabContext=jabContext)
 			else:
 				self._parent=super(JAB,self).parent
diff --git a/tests/unit/test_javaAccessBridge.py b/tests/unit/test_javaAccessBridge.py
@@ -25,8 +25,8 @@ def test_regexNotModified(self):
 		self.assertEqual(regexStr, JAB._processHtml(regexStr))
 
 	def test_htmlStringHasTagsRemoved(self):
-		htmlStr = "<html><body><p>Some <b>bold</b> text.</p></body></html>"
-		expected = "   Some  bold  text.   "
+		htmlStr = "<html><body><p>Some <b>bold</b> <i>text</i>.</p></body></html>"
+		expected = "Some bold text ."
 		self.assertEqual(expected, JAB._processHtml(htmlStr))
 
 
