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

package/lib/modules/hyperlink.js

@@ -49,10 +49,24 @@ function getCellRowColumn(ctx, e, container, scrollX, scrollY) {
   };
 }
 function getCellHyperlink(ctx, r, c) {
-  var _a;
+  var _a, _b, _c, _d;
   var sheetIndex = (0, _utils.getSheetIndex)(ctx, ctx.currentSheetId);
   if (sheetIndex != null) {
-    return (_a = ctx.luckysheetfile[sheetIndex].hyperlink) === null || _a === void 0 ? void 0 : _a["".concat(r, "_").concat(c)];
+    var cellLink = (_a = ctx.luckysheetfile[sheetIndex].hyperlink) === null || _a === void 0 ? void 0 : _a["".concat(r, "_").concat(c)];
+    if (cellLink) return cellLink;
+    var cell = (_c = (_b = (0, _context.getFlowdata)(ctx)) === null || _b === void 0 ? void 0 : _b[r]) === null || _c === void 0 ? void 0 : _c[c];
+    if (((_d = cell === null || cell === void 0 ? void 0 : cell.ct) === null || _d === void 0 ? void 0 : _d.t) === "inlineStr" && Array.isArray(cell.ct.s)) {
+      var seg = cell.ct.s.find(function (s) {
+        var _a;
+        return (_a = s.link) === null || _a === void 0 ? void 0 : _a.linkAddress;
+      });
+      if (seg) {
+        return {
+          linkType: seg.link.linkType,
+          linkAddress: seg.link.linkAddress
+        };
+      }
+    }
   }
   return undefined;
 }
@@ -230,12 +244,10 @@ function showLinkCard(ctx, r, c, options, isEditing, isMouseDown) {
   }
 }
 function goToLink(ctx, r, c, linkType, linkAddress, scrollbarX, scrollbarY) {
-  var _a;
   var currSheetIndex = (0, _utils.getSheetIndex)(ctx, ctx.currentSheetId);
   if (currSheetIndex == null) return;
-  if (((_a = ctx.luckysheetfile[currSheetIndex].hyperlink) === null || _a === void 0 ? void 0 : _a["".concat(r, "_").concat(c)]) == null) {
-    return;
-  }
+  var link = getCellHyperlink(ctx, r, c);
+  if (link == null) return;
   if (linkType === "webpage") {
     if (!/^http[s]?:\/\//.test(linkAddress)) {
       linkAddress = "https://".concat(linkAddress);

package/lib/modules/inline-string.js

@@ -101,8 +101,13 @@ function convertCssToStyleList(cssText, originCell) {
     if (key === "color") {
       styleList.fc = value;
     }
-    if (key === "text-decoration") {
-      styleList.cl = 1;
+    if (key === "text-decoration" || key === "text-decoration-line") {
+      if (value.includes("underline")) {
+        styleList.un = 1;
+      }
+      if (value.includes("line-through")) {
+        styleList.cl = 1;
+      }
     }
     if (key === "border-bottom") {
       styleList.un = 1;
@@ -247,9 +252,12 @@ function getCssText(cssText, attr, value) {
     styleObj._color = fontColor;
   }
   var s = (0, _cell.getFontStyleByCell)(styleObj, undefined, undefined, false);
+  cssText = removeClassWidthCss(cssText, attr);
+  if (_lodash.default.isEmpty(s)) {
+    return cssText;
+  }
   var ukey = _lodash.default.kebabCase(Object.keys(s)[0]);
   var uvalue = Object.values(s)[0];
-  cssText = removeClassWidthCss(cssText, attr);
   cssText = upsetClassWithCss(cssText, ukey, uvalue);
   return cssText;
 }
@@ -311,16 +319,31 @@ function escapeHtmlAttr(s) {
   return s.replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/'/g, "&#39;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
 }
 function updateInlineStringFormat(ctx, attr, value, cellInput) {
-  var _a, _b, _c;
+  var _a, _b, _c, _d, _e, _f, _g, _h;
   var w = window.getSelection();
   if (!w) return;
   if (w.rangeCount === 0) return;
   var range = w.getRangeAt(0);
   var $textEditor = cellInput;
+  var editorText = ((_b = (_a = $textEditor.innerText) !== null && _a !== void 0 ? _a : $textEditor.textContent) !== null && _b !== void 0 ? _b : "").replace(/\r\n/g, "\n").replace(/\r/g, "\n");
+  var selectedText = ((_c = range.toString()) !== null && _c !== void 0 ? _c : "").replace(/\r\n/g, "\n").replace(/\r/g, "\n");
+  if (range.collapsed === false && editorText.length > 0 && selectedText === editorText) {
+    $textEditor.innerHTML = "";
+    var wrapper = document.createElement("span");
+    wrapper.setAttribute("style", getCssText("", attr, value));
+    wrapper.textContent = editorText;
+    $textEditor.appendChild(wrapper);
+    var newRange = document.createRange();
+    newRange.selectNodeContents($textEditor);
+    w.removeAllRanges();
+    w.addRange(newRange);
+    return;
+  }
   if (range.startContainer === $textEditor && range.endContainer === $textEditor && range.collapsed === false) {
     var start = range.startOffset;
     var end = range.endOffset;
     var children = Array.from($textEditor.childNodes).slice(start, end);
+    var hasUnsupportedElementSelection_1 = false;
     children.forEach(function (node) {
       var _a, _b;
       if (node.nodeType === Node.ELEMENT_NODE) {
@@ -328,6 +351,16 @@ function updateInlineStringFormat(ctx, attr, value, cellInput) {
         if (el.tagName === "SPAN") {
           var cssText = getCssText(el.style.cssText, attr, value);
           el.setAttribute("style", cssText);
+        } else {
+          var nestedSpans = el.querySelectorAll("span");
+          if (nestedSpans.length > 0) {
+            nestedSpans.forEach(function (nestedSpan) {
+              var cssText = getCssText(nestedSpan.style.cssText, attr, value);
+              nestedSpan.setAttribute("style", cssText);
+            });
+          } else {
+            hasUnsupportedElementSelection_1 = true;
+          }
         }
       } else if (node.nodeType === Node.TEXT_NODE) {
         var text = (_a = node.textContent) !== null && _a !== void 0 ? _a : "";
@@ -339,6 +372,14 @@ function updateInlineStringFormat(ctx, attr, value, cellInput) {
         (_b = node.parentNode) === null || _b === void 0 ? void 0 : _b.replaceChild(wrapper, node);
       }
     });
+    if (hasUnsupportedElementSelection_1) {
+      var fullText = (_e = (_d = $textEditor.innerText) !== null && _d !== void 0 ? _d : $textEditor.textContent) !== null && _e !== void 0 ? _e : "";
+      $textEditor.innerHTML = "";
+      var wrapper = document.createElement("span");
+      wrapper.setAttribute("style", getCssText("", attr, value));
+      wrapper.textContent = fullText;
+      $textEditor.appendChild(wrapper);
+    }
     var newRange = document.createRange();
     newRange.selectNodeContents($textEditor);
     w.removeAllRanges();
@@ -367,8 +408,20 @@ function updateInlineStringFormat(ctx, attr, value, cellInput) {
         var mid = "";
         var right = "";
         var s1 = 0;
-        var s2 = startOffset;
-        var s3 = endOffset;
+        var htmlPre = 0;
+        if (startContainer.nodeType === Node.TEXT_NODE && span.childNodes.length > 1) {
+          for (var i = 0; i < span.childNodes.length; i += 1) {
+            var child = span.childNodes[i];
+            if (child === startContainer) break;
+            if (child.nodeType === Node.TEXT_NODE) {
+              htmlPre += (child.textContent || "").length;
+            } else if (child.nodeType === Node.ELEMENT_NODE) {
+              htmlPre += child.outerHTML.length;
+            }
+          }
+        }
+        var s2 = htmlPre + startOffset;
+        var s3 = htmlPre + endOffset;
         var s4 = content.length;
         left = content.substring(s1, s2);
         mid = content.substring(s2, s3);
@@ -404,7 +457,7 @@ function updateInlineStringFormat(ctx, attr, value, cellInput) {
           }
           cont += "<span style=\"".concat(escapeHtmlAttr(cssText), "\">").concat(right, "</span>");
         }
-        if (((_a = startContainer.parentElement) === null || _a === void 0 ? void 0 : _a.tagName) === "SPAN") {
+        if (((_f = startContainer.parentElement) === null || _f === void 0 ? void 0 : _f.tagName) === "SPAN") {
           spanIndex = _lodash.default.indexOf($textEditor.querySelectorAll("span"), span);
           span.outerHTML = cont;
         } else {
@@ -420,7 +473,7 @@ function updateInlineStringFormat(ctx, attr, value, cellInput) {
         (0, _cursor.selectTextContent)($textEditor.querySelectorAll("span")[seletedNodeIndex]);
       }
     } else {
-      if (((_b = startContainer.parentElement) === null || _b === void 0 ? void 0 : _b.tagName) === "SPAN" && ((_c = endContainer.parentElement) === null || _c === void 0 ? void 0 : _c.tagName) === "SPAN") {
+      if (((_g = startContainer.parentElement) === null || _g === void 0 ? void 0 : _g.tagName) === "SPAN" && ((_h = endContainer.parentElement) === null || _h === void 0 ? void 0 : _h.tagName) === "SPAN") {
         var startSpan = startContainer.parentNode;
         var endSpan = endContainer.parentNode;
         var allSpans = $textEditor.querySelectorAll("span");

package/lib/modules/moveCells.js

@@ -18,6 +18,7 @@ var _utils = require("../utils");
 var _conditionalFormat = require("./conditionalFormat");
 var _refresh = require("./refresh");
 var _ConditionFormat = require("./ConditionFormat");
+var _formula = require("./formula");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 var dragCellThreshold = 8;
 function getCellLocationByMouse(ctx, e, scrollbarX, scrollbarY, container) {
@@ -131,7 +132,7 @@ function onCellsMove(ctx, globalCache, e, scrollbarX, scrollbarY, container) {
   ele.style.display = "block";
 }
 function onCellsMoveEnd(ctx, globalCache, e, scrollbarX, scrollbarY, container) {
-  var _a, _b, _c, _d, _e;
+  var _a, _b, _c, _d, _e, _f;
   if (!ctx.luckysheet_cell_selected_move) return;
   ctx.luckysheet_cell_selected_move = false;
   var ele = document.getElementById("fortune-cell-selected-move");
@@ -140,17 +141,17 @@ function onCellsMoveEnd(ctx, globalCache, e, scrollbarX, scrollbarY, container)
     globalCache.dragCellStartPos = undefined;
     return;
   }
-  var _f = (0, _location.mousePosition)(e.pageX, e.pageY, ctx),
-    x = _f[0],
-    y = _f[1];
+  var _g = (0, _location.mousePosition)(e.pageX, e.pageY, ctx),
+    x = _g[0],
+    y = _g[1];
   var rect = container.getBoundingClientRect();
   var winH = rect.height - 20 * ctx.zoomRatio;
   var winW = rect.width - 60 * ctx.zoomRatio;
-  var _g = getCellLocationByMouse(ctx, e, scrollbarX, scrollbarY, container),
-    _h = _g.row,
-    row_index = _h[2],
-    _j = _g.column,
-    col_index = _j[2];
+  var _h = getCellLocationByMouse(ctx, e, scrollbarX, scrollbarY, container),
+    _j = _h.row,
+    row_index = _j[2],
+    _k = _h.column,
+    col_index = _k[2];
   var allowEdit = (0, _utils.isAllowEdit)(ctx, [{
     row: [row_index, row_index],
     column: [col_index, col_index]
@@ -379,5 +380,47 @@ function onCellsMoveEnd(ctx, globalCache, e, scrollbarX, scrollbarY, container)
   if (cellChanges.length > 0 && ((_e = ctx === null || ctx === void 0 ? void 0 : ctx.hooks) === null || _e === void 0 ? void 0 : _e.updateCellYdoc)) {
     ctx.hooks.updateCellYdoc(cellChanges);
   }
+  var sourceRect = {
+    rowStart: range[0].row[0],
+    rowEnd: range[0].row[1],
+    colStart: range[0].column[0],
+    colEnd: range[0].column[1]
+  };
+  var targetRowStart = row_s;
+  var targetColStart = col_s;
+  var movedSheet = ctx.luckysheetfile[index];
+  var movedSheetName = (movedSheet === null || movedSheet === void 0 ? void 0 : movedSheet.name) || "";
+  var refCellChanges = [];
+  for (var si = 0; si < ctx.luckysheetfile.length; si += 1) {
+    var sheet = ctx.luckysheetfile[si];
+    var sheetData = sheet.data;
+    if (!sheetData || !sheet.name) continue;
+    for (var r = 0; r < sheetData.length; r += 1) {
+      var rowData = sheetData[r];
+      if (!rowData) continue;
+      for (var c = 0; c < rowData.length; c += 1) {
+        var cell = rowData[c];
+        if (!(cell === null || cell === void 0 ? void 0 : cell.f)) continue;
+        var nextF = "=".concat((0, _formula.functionMoveReference)(cell.f, sheet.name, movedSheetName, sourceRect, targetRowStart, targetColStart));
+        if (nextF !== cell.f) {
+          cell.f = nextF;
+          refCellChanges.push({
+            sheetId: sheet.id || ctx.currentSheetId,
+            path: ["celldata"],
+            value: {
+              r: r,
+              c: c,
+              v: cell
+            },
+            key: "".concat(r, "_").concat(c),
+            type: "update"
+          });
+        }
+      }
+    }
+  }
+  if (refCellChanges.length > 0 && ((_f = ctx === null || ctx === void 0 ? void 0 : ctx.hooks) === null || _f === void 0 ? void 0 : _f.updateCellYdoc)) {
+    ctx.hooks.updateCellYdoc(refCellChanges);
+  }
   (0, _refresh.jfrefreshgrid)(ctx, d, range);
 }

package/lib/modules/selection.d.ts

@@ -2,6 +2,7 @@ import type { Sheet as SheetType, Freezen, Range } from "../types";
 import { Context } from "../context";
 export declare const selectionCache: {
     isPasteAction: boolean;
+    isPasteValuesOnly: boolean;
 };
 export declare function scrollToHighlightCell(ctx: Context, r: number, c: number): void;
 export declare function seletedHighlistByindex(ctx: Context, r1: number, r2: number, c1: number, c2: number): {

package/lib/modules/selection.js

@@ -34,12 +34,14 @@ exports.textFormat = textFormat;
 var _lodash = _interopRequireWildcard(require("lodash"));
 var _context = require("../context");
 var _cell = require("./cell");
+var _inlineString = require("./inline-string");
 var _formula = require("./formula");
 var _clipboard = _interopRequireDefault(require("./clipboard"));
 var _border = require("./border");
 var _utils = require("../utils");
 var _validation = require("./validation");
 var _format = require("./format");
+var _locale = require("../locale");
 var _ConditionFormat = require("./ConditionFormat");
 var _errorStateHelpers = require("./error-state-helpers");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
@@ -56,7 +58,8 @@ var __assign = void 0 && (void 0).__assign || function () {
   return __assign.apply(this, arguments);
 };
 var selectionCache = exports.selectionCache = {
-  isPasteAction: false
+  isPasteAction: false,
+  isPasteValuesOnly: false
 };
 function scrollToHighlightCell(ctx, r, c) {
   var _a, _b, _c, _d;
@@ -1221,7 +1224,7 @@ function rangeValueToHtml(ctx, sheetId, ranges) {
     cpdata += "<tr height=".concat(rowLen, "px >");
     var _loop_3 = function _loop_3(j) {
       var c = colIndexArr[j];
-      var column = '<td ${span} style="${style}">';
+      var column = '<td ${span} style="${style}" data-fortune-cell="${cellData}">';
       var cell = (_f = d[r]) === null || _f === void 0 ? void 0 : _f[c];
       if (cell != null) {
         var style = "";
@@ -1251,9 +1254,22 @@ function rangeValueToHtml(ctx, sheetId, ranges) {
           c_value = (0, _cell.getCellValue)(r, c, d, "m");
         }
         var styleObj = (0, _cell.getStyleByCell)(ctx, d, r, c);
-        style += _lodash.default.map(styleObj, function (v, key) {
+        if (styleObj.borderBottom) {
+          var existing = styleObj.textDecoration;
+          var decorations = new Set(existing ? existing.split(/\s+/).filter(Boolean) : []);
+          decorations.add("underline");
+          styleObj.textDecoration = Array.from(decorations).join(" ");
+          styleObj.textDecorationSkipInk = "none";
+          delete styleObj.borderBottom;
+        }
+        style += _lodash.default.toPairs(styleObj).filter(function (_a) {
+          var v = _a[1];
+          return !_lodash.default.isNil(v) && v !== "" && v !== "undefined";
+        }).map(function (_a) {
+          var key = _a[0],
+            v = _a[1];
           return "".concat(_lodash.default.kebabCase(key), ":").concat(_lodash.default.isNumber(v) ? "".concat(v, "px") : v, ";");
-        }).join("");
+        }).join(" ");
         if (cell.mc) {
           if ("rs" in cell.mc) {
             span = "rowspan=\"".concat(cell.mc.rs, "\" colspan=\"").concat(cell.mc.cs, "\"");
@@ -1432,17 +1448,31 @@ function rangeValueToHtml(ctx, sheetId, ranges) {
             }
           }
         }
+        var cellData = encodeURIComponent(JSON.stringify(__assign(__assign({}, cell), {
+          _srcRow: r,
+          _srcCol: c
+        })));
         column = (0, _utils.replaceHtml)(column, {
           style: style,
-          span: span
+          span: span,
+          cellData: cellData
         });
-        if (_lodash.default.isNil(c_value)) {
-          c_value = (0, _cell.getCellValue)(r, c, d);
-        }
-        if (_lodash.default.isNil(c_value)) {
-          c_value = "";
+        var cellHtml = "";
+        if (cell && (0, _inlineString.isInlineStringCell)(cell)) {
+          cellHtml = (0, _cell.getInlineStringHTML)(r, c, d, {
+            useSemanticMarkup: true,
+            inheritedStyle: styleObj
+          });
+        } else {
+          if (_lodash.default.isNil(c_value)) {
+            c_value = (0, _cell.getCellValue)(r, c, d);
+          }
+          if (_lodash.default.isNil(c_value)) {
+            c_value = "";
+          }
+          cellHtml = (0, _utils.escapeHTMLTag)(String(c_value)).replace(/&lt;br\s*\/?&gt;/g, "<br>");
         }
-        column += (0, _utils.escapeHTMLTag)(c_value);
+        column += cellHtml;
       } else {
         var style = "";
         if (borderInfoCompute && borderInfoCompute["".concat(r, "_").concat(c)]) {
@@ -1484,7 +1514,8 @@ function rangeValueToHtml(ctx, sheetId, ranges) {
         }
         column = (0, _utils.replaceHtml)(column, {
           style: style,
-          span: ""
+          span: "",
+          cellData: ""
         });
         column += "";
       }
@@ -1499,7 +1530,7 @@ function rangeValueToHtml(ctx, sheetId, ranges) {
   return "<table data-type=\"fortune-copy-action-table\">".concat(colgroup).concat(cpdata, "</table>");
 }
 function copy(ctx) {
-  var _a, _b, _c, _d;
+  var _a, _b, _c, _d, _e, _f, _g, _h;
   var flowdata = (0, _context.getFlowdata)(ctx);
   ctx.luckysheet_selection_range = [];
   var copyRange = [];
@@ -1543,8 +1574,63 @@ function copy(ctx) {
     RowlChange: RowlChange,
     HasMC: HasMC
   };
-  var cpdata = rangeValueToHtml(ctx, ctx.currentSheetId, ctx.luckysheet_select_save);
-  cpdata = cpdata === null ? cpdata : cpdata.replace('<td style="', '<td style="white-space: pre-line;"');
+  var cpdata;
+  var sel = ctx.luckysheet_select_save;
+  var isSingleCell = (sel === null || sel === void 0 ? void 0 : sel.length) === 1 && sel[0].row[0] === sel[0].row[1] && sel[0].column[0] === sel[0].column[1];
+  if (isSingleCell) {
+    var r = sel[0].row[0];
+    var c = sel[0].column[0];
+    var fontarray = (0, _locale.locale)(ctx).fontarray;
+    var defaultStyle = {
+      color: "#000000",
+      fontFamily: (_e = fontarray[0]) !== null && _e !== void 0 ? _e : "Arial",
+      fontSize: "11pt",
+      fontWeight: "400",
+      fontStyle: "normal",
+      textAlign: "left",
+      backgroundColor: "transparent"
+    };
+    var cell = (_f = flowdata[r]) === null || _f === void 0 ? void 0 : _f[c];
+    var isRichText_1 = cell != null && (0, _inlineString.isInlineStringCell)(cell);
+    var styleObj = (0, _cell.getStyleByCell)(ctx, flowdata, r, c);
+    if (styleObj.borderBottom) {
+      var existing = styleObj.textDecoration;
+      var decorations = new Set(existing ? existing.split(/\s+/).filter(Boolean) : []);
+      decorations.add("underline");
+      styleObj.textDecoration = Array.from(decorations).join(" ");
+      styleObj.textDecorationSkipInk = "none";
+      delete styleObj.borderBottom;
+    }
+    var mergedStyle = __assign(__assign({}, defaultStyle), styleObj);
+    var TEXT_LEVEL_KEYS_1 = new Set(["color", "fontFamily", "fontSize", "fontWeight", "fontStyle", "textDecoration", "textDecorationSkipInk"]);
+    var styleStr = _lodash.default.toPairs(mergedStyle).filter(function (_a) {
+      var k = _a[0],
+        v = _a[1];
+      return !_lodash.default.isNil(v) && v !== "" && v !== "undefined" && !(isRichText_1 && TEXT_LEVEL_KEYS_1.has(k));
+    }).map(function (_a) {
+      var key = _a[0],
+        v = _a[1];
+      return "".concat(_lodash.default.kebabCase(key), ":").concat(_lodash.default.isNumber(v) ? "".concat(v, "px") : v, ";");
+    }).join(" ");
+    var innerContent = void 0;
+    if (isRichText_1) {
+      innerContent = (0, _cell.getInlineStringHTML)(r, c, flowdata, {
+        useSemanticMarkup: true,
+        inheritedStyle: mergedStyle
+      });
+    } else {
+      var displayValue = (_h = (_g = (0, _cell.getCellValue)(r, c, flowdata, "m")) !== null && _g !== void 0 ? _g : (0, _cell.getCellValue)(r, c, flowdata)) !== null && _h !== void 0 ? _h : "";
+      innerContent = (0, _utils.escapeHTMLTag)(String(displayValue)).replace(/&lt;br\s*\/?&gt;/g, "<br>");
+    }
+    var cellData = encodeURIComponent(JSON.stringify(__assign(__assign({}, cell !== null && cell !== void 0 ? cell : {}), {
+      _srcRow: r,
+      _srcCol: c
+    })));
+    cpdata = "<table data-type=\"fortune-copy-action-table\"><tr><td style=\"white-space: pre-line; ".concat(styleStr, "\" data-fortune-cell=\"").concat(cellData, "\">").concat(innerContent, "</td></tr></table>");
+  } else {
+    cpdata = rangeValueToHtml(ctx, ctx.currentSheetId, ctx.luckysheet_select_save);
+    cpdata = cpdata === null ? cpdata : cpdata.replace('<td style="', '<td style="white-space: pre-line; ');
+  }
   if (cpdata) {
     ctx.iscopyself = true;
     _clipboard.default.writeHtml(cpdata);

package/lib/modules/validation.js

@@ -84,6 +84,7 @@ var MONTH_NAME_MAP = {
 };
 var MONTH_NAMES_RE = "january|february|march|april|may|june|july|august|september|october|november|december|jan|feb|mar|apr|jun|jul|aug|sep|oct|nov|dec";
 var MONTH_ABBR_RE = "jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec";
+var MONTH_ABBR_SET = new Set(MONTH_ABBR_RE.split("|"));
 function isValidDateParts(year, month, day) {
   if (year < 1900) return false;
   if (month < 1 || month > 12) return false;
@@ -298,6 +299,7 @@ function detectDateFormat(str) {
     var d = +m[2];
     var y = +m[3];
     if (mo && isValidDateParts(y, mo, d)) {
+      var isAbbr = MONTH_ABBR_SET.has(m[1].toLowerCase());
       return {
         year: y,
         month: mo,
@@ -305,7 +307,7 @@ function detectDateFormat(str) {
         hours: 0,
         minutes: 0,
         seconds: 0,
-        formatType: "named"
+        formatType: isAbbr ? "named-mdy-abbr" : "named-mdy-full"
       };
     }
   }
@@ -315,6 +317,7 @@ function detectDateFormat(str) {
     var mo = MONTH_NAME_MAP[m[2].toLowerCase()];
     var y = +m[3];
     if (mo && isValidDateParts(y, mo, d)) {
+      var isAbbr = MONTH_ABBR_SET.has(m[2].toLowerCase());
       return {
         year: y,
         month: mo,
@@ -322,7 +325,7 @@ function detectDateFormat(str) {
         hours: 0,
         minutes: 0,
         seconds: 0,
-        formatType: "named"
+        formatType: isAbbr ? "named-dmy-abbr" : "named-dmy-full"
       };
     }
   }
@@ -339,7 +342,7 @@ function detectDateFormat(str) {
         hours: 0,
         minutes: 0,
         seconds: 0,
-        formatType: "named"
+        formatType: "named-abbr-dashes"
       };
     }
   }

package/lib/paste-helpers/calculate-range-cell-size.js

@@ -16,9 +16,6 @@ var getColumnWidth = function getColumnWidth(colIndex, ctx, sheetFile) {
   var defaultColumnWidth = (_a = ctx.defaultcollen) !== null && _a !== void 0 ? _a : 73;
   return (_d = (_c = (_b = sheetFile.config) === null || _b === void 0 ? void 0 : _b.columnlen) === null || _c === void 0 ? void 0 : _c[colIndex]) !== null && _d !== void 0 ? _d : defaultColumnWidth;
 };
-var isCellWrapped = function isCellWrapped(cell) {
-  return Number(cell === null || cell === void 0 ? void 0 : cell.tb) === 1;
-};
 var getCellDisplayText = function getCellDisplayText(cell) {
   var _a, _b;
   var text = (_a = cell === null || cell === void 0 ? void 0 : cell.m) !== null && _a !== void 0 ? _a : cell === null || cell === void 0 ? void 0 : cell.v;
@@ -29,6 +26,10 @@ var getCellDisplayText = function getCellDisplayText(cell) {
   }
   return text == null ? "" : String(text);
 };
+var isCellWrapped = function isCellWrapped(cell) {
+  var _a;
+  return Number(cell === null || cell === void 0 ? void 0 : cell.tb) === 2 || ((_a = cell === null || cell === void 0 ? void 0 : cell.ct) === null || _a === void 0 ? void 0 : _a.t) === "inlineStr" || /[\r\n]/.test(getCellDisplayText(cell));
+};
 var applyFontOnMeasurer = function applyFontOnMeasurer(cell, cellSizeMeasurer) {
   var _a, _b;
   var fontSizePx = (_a = cell === null || cell === void 0 ? void 0 : cell.fs) !== null && _a !== void 0 ? _a : _pasteTableHelpers.DEFAULT_FONT_SIZE;
@@ -92,7 +93,7 @@ function calculateRangeCellSize(ctx, sheetId, startRow, endRow, startCol, endCol
       var fontSizePx = applyFontOnMeasurer(cell, cellSizeMeasurer);
       if (isCellWrapped(cell)) {
         var finalColumnWidth = Math.max(getColumnWidth(col, ctx, sheetFile), maxColumnWidths[col] || 0);
-        cellSizeMeasurer.style.whiteSpace = "normal";
+        cellSizeMeasurer.style.whiteSpace = /[\r\n]/.test(text) ? "pre-wrap" : "normal";
         cellSizeMeasurer.style.width = "".concat(Math.max(5, finalColumnWidth - 8), "px");
         cellSizeMeasurer.textContent = text;
         var wrappedHeight = Math.ceil(cellSizeMeasurer.scrollHeight + 6);

package/lib/paste-table-helpers.d.ts

@@ -1,3 +1,3 @@
 import { Context } from "./context";
-export declare const DEFAULT_FONT_SIZE = 12;
+export declare const DEFAULT_FONT_SIZE = 10;
 export declare function handlePastedTable(ctx: Context, html: string, pasteHandler: (context: Context, data: any, borderInfo?: any) => void): void;