Merge 3913bf5 into a452470

mfairchild365 · web-flow · commit 2897f53d80fc · 2021-08-20T22:06:26.000-05:00
diff --git a/source/virtualBuffers/__init__.py b/source/virtualBuffers/__init__.py
@@ -327,6 +327,10 @@ def _normalizeControlField(self, attrs: textInfos.ControlField):
 			# Get the text for the header cells.
 			textList = []
 			for docHandle, ID in cellIdentifiers:
+				if attrs.get("controlIdentifier_docHandle") == docHandle and attrs.get("controlIdentifier_ID") == ID:
+					# This is a self-reference to a column or row header
+					# Do not double up the cell header name. This is happening in Chrome.
+					continue
 				try:
 					start, end = self._getOffsetsFromFieldIdentifier(int(docHandle), int(ID))
 				except (LookupError, ValueError):
diff --git a/tests/system/robot/chromeTests.py b/tests/system/robot/chromeTests.py
@@ -603,3 +603,49 @@ def test_ariaDescription_sayAll():
 			"After Test Case Marker"
 		])
 	)
+
+
+def test_i10840():
+	"""
+	The name of table header cells should only be conveyed once when navigating directly to them in browse mode
+	Chrome self-references a header cell as its own header, which used to cause the name to be announced twice
+	"""
+	_chrome.prepareChrome(
+		f"""
+			<table>
+				<thead>
+					<tr>
+						<th>Month</th>
+						<th>items</th>
+					</tr>
+				</thead>
+				<tbody>
+					<tr>
+						<td>January</td>
+						<td>100</td>
+					</tr>
+					<tr>
+						<td>February</td>
+						<td>80</td>
+					</tr>
+				</tbody>
+				<tfoot>
+					<tr>
+						<td>Sum</td>
+						<td>180</td>
+					</tr>
+				</tfoot>
+				</table>
+		"""
+	)
+	# Jump to the table
+	actualSpeech = _chrome.getSpeechAfterKey("t")
+	_asserts.strings_match(
+		actualSpeech,
+		"table  with 4 rows and 2 columns  row 1  column 1  Month"
+	)
+	nextActualSpeech = _chrome.getSpeechAfterKey("control+alt+rightArrow")
+	_asserts.strings_match(
+		nextActualSpeech,
+		"column 2  items"
+	)
diff --git a/tests/system/robot/chromeTests.robot b/tests/system/robot/chromeTests.robot
@@ -69,3 +69,6 @@ ARIA description Browse Mode
 ARIA description Say All
 	[Documentation]	Say all, contents includes aria-description
 	test_ariaDescription_sayAll
+i10840
+	[Documentation]	The name of table header cells should only be conveyed once when navigating directly to them in browse mode (chrome self-references a header cell as its own header, which used to cause the name to be announced twice)
+	test_i10840
