@fileverse-dev/fortune-core 1.3.10-yjs-10 → 1.3.11-input-ref

package/es/events/keyboard.js

@@ -117,13 +117,16 @@ import _ from "lodash";
 import { hideCRCount, removeActiveImage } from "..";
 import { getFlowdata } from "../context";
 import { updateCell, cancelNormalSelected } from "../modules/cell";
-import { handleFormulaInput } from "../modules/formula";
+import { handleFormulaInput, israngeseleciton, maybeRecoverDirtyRangeSelection, markRangeSelectionDirty } from "../modules/formula";
 import { copy, deleteSelectedCellText, deleteSelectedCellFormat, textFormat, fillDate, fillTime, fillRightData, fillDownData, moveHighlightCell, moveHighlightRange, selectAll, selectionCache } from "../modules/selection";
 import { cancelPaintModel, handleBold, handleItalic, handleUnderline, handleLink } from "../modules/toolbar";
 import { hasPartMC } from "../modules/validation";
 import { getNowDateTime, getSheetIndex, isAllowEdit } from "../utils";
 import { handleCopy } from "./copy";
 import { jfrefreshgrid } from "../modules/refresh";
+function isLegacyFormulaRangeMode(ctx) {
+  return !!ctx.formulaCache.rangestart || !!ctx.formulaCache.rangedrag_column_start || !!ctx.formulaCache.rangedrag_row_start || ctx.formulaCache.rangeSelectionActive === true || israngeseleciton(ctx);
+}
 export function handleGlobalEnter(ctx, cellInput, e, canvas) {
   var _a, _b, _c;
   if ((e.altKey || e.metaKey) && ctx.luckysheetCellUpdate.length > 0) {
@@ -169,11 +172,20 @@ function moveToEdge(sheetData, key, curr, rowDelta, colDelta, startR, endR, star
   return colDelta === 0 ? r : c;
 }
 function handleControlPlusArrowKey(ctx, e, shiftPressed) {
-  if (ctx.luckysheetCellUpdate.length > 0) return;
+  if (ctx.formulaCache.rangeSelectionActive === false && !maybeRecoverDirtyRangeSelection(ctx)) {
+    return;
+  }
+  var isFormulaRefMode = isLegacyFormulaRangeMode(ctx);
+  if (isFormulaRefMode) {
+    ctx.formulaCache.rangeSelectionActive = true;
+  }
+  if (ctx.luckysheetCellUpdate.length > 0 && !isFormulaRefMode) {
+    return;
+  }
   var idx = getSheetIndex(ctx, ctx.currentSheetId);
   if (_.isNil(idx)) return;
   var file = ctx.luckysheetfile[idx];
-  if (!file || !file.row || !file.column) return;
+  if (!file || _.isNil(file.row) || _.isNil(file.column)) return;
   var maxRow = file.row;
   var maxCol = file.column;
   var last;
@@ -324,7 +336,14 @@ export function handleWithCtrlOrMetaKey(ctx, cache, e, cellInput, fxInput, handl
 }
 function handleShiftWithArrowKey(ctx, e) {
   var _a;
-  if (ctx.luckysheetCellUpdate.length > 0) {
+  if (ctx.formulaCache.rangeSelectionActive === false && !maybeRecoverDirtyRangeSelection(ctx)) {
+    return;
+  }
+  var isFormulaMode = isLegacyFormulaRangeMode(ctx);
+  if (isFormulaMode) {
+    ctx.formulaCache.rangeSelectionActive = true;
+  }
+  if (ctx.luckysheetCellUpdate.length > 0 && !isFormulaMode) {
     return;
   }
   ctx.luckysheet_shiftpositon = _.cloneDeep((_a = ctx.luckysheet_select_save) === null || _a === void 0 ? void 0 : _a[ctx.luckysheet_select_save.length - 1]);
@@ -348,17 +367,15 @@ function handleShiftWithArrowKey(ctx, e) {
   e.preventDefault();
 }
 export function handleArrowKey(ctx, e) {
-  var _a, _b;
-  if (ctx.luckysheetCellUpdate.length > 0 || ctx.luckysheet_cell_selected_move || ctx.luckysheet_cell_selected_extend) {
-    var parser = new DOMParser();
-    var doc = parser.parseFromString("<div>".concat((_a = document.getElementById("luckysheet-rich-text-editor")) === null || _a === void 0 ? void 0 : _a.innerHTML, "</div>"), "text/html");
-    var spans = doc.querySelectorAll("span");
-    var lastSpan = spans[spans.length - 1];
-    var notFunctionInit = !((_b = document.getElementById("luckysheet-rich-text-editor")) === null || _b === void 0 ? void 0 : _b.innerText.includes("("));
-    if ((lastSpan === null || lastSpan === void 0 ? void 0 : lastSpan.innerText.includes(")")) || (lastSpan === null || lastSpan === void 0 ? void 0 : lastSpan.innerText.includes('"')) || notFunctionInit && /^[a-zA-Z]+$/.test(lastSpan === null || lastSpan === void 0 ? void 0 : lastSpan.innerText) && !_.includes(["="], lastSpan === null || lastSpan === void 0 ? void 0 : lastSpan.innerText) || /^[a-zA-Z]+$/.test(lastSpan === null || lastSpan === void 0 ? void 0 : lastSpan.innerText)) {
-      return;
-    }
+  if (ctx.formulaCache.rangeSelectionActive === false && !maybeRecoverDirtyRangeSelection(ctx)) {
+    return;
   }
+  var isFormulaRefMode = isLegacyFormulaRangeMode(ctx);
+  if (isFormulaRefMode) ctx.formulaCache.rangeSelectionActive = true;
+  if (ctx.luckysheetCellUpdate.length > 0 && !isFormulaRefMode) {
+    return;
+  }
+  if (ctx.luckysheetCellUpdate.length > 0 || ctx.luckysheet_cell_selected_move || ctx.luckysheet_cell_selected_extend) {}
   var moveCount = hideCRCount(ctx, e.key);
   switch (e.key) {
     case "ArrowUp":
@@ -376,6 +393,7 @@ export function handleArrowKey(ctx, e) {
     default:
       break;
   }
+  e.preventDefault();
 }
 export function handleGlobalKeyDown(ctx, cellInput, fxInput, e, cache, handleUndo, handleRedo, canvas) {
   var _a, _b, _c;
@@ -484,6 +502,9 @@ export function handleGlobalKeyDown(ctx, cellInput, fxInput, e, cache, handleUnd
           if (ctx.activeImg != null) {
             removeActiveImage(ctx);
           } else {
+            if (ctx.formulaCache.rangeSelectionActive === true) {
+              markRangeSelectionDirty(ctx);
+            }
             deleteSelectedCellText(ctx);
           }
           jfrefreshgrid(ctx, null, undefined);

package/es/events/mouse.js

@@ -1,6 +1,6 @@
 import _ from "lodash";
 import { getFlowdata } from "../context";
-import { cancelActiveImgItem, cancelPaintModel, functionHTMLGenerate, israngeseleciton, rangeHightlightselected, rangeSetValue, onCommentBoxMove, onCommentBoxMoveEnd, onCommentBoxResize, onCommentBoxResizeEnd, onImageMove, onImageMoveEnd, onImageResize, onImageResizeEnd, removeEditingComment, removeOverShowComment, rangeDrag, onFormulaRangeDragEnd, createFormulaRangeSelect, createRangeHightlight, onCellsMoveEnd, onCellsMove, cellFocus, editComment, onIframeMoveEnd, onIframeResizeEnd, overShowError } from "../modules";
+import { cancelActiveImgItem, cancelPaintModel, functionHTMLGenerate, israngeseleciton, maybeRecoverDirtyRangeSelection, rangeHightlightselected, rangeSetValue, onCommentBoxMove, onCommentBoxMoveEnd, onCommentBoxResize, onCommentBoxResizeEnd, onImageMove, onImageMoveEnd, onImageResize, onImageResizeEnd, removeEditingComment, removeOverShowComment, rangeDrag, onFormulaRangeDragEnd, createFormulaRangeSelect, createRangeHightlight, onCellsMoveEnd, onCellsMove, cellFocus, editComment, onIframeMoveEnd, onIframeResizeEnd, overShowError } from "../modules";
 import { getFrozenHandleLeft, getFrozenHandleTop, scrollToFrozenRowCol } from "../modules/freeze";
 import { cancelFunctionrangeSelected, mergeBorder, mergeMoveMain, updateCell, luckysheetUpdateCell } from "../modules/cell";
 import { colLocation, colLocationByIndex, rowLocation, rowLocationByIndex } from "../modules/location";
@@ -106,7 +106,7 @@ export function fixPositionOnFrozenCells(freeze, x, y, mouseX, mouseY) {
 }
 export 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 = [];
   }
@@ -125,11 +125,11 @@ export function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, containe
     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 = rowLocation(y, ctx.visibledatarow);
   var row = row_location[1];
   var row_pre = row_location[0];
@@ -174,12 +174,7 @@ export function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, containe
   }
   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 || 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 || israngeseleciton(ctx)) {
       var rowseleted = [row_index, row_index_ed];
       var columnseleted = [col_index, col_index_ed];
       var left = col_pre;
@@ -246,7 +241,7 @@ export function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, containe
         last.top_move = top_1;
         last.height_move = height;
         ctx.formulaCache.func_selectedrange = last;
-      } else if (e.ctrlKey && ((_h = _.last(cellInput.querySelectorAll("span"))) === null || _h === void 0 ? void 0 : _h.innerText) !== ",") {
+      } else if (e.ctrlKey && ((_g = _.last(cellInput.querySelectorAll("span"))) === null || _g === void 0 ? void 0 : _g.innerText) !== ",") {
         var vText = cellInput.innerText;
         if (vText[vText.length - 1] === ")") {
           vText = vText.substring(0, vText.length - 1);
@@ -262,7 +257,7 @@ export function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, containe
           if (window.getSelection) {
             var currSelection = window.getSelection();
             if (currSelection == null) return;
-            ctx.formulaCache.functionRangeIndex = [_.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 = [_.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;
@@ -307,13 +302,14 @@ export function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, containe
           column_focus: col_index
         };
       }
+      ctx.formulaCache.rangestart = true;
+      ctx.formulaCache.rangedrag_column_start = false;
+      ctx.formulaCache.rangedrag_row_start = false;
       rangeSetValue(ctx, cellInput, {
         row: rowseleted,
         column: columnseleted
       }, fxInput);
-      ctx.formulaCache.rangestart = true;
-      ctx.formulaCache.rangedrag_column_start = false;
-      ctx.formulaCache.rangedrag_row_start = false;
+      rangeHightlightselected(ctx, cellInput);
       ctx.formulaCache.selectingRangeIndex = ctx.formulaCache.rangechangeindex;
       if (ctx.formulaCache.rangechangeindex > ctx.formulaRangeHighlight.length) {
         createRangeHightlight(ctx, cellInput.innerHTML, ctx.formulaCache.rangechangeindex);
@@ -336,7 +332,7 @@ export function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, containe
   }
   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;
@@ -395,7 +391,7 @@ export function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, containe
         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,
@@ -827,10 +823,28 @@ export function mouseRender(ctx, globalCache, e, cellInput, scrollX, scrollY, co
     ctx.luckysheet_select_save[ctx.luckysheet_select_save.length - 1] = last;
     scrollToFrozenRowCol(ctx, (_d = globalCache.freezen) === null || _d === void 0 ? void 0 : _d[ctx.currentSheetId]);
   } else if (ctx.formulaCache.rangestart) {
+    if (ctx.formulaCache.rangeSelectionActive === false && !maybeRecoverDirtyRangeSelection(ctx)) {
+      if (ctx.luckysheetCellUpdate.length > 0) {
+        updateCell(ctx, ctx.luckysheetCellUpdate[0], ctx.luckysheetCellUpdate[1], cellInput);
+      }
+      return;
+    }
     rangeDrag(ctx, e, cellInput, scrollX.scrollLeft, scrollY.scrollTop, container, fxInput);
   } else if (ctx.formulaCache.rangedrag_row_start) {
+    if (ctx.formulaCache.rangeSelectionActive === false && !maybeRecoverDirtyRangeSelection(ctx)) {
+      if (ctx.luckysheetCellUpdate.length > 0) {
+        updateCell(ctx, ctx.luckysheetCellUpdate[0], ctx.luckysheetCellUpdate[1], cellInput);
+      }
+      return;
+    }
     rangeDragRow(ctx, e, cellInput, scrollX.scrollLeft, scrollY.scrollTop, container, fxInput);
   } else if (ctx.formulaCache.rangedrag_column_start) {
+    if (ctx.formulaCache.rangeSelectionActive === false && !maybeRecoverDirtyRangeSelection(ctx)) {
+      if (ctx.luckysheetCellUpdate.length > 0) {
+        updateCell(ctx, ctx.luckysheetCellUpdate[0], ctx.luckysheetCellUpdate[1], cellInput);
+      }
+      return;
+    }
     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) {
     onDropCellSelect(ctx, e, scrollX, scrollY, container);
@@ -1317,6 +1331,7 @@ export function handleRowHeaderMouseDown(ctx, globalCache, e, container, cellInp
           row: rowseleted,
           column: [null, null]
         }, fxInput);
+        rangeHightlightselected(ctx, cellInput);
       }
       ctx.formulaCache.rangedrag_row_start = true;
       ctx.formulaCache.rangestart = false;
@@ -1548,6 +1563,7 @@ export function handleColumnHeaderMouseDown(ctx, globalCache, e, container, cell
           row: [null, null],
           column: columnseleted
         }, fxInput);
+        rangeHightlightselected(ctx, cellInput);
       }
       ctx.formulaCache.rangedrag_column_start = true;
       ctx.formulaCache.rangestart = false;

package/es/modules/cell.js

@@ -541,6 +541,7 @@ export function cancelNormalSelected(ctx) {
   ctx.formulaCache.rangestart = false;
   ctx.formulaCache.rangedrag_column_start = false;
   ctx.formulaCache.rangedrag_row_start = false;
+  ctx.formulaCache.rangeSelectionActive = null;
 }
 export function updateCell(ctx, r, c, $input, value, canvas) {
   var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;

package/es/modules/dropCell.js

@@ -1780,7 +1780,6 @@ function getApplyData(copyD, csLen, asLen) {
 export function updateDropCell(ctx) {
   var _a, _b, _c, _d;
   var _e, _f, _g, _h;
-  console.log("updateDropCell");
   var d = getFlowdata(ctx);
   var allowEdit = isAllowEdit(ctx);
   var isReadOnly = isAllowEditReadOnly(ctx);

package/es/modules/formula.d.ts

@@ -20,6 +20,7 @@ export declare class FormulaCache {
     rangetosheet?: string;
     rangedrag_column_start?: boolean;
     rangedrag_row_start?: boolean;
+    rangeSelectionActive?: boolean | null;
     functionRangeIndex?: number[];
     functionlistMap: any;
     execFunctionExist?: any[];
@@ -44,8 +45,14 @@ export declare function setCaretPosition(ctx: Context, textDom: HTMLElement, chi
 export declare function getrangeseleciton(): ParentNode | ChildNode | null | undefined;
 export declare function rangeHightlightselected(ctx: Context, $editor: HTMLDivElement): void;
 export declare function functionHTMLGenerate(txt: string): string;
+export declare function getLastFormulaRangeIndex($editor: HTMLDivElement): number | null;
+export declare function getFormulaRangeIndexAtCaret($editor: HTMLDivElement): number | null;
+export declare function markRangeSelectionDirty(ctx: Context): void;
+export declare function getFormulaRangeIndexForKeyboardSync($editor: HTMLDivElement): number | null;
 export declare function handleFormulaInput(ctx: Context, $copyTo: HTMLDivElement | null | undefined, $editor: HTMLDivElement, kcode: number, preText?: string, refreshRangeSelect?: boolean): void;
 export declare function israngeseleciton(ctx: Context, istooltip?: boolean): boolean;
+export declare function isFormulaReferenceInputMode(ctx: Context): boolean;
+export declare function maybeRecoverDirtyRangeSelection(ctx: Context): boolean;
 export declare function functionStrChange(txt: string, type: string, rc: "row" | "col", orient: string | null, stindex: number, step: number): string;
 export declare function rangeSetValue(ctx: Context, cellInput: HTMLDivElement, selected: any, fxInput?: HTMLDivElement | null): void;
 export declare function onFormulaRangeDragEnd(ctx: Context): void;