[se] Fix bug 72491

ONLYOFFICE · Jan 16, 2025 · 022f6d3 · 022f6d3
1 parent 690bc30
commit 022f6d3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/cell/view/CellEditorView.js b/cell/view/CellEditorView.js
@@ -144,6 +144,7 @@ function (window, undefined) {
 		this.selectionTimer = undefined;
 		this.enableKeyEvents = true;
 		this.isTopLineActive = false;
+		this.openFromTopLine = false;
 		this.skipTLUpdate = true;
 		this.loadFonts = false;
 		this.isOpened = false;
@@ -332,7 +333,7 @@ function (window, undefined) {
 		}
 		this._setOptions(options);
 		this._cleanLastRangeInfo();
-		this._updateTopLineActive(true === this.input.isFocused);
+		this._updateTopLineActive(true === this.input.isFocused, true);
 
 		this._updateEditorState();
 		this._draw();
@@ -1141,9 +1142,10 @@ function (window, undefined) {
 		return !range ? {range: null} : {range: range, wsName: wsName};
 	};
 
-	CellEditor.prototype._updateTopLineActive = function (state) {
+	CellEditor.prototype._updateTopLineActive = function (state, isOpening) {
 		if (state !== this.isTopLineActive) {
 			this.isTopLineActive = state;
+			this.openFromTopLine = isOpening && state;
 			this.handlers.trigger("updateTopLine", this.isTopLineActive ? c_oAscCellEditorState.editInFormulaBar : c_oAscCellEditorState.editInCell);
 		}
 	};

diff --git a/cell/view/WorkbookView.js b/cell/view/WorkbookView.js
@@ -1395,9 +1395,9 @@
             }, 1000);
         }
 
-        if (this.isFormulaEditMode && this.isCellEditMode && this.cellEditor && this.cellEditor.isTopLineActive) {
+        if (this.isFormulaEditMode && this.isCellEditMode && this.cellEditor && this.cellEditor.openFromTopLine) {
             /* set focus to the top formula entry line */
-            this.input.focus();
+            this.cellEditor.restoreFocus();
         }
 
         asc_applyFunction(callback, d);