Merge 67c2052 into c4de9f9

michaelDCurran · web-flow · commit 7da2b4ebb171 · 2020-09-15T09:05:25.000+10:00
diff --git a/source/NVDAObjects/IAccessible/chromium.py b/source/NVDAObjects/IAccessible/chromium.py
@@ -74,6 +74,15 @@ def _get_states(self):
 		return states
 
 
+class PresentationalList(ia2Web.Ia2Web):
+	""" Ensures that lists like UL, DL and OL always have the readonly state."""
+
+	def _get_states(self):
+		states = super().states
+		states.add(controlTypes.STATE_READONLY)
+		return states
+
+
 def findExtraOverlayClasses(obj, clsList):
 	"""Determine the most appropriate class(es) for Chromium objects.
 	This works similarly to L{NVDAObjects.NVDAObject.findOverlayClasses} except that it never calls any other findOverlayClasses method.
@@ -82,5 +91,7 @@ def findExtraOverlayClasses(obj, clsList):
 		clsList.append(ComboboxListItem)
 	elif obj.role == controlTypes.ROLE_TOGGLEBUTTON:
 		clsList.append(ToggleButton)
+	elif obj.role == controlTypes.ROLE_LIST and obj.IA2Attributes.get('tag') in ('ul', 'dl', 'ol'):
+		clsList.append(PresentationalList)
 	ia2Web.findExtraOverlayClasses(obj, clsList,
 		documentClass=Document)
diff --git a/tests/system/robot/chromeTests.py b/tests/system/robot/chromeTests.py
@@ -15,6 +15,7 @@
 # Imported for type information
 from ChromeLib import ChromeLib as _ChromeLib
 from AssertsLib import AssertsLib as _AssertsLib
+import NvdaLib as _nvdaLib
 
 _builtIn: BuiltIn = BuiltIn()
 _chrome: _ChromeLib = _getLib("ChromeLib")
@@ -39,3 +40,39 @@ def checkbox_labelled_by_inner_element():
 		# Instead this should be spoken as:
 		"Simulate evil cat  check box  not checked"
 	)
+
+def test_i7562():
+	""" List should not be announced on every line of a ul in a contenteditable """
+	spy = _nvdaLib.getSpyLib()
+	_chrome.prepareChrome(
+		r"""
+			<div contenteditable="true">
+				<p>before</p>
+				<ul>
+					<li>frogs</li>
+					<li>birds</li>
+				</ul>
+				<p>after</p>
+			</div>
+		"""
+	)
+	# Tab into the contenteditable - focus mode will be enabled.
+	spy.emulateKeyPress("tab")
+	# DownArow into the list. 'list' should be announced when entering.
+	actualSpeech = _chrome.getSpeechAfterKey("downArrow")
+	_asserts.strings_match(
+		actualSpeech,
+		"list  bullet  frogs"
+	)
+	# DownArrow to the second list item. 'list' should not be announced.
+	actualSpeech = _chrome.getSpeechAfterKey("downArrow")
+	_asserts.strings_match(
+		actualSpeech,
+		"bullet  birds"
+	)
+	# DownArrow out of the list. 'out of list' should be announced.
+	actualSpeech = _chrome.getSpeechAfterKey("downArrow")
+	_asserts.strings_match(
+		actualSpeech,
+		"out of list  after",
+	)
diff --git a/tests/system/robot/chromeTests.robot b/tests/system/robot/chromeTests.robot
@@ -26,3 +26,6 @@ default teardown
 checkbox labelled by inner element
 	[Documentation]	A checkbox labelled by an inner element should not read the label element twice.
 	checkbox_labelled_by_inner_element
+i7562
+	[Documentation]	List should not be announced on every line of a ul in a contenteditable
+	test_i7562
