Merge remote-tracking branch 'remotes/origin/hotfix/v7.5.1' into develop

ONLYOFFICE · Oct 27, 2023 · 3499745 · 3499745
2 parents 63f4c0e + 4249349
commit 3499745
Show file tree

Hide file tree

Showing 31 changed files with 22,043 additions and 4,381 deletions.
diff --git a/cell/api.js b/cell/api.js
@@ -4021,9 +4021,13 @@ var editor;
 	}
 
 	if (window["NATIVE_EDITOR_ENJINE"]) {
-		var ws = this.wb.getWorksheet();
-		var activeCell = this.wbModel.getActiveWs().selectionRange.activeCell;
-		result = [ws.getCellLeftRelative(activeCell.col, 0), ws.getCellTopRelative(activeCell.row, 0)];
+        if (SearchEngine.Count > 0) {
+            var ws = this.wb.getWorksheet();
+            var activeCell = this.wbModel.getActiveWs().selectionRange.activeCell;
+            result = [ws.getCellLeftRelative(activeCell.col, 0), ws.getCellTopRelative(activeCell.row, 0)];
+        } else {
+            result = null;
+        }
 	} else {
 		result = SearchEngine.Count;
 	}

diff --git a/cell/model/HeaderFooter.js b/cell/model/HeaderFooter.js
@@ -1131,7 +1131,10 @@ function (window, undefined) {
 			prevField.canvasObj.canvas.style.display = "block";
 
 			this.cellEditor.close();
-			document.getElementById(this.editorElemId).remove();
+			let elem = document.getElementById(this.editorElemId);
+			if (elem) {
+				elem.parentNode.removeChild(elem);
+			}
 		}
 
 		this.curParentFocusId = null;

diff --git a/cell/model/WorkbookElems.js b/cell/model/WorkbookElems.js
@@ -12455,8 +12455,8 @@ AutoFilterDateElem.prototype.convertDateGroupItemToRange = function(oDateGroupIt
 		}
 		case Asc.EDateTimeGroup.datetimegroupSecond://second
 		{
-			startDate = new Asc.cDate(Date.UTC( oDateGroupItem.Year, oDateGroupItem.Month - 1, oDateGroupItem.Day, oDateGroupItem.Hour, oDateGroupItem.Second)).getExcelDateWithTime();
-			endDate = new Asc.cDate(Date.UTC( oDateGroupItem.Year, oDateGroupItem.Month - 1, oDateGroupItem.Day, oDateGroupItem.Hour, oDateGroupItem.Second )).getExcelDateWithTime();
+			startDate = new Asc.cDate(Date.UTC( oDateGroupItem.Year, oDateGroupItem.Month - 1, oDateGroupItem.Day, oDateGroupItem.Hour, oDateGroupItem.Minute, oDateGroupItem.Second, 0)).getExcelDateWithTime();
+			endDate = new Asc.cDate(Date.UTC( oDateGroupItem.Year, oDateGroupItem.Month - 1, oDateGroupItem.Day, oDateGroupItem.Hour, oDateGroupItem.Minute, oDateGroupItem.Second,  1000)).getExcelDateWithTime();
 			break;
 		}
 		case Asc.EDateTimeGroup.datetimegroupYear://year

diff --git a/cell/view/CellEditorView.js b/cell/view/CellEditorView.js
@@ -3092,9 +3092,13 @@
 	CellEditor.prototype.End_CompositeInput = function () {
 		var tmpBegin = this.selectionBegin, tmpEnd = this.selectionEnd;
 
-		this.selectionBegin = this.beginCompositePos;
-		this.selectionEnd = this.beginCompositePos + this.compositeLength;
-		this.setTextStyle('u', Asc.EUnderline.underlineNone);
+		//TODO linux(popOs + portuguese lang.) composite input - doesn't come Replace_CompositeText on remove chars
+		let checkFragments = this._findFragment(this.beginCompositePos) && this._findFragment(this.beginCompositePos + this.compositeLength);
+		if (checkFragments) {
+			this.selectionBegin = this.beginCompositePos;
+			this.selectionEnd = this.beginCompositePos + this.compositeLength;
+			this.setTextStyle('u', Asc.EUnderline.underlineNone);
+		}
 
 		this.beginCompositePos = -1;
 		this.compositeLength = 0;

diff --git a/cell/view/WorksheetView.js b/cell/view/WorksheetView.js
@@ -7004,8 +7004,8 @@
 		fVerLine = ctx.lineVerPrevPx;
 
 
-		if (AscBrowser.retinaPixelRatio === 2) {
-			widthLine = AscCommon.AscBrowser.convertToRetinaValue(widthLine, true);
+		if (AscBrowser.retinaPixelRatio >= 2) {
+			widthLine = ((widthLine * 2) + 0.5) >> 0
 		}
 
 		if (col != null) {
@@ -7102,7 +7102,7 @@
 
         this._activateOverlayCtx();
         var t = this;
-		var isRetinaWidth = AscCommon.AscBrowser.convertToRetinaValue(1, true) === 2;
+		var isRetinaWidth = this.getRetinaPixelRatio() >= 2;
         var selectionRange = this.model.getSelection();
         selectionRange.ranges.forEach(function (item, index) {
             var arnIntersection = item.intersectionSimple(range);
@@ -7233,7 +7233,8 @@
 		if (null !== this.activeMoveRange) {
 			let activeMoveRange = this.activeMoveRange;
 			let colRowMoveProps = this.startCellMoveRange && this.startCellMoveRange.colRowMoveProps;
-			if (colRowMoveProps && colRowMoveProps.shiftKey) {
+			let bInsertBetweenRowCol = !!(colRowMoveProps && colRowMoveProps.shiftKey);
+			if (bInsertBetweenRowCol) {
 				if (colRowMoveProps.colByX != null) {
 					activeMoveRange = new Asc.Range(colRowMoveProps.colByX, activeMoveRange.r1, colRowMoveProps.colByX + 1, activeMoveRange.r2);
 				} else if (colRowMoveProps.rowByY != null) {
@@ -7244,9 +7245,9 @@
 			arnIntersection = activeMoveRange.intersectionSimple(range);
 			if (arnIntersection) {
 				// Координаты для перемещения диапазона
-				_x1 = this._getColLeft(arnIntersection.c1) - offsetX - 2;
+				_x1 = this._getColLeft(arnIntersection.c1) - offsetX - 2 - 1*isRetinaWidth*bInsertBetweenRowCol;
 				_x2 = this._getColLeft(arnIntersection.c2 + 1) - offsetX + 1 + 2;
-				_y1 = this._getRowTop(arnIntersection.r1) - offsetY - 2;
+				_y1 = this._getRowTop(arnIntersection.r1) - offsetY - 2 - 1*isRetinaWidth*bInsertBetweenRowCol;
 				_y2 = this._getRowTop(arnIntersection.r2 + 1) - offsetY + 1 + 2;
 
 				// Выбираем наибольший range для очистки

diff --git a/common/Charts/DrawingObjects.js b/common/Charts/DrawingObjects.js
@@ -4472,11 +4472,7 @@ CSparklineView.prototype.setMinMaxValAx = function(minVal, maxVal, oSparklineGro
             return false;
         }
 
-        _this.CompositeInput = {
-            Run    : oRun,
-            Pos    : oRun.State.ContentPos,
-            Length : 0
-        };
+        _this.CompositeInput = new AscWord.RunCompositeInput_Old(oRun);
 
         oRun.Set_CompositeInput(_this.CompositeInput);
         _this.controller.startRecalculate();

diff --git a/configs/cell.json b/configs/cell.json
@@ -197,6 +197,7 @@
 
 			"word/Editor/Paragraph/Run/FontClassification.js",
 			"word/Editor/Paragraph/Run/FontCalculator.js",
+			"word/Editor/Paragraph/Run/run-composite-input.js",
 			"word/Editor/Paragraph/Run/RunAutoCorrect.js",
 			"word/Editor/DocumentContentElementBase.js",
 			"word/Editor/ParagraphContentBase.js",
@@ -269,6 +270,7 @@
 			"word/Editor/Layout/ReadView.js",
 			"word/Editor/DocumentContentBase.js",
 			"word/Editor/Document.js",
+			"word/Editor/document-composite-input.js",
 			"word/Editor/ChangeCase.js",
 			"word/Editor/SelectedContent.js",
 			"word/Editor/DocumentOutline.js",

diff --git a/configs/slide.json b/configs/slide.json
@@ -148,6 +148,7 @@
 
 			"word/Editor/Paragraph/Run/FontClassification.js",
 			"word/Editor/Paragraph/Run/FontCalculator.js",
+			"word/Editor/Paragraph/Run/run-composite-input.js",
 			"word/Editor/Paragraph/Run/RunAutoCorrect.js",
 			"slide/Drawing/ThemeLoader.js",
 			"word/Editor/Serialize2.js",
@@ -265,6 +266,7 @@
 			"word/Editor/Layout/ReadView.js",
 			"word/Editor/DocumentContentBase.js",
 			"word/Editor/Document.js",
+			"word/Editor/document-composite-input.js",
 			"word/Editor/ChangeCase.js",
 			"word/Editor/SelectedContent.js",
 			"word/Editor/DocumentOutline.js",

diff --git a/configs/word.json b/configs/word.json
@@ -149,6 +149,7 @@
 
 			"word/Editor/Paragraph/Run/FontClassification.js",
 			"word/Editor/Paragraph/Run/FontCalculator.js",
+			"word/Editor/Paragraph/Run/run-composite-input.js",
 			"word/Editor/Paragraph/Run/RunAutoCorrect.js",
 			"word/Drawing/translations.js",
 			"word/Editor/GraphicObjects/Format/ShapePrototype.js",
@@ -233,6 +234,7 @@
 			"word/Editor/Layout/ReadView.js",
 			"word/Editor/DocumentContentBase.js",
 			"word/Editor/Document.js",
+			"word/Editor/document-composite-input.js",
 			"word/Editor/ChangeCase.js",
 			"word/Editor/SelectedContent.js",
 			"word/Editor/DocumentOutline.js",

diff --git a/pdf/api.js b/pdf/api.js
@@ -371,10 +371,6 @@
 		}
 
 		let isEntered = oDoc.activeForm.EnterText(text);
-		if (viewer.pagesInfo.pages[oDoc.activeForm._page].needRedrawForms) {
-			viewer._paint();
-			viewer.onUpdateOverlay();
-		}
 
 		if (isEntered) {
 			this.WordControl.m_oDrawingDocument.TargetStart();
@@ -488,7 +484,86 @@
 		if (!bIsFreeze)
 			this.WordControl.OnScroll();
 	};
-
+	// composite input
+	PDFEditorApi.prototype.Begin_CompositeInput = function()
+	{
+		let viewer = this.DocumentRenderer;
+		if (!viewer)
+			return false;
+
+		let pdfDoc = viewer.getPDFDoc();
+		if (!pdfDoc.activeForm || !pdfDoc.activeForm.IsEditable())
+			return false;
+
+		function begin() {
+			pdfDoc.activeForm.beginCompositeInput();
+		}
+
+		if (!pdfDoc.checkDefaultFieldFonts(begin))
+			return true;
+
+		begin();
+		return true;
+	};
+	PDFEditorApi.prototype.Add_CompositeText = function(codePoint) {
+		let form = this._getActiveForm();
+		if (!form || !form.IsEditable())
+			return;
+
+		form.addCompositeText(codePoint);
+	};
+	PDFEditorApi.prototype.Remove_CompositeText = function(count) {
+		let form = this._getActiveForm();
+		if (!form || !form.IsEditable())
+			return;
+
+		form.removeCompositeText(count);
+	};
+	PDFEditorApi.prototype.Replace_CompositeText = function(codePoints) {
+		let form = this._getActiveForm();
+		if (!form || !form.IsEditable())
+			return;
+
+		form.replaceCompositeText(codePoints);
+	};
+	PDFEditorApi.prototype.End_CompositeInput = function()
+	{
+		let form = this._getActiveForm();
+		if (!form || !form.IsEditable())
+			return;
+
+		form.endCompositeInput();
+	};
+	PDFEditorApi.prototype.Set_CursorPosInCompositeText = function(pos) {
+		let form = this._getActiveForm();
+		if (!form || !form.IsEditable())
+			return;
+
+		form.setPosInCompositeInput(pos);
+	};
+	PDFEditorApi.prototype.Get_CursorPosInCompositeText = function() {
+		let form = this._getActiveForm();
+		if (!form || !form.IsEditable())
+			return 0;
+
+		return form.getPosInCompositeInput();
+	};
+	PDFEditorApi.prototype.Get_MaxCursorPosInCompositeText = function() {
+		let form = this._getActiveForm();
+		if (!form || !form.IsEditable())
+			return 0;
+
+		return form.getMaxPosInCompositeInput();
+	};
+	PDFEditorApi.prototype._getActiveForm = function() {
+		let viewer = this.DocumentRenderer;
+		if (!viewer)
+			return null;
+
+		let pdfDoc = viewer.getPDFDoc();
+		return pdfDoc.activeForm;
+	};
+
 
 	// for comments
 	PDFEditorApi.prototype.can_AddQuotedComment = function()

diff --git a/pdf/src/document.js b/pdf/src/document.js
@@ -196,7 +196,7 @@ var CPresentation = CPresentation || function(){};
                 if (value != null && value.toString)
                     value = value.toString();
 
-                oField.SetValue(value);
+                oField.SetValue(value, true);
             }
         }
     };
@@ -1254,7 +1254,9 @@ var CPresentation = CPresentation || function(){};
         this.calculateInfo.SetSourceField(oSourceField);
         this.calculateInfo.names.forEach(function(name) {
             let oField = oThis.GetField(name);
-
+            if (!oField)
+                return;
+
             let oFormatTrigger = oField.GetTrigger(AscPDF.FORMS_TRIGGERS_TYPES.Calculate);
             let oActionRunScript = oFormatTrigger ? oFormatTrigger.GetActions()[0] : null;