@windoc/core 0.3.1 → 0.3.3

package/dist/index.d.mts

@@ -698,6 +698,7 @@ interface IDrawOption {
     curIndex?: number;
     isSetCursor?: boolean;
     isSubmitHistory?: boolean;
+    isInputHistory?: boolean;
     isCompute?: boolean;
     isLazy?: boolean;
     isInit?: boolean;
@@ -1490,10 +1491,15 @@ declare class HistoryManager {
     private undoStack;
     private redoStack;
     private maxRecordCount;
+    private lastInputTime;
     constructor(draw: Draw);
     undo(): void;
     redo(): void;
     execute(fn: Function): void;
+    replaceLatest(fn: Function): void;
+    isInputGroupable(): boolean;
+    recordInputTime(): void;
+    resetInputTime(): void;
     isCanUndo(): boolean;
     isCanRedo(): boolean;
     isStackEmpty(): boolean;
@@ -2534,7 +2540,7 @@ declare class Draw {
     private _immediateRender;
     render(payload?: IDrawOption): void;
     setCursor(curIndex: number | undefined): number | undefined;
-    submitHistory(curIndex: number | undefined): void;
+    submitHistory(curIndex: number | undefined, isInput?: boolean): void;
     destroy(): void;
     clearSideEffect(): void;
 }

package/dist/index.d.ts

@@ -698,6 +698,7 @@ interface IDrawOption {
     curIndex?: number;
     isSetCursor?: boolean;
     isSubmitHistory?: boolean;
+    isInputHistory?: boolean;
     isCompute?: boolean;
     isLazy?: boolean;
     isInit?: boolean;
@@ -1490,10 +1491,15 @@ declare class HistoryManager {
     private undoStack;
     private redoStack;
     private maxRecordCount;
+    private lastInputTime;
     constructor(draw: Draw);
     undo(): void;
     redo(): void;
     execute(fn: Function): void;
+    replaceLatest(fn: Function): void;
+    isInputGroupable(): boolean;
+    recordInputTime(): void;
+    resetInputTime(): void;
     isCanUndo(): boolean;
     isCanRedo(): boolean;
     isStackEmpty(): boolean;
@@ -2534,7 +2540,7 @@ declare class Draw {
     private _immediateRender;
     render(payload?: IDrawOption): void;
     setCursor(curIndex: number | undefined): number | undefined;
-    submitHistory(curIndex: number | undefined): void;
+    submitHistory(curIndex: number | undefined, isInput?: boolean): void;
     destroy(): void;
     clearSideEffect(): void;
 }

package/dist/index.js

@@ -6517,34 +6517,25 @@ var Cursor = class {
     const nextElement = elementList[curIndex + 1];
     const isNearImage = curElement && curElement.type === "image" /* IMAGE */ || nextElement && nextElement.type === "image" /* IMAGE */;
     const isNearSeparator = curElement?.type === "separator" /* SEPARATOR */;
-    if (isNearImage || isNearSeparator) {
+    const isNearTab = curElement?.type === "tab" /* TAB */;
+    if (isNearImage || isNearSeparator || isNearTab) {
       const { defaultSize, defaultFont } = this.options;
       const ctx = this.draw.getCtx();
       ctx.save();
       ctx.font = `${defaultSize * (96 / 72) * scale}px ${defaultFont}`;
       const textMetrics = ctx.measureText("M");
       ctx.restore();
-      if (isNearSeparator) {
-        const textHeight = textMetrics.fontBoundingBoxAscent + textMetrics.fontBoundingBoxDescent;
-        effectiveMetrics = {
-          width: metrics.width,
-          height: textHeight,
-          boundingBoxAscent: textMetrics.fontBoundingBoxAscent,
-          boundingBoxDescent: textMetrics.fontBoundingBoxDescent
-        };
-      } else {
-        const textHeight = textMetrics.actualBoundingBoxAscent + textMetrics.actualBoundingBoxDescent;
-        effectiveMetrics = {
-          width: metrics.width,
-          height: textHeight,
-          boundingBoxAscent: textMetrics.actualBoundingBoxAscent,
-          boundingBoxDescent: textMetrics.actualBoundingBoxDescent
-        };
-      }
+      const textHeight = textMetrics.fontBoundingBoxAscent + textMetrics.fontBoundingBoxDescent;
+      effectiveMetrics = {
+        width: metrics.width,
+        height: textHeight,
+        boundingBoxAscent: textMetrics.fontBoundingBoxAscent,
+        boundingBoxDescent: textMetrics.fontBoundingBoxDescent
+      };
     }
     const cursorPadding = 2 * scale;
     const cursorHeight = effectiveMetrics.boundingBoxAscent + effectiveMetrics.boundingBoxDescent + cursorPadding;
-    const cursorTop = isNearImage ? leftTop[1] + cursorPosition.lineHeight - effectiveMetrics.boundingBoxDescent - cursorPadding / 2 + preY : isNearSeparator ? leftTop[1] + ascent - (effectiveMetrics.boundingBoxAscent + effectiveMetrics.boundingBoxDescent + cursorPadding) / 2 + preY : leftTop[1] + ascent - effectiveMetrics.boundingBoxAscent - cursorPadding / 2 + preY;
+    const cursorTop = isNearImage ? leftTop[1] + cursorPosition.lineHeight - cursorHeight + preY : isNearSeparator ? leftTop[1] + ascent - (effectiveMetrics.boundingBoxAscent + effectiveMetrics.boundingBoxDescent + cursorPadding) / 2 + preY : leftTop[1] + ascent - effectiveMetrics.boundingBoxAscent - cursorPadding / 2 + preY;
     const cursorLeft = hitLineStartIndex ? leftTop[0] : rightTop[0];
     agentCursorDom.style.left = `${cursorLeft}px`;
     agentCursorDom.style.top = `${cursorTop}px`;
@@ -7811,6 +7802,12 @@ function left(evt, host) {
       }
     }
   }
+  if (!isCollapsed && !evt.shiftKey) {
+    rangeManager.setRange(startIndex, startIndex);
+    draw.render({ curIndex: startIndex, isSetCursor: true, isSubmitHistory: false, isCompute: false });
+    evt.preventDefault();
+    return;
+  }
   const curIndex = startIndex - moveCount;
   let anchorStartIndex = curIndex;
   let anchorEndIndex = curIndex;
@@ -7947,6 +7944,12 @@ function right(evt, host) {
       }
     }
   }
+  if (!isCollapsed && !evt.shiftKey) {
+    rangeManager.setRange(endIndex, endIndex);
+    draw.render({ curIndex: endIndex, isSetCursor: true, isSubmitHistory: false, isCompute: false });
+    evt.preventDefault();
+    return;
+  }
   const curIndex = endIndex + moveCount;
   let anchorStartIndex = curIndex;
   let anchorEndIndex = curIndex;
@@ -8513,9 +8516,11 @@ function input(data2, host) {
   }
   if (~curIndex) {
     rangeManager.setRange(curIndex, curIndex);
+    const isWordBoundary = !isComposing && /[\s\p{P}]/u.test(data2);
     draw.render({
       curIndex,
-      isSubmitHistory: !isComposing
+      isSubmitHistory: !isComposing,
+      isInputHistory: !isComposing && !isWordBoundary
     });
   }
   if (isComposing && ~curIndex) {
@@ -9186,10 +9191,12 @@ var GlobalEvent = class {
 };
 
 // src/core/history/HistoryManager.ts
+var INPUT_GROUP_INTERVAL = 1e3;
 var HistoryManager = class {
   constructor(draw) {
     this.undoStack = [];
     this.redoStack = [];
+    this.lastInputTime = 0;
     this.maxRecordCount = draw.getOptions().historyMaxRecordCount + 1;
   }
   undo() {
@@ -9217,6 +9224,25 @@ var HistoryManager = class {
       this.undoStack.shift();
     }
   }
+  replaceLatest(fn) {
+    if (this.undoStack.length > 0) {
+      this.undoStack[this.undoStack.length - 1] = fn;
+    } else {
+      this.execute(fn);
+    }
+    if (this.redoStack.length) {
+      this.redoStack = [];
+    }
+  }
+  isInputGroupable() {
+    return Date.now() - this.lastInputTime < INPUT_GROUP_INTERVAL;
+  }
+  recordInputTime() {
+    this.lastInputTime = Date.now();
+  }
+  resetInputTime() {
+    this.lastInputTime = 0;
+  }
   isCanUndo() {
     return this.undoStack.length > 1;
   }
@@ -22397,6 +22423,7 @@ var Draw = class {
     const { header, footer } = this.options;
     const {
       isSubmitHistory = true,
+      isInputHistory = false,
       isSetCursor = true,
       isCompute = true,
       isLazy = true,
@@ -22476,7 +22503,7 @@ var Draw = class {
       this.cursor.focus();
     }
     if (isSubmitHistory && !isFirstRender || curIndex !== void 0 && this.historyManager.isStackEmpty()) {
-      this.submitHistory(curIndex);
+      this.submitHistory(curIndex, isInputHistory);
     }
     nextTick(() => {
       this.range.setRangeStyle();
@@ -22539,7 +22566,7 @@ var Draw = class {
     });
     return curIndex;
   }
-  submitHistory(curIndex) {
+  submitHistory(curIndex, isInput = false) {
     const positionContext = this.position.getPositionContext();
     const oldElementList = getSlimCloneElementList(this.elementList);
     const oldHeaderElementList = getSlimCloneElementList(
@@ -22552,7 +22579,7 @@ var Draw = class {
     const pageNo = this.pageNo;
     const oldPositionContext = deepClone(positionContext);
     const zone = this.zone.getZone();
-    this.historyManager.execute(() => {
+    const fn = () => {
       this.zone.setZone(zone);
       this.setPageNo(pageNo);
       this.position.setPositionContext(deepClone(oldPositionContext));
@@ -22565,7 +22592,17 @@ var Draw = class {
         isSubmitHistory: false,
         isSourceHistory: true
       });
-    });
+    };
+    if (isInput && this.historyManager.isInputGroupable()) {
+      this.historyManager.replaceLatest(fn);
+    } else {
+      this.historyManager.execute(fn);
+    }
+    if (isInput) {
+      this.historyManager.recordInputTime();
+    } else {
+      this.historyManager.resetInputTime();
+    }
   }
   destroy() {
     this.container.remove();