@textbus/platform-browser 5.4.10 → 5.4.11

package/dist/index.esm.js

@@ -1087,67 +1087,40 @@ var SelectionBridge = /*#__PURE__*/ function() {
         {
             key: "getVerticalMovePosition",
             value: /**
-   * 计算光标到下一行或上一行的位置
-   * @param currentPosition
-   * @param startLeft
-   * @param toNext
-   * @private
+   * 通过遍历模型位置 + 视觉 rect 判断换行，计算光标到下一行或上一行的位置。
+   * 不使用 Selection.modify()，避免复杂布局中的死循环。
    */ function getVerticalMovePosition(currentPosition, startLeft, toNext) {
-                var nativePos = this.findSelectedNodeAndOffset(currentPosition.slot, currentPosition.offset);
-                if (!nativePos) return currentPosition;
-                this.ignoreSelectionChange = true;
-                var sel = this.nativeSelection;
-                sel.removeAllRanges();
-                sel.setBaseAndExtent(nativePos.node, nativePos.offset, nativePos.node, nativePos.offset);
-                var startRect = getLayoutRectByRange(sel.getRangeAt(0).cloneRange());
-                var lastPos = currentPosition;
-                var prevRange = {
-                    node: nativePos.node,
-                    offset: nativePos.offset
+                var _this = this;
+                var startRect = this.getRect(currentPosition);
+                if (!startRect) return currentPosition;
+                var startTop = startRect.top;
+                var startBottom = startTop + startRect.height;
+                var step = toNext ? function(pos) {
+                    return _this.selection.getNextPositionByPosition(pos.slot, pos.offset);
+                } : function(pos) {
+                    return _this.selection.getPreviousPositionByPosition(pos.slot, pos.offset);
                 };
+                var cur = currentPosition;
                 while(true){
-                    sel.modify('move', toNext ? 'forward' : 'backward', 'line');
-                    var focusNode = sel.focusNode, focusOffset = sel.focusOffset;
-                    if (!focusNode) break;
-                    // 浏览器无法继续移动
-                    if (prevRange && focusNode === prevRange.node && focusOffset === prevRange.offset) break;
-                    prevRange = {
-                        node: focusNode,
-                        offset: focusOffset
-                    };
-                    // X 轴对齐
-                    // const movedRect = getLayoutRectByRange(sel.getRangeAt(0).cloneRange())
-                    // const xRefined = this.caretPositionFromPoint(startLeft, movedRect)
-                    // if (xRefined) {
-                    //   focusNode = xRefined.offsetNode
-                    //   focusOffset = xRefined.offset
-                    // }
-                    var modelPos = this.getCorrectedPosition(focusNode, focusOffset, true);
-                    if (!modelPos) {
-                        lastPos = this.getDocumentBoundary(toNext);
-                        break;
+                    var next = step(cur);
+                    if (next.slot === cur.slot && next.offset === cur.offset) break;
+                    var rect = this.getRect(next);
+                    if (!rect) break;
+                    cur = next;
+                    if (this.isDifferentLine(startTop, startBottom, rect, toNext)) {
+                        return this.refineXOnLine(cur, startLeft, rect);
                     }
-                    lastPos = modelPos;
-                    var rect = this.getRect(modelPos);
-                    // 仍未到达新行，继续 modify
-                    if (this.isSameLine(startRect, rect, toNext)) continue;
-                    // 已到达新行，沿该行微调 X
-                    this.ignoreSelectionChange = false;
-                    return this.refineXOnLine(modelPos, startLeft, rect);
                 }
-                this.ignoreSelectionChange = false;
-                return lastPos;
+                return this.getDocumentBoundary(toNext);
             }
         },
         {
-            key: "isSameLine",
-            value: /** 目标位置是否仍在当前视觉行内 */ function isSameLine(startRect, targetRect, toNext) {
-                var startBottom = startRect.top + startRect.height;
-                var targetBottom = targetRect.top + targetRect.height;
+            key: "isDifferentLine",
+            value: /** 目标位置是否已离开起始行 */ function isDifferentLine(startTop, startBottom, targetRect, toNext) {
                 if (toNext) {
-                    return targetRect.top <= startRect.top || targetBottom <= startBottom;
+                    return targetRect.top >= startBottom;
                 }
-                return targetRect.top >= startRect.top || targetBottom >= startBottom;
+                return targetRect.top + targetRect.height <= startTop;
             }
         },
         {
@@ -2206,9 +2179,7 @@ var MagicInput = /*#__PURE__*/ function(Input) {
                 }), fromEvent(textarea, 'focus').subscribe(function() {
                     _this.nativeFocus = true;
                 }), this.caret.onStyleChange.subscribe(function(style) {
-                    Object.assign(textarea.style, {
-                        fontSize: style.fontSize
-                    });
+                    Object.assign(textarea.style, style);
                 }));
                 this.handleInput(textarea);
                 this.handleShortcut(textarea);
@@ -2452,7 +2423,7 @@ var MagicInput = /*#__PURE__*/ function(Input) {
                         border: 'none',
                         width: '100%',
                         display: 'block',
-                        height: '16px',
+                        height: '100%',
                         position: 'absolute',
                         left: 0,
                         bottom: this.isWindows ? '3px' : '0'