@hufe921/canvas-editor 0.9.84 → 0.9.86

package/CHANGELOG.md

@@ -1,3 +1,48 @@
+## [0.9.86](https://github.com/Hufe921/canvas-editor/compare/v0.9.85...v0.9.86) (2024-07-13)
+
+
+### Bug Fixes
+
+* add control placeholder boundary error #686 ([fac5c5c](https://github.com/Hufe921/canvas-editor/commit/fac5c5c045a30cb5e0c46ef027c83f21e07bcaa8)), closes [#686](https://github.com/Hufe921/canvas-editor/issues/686)
+* add control placeholder using default style #691 ([eb3ea5e](https://github.com/Hufe921/canvas-editor/commit/eb3ea5ed55cdedea0e281d45177c8661f674a280)), closes [#691](https://github.com/Hufe921/canvas-editor/issues/691)
+* delete table col boundary error #688 ([3f0a49f](https://github.com/Hufe921/canvas-editor/commit/3f0a49f56be7060d328a63c994f571b0a35a3521)), closes [#688](https://github.com/Hufe921/canvas-editor/issues/688)
+* refocus when cursor is not focused #685 ([0ac8ae7](https://github.com/Hufe921/canvas-editor/commit/0ac8ae7c4b0b47ee84a9c0f8c37ffde612849957)), closes [#685](https://github.com/Hufe921/canvas-editor/issues/685)
+* remove title and list properties from getControlList return value #683 ([b024050](https://github.com/Hufe921/canvas-editor/commit/b024050b3ef7f787079a74b062e5d83085be1a5f)), closes [#683](https://github.com/Hufe921/canvas-editor/issues/683)
+
+
+### Features
+
+* add executeInsertControl api ([e5b3d05](https://github.com/Hufe921/canvas-editor/commit/e5b3d05991a26dc186cdf63962ca3c7b50a32572))
+
+
+
+## [0.9.85](https://github.com/Hufe921/canvas-editor/compare/v0.9.84...v0.9.85) (2024-07-07)
+
+
+### Bug Fixes
+
+* custom override method removes support for asynchronous #672 ([0e705d6](https://github.com/Hufe921/canvas-editor/commit/0e705d6a0bdb0922efd5c47edd8ca9eba9964199)), closes [#672](https://github.com/Hufe921/canvas-editor/issues/672)
+* set control highlight and re render #678 ([24df9d3](https://github.com/Hufe921/canvas-editor/commit/24df9d3b006a8daf795ada677bfd0159e3ccc3f5)), closes [#678](https://github.com/Hufe921/canvas-editor/issues/678)
+
+
+### Chores
+
+* update build.yml ([a40441d](https://github.com/Hufe921/canvas-editor/commit/a40441dc3994a41ae29c341a542be6e0e7dada2e))
+
+
+### Features
+
+* add render mode #667 ([affd191](https://github.com/Hufe921/canvas-editor/commit/affd1911552a73a2b63a13f2c423121637830b99)), closes [#667](https://github.com/Hufe921/canvas-editor/issues/667)
+* add title deletable property #670 ([b3d8413](https://github.com/Hufe921/canvas-editor/commit/b3d8413b35050eac626af1c57beaaf1b8d692a0e)), closes [#670](https://github.com/Hufe921/canvas-editor/issues/670)
+* insert element boundary optimization #669 ([de44bd6](https://github.com/Hufe921/canvas-editor/commit/de44bd68ab01e5ffa8d6a8dc5d566b0cdb8d08e6)), closes [#669](https://github.com/Hufe921/canvas-editor/issues/669)
+
+
+### Tests
+
+* update text test case ([c24da73](https://github.com/Hufe921/canvas-editor/commit/c24da737b15200775a7d4a5edf4e2224f6ec5429))
+
+
+
 ## [0.9.84](https://github.com/Hufe921/canvas-editor/compare/v0.9.83...v0.9.84) (2024-06-30)
 
 

package/dist/canvas-editor.es.js

@@ -23,7 +23,7 @@ var __publicField = (obj, key, value) => {
   return value;
 };
 var index = "";
-const version = "0.9.84";
+const version = "0.9.86";
 var MaxHeightRatio;
 (function(MaxHeightRatio2) {
   MaxHeightRatio2["HALF"] = "half";
@@ -364,10 +364,6 @@ function isObjectEqual(obj1, obj2) {
   }
   return !obj1Keys.some((key) => obj2[key] !== obj1[key]);
 }
-function isPromiseFunction(fn) {
-  var _a;
-  return ((_a = fn == null ? void 0 : fn.constructor) == null ? void 0 : _a.name) === "AsyncFunction";
-}
 const CURSOR_AGENT_OFFSET_HEIGHT = 12;
 const defaultCursorOption = {
   width: 1,
@@ -4355,7 +4351,7 @@ function formatElementContext(sourceElementList, formatElementList2, anchorIndex
   let isBreakWarped = false;
   for (let e = 0; e < formatElementList2.length; e++) {
     const targetElement = formatElementList2[e];
-    if (isBreakWhenWrap && !copyElement.listId && /^\n/.test(targetElement.value)) {
+    if (isBreakWhenWrap && !copyElement.listId && START_LINE_BREAK_REG.test(targetElement.value)) {
       isBreakWarped = true;
     }
     if (isBreakWarped || !copyElement.listId && targetElement.type === ElementType.LIST) {
@@ -5060,7 +5056,7 @@ function pasteImage(host, file) {
     };
   };
 }
-async function pasteByEvent(host, evt) {
+function pasteByEvent(host, evt) {
   const draw = host.getDraw();
   const isReadonly = draw.isReadonly();
   if (isReadonly)
@@ -5070,7 +5066,7 @@ async function pasteByEvent(host, evt) {
     return;
   const { paste } = draw.getOverride();
   if (paste) {
-    const overrideResult = isPromiseFunction(paste) ? await paste(evt) : paste(evt);
+    const overrideResult = paste(evt);
     if ((overrideResult == null ? void 0 : overrideResult.preventDefault) !== false)
       return;
   }
@@ -5123,7 +5119,7 @@ async function pasteByApi(host, options) {
     return;
   const { paste } = draw.getOverride();
   if (paste) {
-    const overrideResult = isPromiseFunction(paste) ? await paste() : paste();
+    const overrideResult = paste();
     if ((overrideResult == null ? void 0 : overrideResult.preventDefault) !== false)
       return;
   }
@@ -5294,8 +5290,10 @@ class Cursor {
     const agentCursorDom = this.cursorAgent.getAgentCursorDom();
     if (isFocus) {
       setTimeout(() => {
-        agentCursorDom.focus();
-        agentCursorDom.setSelectionRange(0, 0);
+        if (document.activeElement !== agentCursorDom) {
+          agentCursorDom.focus();
+          agentCursorDom.setSelectionRange(0, 0);
+        }
       });
     }
     const descent = metrics.boundingBoxDescent < 0 ? 0 : metrics.boundingBoxDescent;
@@ -5404,6 +5402,11 @@ var WordBreak;
   WordBreak2["BREAK_ALL"] = "break-all";
   WordBreak2["BREAK_WORD"] = "break-word";
 })(WordBreak || (WordBreak = {}));
+var RenderMode;
+(function(RenderMode2) {
+  RenderMode2["SPEED"] = "speed";
+  RenderMode2["COMPATIBILITY"] = "compatibility";
+})(RenderMode || (RenderMode = {}));
 var MouseEventButton;
 (function(MouseEventButton2) {
   MouseEventButton2[MouseEventButton2["LEFT"] = 0] = "LEFT";
@@ -6166,8 +6169,10 @@ function enter(evt, host) {
   if (evt.shiftKey && startElement.listId) {
     enterText.listWrap = true;
   }
+  formatElementContext(elementList, [enterText], startIndex, {
+    isBreakWhenWrap: true
+  });
   if (!(endElement.titleId && endElement.titleId !== ((_b = elementList[endIndex + 1]) == null ? void 0 : _b.titleId))) {
-    formatElementContext(elementList, [enterText], startIndex);
     const copyElement = getAnchorElement(elementList, endIndex);
     if (copyElement) {
       const copyAttr = [...EDITOR_ROW_ATTR];
@@ -6982,11 +6987,11 @@ function cut(host) {
   rangeManager.setRange(curIndex, curIndex);
   draw.render({ curIndex });
 }
-async function copy(host) {
+function copy(host) {
   const draw = host.getDraw();
   const { copy: copy2 } = draw.getOverride();
   if (copy2) {
-    const overrideResult = isPromiseFunction(copy2) ? await copy2() : copy2();
+    const overrideResult = copy2();
     if ((overrideResult == null ? void 0 : overrideResult.preventDefault) !== false)
       return;
   }
@@ -7034,12 +7039,12 @@ async function copy(host) {
     return;
   writeElementList(copyElementList, draw.getOptions());
 }
-async function drop(evt, host) {
+function drop(evt, host) {
   var _a, _b;
   const draw = host.getDraw();
   const { drop: drop2 } = draw.getOverride();
   if (drop2) {
-    const overrideResult = isPromiseFunction(drop2) ? await drop2(evt) : drop2(evt);
+    const overrideResult = drop2(evt);
     if ((overrideResult == null ? void 0 : overrideResult.preventDefault) !== false)
       return;
   }
@@ -9250,6 +9255,14 @@ class TextParticle {
   }
   record(ctx, element, x, y) {
     this.ctx = ctx;
+    if (this.options.renderMode === RenderMode.COMPATIBILITY) {
+      this._setCurXY(x, y);
+      this.text = element.value;
+      this.curStyle = element.style;
+      this.curColor = element.color;
+      this.complete();
+      return;
+    }
     if (!this.text) {
       this._setCurXY(x, y);
     }
@@ -10882,7 +10895,7 @@ class TextControl {
     this.control.getDraw().spliceElementList(elementList, startIndex + 1, endIndex - startIndex);
     const value = this.getValue(context);
     if (!value.length) {
-      this.control.addPlaceholder(startIndex);
+      this.control.addPlaceholder(startIndex, context);
     }
     return startIndex;
   }
@@ -12056,16 +12069,17 @@ class Control {
     if (!control.placeholder)
       return;
     const placeholderStrList = splitText(control.placeholder);
+    const anchorElementStyleAttr = pickObject(startElement, CONTROL_STYLE_ATTR);
     for (let p = 0; p < placeholderStrList.length; p++) {
       const value = placeholderStrList[p];
-      const newElement = {
+      const newElement = __spreadProps(__spreadValues({}, anchorElementStyleAttr), {
         value,
         controlId: startElement.controlId,
         type: ElementType.CONTROL,
         control: startElement.control,
         controlComponent: ControlComponent.PLACEHOLDER,
         color: this.controlOptions.placeholderColor
-      };
+      });
       formatElementContext(elementList, [newElement], startIndex);
       this.draw.spliceElementList(elementList, startIndex + p + 1, 0, newElement);
     }
@@ -12398,7 +12412,11 @@ class Control {
           }
         }
         if (element.controlId) {
-          controlElementList.push(element);
+          const controlElement = omitObject(element, [
+            ...TITLE_CONTEXT_ATTR,
+            ...LIST_CONTEXT_ATTR
+          ]);
+          controlElementList.push(controlElement);
         }
       }
     }
@@ -14951,7 +14969,8 @@ class Draw {
       if (!this.control.getActiveControl()) {
         let deleteIndex = endIndex - 1;
         while (deleteIndex >= start) {
-          if (((_c = (_b = elementList[deleteIndex]) == null ? void 0 : _b.control) == null ? void 0 : _c.deletable) !== false) {
+          const deleteElement = elementList[deleteIndex];
+          if (((_b = deleteElement == null ? void 0 : deleteElement.control) == null ? void 0 : _b.deletable) !== false && ((_c = deleteElement == null ? void 0 : deleteElement.title) == null ? void 0 : _c.deletable) !== false) {
             elementList.splice(deleteIndex, 1);
           }
           deleteIndex--;
@@ -16326,6 +16345,7 @@ class Command {
     __publicField(this, "executeSetControlProperties");
     __publicField(this, "executeSetControlHighlight");
     __publicField(this, "executeLocationControl");
+    __publicField(this, "executeInsertControl");
     __publicField(this, "executeUpdateOptions");
     __publicField(this, "executeInsertTitle");
     __publicField(this, "getCatalog");
@@ -16464,6 +16484,7 @@ class Command {
     this.getControlValue = adapt.getControlValue.bind(adapt);
     this.getControlList = adapt.getControlList.bind(adapt);
     this.executeLocationControl = adapt.locationControl.bind(adapt);
+    this.executeInsertControl = adapt.insertControl.bind(adapt);
   }
 }
 const defaultWatermarkOption = {
@@ -16603,6 +16624,7 @@ function mergeOption(options = {}) {
     marginIndicatorColor: "#BABABA",
     margins: [100, 120, 100, 120],
     pageMode: PageMode.PAGING,
+    renderMode: RenderMode.SPEED,
     defaultHyperlinkColor: "#0000FF",
     paperDirection: PaperDirection.VERTICAL,
     inactiveAlpha: 0.6,
@@ -17654,27 +17676,15 @@ class CommandAdapt {
       const tr = curTrList[t];
       for (let d = 0; d < tr.tdList.length; d++) {
         const td = tr.tdList[d];
-        if (td.colspan > 1) {
-          const tdColIndex = td.colIndex;
-          if (tdColIndex <= curColIndex && tdColIndex + td.colspan - 1 >= curColIndex) {
-            td.colspan -= 1;
+        if (td.colIndex <= curColIndex && td.colIndex + td.colspan > curColIndex) {
+          if (td.colspan > 1) {
+            td.colspan--;
+          } else {
+            tr.tdList.splice(d, 1);
           }
         }
       }
     }
-    for (let t = 0; t < curTrList.length; t++) {
-      const tr = curTrList[t];
-      let start = -1;
-      for (let d = 0; d < tr.tdList.length; d++) {
-        const td = tr.tdList[d];
-        if (td.colIndex === curColIndex) {
-          start = d;
-        }
-      }
-      if (~start) {
-        tr.tdList.splice(start, 1);
-      }
-    }
     (_a = element.colgroup) == null ? void 0 : _a.splice(curColIndex, 1);
     this.position.setPositionContext({
       isTable: false
@@ -18616,7 +18626,9 @@ class CommandAdapt {
     const cloneElementList = deepClone(payload);
     const { startIndex } = this.range.getRange();
     const elementList = this.draw.getElementList();
-    formatElementContext(elementList, cloneElementList, startIndex);
+    formatElementContext(elementList, cloneElementList, startIndex, {
+      isBreakWhenWrap: true
+    });
     this.draw.insertElementList(cloneElementList);
   }
   appendElementList(elementList, options) {
@@ -18808,6 +18820,9 @@ class CommandAdapt {
   }
   setControlHighlight(payload) {
     this.draw.getControl().setHighlightList(payload);
+    this.draw.render({
+      isSubmitHistory: false
+    });
   }
   updateOptions(payload) {
     const newOption = mergeOption(payload);
@@ -18893,6 +18908,24 @@ class CommandAdapt {
       }
     }
   }
+  insertControl(payload) {
+    const isReadonly = this.draw.isReadonly();
+    if (isReadonly)
+      return;
+    const cloneElement = deepClone(payload);
+    const { startIndex } = this.range.getRange();
+    const elementList = this.draw.getElementList();
+    const copyElement = getAnchorElement(elementList, startIndex);
+    if (!copyElement)
+      return;
+    const cloneAttr = [
+      ...TABLE_CONTEXT_ATTR,
+      ...EDITOR_ROW_ATTR,
+      ...LIST_CONTEXT_ATTR
+    ];
+    cloneProperty(cloneAttr, copyElement, cloneElement);
+    this.draw.insertElementList([cloneElement]);
+  }
   getContainer() {
     return this.draw.getContainer();
   }
@@ -20152,5 +20185,5 @@ class Editor {
     this.use = plugin.use.bind(plugin);
   }
 }
-export { BackgroundRepeat, BackgroundSize, BlockType, Command, ControlIndentation, ControlType, EDITOR_COMPONENT, Editor, EditorComponent, EditorMode, EditorZone, ElementType, INTERNAL_CONTEXT_MENU_KEY, ImageDisplay, KeyMap, LETTER_CLASS, ListStyle, ListType, MaxHeightRatio, NumberType, PageMode, PaperDirection, RowFlex, TableBorder, TdBorder, TdSlash, TextDecorationStyle, TitleLevel, VerticalAlign, WordBreak, Editor as default, splitText };
+export { BackgroundRepeat, BackgroundSize, BlockType, Command, ControlIndentation, ControlType, EDITOR_COMPONENT, Editor, EditorComponent, EditorMode, EditorZone, ElementType, INTERNAL_CONTEXT_MENU_KEY, ImageDisplay, KeyMap, LETTER_CLASS, ListStyle, ListType, MaxHeightRatio, NumberType, PageMode, PaperDirection, RenderMode, RowFlex, TableBorder, TdBorder, TdSlash, TextDecorationStyle, TitleLevel, VerticalAlign, WordBreak, Editor as default, splitText };
 //# sourceMappingURL=canvas-editor.es.js.map