For bug #64883

Fix selection for the hidden part of complex fields
ONLYOFFICE · Feb 8, 2024 · 9e8c6d1 · 9e8c6d1
1 parent aca0923
commit 9e8c6d1
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 0 deletions.
diff --git a/word/Editor/Paragraph.js b/word/Editor/Paragraph.js
@@ -19255,6 +19255,26 @@ CParagraphComplexFieldsInfo.prototype.ResetPage = function(Paragraph, CurPage)
 	else
 		this.CF = [];
 };
+CParagraphComplexFieldsInfo.prototype.resetPage = function(paragraph, page)
+{
+	this.ResetPage(paragraph, page);
+};
+/**
+ * @param element {AscWord.CRunElementBase}
+ * @returns {boolean}
+ */
+CParagraphComplexFieldsInfo.prototype.checkRunElement = function(element)
+{
+	if ((this.IsHiddenFieldContent() || this.IsComplexFieldCode())
+		&& para_End !== element.Type
+		&& para_FieldChar !== element.Type)
+		return false;
+
+	if (para_FieldChar === element.Type)
+		this.ProcessFieldChar(element);
+
+	return true;
+};
 /**
  * Находимся ли мы внутри содержимого скрытого поля
  * @returns {boolean}

diff --git a/word/Editor/Paragraph/draw-selection.js b/word/Editor/Paragraph/draw-selection.js
@@ -64,10 +64,14 @@
 		this.endInfo      = null;
 
 		this.anchoredObjects = [];
+
+		this.complexFields = new CParagraphComplexFieldsInfo();
 	}
 	ParagraphDrawSelectionState.prototype.resetPage = function(page)
 	{
 		this.page = page;
+
+		this.complexFields.resetPage(this.paragraph, page);
 	};
 	ParagraphDrawSelectionState.prototype.resetLine = function(line)
 	{
@@ -119,6 +123,9 @@
 	 */
 	ParagraphDrawSelectionState.prototype.handleRunElement = function(element, isSelected)
 	{
+		if (!this.complexFields.checkRunElement(element))
+			return;
+
 		if (para_Drawing === element.Type && !element.IsInline())
 		{
 			if (isSelected)