@windoc/core 0.3.22 → 0.3.23

package/dist/index.d.mts

@@ -1287,6 +1287,7 @@ interface IEditorOption {
     historyMaxRecordCount?: number;
     printPixelRatio?: number;
     maskMargin?: IMargin;
+    scrollPaddingLines?: number;
     letterClass?: string[];
     contextMenuDisableKeys?: string[];
     shortcutDisableKeys?: string[];
@@ -1469,7 +1470,6 @@ type IDrawCursorOption = ICursorOption & {
     hitLineStartIndex?: number;
 };
 interface IMoveCursorToVisibleOption {
-    direction: MoveDirection;
     cursorPosition: IElementPosition;
 }
 declare class Cursor {

package/dist/index.d.ts

@@ -1287,6 +1287,7 @@ interface IEditorOption {
     historyMaxRecordCount?: number;
     printPixelRatio?: number;
     maskMargin?: IMargin;
+    scrollPaddingLines?: number;
     letterClass?: string[];
     contextMenuDisableKeys?: string[];
     shortcutDisableKeys?: string[];
@@ -1469,7 +1470,6 @@ type IDrawCursorOption = ICursorOption & {
     hitLineStartIndex?: number;
 };
 interface IMoveCursorToVisibleOption {
-    direction: MoveDirection;
     cursorPosition: IElementPosition;
 }
 declare class Cursor {

package/dist/index.js

@@ -78,7 +78,7 @@ __export(index_exports, {
 module.exports = __toCommonJS(index_exports);
 
 // src/version.ts
-var version = "0.3.22";
+var version = "0.3.23";
 
 // src/dataset/enum/Common.ts
 var MaxHeightRatio = /* @__PURE__ */ ((MaxHeightRatio2) => {
@@ -4501,6 +4501,7 @@ function mergeOption(options = {}) {
     wordBreak: "break-word" /* BREAK_WORD */,
     printPixelRatio: 3,
     maskMargin: [0, 0, 0, 0],
+    scrollPaddingLines: 3,
     letterClass: [LETTER_CLASS.ENGLISH],
     contextMenuDisableKeys: [],
     shortcutDisableKeys: [],
@@ -6489,7 +6490,10 @@ var Cursor = class {
     const agentCursorDom = this.cursorAgent.getAgentCursorDom();
     if (document.activeElement !== agentCursorDom) {
       agentCursorDom.focus({ preventScroll: true });
+      const scrollContainer = findScrollContainer(this.container);
+      const { scrollLeft, scrollTop } = scrollContainer;
       agentCursorDom.setSelectionRange(0, 0);
+      scrollContainer.scroll(scrollLeft, scrollTop);
     }
   }
   drawCursor(payload) {
@@ -6559,7 +6563,6 @@ var Cursor = class {
       this.recoveryCursor();
       return;
     }
-    const oldTop = this.cursorDom.style.top;
     const isReadonly = this.draw.isReadonly();
     this.cursorDom.style.width = `${width * scale}px`;
     this.cursorDom.style.backgroundColor = color;
@@ -6573,10 +6576,7 @@ var Cursor = class {
       this._clearBlinkTimeout();
     }
     nextTick2(() => {
-      this.moveCursorToVisible({
-        cursorPosition,
-        direction: parseInt(oldTop) > cursorTop ? "top" /* UP */ : "down" /* DOWN */
-      });
+      this.moveCursorToVisible({ cursorPosition });
     });
   }
   recoveryCursor() {
@@ -6584,41 +6584,44 @@ var Cursor = class {
     this._clearBlinkTimeout();
   }
   moveCursorToVisible(payload) {
-    const { cursorPosition, direction } = payload;
-    if (!cursorPosition || !direction) return;
+    const { cursorPosition } = payload;
+    if (!cursorPosition) return;
     const {
       pageNo,
-      coordinate: { leftTop, leftBottom }
+      coordinate: { leftTop },
+      ascent,
+      metrics: { boundingBoxAscent, boundingBoxDescent }
     } = cursorPosition;
-    const prePageY = pageNo * (this.draw.getHeight() + this.draw.getPageGap()) + this.container.getBoundingClientRect().top;
-    const isUp = direction === "top" /* UP */;
-    const x = leftBottom[0];
-    const cursorTop = leftTop[1] + cursorPosition.ascent - cursorPosition.metrics.boundingBoxAscent;
-    const cursorBottom = cursorTop + cursorPosition.metrics.boundingBoxAscent + cursorPosition.metrics.boundingBoxDescent;
-    const y = isUp ? cursorTop + prePageY : cursorBottom + prePageY;
+    const containerRect = this.container.getBoundingClientRect();
+    const pageOffset = pageNo * (this.draw.getHeight() + this.draw.getPageGap());
+    const cursorTopViewport = containerRect.top + pageOffset + leftTop[1] + ascent - boundingBoxAscent;
+    const cursorBottomViewport = cursorTopViewport + boundingBoxAscent + boundingBoxDescent;
     const scrollContainer = findScrollContainer(this.container);
-    const rect = {
-      left: 0,
-      right: 0,
-      top: 0,
-      bottom: 0
-    };
+    let visibleTop;
+    let visibleBottom;
     if (scrollContainer === document.documentElement) {
-      rect.right = window.innerWidth;
-      rect.bottom = window.innerHeight;
+      visibleTop = 0;
+      visibleBottom = window.innerHeight;
     } else {
-      const { left: left2, right: right2, top, bottom } = scrollContainer.getBoundingClientRect();
-      rect.left = left2;
-      rect.right = right2;
-      rect.top = top;
-      rect.bottom = bottom;
-    }
-    const { maskMargin } = this.options;
-    rect.top += maskMargin[0];
-    rect.bottom -= maskMargin[2];
-    if (!(x >= rect.left && x <= rect.right && y >= rect.top && y <= rect.bottom)) {
-      const { scrollLeft, scrollTop } = scrollContainer;
-      isUp ? scrollContainer.scroll(scrollLeft, scrollTop - (rect.top - y)) : scrollContainer.scroll(scrollLeft, scrollTop + y - rect.bottom);
+      const scrollRect = scrollContainer.getBoundingClientRect();
+      visibleTop = scrollRect.top;
+      visibleBottom = scrollRect.bottom;
+    }
+    if (cursorTopViewport >= visibleTop && cursorBottomViewport <= visibleBottom) {
+      return;
+    }
+    const scrollPadding = (boundingBoxAscent + boundingBoxDescent) * this.options.scrollPaddingLines;
+    const { scrollLeft, scrollTop } = scrollContainer;
+    if (cursorTopViewport < visibleTop) {
+      scrollContainer.scroll(
+        scrollLeft,
+        scrollTop - (visibleTop - cursorTopViewport) - scrollPadding
+      );
+    } else {
+      scrollContainer.scroll(
+        scrollLeft,
+        scrollTop + (cursorBottomViewport - visibleBottom) + scrollPadding
+      );
     }
   }
 };
@@ -8590,8 +8593,7 @@ function updown(evt, host) {
   });
   if (!isCollapsed) {
     draw.getCursor().moveCursorToVisible({
-      cursorPosition: positionList[isUp ? anchorStartIndex : anchorEndIndex],
-      direction: isUp ? "top" /* UP */ : "down" /* DOWN */
+      cursorPosition: positionList[isUp ? anchorStartIndex : anchorEndIndex]
     });
   }
 }