@fileverse-dev/fortune-core 1.3.12-mixed-a → 1.3.13-create-1

package/es/events/keyboard.d.ts

@@ -1,6 +1,6 @@
 import { Context } from "../context";
 import { GlobalCache } from "../types";
-export declare function handleGlobalEnter(ctx: Context, cellInput: HTMLDivElement, e: KeyboardEvent, canvas?: CanvasRenderingContext2D): void;
-export declare function handleWithCtrlOrMetaKey(ctx: Context, cache: GlobalCache, e: KeyboardEvent, cellInput: HTMLDivElement, fxInput: HTMLDivElement | null | undefined, handleUndo: () => void, handleRedo: () => void): void;
+export declare function handleGlobalEnter(ctx: Context, cellInput: HTMLDivElement, e: KeyboardEvent, cache: GlobalCache, canvas?: CanvasRenderingContext2D): void;
+export declare function handleWithCtrlOrMetaKey(ctx: Context, cache: GlobalCache, e: KeyboardEvent, cellInput: HTMLDivElement, fxInput: HTMLDivElement | null | undefined, handleUndo: () => void, handleRedo: () => void, canvas?: CanvasRenderingContext2D): void;
 export declare function handleArrowKey(ctx: Context, e: KeyboardEvent): void;
 export declare function handleGlobalKeyDown(ctx: Context, cellInput: HTMLDivElement, fxInput: HTMLDivElement | null | undefined, e: KeyboardEvent, cache: GlobalCache, handleUndo: () => void, handleRedo: () => void, canvas?: CanvasRenderingContext2D): Promise<void>;

package/es/events/keyboard.js

@@ -117,15 +117,30 @@ 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, setFormulaEditorOwner, getFormulaEditorOwner, suppressFormulaRangeSelectionForInitialEdit } from "../modules/formula";
+import { isInlineStringCell } from "../modules/inline-string";
 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";
-export function handleGlobalEnter(ctx, cellInput, e, canvas) {
-  var _a, _b, _c;
+import { moveToEnd } from "../modules/cursor";
+function clearTypeOverPending(cache) {
+  delete cache.pendingTypeOverCell;
+}
+function getTypeOverInitialContent(e) {
+  if (e.keyCode === 229) return undefined;
+  if (e.ctrlKey || e.metaKey || e.altKey) return undefined;
+  if (e.key === "Backspace" || e.key === "Delete") return "";
+  if (e.key.length === 1) return e.key;
+  return undefined;
+}
+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, cache, canvas) {
+  var _a, _b, _c, _d;
   if ((e.altKey || e.metaKey) && ctx.luckysheetCellUpdate.length > 0) {
     var last = (_a = ctx.luckysheet_select_save) === null || _a === void 0 ? void 0 : _a[ctx.luckysheet_select_save.length - 1];
     if (last && !_.isNil(last.row_focus) && !_.isNil(last.column_focus)) {}
@@ -133,33 +148,61 @@ export function handleGlobalEnter(ctx, cellInput, e, canvas) {
   } else if (ctx.luckysheetCellUpdate.length > 0) {
     var lastCellUpdate = _.clone(ctx.luckysheetCellUpdate);
     updateCell(ctx, ctx.luckysheetCellUpdate[0], ctx.luckysheetCellUpdate[1], cellInput, undefined, canvas);
+    cache.enteredEditByTyping = false;
+    clearTypeOverPending(cache);
     ctx.luckysheet_select_save = [{
       row: [lastCellUpdate[0], lastCellUpdate[0]],
       column: [lastCellUpdate[1], lastCellUpdate[1]],
       row_focus: lastCellUpdate[0],
       column_focus: lastCellUpdate[1]
     }];
-    moveHighlightCell(ctx, "down", hideCRCount(ctx, "ArrowDown"), "rangeOfSelect");
+    var rowStep = e.shiftKey ? -hideCRCount(ctx, "ArrowUp") : hideCRCount(ctx, "ArrowDown");
+    moveHighlightCell(ctx, "down", rowStep, "rangeOfSelect");
     e.preventDefault();
   } else {
     if (((_c = (_b = ctx.luckysheet_select_save) === null || _b === void 0 ? void 0 : _b.length) !== null && _c !== void 0 ? _c : 0) > 0) {
       var last = ctx.luckysheet_select_save[ctx.luckysheet_select_save.length - 1];
       var row_index = last.row_focus;
       var col_index = last.column_focus;
+      if (!_.isNil(row_index) && !_.isNil(col_index)) {
+        var flowdata = getFlowdata(ctx);
+        var cellAt = (_d = flowdata === null || flowdata === void 0 ? void 0 : flowdata[row_index]) === null || _d === void 0 ? void 0 : _d[col_index];
+        if ((cellAt === null || cellAt === void 0 ? void 0 : cellAt.f) != null && String(cellAt.f).trim() !== "") {
+          suppressFormulaRangeSelectionForInitialEdit(ctx);
+        }
+      }
       ctx.luckysheetCellUpdate = [row_index, col_index];
+      cache.enteredEditByTyping = false;
+      clearTypeOverPending(cache);
       e.preventDefault();
     }
   }
 }
+function cellCountsForDataEdge(cell) {
+  var _a, _b;
+  if (cell == null) return false;
+  if (!_.isPlainObject(cell)) return !_.isNil(cell);
+  if (cell.f != null && String(cell.f) !== "") return true;
+  if (!_.isNil(cell.v)) return true;
+  if (isInlineStringCell(cell)) {
+    return ((_b = (_a = cell.ct) === null || _a === void 0 ? void 0 : _a.s) !== null && _b !== void 0 ? _b : []).some(function (seg) {
+      return (seg === null || seg === void 0 ? void 0 : seg.v) != null && String(seg.v).length > 0;
+    });
+  }
+  return false;
+}
 function moveToEdge(sheetData, key, curr, rowDelta, colDelta, startR, endR, startC, endC, maxRow, maxCol) {
-  var _a, _b, _c, _d, _e, _f;
+  var _a, _b, _c;
   var selectedLimit = -1;
   if (key === "ArrowUp") selectedLimit = startR - 1;else if (key === "ArrowDown") selectedLimit = endR + 1;else if (key === "ArrowLeft") selectedLimit = startC - 1;else if (key === "ArrowRight") selectedLimit = endC + 1;
   var maxRowCol = colDelta === 0 ? maxRow : maxCol;
   var r = colDelta === 0 ? selectedLimit : curr;
   var c = colDelta === 0 ? curr : selectedLimit;
   while (r >= 0 && c >= 0 && (colDelta === 0 ? r : c) < maxRowCol - 1) {
-    if (!_.isNil((_b = (_a = sheetData === null || sheetData === void 0 ? void 0 : sheetData[r]) === null || _a === void 0 ? void 0 : _a[c]) === null || _b === void 0 ? void 0 : _b.v) && (_.isNil((_d = (_c = sheetData === null || sheetData === void 0 ? void 0 : sheetData[r - rowDelta]) === null || _c === void 0 ? void 0 : _c[c - colDelta]) === null || _d === void 0 ? void 0 : _d.v) || _.isNil((_f = (_e = sheetData === null || sheetData === void 0 ? void 0 : sheetData[r + rowDelta]) === null || _e === void 0 ? void 0 : _e[c + colDelta]) === null || _f === void 0 ? void 0 : _f.v))) {
+    var here = (_a = sheetData === null || sheetData === void 0 ? void 0 : sheetData[r]) === null || _a === void 0 ? void 0 : _a[c];
+    var behind = (_b = sheetData === null || sheetData === void 0 ? void 0 : sheetData[r - rowDelta]) === null || _b === void 0 ? void 0 : _b[c - colDelta];
+    var ahead = (_c = sheetData === null || sheetData === void 0 ? void 0 : sheetData[r + rowDelta]) === null || _c === void 0 ? void 0 : _c[c + colDelta];
+    if (cellCountsForDataEdge(here) && (!cellCountsForDataEdge(behind) || !cellCountsForDataEdge(ahead))) {
       break;
     } else {
       r += 1 * rowDelta;
@@ -168,83 +211,120 @@ function moveToEdge(sheetData, key, curr, rowDelta, colDelta, startR, endR, star
   }
   return colDelta === 0 ? r : c;
 }
+function isPlainTextCellOrFxEdit(ctx, cellInput, fxInput) {
+  var _a, _b, _c;
+  if (ctx.luckysheetCellUpdate.length === 0) return false;
+  var cellT = ((_a = cellInput === null || cellInput === void 0 ? void 0 : cellInput.innerText) !== null && _a !== void 0 ? _a : "").trim();
+  var fxT = ((_b = fxInput === null || fxInput === void 0 ? void 0 : fxInput.innerText) !== null && _b !== void 0 ? _b : "").trim();
+  var owner = getFormulaEditorOwner(ctx);
+  if (owner === "fx" && fxInput) {
+    return !fxT.startsWith("=");
+  }
+  if (owner === "cell") {
+    return !cellT.startsWith("=");
+  }
+  var aid = (_c = document.activeElement) === null || _c === void 0 ? void 0 : _c.id;
+  if (aid === "luckysheet-functionbox-cell" && fxInput) {
+    return !fxT.startsWith("=");
+  }
+  if (aid === "luckysheet-rich-text-editor") {
+    return !cellT.startsWith("=");
+  }
+  if (cellT.startsWith("=") || fxT.startsWith("=")) return false;
+  return true;
+}
+function isDirectPlainTextCellEdit(ctx, cache, cellInput, fxInput) {
+  return (cache === null || cache === void 0 ? void 0 : cache.enteredEditByTyping) === true && ctx.luckysheetCellUpdate.length > 0 && isPlainTextCellOrFxEdit(ctx, cellInput, fxInput);
+}
+function commitDirectPlainCellEdit(ctx, cache, cellInput, canvas) {
+  if (ctx.luckysheetCellUpdate.length === 0) return;
+  updateCell(ctx, ctx.luckysheetCellUpdate[0], ctx.luckysheetCellUpdate[1], cellInput, undefined, canvas);
+  if (cache) {
+    cache.enteredEditByTyping = false;
+    clearTypeOverPending(cache);
+  }
+}
 function handleControlPlusArrowKey(ctx, e, shiftPressed) {
-  var _a, _b, _c, _d;
+  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 || _.isNil(file.row) || _.isNil(file.column)) return;
   var maxRow = file.row;
   var maxCol = file.column;
-  if (_.isNil(maxRow) || _.isNil(maxCol)) return;
-  var last = ctx.luckysheet_select_save && ctx.luckysheet_select_save.length > 0 ? ctx.luckysheet_select_save[ctx.luckysheet_select_save.length - 1] : undefined;
+  var last;
+  if (ctx.luckysheet_select_save && ctx.luckysheet_select_save.length > 0) last = ctx.luckysheet_select_save[ctx.luckysheet_select_save.length - 1];
   if (!last) return;
   var currR = last.row_focus;
   var currC = last.column_focus;
   if (_.isNil(currR) || _.isNil(currC)) return;
-  var startR = (_a = last.row) === null || _a === void 0 ? void 0 : _a[0];
-  var endR = (_b = last.row) === null || _b === void 0 ? void 0 : _b[1];
-  var startC = (_c = last.column) === null || _c === void 0 ? void 0 : _c[0];
-  var endC = (_d = last.column) === null || _d === void 0 ? void 0 : _d[1];
-  if (_.isNil(startR) || _.isNil(endR) || _.isNil(startC) || _.isNil(endC)) {
-    return;
-  }
+  var startR = last.row[0];
+  var endR = last.row[1];
+  var startC = last.column[0];
+  var endC = last.column[1];
   var horizontalOffset = currC - endC !== 0 ? currC - endC : currC - startC;
   var verticalOffset = currR - endR !== 0 ? currR - endR : currR - startR;
   var sheetData = file.data;
   if (!sheetData) return;
+  var selectedLimit;
   switch (e.key) {
     case "ArrowUp":
-      {
-        var selectedLimit = moveToEdge(sheetData, e.key, currC, -1, 0, startR, endR, startC, endC, maxRow, maxCol);
-        if (shiftPressed) {
-          moveHighlightRange(ctx, "down", verticalOffset, "rangeOfSelect");
-          moveHighlightRange(ctx, "down", selectedLimit - currR, "rangeOfSelect");
-        } else {
-          moveHighlightCell(ctx, "down", selectedLimit - currR, "rangeOfSelect");
-        }
+      selectedLimit = moveToEdge(sheetData, e.key, currC, -1, 0, startR, endR, startC, endC, maxRow, maxCol);
+      if (shiftPressed) {
+        moveHighlightRange(ctx, "down", verticalOffset, "rangeOfSelect");
+        moveHighlightRange(ctx, "down", selectedLimit - currR, "rangeOfSelect");
+      } else {
+        moveHighlightCell(ctx, "down", selectedLimit - currR, "rangeOfSelect");
       }
       break;
     case "ArrowDown":
-      {
-        var selectedLimit = moveToEdge(sheetData, e.key, currC, 1, 0, startR, endR, startC, endC, maxRow, maxCol);
-        if (shiftPressed) {
-          moveHighlightRange(ctx, "down", verticalOffset, "rangeOfSelect");
-          moveHighlightRange(ctx, "down", selectedLimit - currR, "rangeOfSelect");
-        } else {
-          moveHighlightCell(ctx, "down", selectedLimit - currR, "rangeOfSelect");
-        }
+      selectedLimit = moveToEdge(sheetData, e.key, currC, 1, 0, startR, endR, startC, endC, maxRow, maxCol);
+      if (shiftPressed) {
+        moveHighlightRange(ctx, "down", verticalOffset, "rangeOfSelect");
+        moveHighlightRange(ctx, "down", selectedLimit - currR, "rangeOfSelect");
+      } else {
+        moveHighlightCell(ctx, "down", selectedLimit - currR, "rangeOfSelect");
       }
       break;
     case "ArrowLeft":
-      {
-        var selectedLimit = moveToEdge(sheetData, e.key, currR, 0, -1, startR, endR, startC, endC, maxRow, maxCol);
-        if (shiftPressed) {
-          moveHighlightRange(ctx, "right", horizontalOffset, "rangeOfSelect");
-          moveHighlightRange(ctx, "right", selectedLimit - currC, "rangeOfSelect");
-        } else {
-          moveHighlightCell(ctx, "right", selectedLimit - currC, "rangeOfSelect");
-        }
+      selectedLimit = moveToEdge(sheetData, e.key, currR, 0, -1, startR, endR, startC, endC, maxRow, maxCol);
+      if (shiftPressed) {
+        moveHighlightRange(ctx, "right", horizontalOffset, "rangeOfSelect");
+        moveHighlightRange(ctx, "right", selectedLimit - currC, "rangeOfSelect");
+      } else {
+        moveHighlightCell(ctx, "right", selectedLimit - currC, "rangeOfSelect");
       }
       break;
     case "ArrowRight":
-      {
-        var selectedLimit = moveToEdge(sheetData, e.key, currR, 0, 1, startR, endR, startC, endC, maxRow, maxCol);
-        if (shiftPressed) {
-          moveHighlightRange(ctx, "right", horizontalOffset, "rangeOfSelect");
-          moveHighlightRange(ctx, "right", selectedLimit - currC, "rangeOfSelect");
-        } else {
-          moveHighlightCell(ctx, "right", selectedLimit - currC, "rangeOfSelect");
-        }
+      selectedLimit = moveToEdge(sheetData, e.key, currR, 0, 1, startR, endR, startC, endC, maxRow, maxCol);
+      if (shiftPressed) {
+        moveHighlightRange(ctx, "right", horizontalOffset, "rangeOfSelect");
+        moveHighlightRange(ctx, "right", selectedLimit - currC, "rangeOfSelect");
+      } else {
+        moveHighlightCell(ctx, "right", selectedLimit - currC, "rangeOfSelect");
       }
       break;
     default:
       break;
   }
 }
-export function handleWithCtrlOrMetaKey(ctx, cache, e, cellInput, fxInput, handleUndo, handleRedo) {
-  var _a, _b, _c, _d;
+export function handleWithCtrlOrMetaKey(ctx, cache, e, cellInput, fxInput, handleUndo, handleRedo, canvas) {
+  var _a, _b, _c, _d, _e, _f, _g;
   var flowdata = getFlowdata(ctx);
   if (!flowdata) return;
+  if ((e.ctrlKey || e.metaKey) && ["ArrowUp", "ArrowDown", "ArrowLeft", "ArrowRight"].includes(e.key) && isPlainTextCellOrFxEdit(ctx, cellInput, fxInput)) {
+    if (isDirectPlainTextCellEdit(ctx, cache, cellInput, fxInput)) {
+      commitDirectPlainCellEdit(ctx, cache, cellInput, canvas);
+    } else {
+      return;
+    }
+  }
   if (e.shiftKey) {
     ctx.luckysheet_shiftpositon = _.cloneDeep((_a = ctx.luckysheet_select_save) === null || _a === void 0 ? void 0 : _a[ctx.luckysheet_select_save.length - 1]);
     ctx.luckysheet_shiftkeydown = true;
@@ -257,6 +337,8 @@ export function handleWithCtrlOrMetaKey(ctx, cache, e, cellInput, fxInput, handl
       var col_index = last.column_focus;
       updateCell(ctx, row_index, col_index, cellInput);
       ctx.luckysheetCellUpdate = [row_index, col_index];
+      cache.enteredEditByTyping = false;
+      clearTypeOverPending(cache);
       cache.ignoreWriteCell = true;
       var value = getNowDateTime(2);
       cellInput.innerText = value;
@@ -265,6 +347,14 @@ export function handleWithCtrlOrMetaKey(ctx, cache, e, cellInput, fxInput, handl
       handleRedo();
       e.stopPropagation();
       return;
+    } else if (e.code === "KeyV") {
+      if (((_d = (_c = ctx.luckysheet_select_save) === null || _c === void 0 ? void 0 : _c.length) !== null && _d !== void 0 ? _d : 0) > 1) {
+        return;
+      }
+      selectionCache.isPasteAction = true;
+      selectionCache.isPasteValuesOnly = true;
+      e.stopPropagation();
+      return;
     }
   } else if (["ArrowUp", "ArrowDown", "ArrowLeft", "ArrowRight"].includes(e.key)) {
     handleControlPlusArrowKey(ctx, e, false);
@@ -277,7 +367,14 @@ export function handleWithCtrlOrMetaKey(ctx, cache, e, cellInput, fxInput, handl
   } else if (e.code === "Backslash") {
     deleteSelectedCellFormat(ctx);
   } else if (e.code === "KeyC") {
-    handleCopy(ctx);
+    if (ctx.luckysheetCellUpdate.length > 0) {
+      e.preventDefault();
+      var sel = window.getSelection();
+      var text = sel && !sel.isCollapsed ? sel.toString() : cellInput.innerText;
+      (_e = navigator.clipboard) === null || _e === void 0 ? void 0 : _e.writeText(text).catch(function () {});
+    } else {
+      handleCopy(ctx);
+    }
     e.stopPropagation();
     return;
   } else if (e.code === "KeyF") {
@@ -285,7 +382,7 @@ export function handleWithCtrlOrMetaKey(ctx, cache, e, cellInput, fxInput, handl
   } else if (e.code === "KeyH") {
     ctx.showReplace = true;
   } else if (e.code === "KeyV") {
-    if (((_d = (_c = ctx.luckysheet_select_save) === null || _c === void 0 ? void 0 : _c.length) !== null && _d !== void 0 ? _d : 0) > 1) {
+    if (((_g = (_f = ctx.luckysheet_select_save) === null || _f === void 0 ? void 0 : _f.length) !== null && _g !== void 0 ? _g : 0) > 1) {
       return;
     }
     selectionCache.isPasteAction = true;
@@ -333,7 +430,17 @@ export function handleWithCtrlOrMetaKey(ctx, cache, e, cellInput, fxInput, handl
 }
 function handleShiftWithArrowKey(ctx, e) {
   var _a;
-  if (ctx.luckysheetCellUpdate.length > 0) {
+  if (ctx.formulaCache.keyboardRangeSelectionLock === true) {
+    return;
+  }
+  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]);
@@ -357,17 +464,18 @@ 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.keyboardRangeSelectionLock === true) {
+    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":
@@ -385,12 +493,13 @@ export function handleArrowKey(ctx, e) {
     default:
       break;
   }
+  e.preventDefault();
 }
 export function handleGlobalKeyDown(ctx, cellInput, fxInput, e, cache, handleUndo, handleRedo, canvas) {
-  var _a, _b, _c, _d;
+  var _a, _b, _c, _d, _e, _f, _g;
   return __awaiter(this, void 0, void 0, function () {
-    var handledFlvShortcut, kcode, kstr, allowEdit, isFxInput, ignoredKeys, restCod, last, row_index, col_index, isEditing, inputText, isFormulaEdit, enteredByTyping, last, row_index, col_index;
-    return __generator(this, function (_e) {
+    var handledFlvShortcut, kcode, kstr, allowEdit, isFxInput, ignoredKeys, restCod, last, row_index, col_index, flowdataF2, cellF2, isEditing, inlineText, fxText, isFormulaEdit, enteredByTyping, last, row_index, col_index, flowdata, cellAt, existingFormula, initial;
+    return __generator(this, function (_h) {
       if (e.shiftKey && e.code === "Space") {
         e.stopImmediatePropagation();
         e.stopPropagation();
@@ -451,10 +560,12 @@ export function handleGlobalKeyDown(ctx, cellInput, fxInput, e, cache, handleUnd
       }
       if (kstr === "Enter") {
         if (!allowEdit) return [2];
-        handleGlobalEnter(ctx, cellInput, e, canvas);
+        handleGlobalEnter(ctx, cellInput, e, cache, canvas);
       } else if (kstr === "Tab") {
         if (ctx.luckysheetCellUpdate.length > 0) {
           updateCell(ctx, ctx.luckysheetCellUpdate[0], ctx.luckysheetCellUpdate[1], cellInput, undefined, canvas);
+          cache.enteredEditByTyping = false;
+          clearTypeOverPending(cache);
         }
         if (e.shiftKey) {
           moveHighlightCell(ctx, "right", -hideCRCount(ctx, "ArrowLeft"), "rangeOfSelect");
@@ -471,20 +582,34 @@ export function handleGlobalKeyDown(ctx, cellInput, fxInput, e, cache, handleUnd
         if (!last) return [2];
         row_index = last.row_focus;
         col_index = last.column_focus;
+        if (!_.isNil(row_index) && !_.isNil(col_index)) {
+          flowdataF2 = getFlowdata(ctx);
+          cellF2 = (_d = flowdataF2 === null || flowdataF2 === void 0 ? void 0 : flowdataF2[row_index]) === null || _d === void 0 ? void 0 : _d[col_index];
+          if ((cellF2 === null || cellF2 === void 0 ? void 0 : cellF2.f) != null && String(cellF2.f).trim() !== "") {
+            suppressFormulaRangeSelectionForInitialEdit(ctx);
+          }
+        }
+        cache.enteredEditByTyping = false;
+        clearTypeOverPending(cache);
         ctx.luckysheetCellUpdate = [row_index, col_index];
         e.preventDefault();
       } else if (kstr === "F4" && ctx.luckysheetCellUpdate.length > 0) {
         e.preventDefault();
       } else if (kstr === "Escape" && ctx.luckysheetCellUpdate.length > 0) {
+        cache.enteredEditByTyping = false;
+        clearTypeOverPending(cache);
         cancelNormalSelected(ctx);
         moveHighlightCell(ctx, "down", 0, "rangeOfSelect");
         e.preventDefault();
       } else {
         if (e.ctrlKey || e.metaKey) {
-          handleWithCtrlOrMetaKey(ctx, cache, e, cellInput, fxInput, handleUndo, handleRedo);
+          handleWithCtrlOrMetaKey(ctx, cache, e, cellInput, fxInput, handleUndo, handleRedo, canvas);
           return [2];
         }
         if (e.shiftKey && (kstr === "ArrowUp" || kstr === "ArrowDown" || kstr === "ArrowLeft" || kstr === "ArrowRight")) {
+          if (isDirectPlainTextCellEdit(ctx, cache, cellInput, fxInput)) {
+            commitDirectPlainCellEdit(ctx, cache, cellInput, canvas);
+          }
           handleShiftWithArrowKey(ctx, e);
         } else if (kstr === "Escape") {
           ctx.contextMenu = {};
@@ -493,18 +618,23 @@ 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);
           e.preventDefault();
         } else if (kstr === "ArrowUp" || kstr === "ArrowDown" || kstr === "ArrowLeft" || kstr === "ArrowRight") {
           isEditing = ctx.luckysheetCellUpdate.length > 0;
-          inputText = (_d = cellInput === null || cellInput === void 0 ? void 0 : cellInput.innerText) !== null && _d !== void 0 ? _d : "";
-          isFormulaEdit = isEditing && inputText.trim().startsWith("=");
+          inlineText = (_e = cellInput === null || cellInput === void 0 ? void 0 : cellInput.innerText) !== null && _e !== void 0 ? _e : "";
+          fxText = (_f = fxInput === null || fxInput === void 0 ? void 0 : fxInput.innerText) !== null && _f !== void 0 ? _f : "";
+          isFormulaEdit = isEditing && (inlineText.trim().startsWith("=") || fxText.trim().startsWith("="));
           enteredByTyping = cache.enteredEditByTyping === true;
-          if (isEditing && !isFormulaEdit && enteredByTyping) {
+          if (isEditing && !isFormulaEdit && enteredByTyping && !e.shiftKey) {
             updateCell(ctx, ctx.luckysheetCellUpdate[0], ctx.luckysheetCellUpdate[1], cellInput, undefined, canvas);
             cache.enteredEditByTyping = false;
+            clearTypeOverPending(cache);
             handleArrowKey(ctx, e);
             e.preventDefault();
           } else {
@@ -516,12 +646,33 @@ export function handleGlobalKeyDown(ctx, cellInput, fxInput, e, cache, handleUnd
             last = ctx.luckysheet_select_save[ctx.luckysheet_select_save.length - 1];
             row_index = last.row_focus;
             col_index = last.column_focus;
+            if (_.isNil(row_index) || _.isNil(col_index)) return [2];
+            flowdata = getFlowdata(ctx);
+            cellAt = (_g = flowdata === null || flowdata === void 0 ? void 0 : flowdata[row_index]) === null || _g === void 0 ? void 0 : _g[col_index];
+            existingFormula = (cellAt === null || cellAt === void 0 ? void 0 : cellAt.f) != null && String(cellAt.f).trim() !== "" ? String(cellAt.f).replace(/[\r\n]/g, "") : null;
+            if (existingFormula != null) {
+              suppressFormulaRangeSelectionForInitialEdit(ctx);
+            }
             ctx.luckysheetCellUpdate = [row_index, col_index];
             cache.overwriteCell = true;
-            cache.overwriteCellFirstChar = e.key;
+            cache.pendingTypeOverCell = [row_index, col_index];
+            setFormulaEditorOwner(ctx, "cell");
             cache.enteredEditByTyping = true;
-            handleFormulaInput(ctx, fxInput, cellInput, kcode);
-            e.preventDefault();
+            cellInput.focus();
+            initial = getTypeOverInitialContent(e);
+            if (initial !== undefined) {
+              cellInput.textContent = initial;
+              if (fxInput) fxInput.textContent = initial;
+              handleFormulaInput(ctx, fxInput, cellInput, kcode);
+              e.preventDefault();
+            } else {
+              cellInput.textContent = "";
+              if (fxInput) fxInput.textContent = "";
+              handleFormulaInput(ctx, fxInput, cellInput, kcode);
+            }
+            queueMicrotask(function () {
+              moveToEnd(cellInput);
+            });
           }
         }
       }