@hufe921/canvas-editor 0.9.67 → 0.9.68

package/CHANGELOG.md

@@ -1,3 +1,23 @@
+## [0.9.68](https://github.com/Hufe921/canvas-editor/compare/v0.9.67...v0.9.68) (2024-03-10)
+
+
+### Bug Fixes
+
+* dragging element boundary error ([a2d8dd5](https://github.com/Hufe921/canvas-editor/commit/a2d8dd55b36a09b42fae377e06bf667dced3857e))
+* hyperlink word count statistics #449 ([180bd08](https://github.com/Hufe921/canvas-editor/commit/180bd088397159e32dc70da4eefd507721ced432)), closes [#449](https://github.com/Hufe921/canvas-editor/issues/449)
+
+
+### Features
+
+* set print layout format when printing #448 ([c6534f7](https://github.com/Hufe921/canvas-editor/commit/c6534f766d8640cbea4e441541065d25e0dd8b82)), closes [#448](https://github.com/Hufe921/canvas-editor/issues/448)
+
+
+### Performance Improvements
+
+* history stack memory ([5044c31](https://github.com/Hufe921/canvas-editor/commit/5044c319211322c0ab2a2db461b029f34b292939))
+
+
+
 ## [0.9.67](https://github.com/Hufe921/canvas-editor/compare/v0.9.66...v0.9.67) (2024-03-01)
 
 

package/dist/canvas-editor.es.js

@@ -23,7 +23,7 @@ var __publicField = (obj, key, value) => {
   return value;
 };
 var index = "";
-const version = "0.9.67";
+const version = "0.9.68";
 var MaxHeightRatio;
 (function(MaxHeightRatio2) {
   MaxHeightRatio2["HALF"] = "half";
@@ -119,6 +119,22 @@ function throttle(func, delay) {
     }
   };
 }
+function deepCloneOmitKeys(obj, omitKeys) {
+  if (!obj || typeof obj !== "object") {
+    return obj;
+  }
+  let newObj = {};
+  if (Array.isArray(obj)) {
+    newObj = obj.map((item) => deepCloneOmitKeys(item, omitKeys));
+  } else {
+    Object.keys(obj).forEach((key) => {
+      if (omitKeys.includes(key))
+        return;
+      return newObj[key] = deepCloneOmitKeys(obj[key], omitKeys);
+    });
+  }
+  return newObj;
+}
 function deepClone(obj) {
   if (!obj || typeof obj !== "object") {
     return obj;
@@ -4631,6 +4647,12 @@ ${listIndex + 1}.${buildText(listElementList)}${isLast ? `
   }
   return buildText(zipElementList(elementList));
 }
+function getSlimCloneElementList(elementList) {
+  return deepCloneOmitKeys(elementList, [
+    "metrics",
+    "style"
+  ]);
+}
 function setClipboardData(data2) {
   localStorage.setItem(EDITOR_CLIPBOARD, JSON.stringify({
     text: data2.text,
@@ -5250,6 +5272,7 @@ function setRangeCache(host) {
   host.cacheRange = deepClone(rangeManager.getRange());
   host.cacheElementList = draw.getElementList();
   host.cachePositionList = position.getPositionList();
+  host.cachePositionContext = position.getPositionContext();
 }
 function mousedown(evt, host) {
   var _a;
@@ -5387,13 +5410,14 @@ function moveImgPosition(element, evt, host) {
   draw.getImageParticle().destroyFloatImage();
 }
 function mouseup(evt, host) {
-  var _a, _b, _c;
+  var _a, _b, _c, _d;
   if (host.isAllowDrop) {
     const draw = host.getDraw();
     if (draw.isReadonly())
       return;
     const position = draw.getPosition();
     const positionList = position.getPositionList();
+    const positionContext = position.getPositionContext();
     const rangeManager = draw.getRange();
     const cacheRange = host.cacheRange;
     const cacheElementList = host.cacheElementList;
@@ -5402,7 +5426,7 @@ function mouseup(evt, host) {
     const isCacheRangeCollapsed = cacheRange.startIndex === cacheRange.endIndex;
     const cacheStartIndex = isCacheRangeCollapsed ? cacheRange.startIndex - 1 : cacheRange.startIndex;
     const cacheEndIndex = cacheRange.endIndex;
-    if (range.startIndex >= cacheStartIndex && range.endIndex <= cacheEndIndex) {
+    if (range.startIndex >= cacheStartIndex && range.endIndex <= cacheEndIndex && ((_a = host.cachePositionContext) == null ? void 0 : _a.tdId) === positionContext.tdId) {
       draw.clearSideEffect();
       let isSubmitHistory = false;
       if (isCacheRangeCollapsed) {
@@ -5431,7 +5455,7 @@ function mouseup(evt, host) {
     if (isContainControl) {
       const cacheStartElement2 = cacheElementList[cacheStartIndex + 1];
       const cacheEndElement2 = cacheElementList[cacheEndIndex];
-      const isAllowDragControl = (!cacheStartElement2.controlId || cacheStartElement2.controlComponent === ControlComponent.PREFIX) && (!cacheEndElement2.controlId || cacheEndElement2.controlComponent === ControlComponent.POSTFIX) || cacheStartElement2.controlId === cacheEndElement2.controlId && cacheStartElement2.controlComponent === ControlComponent.PREFIX && cacheEndElement2.controlComponent === ControlComponent.POSTFIX || ((_a = cacheStartElement2.control) == null ? void 0 : _a.type) === ControlType.TEXT && cacheStartElement2.controlComponent === ControlComponent.VALUE && ((_b = cacheEndElement2.control) == null ? void 0 : _b.type) === ControlType.TEXT && cacheEndElement2.controlComponent === ControlComponent.VALUE;
+      const isAllowDragControl = (!cacheStartElement2.controlId || cacheStartElement2.controlComponent === ControlComponent.PREFIX) && (!cacheEndElement2.controlId || cacheEndElement2.controlComponent === ControlComponent.POSTFIX) || cacheStartElement2.controlId === cacheEndElement2.controlId && cacheStartElement2.controlComponent === ControlComponent.PREFIX && cacheEndElement2.controlComponent === ControlComponent.POSTFIX || ((_b = cacheStartElement2.control) == null ? void 0 : _b.type) === ControlType.TEXT && cacheStartElement2.controlComponent === ControlComponent.VALUE && ((_c = cacheEndElement2.control) == null ? void 0 : _c.type) === ControlType.TEXT && cacheEndElement2.controlComponent === ControlComponent.VALUE;
       if (!isAllowDragControl) {
         draw.render({
           curIndex: range.startIndex,
@@ -5465,6 +5489,8 @@ function mouseup(evt, host) {
       }
     });
     formatElementContext(elementList, replaceElementList, range.startIndex);
+    const cacheStartElement = cacheElementList[cacheStartIndex];
+    const cacheStartPosition = cachePositionList[cacheStartIndex];
     const cacheRangeStartId = createDragId(cacheElementList[cacheStartIndex]);
     const cacheRangeEndId = createDragId(cacheElementList[cacheEndIndex]);
     const replaceLength = replaceElementList.length;
@@ -5494,15 +5520,12 @@ function mouseup(evt, host) {
         startIndex: cacheRangeStartIndex,
         endIndex: cacheRangeEndIndex
       }));
-      (_c = control.getActiveControl()) == null ? void 0 : _c.cut();
+      (_d = control.getActiveControl()) == null ? void 0 : _d.cut();
     } else {
       draw.spliceElementList(cacheElementList, cacheRangeStartIndex + 1, cacheRangeEndIndex - cacheRangeStartIndex);
     }
     const startElement = elementList[range.startIndex];
-    const cacheStartElement = cacheElementList[cacheStartIndex];
     const startPosition = positionList[range.startIndex];
-    const cacheStartPosition = cachePositionList[cacheStartIndex];
-    const positionContext = position.getPositionContext();
     let positionContextIndex = positionContext.index;
     if (positionContextIndex) {
       if (startElement.tableId && !cacheStartElement.tableId) {
@@ -6395,6 +6418,7 @@ class CanvasEvent {
     __publicField(this, "cacheRange");
     __publicField(this, "cacheElementList");
     __publicField(this, "cachePositionList");
+    __publicField(this, "cachePositionContext");
     __publicField(this, "mouseDownStartPosition");
     __publicField(this, "draw");
     __publicField(this, "pageContainer");
@@ -6414,6 +6438,7 @@ class CanvasEvent {
     this.cacheRange = null;
     this.cacheElementList = null;
     this.cachePositionList = null;
+    this.cachePositionContext = null;
     this.mouseDownStartPosition = null;
   }
   getDraw() {
@@ -10525,7 +10550,7 @@ class CheckboxParticle {
     ctx.restore();
   }
 }
-const encodedJs$2 = "KCgpPT57KGZ1bmN0aW9uKCl7InVzZSBzdHJpY3QiO3ZhciBmOyhmdW5jdGlvbih0KXt0LlRFWFQ9InRleHQiLHQuVEFCTEU9InRhYmxlIix0LkhZUEVSTElOSz0iaHlwZXJsaW5rIix0LkNPTlRST0w9ImNvbnRyb2wifSkoZnx8KGY9e30pKTt2YXIgcDsoZnVuY3Rpb24odCl7dC5WQUxVRT0idmFsdWUifSkocHx8KHA9e30pKTtjb25zdCBoPSJcdTIwMEIiLGc9YApgO2Z1bmN0aW9uIGEodCl7bGV0IGw9IiIsbj0wO2Zvcig7bjx0Lmxlbmd0aDspe2NvbnN0IG89dFtuXTtpZihvLnR5cGU9PT1mLlRBQkxFKXtpZihvLnRyTGlzdClmb3IobGV0IHI9MDtyPG8udHJMaXN0Lmxlbmd0aDtyKyspe2NvbnN0IHM9by50ckxpc3Rbcl07Zm9yKGxldCBlPTA7ZTxzLnRkTGlzdC5sZW5ndGg7ZSsrKXtjb25zdCBpPXMudGRMaXN0W2VdO2wrPWEoaS52YWx1ZSl9fX1lbHNlIGlmKG8udHlwZT09PWYuSFlQRVJMSU5LKXtjb25zdCByPW8uaHlwZXJsaW5rSWQscz1bXTtmb3IoO248dC5sZW5ndGg7KXtjb25zdCBlPXRbbl07aWYociE9PWUuaHlwZXJsaW5rSWQpe24tLTticmVha31kZWxldGUgZS50eXBlLHMucHVzaChlKSxuKyt9bCs9YShzKX1lbHNlIGlmKG8uY29udHJvbElkKXtjb25zdCByPW8uY29udHJvbElkLHM9W107Zm9yKDtuPHQubGVuZ3RoOyl7Y29uc3QgZT10W25dO2lmKHIhPT1lLmNvbnRyb2xJZCl7bi0tO2JyZWFrfWUuY29udHJvbENvbXBvbmVudD09PXAuVkFMVUUmJihkZWxldGUgZS5jb250cm9sSWQscy5wdXNoKGUpKSxuKyt9bCs9YShzKX0oIW8udHlwZXx8by50eXBlPT09Zi5URVhUKSYmKGwrPW8udmFsdWUpLG4rK31yZXR1cm4gbH1mdW5jdGlvbiBkKHQpe2NvbnN0IGw9W10sbj0vWzAtOV0vLG89L1tBLVphLXpdLyxyPS9ccy87bGV0IHM9ITEsZT0hMSxpPSIiO2Z1bmN0aW9uIHUoKXtpJiYobC5wdXNoKGkpLGk9IiIpfWZvcihjb25zdCBjIG9mIHQpby50ZXN0KGMpPyhzfHx1KCksaSs9YyxzPSEwLGU9ITEpOm4udGVzdChjKT8oZXx8dSgpLGkrPWMscz0hMSxlPSEwKToodSgpLHM9ITEsZT0hMSxyLnRlc3QoYyl8fGwucHVzaChjKSk7cmV0dXJuIHUoKSxsfW9ubWVzc2FnZT10PT57Y29uc3QgbD10LmRhdGEsbz1hKGwpLnJlcGxhY2UobmV3IFJlZ0V4cChgXiR7aH1gKSwiIikucmVwbGFjZShuZXcgUmVnRXhwKGgsImciKSxnKSxyPWQobyk7cG9zdE1lc3NhZ2Uoci5sZW5ndGgpfX0pKCk7fSkoKTsK";
+const encodedJs$2 = "KCgpPT57KGZ1bmN0aW9uKCl7InVzZSBzdHJpY3QiO3ZhciBmOyhmdW5jdGlvbih0KXt0LlRFWFQ9InRleHQiLHQuVEFCTEU9InRhYmxlIix0LkhZUEVSTElOSz0iaHlwZXJsaW5rIix0LkNPTlRST0w9ImNvbnRyb2wifSkoZnx8KGY9e30pKTt2YXIgcDsoZnVuY3Rpb24odCl7dC5WQUxVRT0idmFsdWUifSkocHx8KHA9e30pKTtjb25zdCBoPSJcdTIwMEIiLGc9YApgO2Z1bmN0aW9uIGEodCl7bGV0IGw9IiIsbj0wO2Zvcig7bjx0Lmxlbmd0aDspe2NvbnN0IG89dFtuXTtpZihvLnR5cGU9PT1mLlRBQkxFKXtpZihvLnRyTGlzdClmb3IobGV0IHI9MDtyPG8udHJMaXN0Lmxlbmd0aDtyKyspe2NvbnN0IHM9by50ckxpc3Rbcl07Zm9yKGxldCBlPTA7ZTxzLnRkTGlzdC5sZW5ndGg7ZSsrKXtjb25zdCBpPXMudGRMaXN0W2VdO2wrPWEoaS52YWx1ZSl9fX1lbHNlIGlmKG8udHlwZT09PWYuSFlQRVJMSU5LKXtjb25zdCByPW8uaHlwZXJsaW5rSWQscz1bXTtmb3IoO248dC5sZW5ndGg7KXtjb25zdCBlPXRbbl07aWYociE9PWUuaHlwZXJsaW5rSWQpe24tLTticmVha31kZWxldGUgZS50eXBlLHMucHVzaChlKSxuKyt9bCs9YShzKX1lbHNlIGlmKG8uY29udHJvbElkKXtjb25zdCByPW8uY29udHJvbElkLHM9W107Zm9yKDtuPHQubGVuZ3RoOyl7Y29uc3QgZT10W25dO2lmKHIhPT1lLmNvbnRyb2xJZCl7bi0tO2JyZWFrfWUuY29udHJvbENvbXBvbmVudD09PXAuVkFMVUUmJihkZWxldGUgZS5jb250cm9sSWQscy5wdXNoKGUpKSxuKyt9bCs9YShzKX1lbHNlKCFvLnR5cGV8fG8udHlwZT09PWYuVEVYVCkmJihsKz1vLnZhbHVlKTtuKyt9cmV0dXJuIGx9ZnVuY3Rpb24gZCh0KXtjb25zdCBsPVtdLG49L1swLTldLyxvPS9bQS1aYS16XS8scj0vXHMvO2xldCBzPSExLGU9ITEsaT0iIjtmdW5jdGlvbiB1KCl7aSYmKGwucHVzaChpKSxpPSIiKX1mb3IoY29uc3QgYyBvZiB0KW8udGVzdChjKT8oc3x8dSgpLGkrPWMscz0hMCxlPSExKTpuLnRlc3QoYyk/KGV8fHUoKSxpKz1jLHM9ITEsZT0hMCk6KHUoKSxzPSExLGU9ITEsci50ZXN0KGMpfHxsLnB1c2goYykpO3JldHVybiB1KCksbH1vbm1lc3NhZ2U9dD0+e2NvbnN0IGw9dC5kYXRhLG89YShsKS5yZXBsYWNlKG5ldyBSZWdFeHAoYF4ke2h9YCksIiIpLnJlcGxhY2UobmV3IFJlZ0V4cChoLCJnIiksZykscj1kKG8pO3Bvc3RNZXNzYWdlKHIubGVuZ3RoKX19KSgpO30pKCk7Cg==";
 const blob$2 = typeof window !== "undefined" && window.Blob && new Blob([atob(encodedJs$2)], { type: "text/javascript;charset=utf-8" });
 function WorkerWrapper$2() {
   const objURL = blob$2 && (window.URL || window.webkitURL).createObjectURL(blob$2);
@@ -14111,23 +14136,22 @@ class Draw {
       this.cursor.drawCursor();
     }
     if (isSubmitHistory) {
-      const self = this;
-      const oldElementList = deepClone(this.elementList);
-      const oldHeaderElementList = deepClone(this.header.getElementList());
-      const oldFooterElementList = deepClone(this.footer.getElementList());
-      const { startIndex, endIndex } = this.range.getRange();
+      const oldElementList = getSlimCloneElementList(this.elementList);
+      const oldHeaderElementList = getSlimCloneElementList(this.header.getElementList());
+      const oldFooterElementList = getSlimCloneElementList(this.footer.getElementList());
+      const oldRange = deepClone(this.range.getRange());
       const pageNo = this.pageNo;
       const oldPositionContext = deepClone(positionContext);
       const zone2 = this.zone.getZone();
-      this.historyManager.execute(function() {
-        self.zone.setZone(zone2);
-        self.setPageNo(pageNo);
-        self.position.setPositionContext(deepClone(oldPositionContext));
-        self.header.setElementList(deepClone(oldHeaderElementList));
-        self.footer.setElementList(deepClone(oldFooterElementList));
-        self.elementList = deepClone(oldElementList);
-        self.range.setRange(startIndex, endIndex);
-        self.render({
+      this.historyManager.execute(() => {
+        this.zone.setZone(zone2);
+        this.setPageNo(pageNo);
+        this.position.setPositionContext(deepClone(oldPositionContext));
+        this.header.setElementList(deepClone(oldHeaderElementList));
+        this.footer.setElementList(deepClone(oldFooterElementList));
+        this.elementList = deepClone(oldElementList);
+        this.range.replaceRange(deepClone(oldRange));
+        this.render({
           curIndex,
           isSubmitHistory: false,
           isSourceHistory: true
@@ -14401,7 +14425,8 @@ var VerticalAlign;
   VerticalAlign2["MIDDLE"] = "middle";
   VerticalAlign2["BOTTOM"] = "bottom";
 })(VerticalAlign || (VerticalAlign = {}));
-function printImageBase64(base64List, width, height) {
+function printImageBase64(base64List, options) {
+  const { width, height, direction = PaperDirection.VERTICAL } = options;
   const iframe = document.createElement("iframe");
   iframe.style.visibility = "hidden";
   iframe.style.position = "absolute";
@@ -14423,7 +14448,15 @@ function printImageBase64(base64List, width, height) {
     container.append(image);
   });
   const style = document.createElement("style");
-  const stylesheet = `*{margin:0;padding:0;}@page{margin:0;}`;
+  const stylesheet = `
+  * {
+    margin: 0;
+    padding: 0;
+  }
+  @page {
+    margin: 0;
+    size: ${direction === PaperDirection.HORIZONTAL ? `landscape` : `portrait`};
+  }`;
   style.append(document.createTextNode(stylesheet));
   setTimeout(() => {
     doc.write(`${style.outerHTML}${container.innerHTML}`);
@@ -16112,7 +16145,7 @@ class CommandAdapt {
     });
   }
   async print() {
-    const { scale, printPixelRatio } = this.options;
+    const { scale, printPixelRatio, paperDirection } = this.options;
     if (scale !== 1) {
       this.draw.setPageScale(1);
     }
@@ -16122,7 +16155,11 @@ class CommandAdapt {
       pixelRatio: printPixelRatio,
       mode: EditorMode.PRINT
     });
-    printImageBase64(base64List, width, height);
+    printImageBase64(base64List, {
+      width,
+      height,
+      direction: paperDirection
+    });
     if (scale !== 1) {
       this.draw.setPageScale(scale);
     }