@fileverse-dev/fortune-core 1.3.5-hyper → 1.3.5-hyper-2

package/es/api/sheet.js

@@ -209,23 +209,22 @@ export function calculateSheetFromula(ctx, id) {
   }
 }
 export function calculateReferencedCellSheetFromula(ctx, id, refCell) {
-  var _a, _b, _c, _d, _e, _f;
+  var _a, _b, _c, _d, _e;
   var index = getSheetIndex(ctx, id);
   if (!ctx.luckysheetfile[index].data) return;
   var _loop_1 = function _loop_1(r) {
     var _loop_2 = function _loop_2(c) {
-      console.log(refCell, (_a = ctx.luckysheetfile[index].data[r][c]) === null || _a === void 0 ? void 0 : _a.f);
       var isRef = false;
-      if (refCell && ((_b = ctx.luckysheetfile[index].data[r][c]) === null || _b === void 0 ? void 0 : _b.f) && !((_c = ctx.luckysheetfile[index].data[r][c]) === null || _c === void 0 ? void 0 : _c.isDataBlockFormula)) {
+      if (refCell && ((_a = ctx.luckysheetfile[index].data[r][c]) === null || _a === void 0 ? void 0 : _a.f) && !((_b = ctx.luckysheetfile[index].data[r][c]) === null || _b === void 0 ? void 0 : _b.isDataBlockFormula)) {
         isRef = refCell.some(function (cell) {
           var _a;
           return isCellReferenced((_a = ctx.luckysheetfile[index].data[r][c]) === null || _a === void 0 ? void 0 : _a.f, cell);
         });
       }
-      if (!isRef || !((_d = ctx.luckysheetfile[index].data[r][c]) === null || _d === void 0 ? void 0 : _d.f) || ((_e = ctx.luckysheetfile[index].data[r][c]) === null || _e === void 0 ? void 0 : _e.isDataBlockFormula)) {
+      if (!isRef || !((_c = ctx.luckysheetfile[index].data[r][c]) === null || _c === void 0 ? void 0 : _c.f) || ((_d = ctx.luckysheetfile[index].data[r][c]) === null || _d === void 0 ? void 0 : _d.isDataBlockFormula)) {
         return "continue";
       }
-      var result = execfunction(ctx, (_f = ctx.luckysheetfile[index].data[r][c]) === null || _f === void 0 ? void 0 : _f.f, r, c, id);
+      var result = execfunction(ctx, (_e = ctx.luckysheetfile[index].data[r][c]) === null || _e === void 0 ? void 0 : _e.f, r, c, id);
       var isValueArray = Array.isArray(result[1]);
       if (isValueArray) {
         var value = {

package/es/events/keyboard.js

@@ -139,7 +139,7 @@ export function handleGlobalEnter(ctx, cellInput, e, canvas) {
       row_focus: lastCellUpdate[0],
       column_focus: lastCellUpdate[1]
     }];
-    moveHighlightCell(ctx, "down", 1, "rangeOfSelect");
+    moveHighlightCell(ctx, "down", hideCRCount(ctx, "ArrowDown"), "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) {
@@ -434,9 +434,9 @@ export function handleGlobalKeyDown(ctx, cellInput, fxInput, e, cache, handleUnd
           updateCell(ctx, ctx.luckysheetCellUpdate[0], ctx.luckysheetCellUpdate[1], cellInput, undefined, canvas);
         }
         if (e.shiftKey) {
-          moveHighlightCell(ctx, "right", -1, "rangeOfSelect");
+          moveHighlightCell(ctx, "right", -hideCRCount(ctx, "ArrowLeft"), "rangeOfSelect");
         } else {
-          moveHighlightCell(ctx, "right", 1, "rangeOfSelect");
+          moveHighlightCell(ctx, "right", hideCRCount(ctx, "ArrowRight"), "rangeOfSelect");
         }
         e.preventDefault();
       } else if (kstr === "F2") {

package/es/modules/cursor.d.ts

@@ -6,3 +6,4 @@ export declare function getSelectionCharacterOffsets(element: Node): {
     end: number;
 } | null;
 export declare function setSelectionByCharacterOffset(element: HTMLDivElement, start: number, end: number): void;
+export declare function getRangeRectsByCharacterOffset(element: HTMLDivElement, start: number, end: number): DOMRect[];

package/es/modules/cursor.js

@@ -114,4 +114,39 @@ export function setSelectionByCharacterOffset(element, start, end) {
     sel.removeAllRanges();
     sel.addRange(range);
   }
+}
+export function getRangeRectsByCharacterOffset(element, start, end) {
+  if (start >= end) return [];
+  var charIndex = 0;
+  var startNode = null;
+  var startOffset = 0;
+  var endNode = null;
+  var endOffset = 0;
+  function walk(node) {
+    if (node.nodeType === Node.TEXT_NODE) {
+      var len = (node.textContent || "").length;
+      if (startNode == null && charIndex + len > start) {
+        startNode = node;
+        startOffset = start - charIndex;
+      }
+      if (endNode == null && charIndex + len >= end) {
+        endNode = node;
+        endOffset = end - charIndex;
+        return true;
+      }
+      charIndex += len;
+      return false;
+    }
+    for (var i = 0; i < node.childNodes.length; i += 1) {
+      if (walk(node.childNodes[i])) return true;
+    }
+    return false;
+  }
+  walk(element);
+  if (!startNode || !endNode) return [];
+  var range = document.createRange();
+  range.setStart(startNode, startOffset);
+  range.setEnd(endNode, endOffset);
+  var rects = range.getClientRects();
+  return Array.from(rects);
 }

package/es/modules/selection.js

@@ -1613,6 +1613,7 @@ export function deleteSelectedCellFormat(ctx) {
   return "success";
 }
 export function fillRightData(ctx) {
+  var _a, _b;
   var allowEdit = isAllowEdit(ctx);
   if (allowEdit === false) {
     return "allowEdit";
@@ -1640,10 +1641,20 @@ export function fillRightData(ctx) {
       var r2 = selection[s].row[1];
       var c1 = selection[s].column[0];
       var c2 = selection[s].column[1];
-      for (var r = r1; r <= r2; r += 1) {
-        for (var c = c1; c <= c2; c += 1) {
-          var previousCell = d[r][c - 1];
-          d[r][c] = __assign({}, previousCell);
+      var isSingleCell = r1 === r2 && c1 === c2;
+      if (isSingleCell) {
+        if (c1 - 1 >= 0 && d[r1]) {
+          var prev = d[r1][c1 - 1];
+          d[r1][c1] = prev != null ? __assign({}, prev) : {};
+        }
+      } else {
+        for (var r = r1; r <= r2; r += 1) {
+          var sourceCell = (_a = d[r]) === null || _a === void 0 ? void 0 : _a[c1];
+          for (var c = c1 + 1; c <= c2; c += 1) {
+            if (d[r]) {
+              d[r][c] = sourceCell != null ? __assign({}, sourceCell) : (_b = d[r][c]) !== null && _b !== void 0 ? _b : {};
+            }
+          }
         }
       }
     }
@@ -1651,6 +1662,7 @@ export function fillRightData(ctx) {
   return "success";
 }
 export function fillDownData(ctx) {
+  var _a, _b;
   var allowEdit = isAllowEdit(ctx);
   if (allowEdit === false) {
     return "allowEdit";
@@ -1678,10 +1690,20 @@ export function fillDownData(ctx) {
       var r2 = selection[s].row[1];
       var c1 = selection[s].column[0];
       var c2 = selection[s].column[1];
-      for (var r = r1; r <= r2; r += 1) {
+      var isSingleCell = r1 === r2 && c1 === c2;
+      if (isSingleCell) {
+        if (r1 - 1 >= 0 && d[r1 - 1]) {
+          var prev = d[r1 - 1][c1];
+          if (!d[r1]) d[r1] = [];
+          d[r1][c1] = prev != null ? __assign({}, prev) : {};
+        }
+      } else {
         for (var c = c1; c <= c2; c += 1) {
-          var previousCell = d[r - 1][c];
-          d[r][c] = __assign({}, previousCell);
+          var sourceCell = (_a = d[r1]) === null || _a === void 0 ? void 0 : _a[c];
+          for (var r = r1 + 1; r <= r2; r += 1) {
+            if (!d[r]) d[r] = [];
+            d[r][c] = sourceCell != null ? __assign({}, sourceCell) : (_b = d[r][c]) !== null && _b !== void 0 ? _b : {};
+          }
         }
       }
     }

package/lib/api/sheet.js

@@ -227,23 +227,22 @@ function calculateSheetFromula(ctx, id) {
   }
 }
 function calculateReferencedCellSheetFromula(ctx, id, refCell) {
-  var _a, _b, _c, _d, _e, _f;
+  var _a, _b, _c, _d, _e;
   var index = (0, _utils.getSheetIndex)(ctx, id);
   if (!ctx.luckysheetfile[index].data) return;
   var _loop_1 = function _loop_1(r) {
     var _loop_2 = function _loop_2(c) {
-      console.log(refCell, (_a = ctx.luckysheetfile[index].data[r][c]) === null || _a === void 0 ? void 0 : _a.f);
       var isRef = false;
-      if (refCell && ((_b = ctx.luckysheetfile[index].data[r][c]) === null || _b === void 0 ? void 0 : _b.f) && !((_c = ctx.luckysheetfile[index].data[r][c]) === null || _c === void 0 ? void 0 : _c.isDataBlockFormula)) {
+      if (refCell && ((_a = ctx.luckysheetfile[index].data[r][c]) === null || _a === void 0 ? void 0 : _a.f) && !((_b = ctx.luckysheetfile[index].data[r][c]) === null || _b === void 0 ? void 0 : _b.isDataBlockFormula)) {
         isRef = refCell.some(function (cell) {
           var _a;
           return isCellReferenced((_a = ctx.luckysheetfile[index].data[r][c]) === null || _a === void 0 ? void 0 : _a.f, cell);
         });
       }
-      if (!isRef || !((_d = ctx.luckysheetfile[index].data[r][c]) === null || _d === void 0 ? void 0 : _d.f) || ((_e = ctx.luckysheetfile[index].data[r][c]) === null || _e === void 0 ? void 0 : _e.isDataBlockFormula)) {
+      if (!isRef || !((_c = ctx.luckysheetfile[index].data[r][c]) === null || _c === void 0 ? void 0 : _c.f) || ((_d = ctx.luckysheetfile[index].data[r][c]) === null || _d === void 0 ? void 0 : _d.isDataBlockFormula)) {
         return "continue";
       }
-      var result = (0, _2.execfunction)(ctx, (_f = ctx.luckysheetfile[index].data[r][c]) === null || _f === void 0 ? void 0 : _f.f, r, c, id);
+      var result = (0, _2.execfunction)(ctx, (_e = ctx.luckysheetfile[index].data[r][c]) === null || _e === void 0 ? void 0 : _e.f, r, c, id);
       var isValueArray = Array.isArray(result[1]);
       if (isValueArray) {
         var value = {

package/lib/events/keyboard.js

@@ -149,7 +149,7 @@ function handleGlobalEnter(ctx, cellInput, e, canvas) {
       row_focus: lastCellUpdate[0],
       column_focus: lastCellUpdate[1]
     }];
-    (0, _selection.moveHighlightCell)(ctx, "down", 1, "rangeOfSelect");
+    (0, _selection.moveHighlightCell)(ctx, "down", (0, _2.hideCRCount)(ctx, "ArrowDown"), "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) {
@@ -444,9 +444,9 @@ function handleGlobalKeyDown(ctx, cellInput, fxInput, e, cache, handleUndo, hand
           (0, _cell.updateCell)(ctx, ctx.luckysheetCellUpdate[0], ctx.luckysheetCellUpdate[1], cellInput, undefined, canvas);
         }
         if (e.shiftKey) {
-          (0, _selection.moveHighlightCell)(ctx, "right", -1, "rangeOfSelect");
+          (0, _selection.moveHighlightCell)(ctx, "right", -(0, _2.hideCRCount)(ctx, "ArrowLeft"), "rangeOfSelect");
         } else {
-          (0, _selection.moveHighlightCell)(ctx, "right", 1, "rangeOfSelect");
+          (0, _selection.moveHighlightCell)(ctx, "right", (0, _2.hideCRCount)(ctx, "ArrowRight"), "rangeOfSelect");
         }
         e.preventDefault();
       } else if (kstr === "F2") {

package/lib/modules/cursor.d.ts

@@ -6,3 +6,4 @@ export declare function getSelectionCharacterOffsets(element: Node): {
     end: number;
 } | null;
 export declare function setSelectionByCharacterOffset(element: HTMLDivElement, start: number, end: number): void;
+export declare function getRangeRectsByCharacterOffset(element: HTMLDivElement, start: number, end: number): DOMRect[];

package/lib/modules/cursor.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.getRangeRectsByCharacterOffset = getRangeRectsByCharacterOffset;
 exports.getSelectionCharacterOffsets = getSelectionCharacterOffsets;
 exports.moveToEnd = moveToEnd;
 exports.selectTextContent = selectTextContent;
@@ -124,4 +125,39 @@ function setSelectionByCharacterOffset(element, start, end) {
     sel.removeAllRanges();
     sel.addRange(range);
   }
+}
+function getRangeRectsByCharacterOffset(element, start, end) {
+  if (start >= end) return [];
+  var charIndex = 0;
+  var startNode = null;
+  var startOffset = 0;
+  var endNode = null;
+  var endOffset = 0;
+  function walk(node) {
+    if (node.nodeType === Node.TEXT_NODE) {
+      var len = (node.textContent || "").length;
+      if (startNode == null && charIndex + len > start) {
+        startNode = node;
+        startOffset = start - charIndex;
+      }
+      if (endNode == null && charIndex + len >= end) {
+        endNode = node;
+        endOffset = end - charIndex;
+        return true;
+      }
+      charIndex += len;
+      return false;
+    }
+    for (var i = 0; i < node.childNodes.length; i += 1) {
+      if (walk(node.childNodes[i])) return true;
+    }
+    return false;
+  }
+  walk(element);
+  if (!startNode || !endNode) return [];
+  var range = document.createRange();
+  range.setStart(startNode, startOffset);
+  range.setEnd(endNode, endOffset);
+  var rects = range.getClientRects();
+  return Array.from(rects);
 }

package/lib/modules/selection.js

@@ -1648,6 +1648,7 @@ function deleteSelectedCellFormat(ctx) {
   return "success";
 }
 function fillRightData(ctx) {
+  var _a, _b;
   var allowEdit = (0, _utils.isAllowEdit)(ctx);
   if (allowEdit === false) {
     return "allowEdit";
@@ -1675,10 +1676,20 @@ function fillRightData(ctx) {
       var r2 = selection[s].row[1];
       var c1 = selection[s].column[0];
       var c2 = selection[s].column[1];
-      for (var r = r1; r <= r2; r += 1) {
-        for (var c = c1; c <= c2; c += 1) {
-          var previousCell = d[r][c - 1];
-          d[r][c] = __assign({}, previousCell);
+      var isSingleCell = r1 === r2 && c1 === c2;
+      if (isSingleCell) {
+        if (c1 - 1 >= 0 && d[r1]) {
+          var prev = d[r1][c1 - 1];
+          d[r1][c1] = prev != null ? __assign({}, prev) : {};
+        }
+      } else {
+        for (var r = r1; r <= r2; r += 1) {
+          var sourceCell = (_a = d[r]) === null || _a === void 0 ? void 0 : _a[c1];
+          for (var c = c1 + 1; c <= c2; c += 1) {
+            if (d[r]) {
+              d[r][c] = sourceCell != null ? __assign({}, sourceCell) : (_b = d[r][c]) !== null && _b !== void 0 ? _b : {};
+            }
+          }
         }
       }
     }
@@ -1686,6 +1697,7 @@ function fillRightData(ctx) {
   return "success";
 }
 function fillDownData(ctx) {
+  var _a, _b;
   var allowEdit = (0, _utils.isAllowEdit)(ctx);
   if (allowEdit === false) {
     return "allowEdit";
@@ -1713,10 +1725,20 @@ function fillDownData(ctx) {
       var r2 = selection[s].row[1];
       var c1 = selection[s].column[0];
       var c2 = selection[s].column[1];
-      for (var r = r1; r <= r2; r += 1) {
+      var isSingleCell = r1 === r2 && c1 === c2;
+      if (isSingleCell) {
+        if (r1 - 1 >= 0 && d[r1 - 1]) {
+          var prev = d[r1 - 1][c1];
+          if (!d[r1]) d[r1] = [];
+          d[r1][c1] = prev != null ? __assign({}, prev) : {};
+        }
+      } else {
         for (var c = c1; c <= c2; c += 1) {
-          var previousCell = d[r - 1][c];
-          d[r][c] = __assign({}, previousCell);
+          var sourceCell = (_a = d[r1]) === null || _a === void 0 ? void 0 : _a[c];
+          for (var r = r1 + 1; r <= r2; r += 1) {
+            if (!d[r]) d[r] = [];
+            d[r][c] = sourceCell != null ? __assign({}, sourceCell) : (_b = d[r][c]) !== null && _b !== void 0 ? _b : {};
+          }
         }
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fileverse-dev/fortune-core",
-  "version": "1.3.5-hyper",
+  "version": "1.3.5-hyper-2",
   "main": "lib/index.js",
   "module": "es/index.js",
   "typings": "lib/index.d.ts",