Merge a682141 into 2de9755

michaelDCurran · web-flow · commit 1abd72776da6 · 2022-09-19T16:43:28.000+10:00
diff --git a/source/NVDAObjects/UIA/excel.py b/source/NVDAObjects/UIA/excel.py
@@ -11,6 +11,8 @@
 from UIAHandler.constants import (
 	UIAutomationType,
 )
+import speech
+import api
 import colors
 import locationHelper
 import controlTypes
@@ -592,3 +594,18 @@ class BadExcelFormulaEdit(ExcelObject):
 	"""
 
 	shouldAllowUIAFocusEvent = False
+
+
+class ExcelTable(UIA):
+	""" Represents a table within an Excel spreadsheet."""
+
+	def event_focusExited(self):
+		# Generally, NVDA would not announce when focus exits an ancestor control.
+		# However, it is very common for focus to enter and exit tables within a spreadsheet,
+		# Thus we specifically announce exiting tables here,
+		# But only when focus is on an Excel cell,
+		# As we don't want to announce exiting the table when focus moves out of the spreadsheet entirely.
+		newFocus = api.getFocusObject()
+		if isinstance(newFocus, ExcelCell):
+			# Translators: announced when moving outside of a table in an Excel spreadsheet.
+			speech.speakMessage(_("Out of table"))
diff --git a/source/NVDAObjects/__init__.py b/source/NVDAObjects/__init__.py
@@ -1203,6 +1203,10 @@ def event_loseFocus(self):
 		# Forget the word currently being typed as focus is moving to a new control. 
 		speech.clearTypedWordBuffer()
 
+	def event_focusExited(self):
+		# In the general case, NVDA should not announce anything when focus exits an ancestor control.
+		pass
+
 	def event_foreground(self):
 		"""Called when the foreground window changes.
 		This method should only perform tasks specific to the foreground window changing.
diff --git a/source/api.py b/source/api.py
@@ -175,6 +175,9 @@ def setFocusObject(obj: NVDAObjects.NVDAObject) -> bool:  # noqa: C901
 	braille.invalidateCachedFocusAncestors(focusDifferenceLevel)
 	if config.conf["reviewCursor"]["followFocus"]:
 		setNavigatorObject(obj,isFocus=True)
+	# Fire focusExited event for all old focus ancestors not common with the new focus
+	for oldFocusAncestor in reversed(oldFocusLine[focusDifferenceLevel:-1]):
+		eventHandler.executeEvent("focusExited", oldFocusAncestor)
 	return True
 
 def getFocusDifferenceLevel():
diff --git a/user_docs/en/changes.t2t b/user_docs/en/changes.t2t
@@ -27,6 +27,7 @@ What's New in NVDA
   - Read entire column: ``NVDA+control+alt+upArrow``
   - Read entire row: ``NVDA+control+alt+leftArrow``
   -
+- Microsoft Excel via UI Automation: NVDA now announces when moving out of a table within a spreadsheet. (#14165)
 -
 
 

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ What's New in NVDA`
`27`	`27`	- Read entire column: ``NVDA+control+alt+upArrow``
`28`	`28`	- Read entire row: ``NVDA+control+alt+leftArrow``
`29`	`29`	`-`
	`30`	`+- Microsoft Excel via UI Automation: NVDA now announces when moving out of a table within a spreadsheet. (#14165)`
`30`	`31`	`-`
`31`	`32`
`32`	`33`