Don't unnecessarily repeat row and column headers when navigating ARIA grids in focus mode. (#20091)

Fixes #17750.
Summary of the issue:

When moving to an ARIA grid cell in focus mode in web browsers, NVDA previously reported both the row and column headers even if only the row or only the column changed.
Description of user facing changes:

When moving to an ARIA grid cell in focus mode in web browsers, NVDA no longer reports both the row and column headers even if only the row or only the column changed.
Description of development approach:

Previously, there were two problems:

    After c4c3da6 (BrowseModeDocumentTextInfo.getControlFieldSpeech: Report the name of groupings (such as fieldsets) for quicknav and focus jumps, similar to how landmark labels are reported. #7435), Browse mode was updating the speech properties cache before speaking the focused object, even in focus mode. That meant that the row and column coordinates for the newly focused cell were already cached before NVDA spoke it, which made NVDA behave as if the coordinates never changed. The fix is to update the cache from the TextInfo after speaking the focused object.
    Virtual buffers just used the IA2 unique id as the table id, but NVDAObjects use both the window handle and id, meaning that these didn't compare correctly in the speech cache. The fix is to make the vbuf normalize table ids to windowHandle and id.

Author: jcsteh

source/browseMode.py

@@ -2225,12 +2225,15 @@ def event_gainFocus(self, obj, nextHandler):
 				# we need to call it manually here.
 				vision.handler.handleGainFocus(obj)
 			else:
-				# Although we are going to speak the object rather than textInfo content, we still need to silently speak the textInfo content so that the textInfo speech cache is updated correctly.
+				self._replayFocusEnteredEvents()
+				nextHandler()
+				# Although we spoke the object rather than textInfo content, we still need to silently speak the textInfo content so that the textInfo speech cache is updated correctly.
 				# Not doing this would cause  later browseMode speaking to either not speak controlFields it had entered, or speak controlField exits after having already exited.
 				# See #7435 for a discussion on this.
+				# #17750: It's important that we do this *after* speaking the object.
+				# Otherwise, the cached info would prevent NVDA from detecting things like
+				# row and column changes.
 				speech.speakTextInfo(focusInfo, reason=OutputReason.ONLYCACHE)
-				self._replayFocusEnteredEvents()
-				nextHandler()
 			focusInfo.collapse()
 			if self._focusEventMustUpdateCaretPosition:
 				self._set_selection(focusInfo, reason=OutputReason.FOCUS)

source/virtualBuffers/gecko_ia2.py

@@ -216,7 +216,15 @@ def _normalizeControlField(self, attrs):  # noqa: C901
 			attrs["detailsRoles"] = set(self._normalizeDetailsRole(detailsRoles))
 			if config.conf["debugLog"]["annotations"]:
 				log.debug(f"detailsRoles: {attrs['detailsRoles']}")
-		return super()._normalizeControlField(attrs)
+		attrs = super()._normalizeControlField(attrs)
+		# #17750: The table-id attribute from the buffer is just a unique id.
+		# However, the IAccessible NVDAObject specifies the tableID as
+		# (windowHandle, uniqueId). These need to be compatible for speech cache
+		# comparison lest we break row/column change detection.
+		tableID = attrs.get("table-id")
+		if tableID:
+			attrs["table-id"] = (int(attrs["controlIdentifier_docHandle"]), tableID)
+		return attrs
 
 	def _normalizeDetailsRole(self, detailsRoles: str) -> Iterable[Optional[controlTypes.Role]]:
 		"""
@@ -579,8 +587,7 @@ def event_scrollingStart(self, obj, nextHandler):
 	event_scrollingStart.ignoreIsReady = True
 
 	def _getTableCellAt(self, tableID, startPos, destRow, destCol):
-		docHandle = self.rootDocHandle
-		table = self.getNVDAObjectFromIdentifier(docHandle, tableID)
+		table = self.getNVDAObjectFromIdentifier(*tableID)
 		try:
 			try:
 				cell = table.IAccessibleTable2Object.cellAt(destRow - 1, destCol - 1).QueryInterface(

user_docs/en/changes.md

@@ -10,6 +10,8 @@
 
 ### Bug Fixes
 
+* When moving to an ARIA grid cell in focus mode in web browsers, NVDA no longer reports both the row and column headers even if only the row or only the column changed. (#17750, @jcsteh)
+
 ### Changes for Developers
 
 Please refer to [the developer guide](https://download.nvaccess.org/documentation/developerGuide.html#API) for information on NVDA's API deprecation and removal process.