Merge c8d65b8 into 826ef91

SaschaCowley · web-flow · commit 98dfd1c2afbd · 2024-07-30T05:58:13.000Z
diff --git a/source/NVDAObjects/IAccessible/__init__.py b/source/NVDAObjects/IAccessible/__init__.py
@@ -274,7 +274,14 @@ def _getCaretOffset(self):
 			raise RuntimeError("no active caret in this object")
 		return offset
 
-	def _setCaretOffset(self, offset):
+	def _setCaretOffset(self, offset: int) -> None:
+		iaTextObject = self.obj.IAccessibleTextObject
+		if offset > (nCharacters := iaTextObject.nCharacters):
+			log.debugWarning(
+				f"{offset=} is greater than IAccessibleText::{nCharacters=}. Clamping to {nCharacters}.",
+				stack_info=True,
+			)
+			offset = nCharacters
 		self.obj.IAccessibleTextObject.SetCaretOffset(offset)
 
 	def _getSelectionOffsets(self):
diff --git a/source/NVDAObjects/IAccessible/ia2TextMozilla.py b/source/NVDAObjects/IAccessible/ia2TextMozilla.py
@@ -684,9 +684,16 @@ def _findNextContent(self, origin, moveBack=False, limitToInline=False):
 				pass
 		return ti, obj
 
-	def move(self, unit, direction, endPoint=None):
+	def move(
+		self,
+		unit: int,
+		direction: str,
+		endPoint: str | None = None,
+	) -> int:
 		if direction == 0:
 			return 0
+		if self._makeRawTextInfo(self.obj, textInfos.POSITION_ALL)._getStoryLength() == 0:
+			return 0
 
 		if not endPoint or endPoint == "start":
 			moveTi = self._start
diff --git a/user_docs/en/changes.md b/user_docs/en/changes.md
@@ -24,7 +24,7 @@ The available options are:
 * The Seika Notetaker driver now correctly generates braille input for space, backspace and dots with space/backspace gestures. (#16642, @school510587)
 * In on-demand speech mode, NVDA does not talk anymore when a message is opened in Outlook, when a new page is loaded in a browser or during the slideshow in PowerPoint. (#16825, @CyrilleB79)
 * In Mozilla Firefox, moving the mouse over text before or after a link now reliably reports the text. (#15990, @jcsteh)
-
+* NVDA no longer throws an error when panning the braille display forward in some empty edit controls. (#16927)
 
 ### Changes for Developers
 
