Merge 01e5261 into e019a24

mfairchild365 · web-flow · commit e8b7de8ba998 · 2021-04-20T14:49:36.000+10:00
diff --git a/source/browseMode.py b/source/browseMode.py
@@ -1553,6 +1553,13 @@ def event_gainFocus(self, obj, nextHandler):
 			return 
 		if not self.passThrough and self._shouldIgnoreFocus(obj):
 			return
+
+		# If the previous focus object was removed, we might hit a false positive for overlap detection.
+		# Track the previous focus target so that we can account for this scenario.
+		previousFocusObjIsDefunct = False
+		if self._lastFocusObj and controlTypes.STATE_DEFUNCT in self._lastFocusObj.states:
+			previousFocusObjIsDefunct = True
+
 		self._lastFocusObj=obj
 
 		try:
@@ -1570,7 +1577,8 @@ def event_gainFocus(self, obj, nextHandler):
 		caretInfo=self.makeTextInfo(textInfos.POSITION_CARET)
 		# Expand to one character, as isOverlapping() doesn't treat, for example, (4,4) and (4,5) as overlapping.
 		caretInfo.expand(textInfos.UNIT_CHARACTER)
-		if not self._hadFirstGainFocus or not focusInfo.isOverlapping(caretInfo):
+		isOverlapping = focusInfo.isOverlapping(caretInfo)
+		if not self._hadFirstGainFocus or not isOverlapping or (isOverlapping and previousFocusObjIsDefunct):
 			# The virtual caret is not within the focus node.
 			oldPassThrough=self.passThrough
 			passThrough = self.shouldPassThrough(obj, reason=OutputReason.FOCUS)
diff --git a/tests/system/robot/chromeTests.py b/tests/system/robot/chromeTests.py
@@ -345,3 +345,37 @@ def test_ariaCheckbox_browseMode():
 		actualSpeech,
 		"Sandwich Condiments  grouping  list  with 4 items  Lettuce  check box  not checked"
 	)
+
+
+def test_i12147():
+	"""
+	New focus target should be announced if the triggering element is removed when activated.
+	"""
+	_chrome.prepareChrome(
+		f"""
+			<div>
+			  <button id='trigger0'>trigger 0</button>
+			  <h4 id='target0' tabindex='-1'>target 0</h4>
+			</div>
+			<script>
+				let trigger0 = document.querySelector('#trigger0');
+				trigger0.addEventListener('click', e => {{
+				  let focusTarget = document.querySelector('#target0');
+				  trigger0.remove();
+				  focusTarget.focus();
+				}})
+			</script>
+		"""
+	)
+	# Jump to the first button (the trigger)
+	actualSpeech = _chrome.getSpeechAfterKey("tab")
+	_asserts.strings_match(
+		actualSpeech,
+		"trigger 0  button"
+	)
+	# Activate the button, we should hear the new focus target.
+	actualSpeech = _chrome.getSpeechAfterKey("enter")
+	_asserts.strings_match(
+		actualSpeech,
+		"target 0  heading  level 4"
+	)
diff --git a/tests/system/robot/chromeTests.robot b/tests/system/robot/chromeTests.robot
@@ -47,3 +47,6 @@ ARIA checkbox
 	[Documentation]	Navigate to an unchecked checkbox in reading mode.
 	[Tags]	aria-at
 	test_ariaCheckbox_browseMode
+i12147
+	[Documentation]	New focus target should be announced if the triggering element is removed when activated
+	test_i12147
diff --git a/user_docs/en/changes.t2t b/user_docs/en/changes.t2t
@@ -43,6 +43,7 @@ What's New in NVDA
 - - TextInfo.getTextInChunks no longer freezes when called on Rich Edit controls such as the NVDA log viewer. (#11613)
 - It is once again possible to use NVDA in a languages containing underscores in the locale name such as de_CH on Windows 10 1803 and 1809. (#12250)
 - In WordPad, configuration of superscript/subscript reporting works as expected. (#12262)
+- NVDA no longer fails to announce the newly focused content on a web page if the old focus disappears and is replaced by the new focus in the same position. (#12147)
 
 
 == Changes for Developers ==
