@hufe921/canvas-editor 0.9.81 → 0.9.82

package/CHANGELOG.md

@@ -1,3 +1,19 @@
+## [0.9.82](https://github.com/Hufe921/canvas-editor/compare/v0.9.81...v0.9.82) (2024-06-14)
+
+
+### Bug Fixes
+
+* table cell merge boundary error #645 ([f7da332](https://github.com/Hufe921/canvas-editor/commit/f7da33235419aadb2aea024d3cba4444d6d719fd)), closes [#645](https://github.com/Hufe921/canvas-editor/issues/645)
+
+
+### Features
+
+* add executeUpdateElementById api #648 ([5c896bf](https://github.com/Hufe921/canvas-editor/commit/5c896bf95814c6ef2956221763e7df560b3fe98a)), closes [#648](https://github.com/Hufe921/canvas-editor/issues/648)
+* add override internal drop function api #643 ([ec7e076](https://github.com/Hufe921/canvas-editor/commit/ec7e0760c113711fdafc13374ea521605308f867)), closes [#643](https://github.com/Hufe921/canvas-editor/issues/643)
+* move control position by dragging #456 ([cdb0788](https://github.com/Hufe921/canvas-editor/commit/cdb0788dfcecadb70e680eb40a31551e0e096401)), closes [#456](https://github.com/Hufe921/canvas-editor/issues/456)
+
+
+
 ## [0.9.81](https://github.com/Hufe921/canvas-editor/compare/v0.9.80...v0.9.81) (2024-06-07)
 
 

package/dist/canvas-editor.es.js

@@ -23,7 +23,7 @@ var __publicField = (obj, key, value) => {
   return value;
 };
 var index = "";
-const version = "0.9.81";
+const version = "0.9.82";
 var MaxHeightRatio;
 (function(MaxHeightRatio2) {
   MaxHeightRatio2["HALF"] = "half";
@@ -4779,9 +4779,7 @@ function getElementListByHTML(htmlText, options) {
               }
               tr.tdList.push(td);
             });
-            if (tr.tdList.length) {
-              element.trList.push(tr);
-            }
+            element.trList.push(tr);
           });
           if (element.trList.length) {
             const tdCount = element.trList[0].tdList.reduce((pre, cur) => pre + cur.colspan, 0);
@@ -5799,14 +5797,20 @@ function mouseup(evt, host) {
         return;
       }
     }
-    const editorOptions = draw.getOptions();
+    const control = draw.getControl();
     const elementList = draw.getElementList();
+    const isOmitControlAttr = !isContainControl || !!elementList[range.startIndex].controlId || !control.getIsElementListContainFullControl(dragElementList);
+    const editorOptions = draw.getOptions();
     const replaceElementList = dragElementList.map((el) => {
       if (!el.type || el.type === ElementType.TEXT) {
         const newElement = {
           value: el.value
         };
-        EDITOR_ELEMENT_STYLE_ATTR.forEach((attr) => {
+        const copyAttr = EDITOR_ELEMENT_STYLE_ATTR;
+        if (!isOmitControlAttr) {
+          copyAttr.push(...CONTROL_CONTEXT_ATTR);
+        }
+        copyAttr.forEach((attr) => {
           const value = el[attr];
           if (value !== void 0) {
             newElement[attr] = value;
@@ -5814,7 +5818,10 @@ function mouseup(evt, host) {
         });
         return newElement;
       } else {
-        const newElement = omitObject(deepClone(el), CONTROL_CONTEXT_ATTR);
+        let newElement = deepClone(el);
+        if (isOmitControlAttr) {
+          newElement = omitObject(newElement, CONTROL_CONTEXT_ATTR);
+        }
         formatElementList([newElement], {
           isHandleFirstElement: false,
           editorOptions
@@ -5830,7 +5837,6 @@ function mouseup(evt, host) {
     const replaceLength = replaceElementList.length;
     let rangeStart = range.startIndex;
     let rangeEnd = rangeStart + replaceLength;
-    const control = draw.getControl();
     const activeControl = control.getActiveControl();
     if (activeControl && cacheElementList[rangeStart].controlComponent !== ControlComponent.POSTFIX) {
       rangeEnd = activeControl.setValue(replaceElementList);
@@ -6979,6 +6985,12 @@ function copy(host) {
 }
 function drop(evt, host) {
   var _a, _b;
+  const draw = host.getDraw();
+  const { drop: drop2 } = draw.getOverride();
+  if (drop2) {
+    drop2(evt);
+    return;
+  }
   evt.preventDefault();
   const data2 = (_a = evt.dataTransfer) == null ? void 0 : _a.getData("text");
   if (data2) {
@@ -9641,12 +9653,10 @@ class TableParticle {
     const { colgroup, trList } = element;
     if (!colgroup || !trList)
       return;
-    let x = 0;
-    let y = 0;
+    let preX = 0;
     for (let t = 0; t < trList.length; t++) {
       const tr = trList[t];
       const isLastTr = trList.length - 1 === t;
-      let rowMinHeight = 0;
       for (let d = 0; d < tr.tdList.length; d++) {
         const td = tr.tdList[d];
         let colIndex = 0;
@@ -9661,7 +9671,7 @@ class TableParticle {
               for (let preC = 0; preC < c; preC++) {
                 preColWidth += colgroup[preC].width;
               }
-              x = preColWidth;
+              preX = preColWidth;
               break;
             }
           }
@@ -9680,9 +9690,6 @@ class TableParticle {
           const curTr = trList[row + t] || trList[t];
           height += curTr.height;
         }
-        if (rowMinHeight === 0 || rowMinHeight > height) {
-          rowMinHeight = height;
-        }
         const isLastRowTd = tr.tdList.length - 1 === d;
         let isLastColTd = isLastTr;
         if (!isLastColTd) {
@@ -9695,16 +9702,26 @@ class TableParticle {
         td.isLastRowTd = isLastRowTd;
         td.isLastColTd = isLastColTd;
         td.isLastTd = isLastTd;
-        td.x = x;
-        td.y = y;
+        td.x = preX;
+        let preY = 0;
+        for (let preR = 0; preR < t; preR++) {
+          const preTdList = trList[preR].tdList;
+          for (let preD = 0; preD < preTdList.length; preD++) {
+            const td2 = preTdList[preD];
+            if (colIndex >= td2.colIndex && colIndex < td2.colIndex + td2.colspan) {
+              preY += td2.height;
+              break;
+            }
+          }
+        }
+        td.y = preY;
         td.width = width;
         td.height = height;
         td.rowIndex = t;
         td.colIndex = colIndex;
-        x += width;
+        preX += width;
         if (isLastRowTd && !isLastTd) {
-          x = 0;
-          y += rowMinHeight;
+          preX = 0;
         }
       }
     }
@@ -11697,6 +11714,23 @@ class Control {
     }
     return false;
   }
+  getIsElementListContainFullControl(elementList) {
+    if (!elementList.some((element) => element.controlId))
+      return false;
+    let prefixCount = 0;
+    let postfixCount = 0;
+    for (let e = 0; e < elementList.length; e++) {
+      const element = elementList[e];
+      if (element.controlComponent === ControlComponent.PREFIX) {
+        prefixCount++;
+      } else if (element.controlComponent === ControlComponent.POSTFIX) {
+        postfixCount++;
+      }
+    }
+    if (!prefixCount || !postfixCount)
+      return false;
+    return prefixCount === postfixCount;
+  }
   getIsDisabledControl() {
     var _a, _b;
     return !!((_b = (_a = this.activeControl) == null ? void 0 : _a.getElement().control) == null ? void 0 : _b.disabled);
@@ -16164,6 +16198,7 @@ class Command {
     __publicField(this, "executeSetPaperMargin");
     __publicField(this, "executeInsertElementList");
     __publicField(this, "executeAppendElementList");
+    __publicField(this, "executeUpdateElementById");
     __publicField(this, "executeSetValue");
     __publicField(this, "executeRemoveControl");
     __publicField(this, "executeSetLocale");
@@ -16276,6 +16311,7 @@ class Command {
     this.executeSetPaperMargin = adapt.setPaperMargin.bind(adapt);
     this.executeInsertElementList = adapt.insertElementList.bind(adapt);
     this.executeAppendElementList = adapt.appendElementList.bind(adapt);
+    this.executeUpdateElementById = adapt.updateElementById.bind(adapt);
     this.executeSetValue = adapt.setValue.bind(adapt);
     this.executeRemoveControl = adapt.removeControl.bind(adapt);
     this.executeSetLocale = adapt.setLocale.bind(adapt);
@@ -18334,8 +18370,12 @@ class CommandAdapt {
     const selectionText = this.range.toString();
     const selectionElementList = zipElementList(this.range.getSelectionElementList() || []);
     const elementList = this.draw.getElementList();
-    const startElement = pickElementAttr(elementList[isCollapsed ? startIndex : startIndex + 1]);
-    const endElement = pickElementAttr(elementList[endIndex]);
+    const startElement = pickElementAttr(elementList[isCollapsed ? startIndex : startIndex + 1], {
+      extraPickAttrs: ["id"]
+    });
+    const endElement = pickElementAttr(elementList[endIndex], {
+      extraPickAttrs: ["id"]
+    });
     const positionList = this.position.getPositionList();
     const startPageNo = positionList[startIndex].pageNo;
     const endPageNo = positionList[endIndex].pageNo;
@@ -18471,6 +18511,37 @@ class CommandAdapt {
       return;
     this.draw.appendElementList(deepClone(elementList), options);
   }
+  updateElementById(payload) {
+    function getElementIndexById(elementList) {
+      for (let e = 0; e < elementList.length; e++) {
+        const element = elementList[e];
+        if (element.id === payload.id) {
+          return e;
+        }
+      }
+      return -1;
+    }
+    const getElementListFnList = [
+      this.draw.getOriginalMainElementList,
+      this.draw.getHeaderElementList,
+      this.draw.getFooterElementList
+    ];
+    for (const getElementList of getElementListFnList) {
+      const elementList = getElementList.call(this.draw);
+      const elementIndex = getElementIndexById(elementList);
+      if (~elementIndex) {
+        elementList[elementIndex] = __spreadValues(__spreadValues({}, elementList[elementIndex]), payload.properties);
+        formatElementList([elementList[elementIndex]], {
+          isHandleFirstElement: false,
+          editorOptions: this.options
+        });
+        this.draw.render({
+          isSetCursor: false
+        });
+        break;
+      }
+    }
+  }
   setValue(payload) {
     this.draw.setValue(payload);
   }
@@ -19861,6 +19932,7 @@ class Override {
   constructor() {
     __publicField(this, "paste");
     __publicField(this, "copy");
+    __publicField(this, "drop");
   }
 }
 class Editor {