@fileverse-dev/fortune-core 1.0.77 → 1.0.79

package/es/events/paste.d.ts

@@ -1,3 +1,4 @@
 import { Context } from "../context";
+export declare function parseAsLinkIfUrl(txtdata: string, ctx: Context): void;
 export declare function handlePaste(ctx: Context, e: ClipboardEvent): void;
 export declare function handlePasteByClick(ctx: Context, clipboardData: string, triggerType?: string): void;

package/es/events/paste.js

@@ -990,8 +990,20 @@ function handleFormulaStringPaste(ctx, formulaStr) {
     afterUpdateCell(r, c, null, cellTemp);
   }
 }
+export function parseAsLinkIfUrl(txtdata, ctx) {
+  var _a, _b, _c, _d, _e, _f, _g;
+  var urlRegex = /^(https?:\/\/[^\s]+)/;
+  if (urlRegex.test(txtdata)) {
+    var last = (_a = ctx.luckysheet_select_save) === null || _a === void 0 ? void 0 : _a[ctx.luckysheet_select_save.length - 1];
+    if (last) {
+      var rowIndex = (_d = (_b = last.row_focus) !== null && _b !== void 0 ? _b : (_c = last.row) === null || _c === void 0 ? void 0 : _c[0]) !== null && _d !== void 0 ? _d : 0;
+      var colIndex = (_g = (_e = last.column_focus) !== null && _e !== void 0 ? _e : (_f = last.column) === null || _f === void 0 ? void 0 : _f[0]) !== null && _g !== void 0 ? _g : 0;
+      saveHyperlink(ctx, rowIndex, colIndex, txtdata, "webpage", txtdata);
+    }
+  }
+}
 export function handlePaste(ctx, e) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x;
   var allowEdit = isAllowEdit(ctx);
   if (!allowEdit) return;
   if (selectionCache.isPasteAction) {
@@ -1002,6 +1014,10 @@ export function handlePaste(ctx, e) {
       clipboardData = window.clipboardData;
     }
     if (!clipboardData) return;
+    var text = clipboardData.getData("text/plain");
+    if (text) {
+      parseAsLinkIfUrl(text, ctx);
+    }
     var txtdata = clipboardData.getData("text/html") || clipboardData.getData("text/plain");
     var isEqual = true;
     if (txtdata.indexOf("fortune-copy-action-table") > -1 && ((_a = ctx.luckysheet_copy_save) === null || _a === void 0 ? void 0 : _a.copyRange) != null && ctx.luckysheet_copy_save.copyRange.length > 0) {
@@ -1356,15 +1372,7 @@ export function handlePaste(ctx, e) {
     var text = clipboardData === null || clipboardData === void 0 ? void 0 : clipboardData.getData("text/plain");
     if (text) {
       document.execCommand("insertText", false, text);
-      var urlRegex = /^(https?:\/\/[^\s]+)/;
-      if (urlRegex.test(text)) {
-        var last = (_y = ctx.luckysheet_select_save) === null || _y === void 0 ? void 0 : _y[ctx.luckysheet_select_save.length - 1];
-        if (last) {
-          var rowIndex = (_1 = (_z = last.row_focus) !== null && _z !== void 0 ? _z : (_0 = last.row) === null || _0 === void 0 ? void 0 : _0[0]) !== null && _1 !== void 0 ? _1 : 0;
-          var colIndex = (_4 = (_2 = last.column_focus) !== null && _2 !== void 0 ? _2 : (_3 = last.column) === null || _3 === void 0 ? void 0 : _3[0]) !== null && _4 !== void 0 ? _4 : 0;
-          saveHyperlink(ctx, rowIndex, colIndex, text, "webpage", text);
-        }
-      }
+      parseAsLinkIfUrl(text, ctx);
     }
   }
 }

package/es/modules/formula.js

@@ -1193,10 +1193,18 @@ export function createRangeHightlight(ctx, inputInnerHtmlStr, ignoreRangeIndex)
   ctx.formulaRangeHighlight = formulaRanges;
 }
 export function setCaretPosition(ctx, textDom, children, pos) {
+  var _a, _b;
   try {
     var el = textDom;
     var range = document.createRange();
     var sel = window.getSelection();
+    var mainSpan = document.querySelector('.luckysheet-formula-text-string');
+    var textContent = ((_b = (_a = mainSpan === null || mainSpan === void 0 ? void 0 : mainSpan.firstChild) === null || _a === void 0 ? void 0 : _a.nodeValue) === null || _b === void 0 ? void 0 : _b.trim()) || '';
+    var innerSpan = mainSpan === null || mainSpan === void 0 ? void 0 : mainSpan.querySelector('.fortune-formula-functionrange-cell');
+    if (innerSpan && mainSpan) {
+      textContent += innerSpan.textContent;
+      el.innerHTML = textContent;
+    }
     range.setStart(el.childNodes[children], pos);
     range.collapse(true);
     sel === null || sel === void 0 ? void 0 : sel.removeAllRanges();

package/lib/events/paste.d.ts

@@ -1,3 +1,4 @@
 import { Context } from "../context";
+export declare function parseAsLinkIfUrl(txtdata: string, ctx: Context): void;
 export declare function handlePaste(ctx: Context, e: ClipboardEvent): void;
 export declare function handlePasteByClick(ctx: Context, clipboardData: string, triggerType?: string): void;

package/lib/events/paste.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.handlePaste = handlePaste;
 exports.handlePasteByClick = handlePasteByClick;
+exports.parseAsLinkIfUrl = parseAsLinkIfUrl;
 var _lodash = _interopRequireDefault(require("lodash"));
 var _context = require("../context");
 var _locale = require("../locale");
@@ -998,8 +999,20 @@ function handleFormulaStringPaste(ctx, formulaStr) {
     afterUpdateCell(r, c, null, cellTemp);
   }
 }
+function parseAsLinkIfUrl(txtdata, ctx) {
+  var _a, _b, _c, _d, _e, _f, _g;
+  var urlRegex = /^(https?:\/\/[^\s]+)/;
+  if (urlRegex.test(txtdata)) {
+    var last = (_a = ctx.luckysheet_select_save) === null || _a === void 0 ? void 0 : _a[ctx.luckysheet_select_save.length - 1];
+    if (last) {
+      var rowIndex = (_d = (_b = last.row_focus) !== null && _b !== void 0 ? _b : (_c = last.row) === null || _c === void 0 ? void 0 : _c[0]) !== null && _d !== void 0 ? _d : 0;
+      var colIndex = (_g = (_e = last.column_focus) !== null && _e !== void 0 ? _e : (_f = last.column) === null || _f === void 0 ? void 0 : _f[0]) !== null && _g !== void 0 ? _g : 0;
+      (0, _modules.saveHyperlink)(ctx, rowIndex, colIndex, txtdata, "webpage", txtdata);
+    }
+  }
+}
 function handlePaste(ctx, e) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x;
   var allowEdit = (0, _utils.isAllowEdit)(ctx);
   if (!allowEdit) return;
   if (_selection.selectionCache.isPasteAction) {
@@ -1010,6 +1023,10 @@ function handlePaste(ctx, e) {
       clipboardData = window.clipboardData;
     }
     if (!clipboardData) return;
+    var text = clipboardData.getData("text/plain");
+    if (text) {
+      parseAsLinkIfUrl(text, ctx);
+    }
     var txtdata = clipboardData.getData("text/html") || clipboardData.getData("text/plain");
     var isEqual = true;
     if (txtdata.indexOf("fortune-copy-action-table") > -1 && ((_a = ctx.luckysheet_copy_save) === null || _a === void 0 ? void 0 : _a.copyRange) != null && ctx.luckysheet_copy_save.copyRange.length > 0) {
@@ -1364,15 +1381,7 @@ function handlePaste(ctx, e) {
     var text = clipboardData === null || clipboardData === void 0 ? void 0 : clipboardData.getData("text/plain");
     if (text) {
       document.execCommand("insertText", false, text);
-      var urlRegex = /^(https?:\/\/[^\s]+)/;
-      if (urlRegex.test(text)) {
-        var last = (_y = ctx.luckysheet_select_save) === null || _y === void 0 ? void 0 : _y[ctx.luckysheet_select_save.length - 1];
-        if (last) {
-          var rowIndex = (_1 = (_z = last.row_focus) !== null && _z !== void 0 ? _z : (_0 = last.row) === null || _0 === void 0 ? void 0 : _0[0]) !== null && _1 !== void 0 ? _1 : 0;
-          var colIndex = (_4 = (_2 = last.column_focus) !== null && _2 !== void 0 ? _2 : (_3 = last.column) === null || _3 === void 0 ? void 0 : _3[0]) !== null && _4 !== void 0 ? _4 : 0;
-          (0, _modules.saveHyperlink)(ctx, rowIndex, colIndex, text, "webpage", text);
-        }
-      }
+      parseAsLinkIfUrl(text, ctx);
     }
   }
 }

package/lib/modules/formula.js

@@ -1222,10 +1222,18 @@ function createRangeHightlight(ctx, inputInnerHtmlStr, ignoreRangeIndex) {
   ctx.formulaRangeHighlight = formulaRanges;
 }
 function setCaretPosition(ctx, textDom, children, pos) {
+  var _a, _b;
   try {
     var el = textDom;
     var range = document.createRange();
     var sel = window.getSelection();
+    var mainSpan = document.querySelector('.luckysheet-formula-text-string');
+    var textContent = ((_b = (_a = mainSpan === null || mainSpan === void 0 ? void 0 : mainSpan.firstChild) === null || _a === void 0 ? void 0 : _a.nodeValue) === null || _b === void 0 ? void 0 : _b.trim()) || '';
+    var innerSpan = mainSpan === null || mainSpan === void 0 ? void 0 : mainSpan.querySelector('.fortune-formula-functionrange-cell');
+    if (innerSpan && mainSpan) {
+      textContent += innerSpan.textContent;
+      el.innerHTML = textContent;
+    }
     range.setStart(el.childNodes[children], pos);
     range.collapse(true);
     sel === null || sel === void 0 ? void 0 : sel.removeAllRanges();

package/package.json

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