Merge branch hotfix/v7.2.1 into master

.github/workflows/check.yml

@@ -33,6 +33,7 @@ jobs:
           node-qunit-puppeteer tests/word/forms/forms.html
           node-qunit-puppeteer tests/word/forms/complexForm.html
           node-qunit-puppeteer tests/word/api/api.html
+          node-qunit-puppeteer tests/word/api/textInput.html
           node-qunit-puppeteer tests/word/styles/paraPr.html
   builder-tests:
     runs-on: ubuntu-latest

cell/Local/api.js

@@ -131,6 +131,11 @@ var c_oAscError = Asc.c_oAscError;
 			}
 		}
 	};
+
+	spreadsheet_api.prototype._saveLocalCheck = function()
+	{
+		return this._saveCheck();
+	};
 	spreadsheet_api.prototype.asc_Save = function (isNoUserSave, isSaveAs, isResaveAttack)
 	{
 		if (this.isFrameEditor() || AscCommon.c_oAscAdvancedOptionsAction.None !== this.advancedOptionsAction)
@@ -145,7 +150,7 @@ var c_oAscError = Asc.c_oAscError;
 			this.LastUserSavedIndex = AscCommon.History.UserSavedIndex;
 		}
 
-		if (true === this.canSave && this._saveCheck())
+		if (true === this.canSave && this._saveLocalCheck())
 		{
 			var _isNaturalSave = this.IsUserSave;
 			this.canSave = false;

cell/api.js

@@ -1181,7 +1181,7 @@ var editor;
       // ToDo select txt params
       oAdditionalData["codepage"] = AscCommon.c_oAscCodePageUtf8;
       dataContainer.data = last.data;
-    } else if(this.isOpenOOXInBrowser) {
+    } else if(this.isOpenOOXInBrowser && this.saveDocumentToZip) {
 		var t = this;
 		var title = this.documentTitle;
 		AscCommonExcel.executeInR1C1Mode(false, function () {
@@ -1448,7 +1448,7 @@ var editor;
   	if (file.changes && this.VersionHistory) {
   		this.VersionHistory.changes = file.changes;
 	}
-	this.isOpenOOXInBrowser = AscCommon.checkOOXMLSignature(file.data);
+	this.isOpenOOXInBrowser = this["asc_isSupportFeature"]("ooxml") && AscCommon.checkOOXMLSignature(file.data);
 	if (this.isOpenOOXInBrowser) {
 		this.openOOXInBrowserZip = file.data;
 	}
@@ -3950,32 +3950,40 @@ var editor;
    * @param {{}} [oOleObjectInfo] info from oleObject
    */
   spreadsheet_api.prototype.asc_addTableOleObjectInOleEditor = function(oOleObjectInfo) {
-  this.sync_StartAction(Asc.c_oAscAsyncActionType.BlockInteraction, Asc.c_oAscAsyncAction.Open);
-    oOleObjectInfo = oOleObjectInfo || {"binary": AscCommon.getEmpty()};
-    const sStream = oOleObjectInfo["binary"];
-    const oThis = this;
-    const oFile = new AscCommon.OpenFileResult();
-    oFile.bSerFormat = AscCommon.checkStreamSignature(sStream, AscCommon.c_oSerFormat.Signature);
-    oFile.data = sStream;
-    this.isEditOleMode = true;
-    this.isChartEditor = false;
-    this.isFromSheetEditor = oOleObjectInfo["isFromSheetEditor"];
-    const oDocumentImageUrls = oOleObjectInfo["documentImageUrls"];
-    this.asc_CloseFile();
-    this.fAfterLoad = function () {
-        const nImageWidth = oOleObjectInfo["imageWidth"];
-        const nImageHeight = oOleObjectInfo["imageHeight"];
-        if (nImageWidth && nImageHeight) {
-            oThis.saveImageCoefficients = oThis.getScaleCoefficientsForOleTableImage(nImageWidth, nImageHeight);
-        }
-        oThis.wb.scrollToOleSize();
-        oThis.wb.onOleEditorReady();
-        delete oThis.imagesFromGeneralEditor;
-        oThis.sync_EndAction(Asc.c_oAscAsyncActionType.BlockInteraction, Asc.c_oAscAsyncAction.Open);
-    }
+      this.sync_StartAction(Asc.c_oAscAsyncActionType.BlockInteraction, Asc.c_oAscAsyncAction.Open);
+      // на случай, если изображение поставили на загрузку, закрыли редактор, и потом опять открыли
+      this.sync_EndAction(Asc.c_oAscAsyncActionType.BlockInteraction, Asc.c_oAscAsyncAction.LoadImage);
+      this.sendFromFrameToGeneralEditor({
+          "type": AscCommon.c_oAscFrameDataType.OpenFrame
+      });
+      oOleObjectInfo = oOleObjectInfo || {"binary": AscCommon.getEmpty()};
+      const sStream = oOleObjectInfo["binary"];
+      const oThis = this;
+      const oFile = new AscCommon.OpenFileResult();
+      oFile.bSerFormat = AscCommon.checkStreamSignature(sStream, AscCommon.c_oSerFormat.Signature);
+      oFile.data = sStream;
+      this.isEditOleMode = true;
+      this.isChartEditor = false;
+      this.isFromSheetEditor = oOleObjectInfo["isFromSheetEditor"];
+      const oDocumentImageUrls = oOleObjectInfo["documentImageUrls"];
+      this.asc_CloseFile();
+      this.fAfterLoad = function () {
+          const nImageWidth = oOleObjectInfo["imageWidth"];
+          const nImageHeight = oOleObjectInfo["imageHeight"];
+          if (nImageWidth && nImageHeight) {
+              oThis.saveImageCoefficients = oThis.getScaleCoefficientsForOleTableImage(nImageWidth, nImageHeight);
+          }
+          oThis.wb.scrollToOleSize();
+          // добавляем первый поинт после загрузки, чтобы в локальную историю добавился либо стандартный oleSize, либо заданный пользователем
+          const oleSize = oThis.wb.getOleSize();
+          oleSize.addPointToLocalHistory();
+
+          oThis.wb.onOleEditorReady();
+          oThis.sync_EndAction(Asc.c_oAscAsyncActionType.BlockInteraction, Asc.c_oAscAsyncAction.Open);
+      }
 
-    this.imagesFromGeneralEditor = oDocumentImageUrls;
-    this.openDocument(oFile);
+      this.imagesFromGeneralEditor = oDocumentImageUrls || {};
+      this.openDocument(oFile);
     };
   /**
    * get binary info about changed ole object
@@ -3987,10 +3995,31 @@ var editor;
     const arrBinaryData = oBinaryFileWriter.Write().split(';');
     const sCleanBinaryData = arrBinaryData[arrBinaryData.length - 1];
     const oBinaryInfo = {};
+    const arrWorksheets = this.wb.wsViews;
+    const arrRasterImageIds = [];
+    for (let i = 0; i < arrWorksheets.length; i += 1) {
+        const oWorksheet = arrWorksheets[i];
+        const arrDrawings = oWorksheet.model.Drawings;
+        if (arrDrawings) {
+            for (let i = 0; i < arrDrawings.length; i += 1) {
+                const oDrawing = arrDrawings[i];
+                oDrawing.graphicObject.getAllRasterImages(arrRasterImageIds);
+            }
+        }
+    }
+    const urlsForAddToHistory = [];
+    for (let i = 0; i < arrRasterImageIds.length; i += 1) {
+        const url = AscCommon.g_oDocumentUrls.mediaPrefix + arrRasterImageIds[i];
+        if (!(this.imagesFromGeneralEditor && this.imagesFromGeneralEditor[url] && this.imagesFromGeneralEditor[url] === AscCommon.g_oDocumentUrls.getUrls()[url])) {
+            urlsForAddToHistory.push(arrRasterImageIds[i]);
+        }
+    }
+
 
     oBinaryInfo["binary"] = sCleanBinaryData;
     oBinaryInfo["base64Image"] = sDataUrl;
     oBinaryInfo["isFromSheetEditor"] = this.isFromSheetEditor;
+    oBinaryInfo["imagesForAddToHistory"] = urlsForAddToHistory;
     if (this.saveImageCoefficients) {
         oBinaryInfo["widthCoefficient"] = this.saveImageCoefficients.widthCoefficient;
         oBinaryInfo["heightCoefficient"] = this.saveImageCoefficients.heightCoefficient;
@@ -4001,10 +4030,11 @@ var editor;
   }
 
 	spreadsheet_api.prototype.asc_toggleChangeVisibleAreaOleEditor = function (bForceValue) {
-		var ws = this.wb.getWorksheet();
+		const ws = this.wb.getWorksheet();
 		ws.cleanSelection();
 		ws.endEditChart();
 		ws._endSelectionShape();
+        const previousValue = this.isEditVisibleAreaOleEditor;
 		if (typeof bForceValue === 'boolean') {
 			this.isEditVisibleAreaOleEditor = bForceValue;
 		} else {
@@ -4013,6 +4043,11 @@ var editor;
 		if (this.isEditVisibleAreaOleEditor) {
 			this.wb.setCellEditMode(false);
 		}
+        const currentValue = this.isEditVisibleAreaOleEditor;
+        if (previousValue === true && currentValue === false) {
+            const oOleSize = this.wbModel.getOleSize();
+            oOleSize.addToGlobalHistory();
+        }
 		ws._drawSelection();
 	};
 
@@ -4078,6 +4113,10 @@ var editor;
     this.asc_addImage();
   };
   spreadsheet_api.prototype._addImageUrl = function(urls, obj) {
+    if (obj && obj.sendUrlsToFrameEditor && this.isOpenedChartFrame) {
+      this.addImageUrlsFromGeneralToFrameEditor(urls);
+      return;
+    }
     var ws = this.wb.getWorksheet();
     if (ws) {
       if (obj && (obj.isImageChangeUrl || obj.isShapeImageChangeUrl || obj.isTextArtChangeUrl || obj.fAfterUploadOleObjectImage)) {
@@ -4411,7 +4450,7 @@ var editor;
         }
     };
 
-  spreadsheet_api.prototype.asc_addOleObjectAction = function(sLocalUrl, sData, sApplicationId, fWidth, fHeight, nWidthPix, nHeightPix, bSelect)
+  spreadsheet_api.prototype.asc_addOleObjectAction = function(sLocalUrl, sData, sApplicationId, fWidth, fHeight, nWidthPix, nHeightPix, bSelect, arrImagesForAddToHistory)
   {
     var _image = this.ImageLoader.LoadImage(AscCommon.getFullImageSrc2(sLocalUrl), 1);
     if (null != _image){
@@ -4422,20 +4461,20 @@ var editor;
 
       if(ws.objectRender){
         this.asc_canPaste();
-        ws.objectRender.addOleObject(fWidth, fHeight, nWidthPix, nHeightPix, sLocalUrl, sData, sApplicationId, bSelect);
+        ws.objectRender.addOleObject(fWidth, fHeight, nWidthPix, nHeightPix, sLocalUrl, sData, sApplicationId, bSelect, arrImagesForAddToHistory);
         this.asc_endPaste();
       }
     }
   };
 
-  spreadsheet_api.prototype.asc_editOleObjectAction = function(bResize, oOleObject, sImageUrl, sData, fWidth, fHeight, nPixWidth, nPixHeight)
+  spreadsheet_api.prototype.asc_editOleObjectAction = function(oOleObject, sImageUrl, sData, fWidth, fHeight, nPixWidth, nPixHeight, arrImagesForAddToHistory)
   {
     if (oOleObject)
     {
       var ws = this.wb.getWorksheet();
       if(ws.objectRender){
         this.asc_canPaste();
-        ws.objectRender.editOleObject(oOleObject, sData, sImageUrl, fWidth, fHeight, nPixWidth, nPixHeight, bResize);
+        ws.objectRender.editOleObject(oOleObject, sData, sImageUrl, fWidth, fHeight, nPixWidth, nPixHeight, arrImagesForAddToHistory);
         this.asc_endPaste();
       }
     }
@@ -4508,9 +4547,6 @@ var editor;
 	if (!this.canEdit()) {
 	  return;
 	}
-    if (this.isFrameEditor() && !AscCommon.isNullOrEmptyString(props.ImageUrl)) {
-        props.ImageUrl = null;
-    }
     var ws = this.wb.getWorksheet();
     var fReplaceCallback = null, sImageUrl = null, sToken = undefined;
     if(!AscCommon.isNullOrEmptyString(props.ImageUrl)){
@@ -4559,7 +4595,7 @@ var editor;
           ws.objectRender.setGraphicObjectProps(props);
         }
 
-      }, true, undefined, sToken);
+      }, undefined, sToken);
     }
     else{
       var sBulletSymbol = props.asc_getBulletSymbol && props.asc_getBulletSymbol();
@@ -5838,7 +5874,7 @@ var editor;
     }
 
 	  let xlsxData;
-	  this.isOpenOOXInBrowser = AscCommon.checkOOXMLSignature(base64File);
+	  this.isOpenOOXInBrowser = this["asc_isSupportFeature"]("ooxml") && AscCommon.checkOOXMLSignature(base64File);
 	  if (this.isOpenOOXInBrowser) {
 		  //slice because array contains garbage after end of function
 		  this.openOOXInBrowserZip = base64File.slice();
@@ -5907,7 +5943,7 @@ var editor;
       return { data: oBinaryFileWriter.Write(true, true), header: oBinaryFileWriter.WriteFileHeader(oBinaryFileWriter.Memory.GetCurPosition(), Asc.c_nVersionNoBase64) };
   };
   spreadsheet_api.prototype.asc_nativeGetFileData = function() {
-	  if (this.isOpenOOXInBrowser) {
+	  if (this.isOpenOOXInBrowser && this.saveDocumentToZip) {
 		  let res;
 		  this.saveDocumentToZip(this.wb.model, this.editorId, function(data) {
 			  res = data;
@@ -7621,6 +7657,15 @@ var editor;
 		this.sendEvent('onWorksheetChange', range);
 	};
 
+	spreadsheet_api.prototype.asc_enterText = function(codePoints)
+	{
+		let wb = this.wb;
+		if (!wb)
+			return;
+
+		wb.EnterText(codePoints);
+	};
+
   /*
    * Export
    * -----------------------------------------------------------------------------

cell/apiBuilder.js

@@ -52,6 +52,13 @@
 	 */
 	var Api = window["Asc"]["spreadsheet_api"];
 
+	/**
+ 	* The callback function which is called when the specified range of the current sheet changes.
+ 	* <note>Please note that the event is not called for the undo/redo operations.</note>
+	* @event Api#onWorksheetChange
+	* @property {ApiRange} range - The modified range represented as the ApiRange object.
+ 	*/
+
 	/**
 	 * Class representing a sheet.
 	 * @constructor
@@ -86,6 +93,7 @@
 	 * @property {number} Col - Returns the column number for the selected cell.
 	 * @property {ApiRange} Rows - Returns the ApiRange object that represents the rows of the specified range.
 	 * @property {ApiRange} Cols - Returns the ApiRange object that represents the columns of the specified range.
+	 * @property {ApiRange} Cells - Returns a Range object that represents all the cells in the specified range or a specified cell.
 	 * @property {number} Count - Returns the rows or columns count.
 	 * @property {string} Address - Returns the range address.
 	 * @property {string} Value - Returns a value from the first cell of the specified range or sets it to this cell.
@@ -103,8 +111,10 @@
 	 * @property {'center' | 'bottom' | 'top' | 'distributed' | 'justify'} AlignVertical - Sets the text vertical alignment to the current cell range.
 	 * @property {'left' | 'right' | 'center' | 'justify'} AlignHorizontal - Sets the text horizontal alignment to the current cell range.
 	 * @property {boolean} Bold - Sets the bold property to the text characters from the current cell or cell range.
+	 * @property {boolean} Italic - Sets the italic property to the text characters in the current cell or cell range.
 	 * @property {'none' | 'single' | 'singleAccounting' | 'double' | 'doubleAccounting'} Underline - Sets the type of underline applied to the font.
 	 * @property {boolean} Strikeout - Sets a value that indicates whether the contents of the current cell or cell range are displayed struck through.
+	 * @property {boolean} WrapText - Returns the information about the wrapping cell style or specifies whether the words in the cell must be wrapped to fit the cell size or not.
 	 * @property {ApiColor|'No Fill'} FillColor - Returns or sets the background color of the current cell range.
 	 * @property {string} NumberFormat - Sets a value that represents the format code for the object.
 	 * @property {ApiRange} MergeArea - Returns the cell or cell range from the merge area.
@@ -749,6 +759,25 @@
 		}
 	};
 
+	/**
+	 * Subscribes to the specified event and calls the callback function when the event fires.
+	 * @memberof Api
+	 * @typeofeditors ["CSE"]
+	 * @param {string} eventName - The event name.
+	 * @param {function} callback - Function to be called when the event fires.
+	 * @fires Api#onWorksheetChange
+	 */
+	Api.prototype["attachEvent"] = Api.prototype.attachEvent;
+
+	/**
+	 * Unsubscribes from the specified event.
+	 * @memberof Api
+	 * @typeofeditors ["CSE"]
+	 * @param {string} eventName - The event name.
+	 * @fires Api#onWorksheetChange
+	 */
+	Api.prototype["detachEvent"] = Api.prototype.detachEvent;
+
 	/**
 	 * Returns the state of sheet visibility.
 	 * @memberof ApiWorksheet
@@ -2088,7 +2117,7 @@
 		var nRow = bbox.r2 - bbox.r1 + 1;
 		var res;
 		if (this.range.isOneCell()) {
-			res = this.range.getValue();
+			res = this.range.getValueWithoutFormat();
 		} else {
 			res = [];
 			for (var i = 0; i < nRow; i++) {
@@ -2124,7 +2153,7 @@
 		var nRow = bbox.r2 - bbox.r1 + 1;
 		var res;
 		if (this.range.isOneCell()) {
-			res = this.range.getValue();
+			res = this.range.getValueWithFormat();
 		} else {
 			res = [];
 			for (var i = 0; i < nRow; i++) {
@@ -2141,7 +2170,7 @@
 
 	Object.defineProperty(ApiRange.prototype, "Text", {
 		get: function () {
-			return this.range.getValueWithFormat();
+			return this.GetText();
 		},
 		set: function (value) {
 			this.SetValue(value);

cell/apiDefines.js

@@ -44,13 +44,6 @@ function (window, undefined) {
   // Import
   var CColor = AscCommon.CColor;
 
-var c_oAscConfirm = {
-  ConfirmReplaceRange: 0,
-  ConfirmPutMergeRange: 1,
-  ConfirmReplaceFormulaInTable: 2,
-  ConfirmChangeProtectRange: 3
-};
-
 var c_oAscMergeOptions = {
   Disabled: -1,
   None: 0,
@@ -611,11 +604,6 @@ var c_oAscPopUpSelectorType = {
   prot['ByColorFont'] = prot.ByColorFont;
   prot['ByIcon'] = prot.ByIcon;
   prot['ByValue'] = prot.ByValue;
-  window['Asc']['c_oAscConfirm'] = window['Asc'].c_oAscConfirm = c_oAscConfirm;
-  prot = c_oAscConfirm;
-  prot['ConfirmReplaceRange'] = prot.ConfirmReplaceRange;
-  prot['ConfirmPutMergeRange'] = prot.ConfirmPutMergeRange;
-  prot['ConfirmChangeProtectRange'] = prot.ConfirmChangeProtectRange;
 
   prot['ConfirmReplaceFormulaInTable'] = prot.ConfirmReplaceFormulaInTable;
   window['Asc']['c_oAscMergeOptions'] = window['Asc'].c_oAscMergeOptions = c_oAscMergeOptions;