Fix bug #66376

Fix an issue with calculating the current cursor position in some cases
ONLYOFFICE · Feb 6, 2024 · 6fd00e1 · 6fd00e1
1 parent 3e39691
commit 6fd00e1
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/word/Editor/Paragraph/position-calculator.js b/word/Editor/Paragraph/position-calculator.js
@@ -270,12 +270,12 @@
 	};
 	ParagraphPositionCalculator.prototype.getXY = function()
 	{
-		this.bidi.end();
+		this.finalize();
 		return {x : this.posInfo.x, y : this.posInfo.y};
 	};
 	ParagraphPositionCalculator.prototype.getTargetXY = function()
 	{
-		this.bidi.end();
+		this.finalize();
 		let run = this.posInfo.run;
 		if (!run)
 			return {x : this.posInfo.x, y : this.posInfo.y, h : 0, ascent : 0};
@@ -362,6 +362,17 @@
 	ParagraphPositionCalculator.prototype.finalize = function()
 	{
 		this.bidi.end();
+
+		if (this.isNextCurrent)
+		{
+			this.posInfo.x   = this.x;
+			this.posInfo.y   = this.y;
+			this.posInfo.run = this.nextRun;
+
+			this.isNextCurrent = false;
+			this.nextRun       = null;
+		}
+
 		return !!this.posInfo.run;
 	};
 	//--------------------------------------------------------export----------------------------------------------------