Merge d33c7c8 into 43525cd

michaelDCurran · web-flow · commit bcc6ac842365 · 2022-10-26T19:09:31.000+10:00
diff --git a/source/NVDAObjects/__init__.py b/source/NVDAObjects/__init__.py
@@ -1205,7 +1205,18 @@ def event_selection(self):
 		self.event_stateChange()
 
 	def event_stateChange(self):
-		if self is api.getFocusObject():
+		# Automatically announce state changes for certain objects.
+		inFocus = (
+			# this is the current focus:
+			# E.g. announcing the checked state of a checkbox
+			self is api.getFocusObject()
+			# this is a focuse ancestor:
+			# Including the ancestors supports scenarios such as
+			# when pressing a focused button changes the state of an ancestor container,
+			# E.g. a button inside a column header that changes the sorting state of the column (#10890)
+			or any(self is obj for obj in api.getFocusAncestors())
+		)
+		if inFocus:
 			speech.speakObjectProperties(self, states=True, reason=controlTypes.OutputReason.CHANGE)
 		braille.handler.handleUpdate(self)
 		vision.handler.handleUpdate(self, property="states")
diff --git a/tests/system/robot/chromeTests.py b/tests/system/robot/chromeTests.py
@@ -872,7 +872,7 @@ def test_ariaCheckbox_browseMode():
 	"""
 	Navigate to an unchecked checkbox in reading mode.
 	"""
-	testFile = os.path.join(ARIAExamplesDir, "checkbox", "checkbox.html")
+	testFile = os.path.join(ARIAExamplesDir, "checkbox", "checkbox-1", "checkbox-1.html")
 	_chrome.prepareChrome(
 		f"""
 			<iframe src="{testFile}"></iframe>
@@ -2106,6 +2106,55 @@ def test_focus_mode_on_focusable_read_only_lists():
 	)
 
 
+def test_i10890():
+	"""
+	Ensure that sort state is announced on a column header when changed with inner button
+	"""
+	spy = _NvdaLib.getSpyLib()
+	# Chrome sometimes exposes tables as clickable, sometimes not.
+	# This test does not need to know, so disable reporting of clickables.
+	spy.set_configValue(["documentFormatting", "reportClickable"], False)
+	testFile = os.path.join(ARIAExamplesDir, "grid", "datagrids.html")
+	_chrome.prepareChrome(
+		f"""
+			<iframe src="{testFile}"></iframe>
+		"""
+	)
+	# Jump to the Example 2 heading
+	_chrome.getSpeechAfterKey("3")
+	actualSpeech = _chrome.getSpeechAfterKey("3")
+	_asserts.strings_match(
+		actualSpeech,
+		SPEECH_SEP.join([
+			"Example 2: Sortable Data Grid With Editable Cells",
+			"heading",
+			"level 3",
+		])
+	)
+	# Jump to the table
+	actualSpeech = _chrome.getSpeechAfterKey("t")
+	_asserts.strings_match(
+		actualSpeech,
+		SPEECH_SEP.join([
+			"Transactions January 1 through January 7",
+			"table",
+			"with 8 rows and 6 columns",
+			"row 1",
+			"column 1",
+			"sorted ascending",
+			"Date",
+			"button",
+		])
+	)
+	# Press the button
+	actualSpeech = _chrome.getSpeechAfterKey("space")
+	# and ensure that the new sort state is spoken.
+	_asserts.strings_match(
+		actualSpeech,
+		"sorted descending",
+	)
+
+
 def test_ARIASwitchRole():
 	"""
 	Ensure that ARIA switch controls have an appropriate role and states in browse mode.
diff --git a/tests/system/robot/chromeTests.robot b/tests/system/robot/chromeTests.robot
@@ -138,6 +138,10 @@ focus mode is turned on on focused read-only list item
 ARIA details role
 	[Documentation]	Test aria details roles being announced on discovery
 	test_mark_aria_details_role
+<<<<<<< HEAD
+i10890
+	[Documentation]	Test sort state is announced on column header when changed with inner button
+	test_i10890
 ARIA switch role
 	[Documentation]	Test aria switch control has appropriate role and states in browse mode and when focused
 	test_ARIASwitchRole
diff --git a/user_docs/en/changes.t2t b/user_docs/en/changes.t2t
@@ -31,6 +31,7 @@ What's New in NVDA
 - In Firefox, activating the "Show options" button on GitHub issue pages now works reliably. (#14269)
 - The date picker controls in Outlook 2016 / 365 Advanced search dialog now report their label and value. (#12726)
 - ARIA switch controls are now actually reported as switches in Firefox, Chrome and Edge, rather than checkboxes. (#11310)
+- NVDA will automatically announce the sort state on an HTML table column header when changed by pressing an inner button. (#10890)
 -
 
 

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ What's New in NVDA`
`31`	`31`	`- In Firefox, activating the "Show options" button on GitHub issue pages now works reliably. (#14269)`
`32`	`32`	`- The date picker controls in Outlook 2016 / 365 Advanced search dialog now report their label and value. (#12726)`
`33`	`33`	`- ARIA switch controls are now actually reported as switches in Firefox, Chrome and Edge, rather than checkboxes. (#11310)`
	`34`	`+- NVDA will automatically announce the sort state on an HTML table column header when changed by pressing an inner button. (#10890)`
`34`	`35`	`-`
`35`	`36`
`36`	`37`