@fileverse-dev/fortune-core 1.3.12 → 1.3.13-create-2

package/lib/events/mouse.js

@@ -127,7 +127,7 @@ function fixPositionOnFrozenCells(freeze, x, y, mouseX, mouseY) {
 }
 function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, container, fxInput, canvas) {
   var _a, _b;
-  var _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
+  var _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
   if (!(fxInput === null || fxInput === void 0 ? void 0 : fxInput.innerHTML) && ctx) {
     ctx.defaultCandidates = [];
   }
@@ -146,11 +146,11 @@ function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, container, fxIn
     return;
   }
   var freeze = (_c = globalCache.freezen) === null || _c === void 0 ? void 0 : _c[ctx.currentSheetId];
-  var _q = fixPositionOnFrozenCells(freeze, _x, _y, mouseX, mouseY),
-    x = _q.x,
-    y = _q.y,
-    inHorizontalFreeze = _q.inHorizontalFreeze,
-    inVerticalFreeze = _q.inVerticalFreeze;
+  var _p = fixPositionOnFrozenCells(freeze, _x, _y, mouseX, mouseY),
+    x = _p.x,
+    y = _p.y,
+    inHorizontalFreeze = _p.inHorizontalFreeze,
+    inVerticalFreeze = _p.inVerticalFreeze;
   var row_location = (0, _location.rowLocation)(y, ctx.visibledatarow);
   var row = row_location[1];
   var row_pre = row_location[0];
@@ -195,12 +195,8 @@ function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, container, fxIn
   }
   ctx.luckysheet_scroll_status = true;
   if (ctx.luckysheetCellUpdate.length > 0) {
-    var parser = new DOMParser();
-    var doc = parser.parseFromString("<div>".concat((_g = document.getElementById("luckysheet-rich-text-editor")) === null || _g === void 0 ? void 0 : _g.innerHTML, "</div>"), "text/html");
-    var spans = doc.querySelectorAll("span");
-    var firstSpan = spans[0];
-    var lastSpan = spans[spans.length - 1];
-    if ((ctx.formulaCache.rangestart || ctx.formulaCache.rangedrag_column_start || ctx.formulaCache.rangedrag_row_start || (0, _modules.israngeseleciton)(ctx) || (firstSpan === null || firstSpan === void 0 ? void 0 : firstSpan.innerText.includes("=")) && !(lastSpan === null || lastSpan === void 0 ? void 0 : lastSpan.innerText.includes(")"))) && lastSpan && ctx.luckysheetCellUpdate.length === 2) {
+    if (ctx.formulaCache.rangestart || ctx.formulaCache.rangedrag_column_start || ctx.formulaCache.rangedrag_row_start || (0, _modules.israngeseleciton)(ctx)) {
+      var formulaEditorForCmdComma = (0, _modules.getFormulaEditorOwner)(ctx) === "fx" && fxInput ? fxInput : cellInput;
       var rowseleted = [row_index, row_index_ed];
       var columnseleted = [col_index, col_index_ed];
       var left = col_pre;
@@ -267,13 +263,14 @@ function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, container, fxIn
         last.top_move = top_1;
         last.height_move = height;
         ctx.formulaCache.func_selectedrange = last;
-      } else if (e.ctrlKey && ((_h = _lodash.default.last(cellInput.querySelectorAll("span"))) === null || _h === void 0 ? void 0 : _h.innerText) !== ",") {
-        var vText = cellInput.innerText;
+      } else if ((e.ctrlKey || e.metaKey) && ((_g = _lodash.default.last(formulaEditorForCmdComma.querySelectorAll("span"))) === null || _g === void 0 ? void 0 : _g.innerText) !== ",") {
+        var didCmdCommaFormulaHtml = false;
+        var vText = formulaEditorForCmdComma.innerText;
         if (vText[vText.length - 1] === ")") {
           vText = vText.substring(0, vText.length - 1);
         }
         if (vText.length > 0) {
-          var lastWord = vText.substring(vText.length - 1, 1);
+          var lastWord = vText.slice(-1);
           if (lastWord !== "," && lastWord !== "=" && lastWord !== "(") {
             vText += ",";
           }
@@ -283,21 +280,27 @@ function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, container, fxIn
           if (window.getSelection) {
             var currSelection = window.getSelection();
             if (currSelection == null) return;
-            ctx.formulaCache.functionRangeIndex = [_lodash.default.indexOf((_l = (_k = (_j = currSelection.anchorNode) === null || _j === void 0 ? void 0 : _j.parentNode) === null || _k === void 0 ? void 0 : _k.parentNode) === null || _l === void 0 ? void 0 : _l.childNodes, (_m = currSelection.anchorNode) === null || _m === void 0 ? void 0 : _m.parentNode), currSelection.anchorOffset];
+            ctx.formulaCache.functionRangeIndex = [_lodash.default.indexOf((_k = (_j = (_h = currSelection.anchorNode) === null || _h === void 0 ? void 0 : _h.parentNode) === null || _j === void 0 ? void 0 : _j.parentNode) === null || _k === void 0 ? void 0 : _k.childNodes, (_l = currSelection.anchorNode) === null || _l === void 0 ? void 0 : _l.parentNode), currSelection.anchorOffset];
           } else {
             var textRange = document.selection.createRange();
             ctx.formulaCache.functionRangeIndex = textRange;
           }
           cellInput.innerHTML = vText;
+          if (fxInput) fxInput.innerHTML = vText;
           (0, _cell.cancelFunctionrangeSelected)(ctx);
           (0, _modules.createRangeHightlight)(ctx, vText);
+          didCmdCommaFormulaHtml = true;
         }
         ctx.formulaCache.rangestart = false;
         ctx.formulaCache.rangedrag_column_start = false;
         ctx.formulaCache.rangedrag_row_start = false;
-        if (fxInput) fxInput.innerHTML = vText;
-        (0, _modules.rangeHightlightselected)(ctx, cellInput);
+        (0, _modules.rangeHightlightselected)(ctx, formulaEditorForCmdComma);
         (0, _modules.israngeseleciton)(ctx);
+        if (didCmdCommaFormulaHtml) {
+          ctx.formulaCache.rangechangeindex = undefined;
+          var ch = formulaEditorForCmdComma.childNodes;
+          ctx.formulaCache.rangeSetValueTo = ch.length > 0 ? ch[ch.length - 1] : undefined;
+        }
         ctx.formulaCache.func_selectedrange = {
           left: left,
           width: width,
@@ -328,13 +331,15 @@ function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, container, fxIn
           column_focus: col_index
         };
       }
+      ctx.formulaCache.rangestart = true;
+      ctx.formulaCache.rangedrag_column_start = false;
+      ctx.formulaCache.rangedrag_row_start = false;
+      ctx.formulaCache.rangeSelectionActive = true;
       (0, _modules.rangeSetValue)(ctx, cellInput, {
         row: rowseleted,
         column: columnseleted
       }, fxInput);
-      ctx.formulaCache.rangestart = true;
-      ctx.formulaCache.rangedrag_column_start = false;
-      ctx.formulaCache.rangedrag_row_start = false;
+      (0, _modules.rangeHightlightselected)(ctx, cellInput);
       ctx.formulaCache.selectingRangeIndex = ctx.formulaCache.rangechangeindex;
       if (ctx.formulaCache.rangechangeindex > ctx.formulaRangeHighlight.length) {
         (0, _modules.createRangeHightlight)(ctx, cellInput.innerHTML, ctx.formulaCache.rangechangeindex);
@@ -357,7 +362,7 @@ function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, container, fxIn
   }
   if (ctx.luckysheet_select_status) {
     if (e.shiftKey) {
-      var last = (_o = ctx.luckysheet_select_save) === null || _o === void 0 ? void 0 : _o[ctx.luckysheet_select_save.length - 1];
+      var last = (_m = ctx.luckysheet_select_save) === null || _m === void 0 ? void 0 : _m[ctx.luckysheet_select_save.length - 1];
       if (last && last.top != null && last.left != null && last.height != null && last.width != null && last.row_focus != null && last.column_focus != null) {
         var top_2 = 0;
         var height = 0;
@@ -416,7 +421,7 @@ function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, container, fxIn
         ctx.luckysheet_select_save[ctx.luckysheet_select_save.length - 1] = last;
       }
     } else if (e.ctrlKey || e.metaKey) {
-      (_p = ctx.luckysheet_select_save) === null || _p === void 0 ? void 0 : _p.push({
+      (_o = ctx.luckysheet_select_save) === null || _o === void 0 ? void 0 : _o.push({
         left: col_pre,
         width: col - col_pre - 1,
         top: row_pre,
@@ -508,6 +513,8 @@ function handleCellAreaDoubleClick(ctx, globalCache, settings, e, container) {
     row_index = row_focus;
     col_index = column_focus;
   }
+  globalCache.enteredEditByTyping = false;
+  delete globalCache.pendingTypeOverCell;
   (0, _cell.luckysheetUpdateCell)(ctx, row_index, col_index);
 }
 function handleContextMenu(ctx, settings, e, workbookContainer, container, area) {
@@ -848,10 +855,28 @@ function mouseRender(ctx, globalCache, e, cellInput, scrollX, scrollY, container
     ctx.luckysheet_select_save[ctx.luckysheet_select_save.length - 1] = last;
     (0, _freeze.scrollToFrozenRowCol)(ctx, (_d = globalCache.freezen) === null || _d === void 0 ? void 0 : _d[ctx.currentSheetId]);
   } else if (ctx.formulaCache.rangestart) {
+    if (ctx.formulaCache.rangeSelectionActive === false && !(0, _modules.maybeRecoverDirtyRangeSelection)(ctx)) {
+      if (ctx.luckysheetCellUpdate.length > 0) {
+        (0, _cell.updateCell)(ctx, ctx.luckysheetCellUpdate[0], ctx.luckysheetCellUpdate[1], cellInput);
+      }
+      return;
+    }
     (0, _modules.rangeDrag)(ctx, e, cellInput, scrollX.scrollLeft, scrollY.scrollTop, container, fxInput);
   } else if (ctx.formulaCache.rangedrag_row_start) {
+    if (ctx.formulaCache.rangeSelectionActive === false && !(0, _modules.maybeRecoverDirtyRangeSelection)(ctx)) {
+      if (ctx.luckysheetCellUpdate.length > 0) {
+        (0, _cell.updateCell)(ctx, ctx.luckysheetCellUpdate[0], ctx.luckysheetCellUpdate[1], cellInput);
+      }
+      return;
+    }
     (0, _formula.rangeDragRow)(ctx, e, cellInput, scrollX.scrollLeft, scrollY.scrollTop, container, fxInput);
   } else if (ctx.formulaCache.rangedrag_column_start) {
+    if (ctx.formulaCache.rangeSelectionActive === false && !(0, _modules.maybeRecoverDirtyRangeSelection)(ctx)) {
+      if (ctx.luckysheetCellUpdate.length > 0) {
+        (0, _cell.updateCell)(ctx, ctx.luckysheetCellUpdate[0], ctx.luckysheetCellUpdate[1], cellInput);
+      }
+      return;
+    }
     (0, _formula.rangeDragColumn)(ctx, e, cellInput, scrollX.scrollLeft, scrollY.scrollTop, container, fxInput);
   } else if (ctx.luckysheet_rows_selected_status) {} else if (ctx.luckysheet_cols_selected_status) {} else if (ctx.luckysheet_cell_selected_move) {} else if (ctx.luckysheet_cell_selected_extend) {
     (0, _dropCell.onDropCellSelect)(ctx, e, scrollX, scrollY, container);
@@ -957,7 +982,7 @@ function handleOverlayMouseMove(ctx, globalCache, e, cellInput, scrollX, scrollY
   }
 }
 function handleOverlayMouseUp(ctx, globalCache, settings, e, scrollbarX, scrollbarY, container, cellInput, fxInput) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
   var rect = container.getBoundingClientRect();
   (0, _modules.onImageMoveEnd)(ctx, globalCache);
   (0, _modules.onImageResizeEnd)(ctx, globalCache);
@@ -970,11 +995,17 @@ function handleOverlayMouseUp(ctx, globalCache, settings, e, scrollbarX, scrollb
   (0, _hyperlink.onRangeSelectionModalMoveEnd)(globalCache);
   (0, _modules.onCellsMoveEnd)(ctx, globalCache, e, scrollbarX, scrollbarY, container);
   if (ctx.formulaCache.rangestart || ctx.formulaCache.rangedrag_column_start || ctx.formulaCache.rangedrag_row_start) {
-    if (((_a = document.activeElement) === null || _a === void 0 ? void 0 : _a.id) === "luckysheet-functionbox-cell") {
+    if ((0, _modules.getFormulaEditorOwner)(ctx) === "fx") {
       (0, _formula.handleFormulaInput)(ctx, cellInput, fxInput, 0, undefined, false);
     } else {
       (0, _formula.handleFormulaInput)(ctx, fxInput, cellInput, 0, undefined, false);
     }
+    ctx.luckysheet_select_status = false;
+    ctx.luckysheet_scroll_status = false;
+    ctx.luckysheet_rows_selected_status = false;
+    ctx.luckysheet_cols_selected_status = false;
+    e.preventDefault();
+    return;
   }
   if (ctx.luckysheet_select_status) {
     if (ctx.luckysheetPaintModelOn) {
@@ -1016,10 +1047,10 @@ function handleOverlayMouseUp(ctx, globalCache, settings, e, scrollbarX, scrollb
     cfg_1.customHeight[ctx.luckysheet_rows_change_size_start[1]] = 1;
     var changeRowIndex_1 = ctx.luckysheet_rows_change_size_start[1];
     var changeRowSelected_1 = false;
-    if (((_c = (_b = ctx.luckysheet_select_save) === null || _b === void 0 ? void 0 : _b.length) !== null && _c !== void 0 ? _c : 0) > 0) {
-      (_e = (_d = ctx.luckysheet_select_save) === null || _d === void 0 ? void 0 : _d.filter(function (select) {
+    if (((_b = (_a = ctx.luckysheet_select_save) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0) > 0) {
+      (_d = (_c = ctx.luckysheet_select_save) === null || _c === void 0 ? void 0 : _c.filter(function (select) {
         return select.row_select;
-      })) === null || _e === void 0 ? void 0 : _e.some(function (select) {
+      })) === null || _d === void 0 ? void 0 : _d.some(function (select) {
         if (changeRowIndex_1 >= select.row[0] && changeRowIndex_1 <= select.row[1]) {
           changeRowSelected_1 = true;
         }
@@ -1028,9 +1059,9 @@ function handleOverlayMouseUp(ctx, globalCache, settings, e, scrollbarX, scrollb
     }
     if (changeRowSelected_1) {
       cfg_1.rowlen || (cfg_1.rowlen = {});
-      (_g = (_f = ctx.luckysheet_select_save) === null || _f === void 0 ? void 0 : _f.filter(function (select) {
+      (_f = (_e = ctx.luckysheet_select_save) === null || _e === void 0 ? void 0 : _e.filter(function (select) {
         return select.row_select;
-      })) === null || _g === void 0 ? void 0 : _g.forEach(function (select) {
+      })) === null || _f === void 0 ? void 0 : _f.forEach(function (select) {
         for (var r = select.row[0]; r <= select.row[1]; r += 1) {
           cfg_1.rowlen[r] = Math.ceil(size_1 / ctx.zoomRatio);
         }
@@ -1074,10 +1105,10 @@ function handleOverlayMouseUp(ctx, globalCache, settings, e, scrollbarX, scrollb
     cfg_2.customWidth[ctx.luckysheet_cols_change_size_start[1]] = 1;
     var changeColumnIndex_1 = ctx.luckysheet_cols_change_size_start[1];
     var changeColumnSelected_1 = false;
-    if (((_j = (_h = ctx.luckysheet_select_save) === null || _h === void 0 ? void 0 : _h.length) !== null && _j !== void 0 ? _j : 0) > 0) {
-      (_l = (_k = ctx.luckysheet_select_save) === null || _k === void 0 ? void 0 : _k.filter(function (select) {
+    if (((_h = (_g = ctx.luckysheet_select_save) === null || _g === void 0 ? void 0 : _g.length) !== null && _h !== void 0 ? _h : 0) > 0) {
+      (_k = (_j = ctx.luckysheet_select_save) === null || _j === void 0 ? void 0 : _j.filter(function (select) {
         return select.column_select;
-      })) === null || _l === void 0 ? void 0 : _l.some(function (select) {
+      })) === null || _k === void 0 ? void 0 : _k.some(function (select) {
         if (changeColumnIndex_1 >= select.column[0] && changeColumnIndex_1 <= select.column[1]) {
           changeColumnSelected_1 = true;
         }
@@ -1086,9 +1117,9 @@ function handleOverlayMouseUp(ctx, globalCache, settings, e, scrollbarX, scrollb
     }
     if (changeColumnSelected_1) {
       cfg_2.columnlen || (cfg_2.columnlen = {});
-      (_o = (_m = ctx.luckysheet_select_save) === null || _m === void 0 ? void 0 : _m.filter(function (select) {
+      (_m = (_l = ctx.luckysheet_select_save) === null || _l === void 0 ? void 0 : _l.filter(function (select) {
         return select.column_select;
-      })) === null || _o === void 0 ? void 0 : _o.forEach(function (select) {
+      })) === null || _m === void 0 ? void 0 : _m.forEach(function (select) {
         for (var r = select.column[0]; r <= select.column[1]; r += 1) {
           cfg_2.columnlen[r] = Math.ceil(size_2 / ctx.zoomRatio);
         }
@@ -1105,10 +1136,10 @@ function handleOverlayMouseUp(ctx, globalCache, settings, e, scrollbarX, scrollb
     ctx.luckysheet_cols_freeze_drag = false;
     var scrollLeft = ctx.scrollLeft;
     var x = e.pageX - rect.left - ctx.rowHeaderWidth + scrollLeft - window.scrollX;
-    var _p = (0, _location.colLocation)(x, ctx.visibledatacolumn),
-      col_pre = _p[0],
-      col_curr = _p[1],
-      col_index_curr = _p[2];
+    var _o = (0, _location.colLocation)(x, ctx.visibledatacolumn),
+      col_pre = _o[0],
+      col_curr = _o[1],
+      col_index_curr = _o[2];
     var col_index = x > (col_curr + col_pre) / 2 ? col_index_curr : col_index_curr - 1;
     var idx = (0, _utils.getSheetIndex)(ctx, ctx.currentSheetId);
     if (idx == null) return;
@@ -1156,10 +1187,10 @@ function handleOverlayMouseUp(ctx, globalCache, settings, e, scrollbarX, scrollb
     ctx.luckysheet_rows_freeze_drag = false;
     var scrollTop = ctx.scrollTop;
     var y = e.pageY - rect.top - ctx.columnHeaderHeight + scrollTop - window.scrollY;
-    var _q = (0, _location.rowLocation)(y, ctx.visibledatarow),
-      row_pre = _q[0],
-      row_curr = _q[1],
-      row_index_curr = _q[2];
+    var _p = (0, _location.rowLocation)(y, ctx.visibledatarow),
+      row_pre = _p[0],
+      row_curr = _p[1],
+      row_index_curr = _p[2];
     var row_index = y > (row_curr + row_pre) / 2 ? row_index_curr : row_index_curr - 1;
     var idx = (0, _utils.getSheetIndex)(ctx, ctx.currentSheetId);
     if (idx == null) return;
@@ -1338,10 +1369,12 @@ function handleRowHeaderMouseDown(ctx, globalCache, e, container, cellInput, fxI
           row: rowseleted,
           column: [null, null]
         }, fxInput);
+        (0, _modules.rangeHightlightselected)(ctx, cellInput);
       }
       ctx.formulaCache.rangedrag_row_start = true;
       ctx.formulaCache.rangestart = false;
       ctx.formulaCache.rangedrag_column_start = false;
+      ctx.formulaCache.rangeSelectionActive = true;
       ctx.formulaCache.selectingRangeIndex = ctx.formulaCache.rangechangeindex;
       if (ctx.formulaCache.rangechangeindex > ctx.formulaRangeHighlight.length) {
         (0, _modules.createRangeHightlight)(ctx, cellInput.innerHTML, ctx.formulaCache.rangechangeindex);
@@ -1569,10 +1602,12 @@ function handleColumnHeaderMouseDown(ctx, globalCache, e, container, cellInput,
           row: [null, null],
           column: columnseleted
         }, fxInput);
+        (0, _modules.rangeHightlightselected)(ctx, cellInput);
       }
       ctx.formulaCache.rangedrag_column_start = true;
       ctx.formulaCache.rangestart = false;
       ctx.formulaCache.rangedrag_row_start = false;
+      ctx.formulaCache.rangeSelectionActive = true;
       ctx.formulaCache.selectingRangeIndex = ctx.formulaCache.rangechangeindex;
       if (ctx.formulaCache.rangechangeindex > ctx.formulaRangeHighlight.length) {
         (0, _modules.createRangeHightlight)(ctx, cellInput.innerHTML, ctx.formulaCache.rangechangeindex);