@hufe921/canvas-editor 0.9.94 → 0.9.95

package/CHANGELOG.md

@@ -1,3 +1,32 @@
+## [0.9.95](https://github.com/Hufe921/canvas-editor/compare/v0.9.94...v0.9.95) (2024-10-19)
+
+
+### Bug Fixes
+
+* date element update data boundary error #835 ([7f69fd9](https://github.com/Hufe921/canvas-editor/commit/7f69fd9ca2ea474167b10b0e122b745cffed2ab8)), closes [#835](https://github.com/Hufe921/canvas-editor/issues/835)
+* previewer wheel event stop propagation ([ddf0806](https://github.com/Hufe921/canvas-editor/commit/ddf0806e3751c12c56523b987dc1031a85b17b69))
+* set table context error when using directional keys ([b210ce3](https://github.com/Hufe921/canvas-editor/commit/b210ce39b1a440d8fecf7d222c5398b2025d3d68))
+
+
+### Chores
+
+* update watermark option ([d14e720](https://github.com/Hufe921/canvas-editor/commit/d14e72001784202db5eeb7d9bb5ca76cce3cea3c))
+
+
+### Documentation
+
+* update api markdown ([8c0f660](https://github.com/Hufe921/canvas-editor/commit/8c0f660bce8b2a579041af073e04de89913aa1a2))
+
+
+### Features
+
+* add getKeywordContext api #846 ([abbb62d](https://github.com/Hufe921/canvas-editor/commit/abbb62df3bf45e64c67a7da3f7bbe666f4eb1328)), closes [#846](https://github.com/Hufe921/canvas-editor/issues/846)
+* control element support set row flex #839 ([3f265c8](https://github.com/Hufe921/canvas-editor/commit/3f265c835b8f63bcc07b41596ab4dce886e99629)), closes [#839](https://github.com/Hufe921/canvas-editor/issues/839)
+* export getElementListByHTML and getTextFromElementList api ([590c97d](https://github.com/Hufe921/canvas-editor/commit/590c97db225931d6bb4e117736a71be83cbb117e))
+* remove row spacing from continuous tables #842 ([a4d8633](https://github.com/Hufe921/canvas-editor/commit/a4d863320bc8f9b2efa0390c09d58566faa62be9)), closes [#842](https://github.com/Hufe921/canvas-editor/issues/842)
+
+
+
 ## [0.9.94](https://github.com/Hufe921/canvas-editor/compare/v0.9.93...v0.9.94) (2024-10-07)
 
 

package/dist/canvas-editor.es.js

@@ -23,7 +23,7 @@ var __publicField = (obj, key, value) => {
   return value;
 };
 var index = "";
-const version = "0.9.94";
+const version = "0.9.95";
 var MaxHeightRatio;
 (function(MaxHeightRatio2) {
   MaxHeightRatio2["HALF"] = "half";
@@ -6701,7 +6701,7 @@ function left(evt, host) {
                   tdIndex: preTdIndex,
                   tdId: preTd.id,
                   trId: preTr.id,
-                  tableId: element.id
+                  tableId: element.tableId
                 });
                 anchorStartIndex = preTd.value.length - 1;
                 anchorEndIndex = anchorStartIndex;
@@ -6840,7 +6840,7 @@ function right(evt, host) {
                   tdIndex: nextTdIndex,
                   tdId: preTd.id,
                   trId: preTr.id,
-                  tableId: element.id
+                  tableId: element.tableId
                 });
                 anchorStartIndex = 0;
                 anchorEndIndex = anchorStartIndex;
@@ -6988,8 +6988,8 @@ function updown(evt, host) {
           index: index2,
           trIndex: preTrIndex,
           tdIndex: preTdIndex,
-          tdId: preTr.id,
-          trId: preTd.id,
+          tdId: preTd.id,
+          trId: preTr.id,
           tableId
         });
         anchorStartIndex = preTd.value.length - 1;
@@ -7032,8 +7032,8 @@ function updown(evt, host) {
           index: index2,
           trIndex: nexTrIndex,
           tdIndex: nextTdIndex,
-          tdId: nextTr.id,
-          trId: nextTd.id,
+          tdId: nextTd.id,
+          trId: nextTr.id,
           tableId
         });
         anchorStartIndex = nextTd.value.length - 1;
@@ -8822,7 +8822,7 @@ class RangeManager {
       } else {
         const { type, groupId, tableId, index: index2, tdIndex, trIndex } = searchMatch;
         const range = {
-          startIndex: index2 - 1,
+          startIndex: index2,
           endIndex: index2
         };
         if (type === EditorContext.TABLE) {
@@ -13233,6 +13233,45 @@ class Control {
       direction
     });
   }
+  setMinWidthControlInfo(option) {
+    var _a, _b, _c, _d, _e;
+    const { row, rowElement, controlRealWidth, availableWidth } = option;
+    if (!((_a = rowElement.control) == null ? void 0 : _a.minWidth))
+      return;
+    const { scale } = this.options;
+    const controlMinWidth = rowElement.control.minWidth * scale;
+    let controlFirstElement = null;
+    if (((_b = rowElement.control) == null ? void 0 : _b.minWidth) && (((_c = rowElement.control) == null ? void 0 : _c.rowFlex) === RowFlex.CENTER || ((_d = rowElement.control) == null ? void 0 : _d.rowFlex) === RowFlex.RIGHT)) {
+      let controlContentWidth = rowElement.metrics.width;
+      let controlElementIndex = row.elementList.length - 1;
+      while (controlElementIndex >= 0) {
+        const controlRowElement = row.elementList[controlElementIndex];
+        controlContentWidth += controlRowElement.metrics.width;
+        if (((_e = row.elementList[controlElementIndex - 1]) == null ? void 0 : _e.controlComponent) === ControlComponent.PREFIX) {
+          controlFirstElement = controlRowElement;
+          break;
+        }
+        controlElementIndex--;
+      }
+      if (controlFirstElement) {
+        if (controlContentWidth < controlMinWidth) {
+          if (rowElement.control.rowFlex === RowFlex.CENTER) {
+            controlFirstElement.left = (controlMinWidth - controlContentWidth) / 2;
+          } else if (rowElement.control.rowFlex === RowFlex.RIGHT) {
+            controlFirstElement.left = controlMinWidth - controlContentWidth - rowElement.metrics.width;
+          }
+        }
+      }
+    }
+    const extraWidth = controlMinWidth - controlRealWidth;
+    if (extraWidth > 0) {
+      const controlFirstElementLeft = (controlFirstElement == null ? void 0 : controlFirstElement.left) || 0;
+      const rowRemainingWidth = availableWidth - row.width - rowElement.metrics.width;
+      const left2 = Math.min(rowRemainingWidth, extraWidth);
+      rowElement.left = left2 - controlFirstElementLeft;
+      row.width += left2 - controlFirstElementLeft;
+    }
+  }
 }
 class CheckboxParticle {
   constructor(draw) {
@@ -13765,6 +13804,7 @@ class Previewer {
     };
     previewerContainer.onwheel = (evt) => {
       evt.preventDefault();
+      evt.stopPropagation();
       if (evt.deltaY < 0) {
         scaleSize += 0.1;
       } else {
@@ -13884,7 +13924,7 @@ class DateParticle {
     if (startElement.type !== ElementType.DATE)
       return null;
     let preIndex = startIndex;
-    while (preIndex > 0) {
+    while (preIndex >= 0) {
       const preElement = elementList[preIndex];
       if (preElement.dateId !== startElement.dateId) {
         leftIndex = preIndex;
@@ -16835,7 +16875,7 @@ class Draw {
     return defaultBasicRowMarginHeight * ((_a = el.rowMargin) != null ? _a : defaultRowMargin) * scale;
   }
   computeRowList(payload) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
     const { innerWidth, elementList, isPagingMode = false, isFromTable = false, startX = 0, startY = 0, pageHeight = 0, mainOuterHeight = 0, surroundElementList = [] } = payload;
     const { defaultSize, defaultRowMargin, scale, table: { tdPadding }, defaultTabWidth } = this.options;
     const defaultBasicRowMarginHeight = this.getDefaultBasicRowMarginHeight();
@@ -16988,13 +17028,16 @@ class Draw {
         metrics.height = elementHeight;
         metrics.boundingBoxDescent = elementHeight;
         metrics.boundingBoxAscent = -rowMargin;
+        if (((_e = elementList[i + 1]) == null ? void 0 : _e.type) === ElementType.TABLE) {
+          metrics.boundingBoxAscent -= rowMargin;
+        }
         if (isPagingMode) {
           const height2 = this.getHeight();
           const marginHeight = this.getMainOuterHeight();
           let curPagePreHeight = marginHeight;
           for (let r = 0; r < rowList.length; r++) {
             const row = rowList[r];
-            if (row.height + curPagePreHeight > height2 || ((_e = rowList[r - 1]) == null ? void 0 : _e.isPageBreak)) {
+            if (row.height + curPagePreHeight > height2 || ((_f = rowList[r - 1]) == null ? void 0 : _f.isPageBreak)) {
               curPagePreHeight = marginHeight + row.height;
             } else {
               curPagePreHeight += row.height;
@@ -17015,7 +17058,7 @@ class Draw {
                 const trHeight = tr.height * scale;
                 if (curPagePreHeight + rowMarginHeight + preTrHeight + trHeight > height2) {
                   const rowColCount = tr.tdList.reduce((pre, cur) => pre + cur.colspan, 0);
-                  if (((_f = element.colgroup) == null ? void 0 : _f.length) !== rowColCount) {
+                  if (((_g = element.colgroup) == null ? void 0 : _g.length) !== rowColCount) {
                     deleteCount = 0;
                   }
                   break;
@@ -17139,18 +17182,17 @@ class Draw {
         left: 0,
         style: this.getElementFont(element, scale)
       });
-      if ((_g = rowElement.control) == null ? void 0 : _g.minWidth) {
+      if ((_h = rowElement.control) == null ? void 0 : _h.minWidth) {
         if (rowElement.controlComponent) {
           controlRealWidth += metrics.width;
         }
         if (rowElement.controlComponent === ControlComponent.POSTFIX) {
-          const extraWidth = rowElement.control.minWidth - controlRealWidth;
-          if (extraWidth > 0) {
-            const rowRemainingWidth = availableWidth - curRow.width - metrics.width;
-            const left2 = Math.min(rowRemainingWidth, extraWidth) * scale;
-            rowElement.left = left2;
-            curRow.width += left2;
-          }
+          this.control.setMinWidthControlInfo({
+            row: curRow,
+            rowElement,
+            availableWidth,
+            controlRealWidth
+          });
           controlRealWidth = 0;
         }
       }
@@ -17207,10 +17249,10 @@ class Draw {
           elementList: [rowElement],
           ascent,
           rowIndex: curRow.rowIndex + 1,
-          rowFlex: ((_h = elementList[i]) == null ? void 0 : _h.rowFlex) || ((_i = elementList[i + 1]) == null ? void 0 : _i.rowFlex),
+          rowFlex: ((_i = elementList[i]) == null ? void 0 : _i.rowFlex) || ((_j = elementList[i + 1]) == null ? void 0 : _j.rowFlex),
           isPageBreak: element.type === ElementType.PAGE_BREAK
         };
-        if (rowElement.controlComponent !== ControlComponent.PREFIX && ((_j = rowElement.control) == null ? void 0 : _j.indentation) === ControlIndentation.VALUE_START) {
+        if (rowElement.controlComponent !== ControlComponent.PREFIX && ((_k = rowElement.control) == null ? void 0 : _k.indentation) === ControlIndentation.VALUE_START) {
           const preStartIndex = curRow.elementList.findIndex((el) => el.controlId === rowElement.controlId && el.controlComponent !== ControlComponent.PREFIX);
           if (~preStartIndex) {
             const preRowPositionList = this.position.computeRowPosition({
@@ -17243,7 +17285,7 @@ class Draw {
       if (isWrap || i === elementList.length - 1) {
         curRow.isWidthNotEnough = isWidthNotEnough && !isForceBreak;
         if (!curRow.isSurround && ((preElement == null ? void 0 : preElement.rowFlex) === RowFlex.JUSTIFY || (preElement == null ? void 0 : preElement.rowFlex) === RowFlex.ALIGNMENT && isWidthNotEnough)) {
-          const rowElementList = ((_k = curRow.elementList[0]) == null ? void 0 : _k.value) === ZERO ? curRow.elementList.slice(1) : curRow.elementList;
+          const rowElementList = ((_l = curRow.elementList[0]) == null ? void 0 : _l.value) === ZERO ? curRow.elementList.slice(1) : curRow.elementList;
           const gap = (availableWidth - curRow.width) / (rowElementList.length - 1);
           for (let e = 0; e < rowElementList.length - 1; e++) {
             const el = rowElementList[e];
@@ -17348,7 +17390,7 @@ class Draw {
     }
   }
   drawRow(ctx, payload) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g;
     this._drawHighlight(ctx, payload);
     const { scale, table: { tdPadding }, group: group2, lineBreak } = this.options;
     const { rowList, pageNo, elementList, positionList, startIndex, zone: zone2, isDrawLineBreak = !lineBreak.disabled } = payload;
@@ -17466,9 +17508,9 @@ class Draw {
           if (element.type === ElementType.SUBSCRIPT) {
             offsetY2 = this.subscriptParticle.getOffsetY(element);
           }
-          const color = element.controlComponent === ControlComponent.PLACEHOLDER ? void 0 : element.color;
-          this.underline.recordFillInfo(ctx, x - offsetX, y + curRow.height - rowMargin + offsetY2, metrics.width + offsetX, 0, color, (_e = element.textDecoration) == null ? void 0 : _e.style);
-        } else if ((preElement == null ? void 0 : preElement.underline) || ((_f = preElement == null ? void 0 : preElement.control) == null ? void 0 : _f.underline)) {
+          const color = ((_e = element.control) == null ? void 0 : _e.underline) ? this.options.underlineColor : element.color;
+          this.underline.recordFillInfo(ctx, x - offsetX, y + curRow.height - rowMargin + offsetY2, metrics.width + offsetX, 0, color, (_f = element.textDecoration) == null ? void 0 : _f.style);
+        } else if ((preElement == null ? void 0 : preElement.underline) || ((_g = preElement == null ? void 0 : preElement.control) == null ? void 0 : _g.underline)) {
           this.underline.render(ctx);
         }
         if (element.strikeout) {
@@ -17945,6 +17987,7 @@ class Command {
     __publicField(this, "getRangeRow");
     __publicField(this, "getRangeParagraph");
     __publicField(this, "getKeywordRangeList");
+    __publicField(this, "getKeywordContext");
     __publicField(this, "getPaperMargin");
     __publicField(this, "getSearchNavigateInfo");
     __publicField(this, "getLocale");
@@ -18055,6 +18098,7 @@ class Command {
     this.getRangeRow = adapt.getRangeRow.bind(adapt);
     this.getRangeParagraph = adapt.getRangeParagraph.bind(adapt);
     this.getKeywordRangeList = adapt.getKeywordRangeList.bind(adapt);
+    this.getKeywordContext = adapt.getKeywordContext.bind(adapt);
     this.getCatalog = adapt.getCatalog.bind(adapt);
     this.getPaperMargin = adapt.getPaperMargin.bind(adapt);
     this.getSearchNavigateInfo = adapt.getSearchNavigateInfo.bind(adapt);
@@ -19024,12 +19068,14 @@ class CommandAdapt {
     if (isReadonly)
       return;
     const options = this.draw.getOptions();
-    const { color, size, opacity, font } = defaultWatermarkOption;
+    const { color, size, opacity, font, gap } = defaultWatermarkOption;
     options.watermark.data = payload.data;
     options.watermark.color = payload.color || color;
     options.watermark.size = payload.size || size;
     options.watermark.opacity = payload.opacity || opacity;
     options.watermark.font = payload.font || font;
+    options.watermark.repeat = !!payload.repeat;
+    options.watermark.gap = payload.gap || gap;
     this.draw.render({
       isSetCursor: false,
       isSubmitHistory: false,
@@ -19410,6 +19456,34 @@ class CommandAdapt {
   getKeywordRangeList(payload) {
     return this.range.getKeywordRangeList(payload);
   }
+  getKeywordContext(payload) {
+    var _a, _b, _c, _d;
+    const rangeList = this.getKeywordRangeList(payload);
+    if (!rangeList.length)
+      return null;
+    const searchResultContextList = [];
+    const positionList = this.position.getOriginalMainPositionList();
+    const elementList = this.draw.getOriginalMainElementList();
+    for (let r = 0; r < rangeList.length; r++) {
+      const range = rangeList[r];
+      const { startIndex, endIndex, tableId, startTrIndex, startTdIndex } = range;
+      let keywordPositionList = positionList;
+      if (range.tableId) {
+        const tableElement = elementList.find((el) => el.id === tableId);
+        if (tableElement) {
+          keywordPositionList = ((_d = (_c = (_b = (_a = tableElement.trList) == null ? void 0 : _a[startTrIndex]) == null ? void 0 : _b.tdList) == null ? void 0 : _c[startTdIndex]) == null ? void 0 : _d.positionList) || [];
+        }
+      }
+      const startPosition = deepClone(keywordPositionList[startIndex]);
+      const endPosition = deepClone(keywordPositionList[endIndex]);
+      searchResultContextList.push({
+        range,
+        startPosition,
+        endPosition
+      });
+    }
+    return searchResultContextList;
+  }
   pageMode(payload) {
     this.draw.setPageMode(payload);
   }
@@ -21039,5 +21113,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, LineNumberType, ListStyle, ListType, LocationPosition, MaxHeightRatio, NumberType, PageMode, PaperDirection, RenderMode, RowFlex, TableBorder, TdBorder, TdSlash, TextDecorationStyle, TitleLevel, VerticalAlign, WordBreak, createDomFromElementList, 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, LineNumberType, ListStyle, ListType, LocationPosition, MaxHeightRatio, NumberType, PageMode, PaperDirection, RenderMode, RowFlex, TableBorder, TdBorder, TdSlash, TextDecorationStyle, TitleLevel, VerticalAlign, WordBreak, createDomFromElementList, Editor as default, getElementListByHTML, getTextFromElementList, splitText };
 //# sourceMappingURL=canvas-editor.es.js.map