@hufe921/canvas-editor 0.9.41 → 0.9.42

package/CHANGELOG.md

@@ -1,3 +1,20 @@
+## [0.9.42](https://github.com/Hufe921/canvas-editor/compare/v0.9.41...v0.9.42) (2023-07-31)
+
+
+### Bug Fixes
+
+* contentChange call error during initialization #224 ([1b25afb](https://github.com/Hufe921/canvas-editor/commit/1b25afb664b6feff8a0e96dda53a0a3b252663c7)), closes [#224](https://github.com/Hufe921/canvas-editor/issues/224)
+* control value style not affected by prefix #227 ([cf5dd35](https://github.com/Hufe921/canvas-editor/commit/cf5dd356869ac272dd8d3a1948ff5f4c6536b23d)), closes [#227](https://github.com/Hufe921/canvas-editor/issues/227)
+* limit word break element type ([73014dc](https://github.com/Hufe921/canvas-editor/commit/73014dc87be5360ab8f09e211a12b06dfcbb77e2))
+* set header and footer data error #224 ([b22f0b4](https://github.com/Hufe921/canvas-editor/commit/b22f0b45418b76ba008a2f6200bf8210f3c6f0dd)), closes [#224](https://github.com/Hufe921/canvas-editor/issues/224)
+
+
+### Features
+
+* add SetHTML api ([52f7500](https://github.com/Hufe921/canvas-editor/commit/52f7500ae3e27b1746af423dcbf1faffc9134948))
+
+
+
 ## [0.9.41](https://github.com/Hufe921/canvas-editor/compare/v0.9.40...v0.9.41) (2023-07-27)
 
 

package/dist/canvas-editor.es.js

@@ -23,7 +23,7 @@ var __publicField = (obj, key, value) => {
   return value;
 };
 var index = "";
-const version = "0.9.41";
+const version = "0.9.42";
 var MaxHeightRatio;
 (function(MaxHeightRatio2) {
   MaxHeightRatio2["HALF"] = "half";
@@ -228,6 +228,15 @@ function cloneProperty(properties, sourceElement, targetElement) {
     }
   }
 }
+function omitObject(object, keys) {
+  const cloneObject = deepClone(object);
+  for (const key in object) {
+    if (keys.includes(key)) {
+      delete cloneObject[key];
+    }
+  }
+  return cloneObject;
+}
 function convertStringToBase64(input2) {
   const encoder = new TextEncoder();
   const data2 = encoder.encode(input2);
@@ -7225,7 +7234,7 @@ class TextParticle {
     let i = curIndex;
     while (i < elementList.length) {
       const element = elementList[i];
-      if (!LETTER_REG.test(element.value)) {
+      if (element.type && element.type !== ElementType.TEXT || !LETTER_REG.test(element.value)) {
         endElement = element;
         break;
       }
@@ -8096,7 +8105,7 @@ class HyperlinkParticle {
   }
 }
 class Header {
-  constructor(draw) {
+  constructor(draw, data2) {
     __publicField(this, "draw");
     __publicField(this, "position");
     __publicField(this, "options");
@@ -8106,7 +8115,7 @@ class Header {
     this.draw = draw;
     this.position = draw.getPosition();
     this.options = draw.getOptions();
-    this.elementList = draw.getHeaderElementList();
+    this.elementList = data2 || [];
     this.rowList = [];
     this.positionList = [];
   }
@@ -8433,11 +8442,12 @@ class SelectControl {
     this.control.removePlaceholder(startIndex);
     const elementList = this.control.getElementList();
     const startElement = elementList[startIndex];
+    const anchorElement = startElement.controlComponent === ControlComponent.PREFIX ? omitObject(startElement, EDITOR_ELEMENT_STYLE_ATTR) : startElement;
     const start = startIndex + 1;
     const data2 = splitText(valueSet.value);
     const draw = this.control.getDraw();
     for (let i = 0; i < data2.length; i++) {
-      const newElement = __spreadProps(__spreadValues({}, startElement), {
+      const newElement = __spreadProps(__spreadValues({}, anchorElement), {
         value: data2[i],
         controlComponent: ControlComponent.VALUE
       });
@@ -8554,9 +8564,10 @@ class TextControl {
       this.control.removePlaceholder(startIndex);
     }
     const startElement = elementList[startIndex];
+    const anchorElement = startElement.controlComponent === ControlComponent.PREFIX ? omitObject(startElement, EDITOR_ELEMENT_STYLE_ATTR) : startElement;
     const start = range.startIndex + 1;
     for (let i = 0; i < data2.length; i++) {
-      const newElement = __spreadProps(__spreadValues(__spreadValues({}, startElement), data2[i]), {
+      const newElement = __spreadProps(__spreadValues(__spreadValues({}, anchorElement), data2[i]), {
         controlComponent: ControlComponent.VALUE
       });
       formatElementContext(elementList, [newElement], startIndex);
@@ -10333,7 +10344,7 @@ class Zone {
   }
 }
 class Footer {
-  constructor(draw) {
+  constructor(draw, data2) {
     __publicField(this, "draw");
     __publicField(this, "position");
     __publicField(this, "options");
@@ -10343,7 +10354,7 @@ class Footer {
     this.draw = draw;
     this.position = draw.getPosition();
     this.options = draw.getOptions();
-    this.elementList = draw.getFooterElementList();
+    this.elementList = data2 || [];
     this.rowList = [];
     this.positionList = [];
   }
@@ -10607,9 +10618,7 @@ class Draw {
     __publicField(this, "options");
     __publicField(this, "position");
     __publicField(this, "zone");
-    __publicField(this, "headerElementList");
     __publicField(this, "elementList");
-    __publicField(this, "footerElementList");
     __publicField(this, "listener");
     __publicField(this, "eventBus");
     __publicField(this, "i18n");
@@ -10663,9 +10672,7 @@ class Draw {
     this.pagePixelRatio = null;
     this.mode = options.mode;
     this.options = options;
-    this.headerElementList = data2.header || [];
     this.elementList = data2.main;
-    this.footerElementList = data2.footer || [];
     this.listener = listener;
     this.eventBus = eventBus;
     this._formatContainer();
@@ -10691,8 +10698,8 @@ class Draw {
     this.pageNumber = new PageNumber(this);
     this.waterMark = new Watermark(this);
     this.placeholder = new Placeholder(this);
-    this.header = new Header(this);
-    this.footer = new Footer(this);
+    this.header = new Header(this, data2.header);
+    this.footer = new Footer(this, data2.footer);
     this.hyperlinkParticle = new HyperlinkParticle(this);
     this.dateParticle = new DateParticle(this);
     this.separatorParticle = new SeparatorParticle();
@@ -10719,7 +10726,10 @@ class Draw {
     this.visiblePageNoList = [];
     this.intersectionPageNo = 0;
     this.lazyRenderIntersectionObserver = null;
-    this.render({ isSetCursor: false });
+    this.render({
+      isInit: true,
+      isSetCursor: false
+    });
   }
   getMode() {
     return this.mode;
@@ -10884,7 +10894,7 @@ class Draw {
     return this.range;
   }
   getHeaderElementList() {
-    return this.headerElementList;
+    return this.header.getElementList();
   }
   getTableElementList(sourceElementList) {
     const positionContext = this.position.getPositionContext();
@@ -10903,10 +10913,10 @@ class Draw {
   getOriginalElementList() {
     const zoneManager = this.getZone();
     if (zoneManager.isHeaderActive()) {
-      return this.header.getElementList();
+      return this.getHeaderElementList();
     }
     if (zoneManager.isFooterActive()) {
-      return this.footer.getElementList();
+      return this.getFooterElementList();
     }
     return this.elementList;
   }
@@ -10914,7 +10924,7 @@ class Draw {
     return this.elementList;
   }
   getFooterElementList() {
-    return this.footerElementList;
+    return this.footer.getElementList();
   }
   insertElementList(payload) {
     if (!payload.length)
@@ -11217,9 +11227,9 @@ class Draw {
       mainElementList = this.pageRowList[pageNo].flatMap((row) => row.elementList);
     }
     const data2 = {
-      header: zipElementList(this.headerElementList),
+      header: zipElementList(this.getHeaderElementList()),
       main: zipElementList(mainElementList),
-      footer: zipElementList(this.footerElementList)
+      footer: zipElementList(this.getFooterElementList())
     };
     return {
       version,
@@ -11863,7 +11873,7 @@ class Draw {
   render(payload) {
     var _a;
     const { header, footer } = this.options;
-    const { isSubmitHistory = true, isSetCursor = true, isCompute = true, isLazy = true } = payload || {};
+    const { isSubmitHistory = true, isSetCursor = true, isCompute = true, isLazy = true, isInit = false } = payload || {};
     let { curIndex } = payload || {};
     const innerWidth = this.getInnerWidth();
     const isPagingMode = this.getIsPagingMode();
@@ -11953,7 +11963,7 @@ class Draw {
       if (this.eventBus.isSubscribe("pageSizeChange")) {
         this.eventBus.emit("pageSizeChange", this.pageRowList.length);
       }
-      if (isSubmitHistory) {
+      if (isSubmitHistory && !isInit) {
         if (this.listener.contentChange) {
           this.listener.contentChange();
         }
@@ -12044,6 +12054,7 @@ class Command {
     __publicField(this, "executeSetLocale");
     __publicField(this, "executeLocationCatalog");
     __publicField(this, "executeWordTool");
+    __publicField(this, "executeSetHTML");
     __publicField(this, "getCatalog");
     __publicField(this, "getImage");
     __publicField(this, "getValue");
@@ -12125,6 +12136,7 @@ class Command {
     this.executeSetLocale = adapt.setLocale.bind(adapt);
     this.executeLocationCatalog = adapt.locationCatalog.bind(adapt);
     this.executeWordTool = adapt.wordTool.bind(adapt);
+    this.executeSetHTML = adapt.setHTML.bind(adapt);
     this.getImage = adapt.getImage.bind(adapt);
     this.getValue = adapt.getValue.bind(adapt);
     this.getHTML = adapt.getHTML.bind(adapt);
@@ -13861,6 +13873,18 @@ class CommandAdapt {
       });
     }
   }
+  setHTML(payload) {
+    const { header, main, footer } = payload;
+    const innerWidth = this.draw.getOriginalInnerWidth();
+    const getElementList = (htmlText) => htmlText !== void 0 ? getElementListByHTML(htmlText, {
+      innerWidth
+    }) : void 0;
+    this.setValue({
+      header: getElementList(header),
+      main: getElementList(main),
+      footer: getElementList(footer)
+    });
+  }
 }
 class Listener {
   constructor() {