diff --git a/.gitignore b/.gitignore
index 087fc940fe..91eb3abfe4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ package-lock.json
*/node_modules
*/package-lock.json
connector
+tests/package*
diff --git a/cell/api.js b/cell/api.js
index 3daa0d6081..5491fe8eb9 100644
--- a/cell/api.js
+++ b/cell/api.js
@@ -3242,7 +3242,7 @@ var editor;
}
}
- if (this.isMobileVersion) {
+ if (this.isUseOldMobileVersion()) {
this.wb.defaults.worksheetView.halfSelection = true;
this.wb.defaults.worksheetView.activeCellBorderColor = new CColor(79, 158, 79);
var _container = document.getElementById(this.HtmlElementName);
@@ -3258,11 +3258,14 @@ var editor;
if ((typeof AscCommonExcel.CMobileTouchManager) !== "undefined")
{
- this.wb.MobileTouchManager = new AscCommonExcel.CMobileTouchManager({eventsElement: "cell_mobile_element", desktopMode : !this.isMobileVersion});
+ this.wb.MobileTouchManager = new AscCommonExcel.CMobileTouchManager({eventsElement: "cell_mobile_element", desktopMode : !this.isUseOldMobileVersion()});
this.wb.MobileTouchManager.Init(this);
- if (this.isMobileVersion)
+ if (this.isUseOldMobileVersion())
this.wb.MobileTouchManager.initEvents(AscCommon.g_inputContext.HtmlArea.id);
+
+ if (this.controller)
+ this.wb.MobileTouchManager.addClickElement([this.controller.element]);
}
this.asc_CheckGuiControlColors();
diff --git a/cell/model/FormulaObjects/parserFormula.js b/cell/model/FormulaObjects/parserFormula.js
index e91f42f757..e169cd94c4 100644
--- a/cell/model/FormulaObjects/parserFormula.js
+++ b/cell/model/FormulaObjects/parserFormula.js
@@ -9987,8 +9987,12 @@ function parserFormula( formula, parent, _ws ) {
*/
function CalcRecursion() {
this.nLevel = 0;
- this.nIterStep = 1;
this.bIsForceBacktracking = false;
+ this.bIsProcessRecursion = false;
+ this.aElems = [];
+ this.aElemsPart = [];
+
+ this.nIterStep = 1;
this.oStartCellIndex = null;
this.nRecursionCounter = 0;
this.oGroupChangedCells = null;
@@ -10022,6 +10026,10 @@ function parserFormula( formula, parent, _ws ) {
* @param {boolean} bIsForceBacktracking
*/
CalcRecursion.prototype.setIsForceBacktracking = function (bIsForceBacktracking) {
+ if (!this.getIsForceBacktracking()) {
+ this.aElemsPart = [];
+ this.aElems.push(this.aElemsPart);
+ }
this.bIsForceBacktracking = bIsForceBacktracking;
};
/**
@@ -10033,6 +10041,22 @@ function parserFormula( formula, parent, _ws ) {
CalcRecursion.prototype.getIsForceBacktracking = function () {
return this.bIsForceBacktracking;
};
+ /**
+ * Method sets a flag who recognizes work with aElems in _checkDirty method is already in process.
+ * @memberof CalcRecursion
+ * @param {boolean} bIsProcessRecursion
+ */
+ CalcRecursion.prototype.setIsProcessRecursion = function (bIsProcessRecursion) {
+ this.bIsProcessRecursion = bIsProcessRecursion;
+ };
+ /**
+ * Method returns a flag who recognizes work with aElems in _checkDirty method is already in process.
+ * @memberof CalcRecursion
+ * @returns {boolean}
+ */
+ CalcRecursion.prototype.getIsProcessRecursion = function () {
+ return this.bIsProcessRecursion;
+ }
/**
* Method increases recursion level. Uses for tracking a level of recursion in _checkDirty method.
* @memberof CalcRecursion
@@ -10074,6 +10098,32 @@ function parserFormula( formula, parent, _ws ) {
return res;
};
+ /**
+ * Method inserts cells which need to be processed in _checkDirty method again.
+ * Uses for formula chains that reached max recursion level.
+ * @memberof CalcRecursion
+ * @param {{ws:Worksheet, nRow:number, nCol:number}} oCellCoordinate
+ */
+ CalcRecursion.prototype.insert = function (oCellCoordinate) {
+ this.aElemsPart.push(oCellCoordinate);
+ };
+ /**
+ * Method executes callback for each cell from aElems in reverse order.
+ * aElems stores cell coordinates which need to be processed in _checkDirty method again.
+ * @memberof CalcRecursion
+ * @param {Function} fCallback
+ */
+ CalcRecursion.prototype.foreachInReverse = function (fCallback) {
+ for (let i = this.aElems.length - 1; i >= 0; i--) {
+ let aElemsPart = this.aElems[i];
+ for (let j = 0, length = aElemsPart.length; j < length; j++) {
+ fCallback(aElemsPart[j]);
+ if (this.getIsForceBacktracking()) {
+ return;
+ }
+ }
+ }
+ };
/**
* Method increases iteration step.
* @memberof CalcRecursion
diff --git a/cell/model/Workbook.js b/cell/model/Workbook.js
index 4dd32bb65f..229eb048ff 100644
--- a/cell/model/Workbook.js
+++ b/cell/model/Workbook.js
@@ -2910,7 +2910,7 @@
AscFormat.ExecuteNoHistory(function () {
this.CustomProperties = new AscCommon.CCustomProperties();
- }, this, []);
+ }, this, [], true);
this.theme = null;
this.clrSchemeMap = null;
@@ -15178,7 +15178,7 @@
if (oSheetListeners.cellMap.hasOwnProperty(nCellIndex)) {
return oSheetListeners.cellMap[nCellIndex];
- } else {
+ } else if (aOutStack && aOutStack.length) {
for (let nIndex in oSheetListeners.areaMap) {
if (oSheetListeners.areaMap[nIndex].bbox.contains(this.nCol, this.nRow)
&& !_isExcludeFormula(aOutStack, oSheetListeners.areaMap[nIndex])) {
@@ -15607,8 +15607,8 @@
const t = this;
// Checks cell contains formula or formula is not calculated yet
if (this.getIsDirty()) {
- g_cCalcRecursion.incLevel();
if (g_cCalcRecursion.checkLevel()) {
+ g_cCalcRecursion.incLevel();
const isCalc = this.getIsCalc();
this.setIsCalc(true);
const calculatedArrayFormulas = [];
@@ -15639,8 +15639,27 @@
});
g_cCalcRecursion.decLevel();
- this.setIsCalc(false);
- this.setIsDirty(false);
+ if (g_cCalcRecursion.getIsForceBacktracking()) {
+ g_cCalcRecursion.insert({ws: this.ws, nRow: this.nRow, nCol: this.nCol});
+ if (g_cCalcRecursion.getLevel() === 0 && !g_cCalcRecursion.getIsProcessRecursion()) {
+ g_cCalcRecursion.setIsProcessRecursion(true);
+ do {
+ g_cCalcRecursion.setIsForceBacktracking(false);
+ g_cCalcRecursion.foreachInReverse(function(oElem) {
+ oElem.ws._getCellNoEmpty(oElem.nRow, oElem.nCol, function(oCell) {
+ if(oCell && oCell.getIsDirty()) {
+ oCell.setIsCalc(false);
+ oCell._checkDirty();
+ }
+ });
+ });
+ } while (g_cCalcRecursion.getIsForceBacktracking());
+ g_cCalcRecursion.setIsProcessRecursion(false);
+ }
+ } else {
+ this.setIsCalc(false);
+ this.setIsDirty(false);
+ }
}
}
};
diff --git a/cell/view/EventsController.js b/cell/view/EventsController.js
index e0b7b77922..3282775867 100644
--- a/cell/view/EventsController.js
+++ b/cell/view/EventsController.js
@@ -154,7 +154,7 @@
return;
}
- if (this.view.Api.isMobileVersion) {
+ if (this.view.Api.isUseOldMobileVersion()) {
/*раньше события на ресайз вызывался из меню через контроллер. теперь контроллер в меню не доступен, для ресайза подписываемся на глобальный ресайз от window.*/
window.addEventListener("resize", function () {
self._onWindowResize.apply(self, arguments);
@@ -1642,6 +1642,8 @@
touchManager.stopTouchingInProcess();
return res;
}
+ if (touchManager)
+ touchManager.checkMouseFocus(event);
var t = this;
asc["editor"].checkInterfaceElementBlur();
@@ -2177,6 +2179,11 @@
}
}
+ if (event.shiftKey) {
+ deltaX = deltaY;
+ deltaY = 0;
+ }
+
if (this.smoothWheelCorrector && !wb.smoothScroll) {
deltaX = this.smoothWheelCorrector.get_DeltaX(deltaX);
deltaY = this.smoothWheelCorrector.get_DeltaY(deltaY);
diff --git a/cell/view/WorkbookView.js b/cell/view/WorkbookView.js
index 25b12a930d..5b2f4bbba9 100644
--- a/cell/view/WorkbookView.js
+++ b/cell/view/WorkbookView.js
@@ -354,10 +354,10 @@
if (null != this.element) {
if (!this.Api.VersionHistory && !this.Api.isEditOleMode) {
this.element.innerHTML = '\
-
\
-
\
-
\
-
\
+
\
+
\
+
\
+
\
\