@textbus/platform-browser 5.4.9 → 5.4.10

package/dist/index.js

@@ -8,13 +8,13 @@ const core = require('@viewfly/core');
 
 /**
  * 选区焦点可视位置
- */ function _array_like_to_array$2(arr, len) {
+ */ function _array_like_to_array$4(arr, len) {
     if (len == null || len > arr.length) len = arr.length;
     for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
     return arr2;
 }
-function _array_without_holes$2(arr) {
-    if (Array.isArray(arr)) return _array_like_to_array$2(arr);
+function _array_without_holes$3(arr) {
+    if (Array.isArray(arr)) return _array_like_to_array$4(arr);
 }
 function _instanceof$4(left, right) {
     "@swc/helpers - instanceof";
@@ -24,22 +24,22 @@ function _instanceof$4(left, right) {
         return left instanceof right;
     }
 }
-function _iterable_to_array$2(iter) {
+function _iterable_to_array$3(iter) {
     if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
 }
-function _non_iterable_spread$2() {
+function _non_iterable_spread$3() {
     throw new TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
-function _to_consumable_array$2(arr) {
-    return _array_without_holes$2(arr) || _iterable_to_array$2(arr) || _unsupported_iterable_to_array$2(arr) || _non_iterable_spread$2();
+function _to_consumable_array$3(arr) {
+    return _array_without_holes$3(arr) || _iterable_to_array$3(arr) || _unsupported_iterable_to_array$4(arr) || _non_iterable_spread$3();
 }
-function _unsupported_iterable_to_array$2(o, minLen) {
+function _unsupported_iterable_to_array$4(o, minLen) {
     if (!o) return;
-    if (typeof o === "string") return _array_like_to_array$2(o, minLen);
+    if (typeof o === "string") return _array_like_to_array$4(o, minLen);
     var n = Object.prototype.toString.call(o).slice(8, -1);
     if (n === "Object" && o.constructor) n = o.constructor.name;
     if (n === "Map" || n === "Set") return Array.from(n);
-    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array$2(o, minLen);
+    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array$4(o, minLen);
 }
 var OVERFLOW_CLIP_VALUES = new Set([
     'auto',
@@ -102,7 +102,7 @@ function readOverflowClipAxes(style) {
     }
     return {
         clipAncestors: clipAncestors,
-        scrollContainers: _to_consumable_array$2(scrollContainers),
+        scrollContainers: _to_consumable_array$3(scrollContainers),
         firstScrollContainer: (_ref1 = (_clipAncestors_ = clipAncestors[0]) === null || _clipAncestors_ === void 0 ? void 0 : _clipAncestors_.element) !== null && _ref1 !== void 0 ? _ref1 : documentElement
     };
 }
@@ -287,7 +287,7 @@ function createElement(tagName) {
     var el = document.createElement(tagName);
     if (options.classes) {
         var _el_classList;
-        (_el_classList = el.classList).add.apply(_el_classList, _to_consumable_array$2(options.classes));
+        (_el_classList = el.classList).add.apply(_el_classList, _to_consumable_array$3(options.classes));
     }
     if (options.attrs) {
         Object.keys(options.attrs).forEach(function(key) {
@@ -422,13 +422,13 @@ var isMobileBrowser = function isMobileBrowser() {
  * 编辑器容器遮罩层 token
  */ var VIEW_MASK = new core.InjectionToken('VIEW_MASK');
 
-function _array_like_to_array$1(arr, len) {
+function _array_like_to_array$3(arr, len) {
     if (len == null || len > arr.length) len = arr.length;
     for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
     return arr2;
 }
-function _array_without_holes$1(arr) {
-    if (Array.isArray(arr)) return _array_like_to_array$1(arr);
+function _array_without_holes$2(arr) {
+    if (Array.isArray(arr)) return _array_like_to_array$3(arr);
 }
 function _class_call_check$7(instance, Constructor) {
     if (!(instance instanceof Constructor)) {
@@ -470,22 +470,22 @@ function _instanceof$3(left, right) {
         return left instanceof right;
     }
 }
-function _iterable_to_array$1(iter) {
+function _iterable_to_array$2(iter) {
     if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
 }
-function _non_iterable_spread$1() {
+function _non_iterable_spread$2() {
     throw new TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
-function _to_consumable_array$1(arr) {
-    return _array_without_holes$1(arr) || _iterable_to_array$1(arr) || _unsupported_iterable_to_array$1(arr) || _non_iterable_spread$1();
+function _to_consumable_array$2(arr) {
+    return _array_without_holes$2(arr) || _iterable_to_array$2(arr) || _unsupported_iterable_to_array$3(arr) || _non_iterable_spread$2();
 }
-function _unsupported_iterable_to_array$1(o, minLen) {
+function _unsupported_iterable_to_array$3(o, minLen) {
     if (!o) return;
-    if (typeof o === "string") return _array_like_to_array$1(o, minLen);
+    if (typeof o === "string") return _array_like_to_array$3(o, minLen);
     var n = Object.prototype.toString.call(o).slice(8, -1);
     if (n === "Object" && o.constructor) n = o.constructor.name;
     if (n === "Map" || n === "Set") return Array.from(n);
-    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array$1(o, minLen);
+    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array$3(o, minLen);
 }
 function _ts_decorate$4(decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
@@ -509,9 +509,9 @@ exports.Parser = /*#__PURE__*/ function() {
         _define_property$6(this, "formatLoaders", void 0);
         _define_property$6(this, "attributeLoaders", void 0);
         this.textbus = textbus;
-        var componentLoaders = _to_consumable_array$1(options.componentLoaders || []);
-        var formatLoaders = _to_consumable_array$1(options.formatLoaders || []);
-        var attributeLoaders = _to_consumable_array$1(options.attributeLoaders || []);
+        var componentLoaders = _to_consumable_array$2(options.componentLoaders || []);
+        var formatLoaders = _to_consumable_array$2(options.formatLoaders || []);
+        var attributeLoaders = _to_consumable_array$2(options.attributeLoaders || []);
         // options.imports?.forEach(i => {
         //   componentLoaders.push(...(i.componentLoaders || []))
         //   formatLoaders.push(...(i.formatLoaders || []))
@@ -555,7 +555,7 @@ exports.Parser = /*#__PURE__*/ function() {
                         slot.insert('\n');
                         return;
                     }
-                    var schema = _to_consumable_array$1(slot.schema);
+                    var schema = _to_consumable_array$2(slot.schema);
                     var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
                     try {
                         for(var _iterator = this.componentLoaders[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
@@ -1078,13 +1078,10 @@ exports.SelectionBridge = /*#__PURE__*/ function() {
             value: function getLinePosition(currentPosition, toNext) {
                 var _this = this;
                 clearTimeout(this.cacheCaretPositionTimer);
-                var p;
-                if (this.oldCaretPosition) {
-                    p = toNext ? this.getNextLinePositionByOffset(currentPosition, this.oldCaretPosition.left) : this.getPreviousLinePositionByOffset(currentPosition, this.oldCaretPosition.left);
-                } else {
+                if (!this.oldCaretPosition) {
                     this.oldCaretPosition = this.getRect(currentPosition);
-                    p = toNext ? this.getNextLinePositionByOffset(currentPosition, this.oldCaretPosition.left) : this.getPreviousLinePositionByOffset(currentPosition, this.oldCaretPosition.left);
                 }
+                var p = this.getVerticalMovePosition(currentPosition, this.oldCaretPosition.left, toNext);
                 this.cacheCaretPositionTimer = setTimeout(function() {
                     _this.oldCaretPosition = null;
                 }, 3000);
@@ -1092,119 +1089,137 @@ exports.SelectionBridge = /*#__PURE__*/ function() {
             }
         },
         {
-            key: "getPreviousLinePositionByOffset",
+            key: "getVerticalMovePosition",
             value: /**
-   * 获取选区向上移动一行的位置。
+   * 计算光标到下一行或上一行的位置
    * @param currentPosition
-   * @param startLeft 参考位置。
-   */ function getPreviousLinePositionByOffset(currentPosition, startLeft) {
-                var isToPrevLine = false;
-                var loopCount = 0;
-                var minLeft = startLeft;
-                var focusSlot = currentPosition.slot;
-                var focusOffset = currentPosition.offset;
-                var minTop = this.getRect({
-                    slot: focusSlot,
-                    offset: focusOffset
-                }).top;
-                var position;
-                var oldPosition;
-                var oldLeft = 0;
+   * @param startLeft
+   * @param toNext
+   * @private
+   */ 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
+                };
                 while(true){
-                    loopCount++;
-                    position = this.selection.getPreviousPositionByPosition(focusSlot, focusOffset);
-                    focusSlot = position.slot;
-                    focusOffset = position.offset;
-                    var rect2 = this.getRect(position);
-                    if (!isToPrevLine) {
-                        if (rect2.left > minLeft || rect2.top + rect2.height <= minTop) {
-                            isToPrevLine = true;
-                        } else if (rect2.left === minLeft && rect2.top === minTop) {
-                            return position;
-                        }
-                        minLeft = rect2.left;
-                        minTop = rect2.top;
-                    // oldPosition = position
-                    }
-                    if (isToPrevLine) {
-                        if (rect2.left <= startLeft) {
-                            return position;
-                        }
-                        if (oldPosition) {
-                            if (rect2.left >= oldLeft) {
-                                return oldPosition;
-                            }
-                        }
-                        oldLeft = rect2.left;
-                        oldPosition = position;
-                    }
-                    if (loopCount > 10000) {
+                    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;
                     }
+                    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);
                 }
-                return position || {
-                    offset: 0,
-                    slot: focusSlot
-                };
+                this.ignoreSelectionChange = false;
+                return lastPos;
+            }
+        },
+        {
+            key: "isSameLine",
+            value: /** 目标位置是否仍在当前视觉行内 */ function isSameLine(startRect, targetRect, toNext) {
+                var startBottom = startRect.top + startRect.height;
+                var targetBottom = targetRect.top + targetRect.height;
+                if (toNext) {
+                    return targetRect.top <= startRect.top || targetBottom <= startBottom;
+                }
+                return targetRect.top >= startRect.top || targetBottom >= startBottom;
             }
         },
         {
-            key: "getNextLinePositionByOffset",
+            key: "refineXOnLine",
             value: /**
-   * 获取选区向下移动一行的位置。
-   * @param currentPosition
-   * @param startLeft 参考位置。
-   */ function getNextLinePositionByOffset(currentPosition, startLeft) {
-                var isToNextLine = false;
-                var loopCount = 0;
-                var maxRight = startLeft;
-                var focusSlot = currentPosition.slot;
-                var focusOffset = currentPosition.offset;
-                var rect = this.getRect({
-                    slot: focusSlot,
-                    offset: focusOffset
-                });
-                var minTop = rect.top;
-                var oldPosition;
-                var oldLeft = 0;
+   * 沿目标行微调位置。
+   * 起点在 targetX 右侧 → 向左找到离 targetX 最近的右侧位置；
+   * 起点在 targetX 左侧 → 向右找到第一个右侧位置。
+   */ function refineXOnLine(position, targetX, lineRect) {
+                var startRect = this.getRect(position);
+                var startLeft = startRect.left;
+                var lineTop = lineRect.top;
+                var lineBottom = lineTop + Math.max(lineRect.height, 12);
+                if (startLeft === targetX) return position;
+                var cur = position;
+                if (startLeft > targetX) {
+                    var rightSide = position;
+                    while(true){
+                        var prev = this.selection.getPreviousPositionByPosition(cur.slot, cur.offset);
+                        if (prev.slot === cur.slot && prev.offset === cur.offset) break;
+                        var rect = this.getRect(prev);
+                        if (!rect) break;
+                        if (rect.top >= lineBottom || rect.top + rect.height <= lineTop) break;
+                        cur = prev;
+                        if (rect.left === targetX) return prev;
+                        if (rect.left < targetX) return rightSide;
+                        rightSide = prev;
+                    }
+                    return rightSide;
+                }
                 while(true){
-                    loopCount++;
-                    var position = this.selection.getNextPositionByPosition(focusSlot, focusOffset);
-                    focusSlot = position.slot;
-                    focusOffset = position.offset;
-                    var rect2 = this.getRect(position);
-                    if (!isToNextLine) {
-                        if (rect2.left < maxRight || rect2.top >= minTop + rect.height) {
-                            isToNextLine = true;
-                        } else if (rect2.left === maxRight && rect2.top === minTop) {
-                            return position;
-                        }
-                        maxRight = rect2.left;
-                        minTop = rect2.top;
-                        oldPosition = position;
-                    }
-                    if (isToNextLine) {
-                        if (rect2.left > startLeft) {
-                            return oldPosition;
-                        }
-                        if (oldPosition) {
-                            if (rect2.left <= oldLeft) {
-                                return oldPosition;
-                            }
-                        }
-                        oldPosition = position;
-                        oldLeft = rect2.left;
-                    }
-                    if (loopCount > 10000) {
-                        break;
-                    }
+                    var next = this.selection.getNextPositionByPosition(cur.slot, cur.offset);
+                    if (next.slot === cur.slot && next.offset === cur.offset) break;
+                    var rect1 = this.getRect(next);
+                    if (!rect1) break;
+                    if (rect1.top >= lineBottom || rect1.top + rect1.height <= lineTop) break;
+                    cur = next;
+                    if (rect1.left === targetX) return cur;
+                    if (rect1.left > targetX) return cur;
+                }
+                return cur;
+            }
+        },
+        {
+            key: "getDocumentBoundary",
+            value: /** 跳转到文档开头或结尾 */ function getDocumentBoundary(toNext) {
+                var slots = this.rootComponentRef.component.slots;
+                if (toNext) {
+                    var lastSlot = slots[slots.length - 1];
+                    return {
+                        slot: lastSlot,
+                        offset: lastSlot.length
+                    };
                 }
-                return oldPosition || {
-                    offset: focusSlot.length,
-                    slot: focusSlot
+                var firstSlot = slots[0];
+                return {
+                    slot: firstSlot,
+                    offset: 0
                 };
             }
         },
+        {
+            key: "caretPositionFromPoint",
+            value: function caretPositionFromPoint(x, rect) {
+                var _document_caretPositionFromPoint, _document;
+                return (_document_caretPositionFromPoint = (_document = document).caretPositionFromPoint) === null || _document_caretPositionFromPoint === void 0 ? void 0 : _document_caretPositionFromPoint.call(_document, x, rect.top + rect.height / 2);
+            }
+        },
         {
             key: "unListen",
             value: function unListen() {
@@ -1504,7 +1519,7 @@ exports.SelectionBridge = /*#__PURE__*/ function() {
                     };
                 }
                 var firstChild = toAfter ? node.firstChild : node.lastChild;
-                if (firstChild) {
+                if (firstChild && !excludeNodes.includes(firstChild)) {
                     return this.findFocusNode(firstChild, toAfter, excludeNodes);
                 }
                 var nextSibling = toAfter ? node.nextSibling : node.previousSibling;
@@ -1519,6 +1534,13 @@ exports.SelectionBridge = /*#__PURE__*/ function() {
             value: function findFocusNodeByParent(node, toAfter, excludeNodes) {
                 var parentNode = node.parentNode;
                 if (parentNode) {
+                    if (excludeNodes.includes(parentNode)) {
+                        var nextNode = toAfter ? parentNode.nextSibling : parentNode.previousSibling;
+                        if (nextNode) {
+                            return this.findFocusNode(nextNode, toAfter, excludeNodes);
+                        }
+                        return this.findFocusNodeByParent(parentNode, toAfter, excludeNodes);
+                    }
                     var parentPosition = this.domAdapter.getLocationByNativeNode(parentNode);
                     if (parentPosition) {
                         return {
@@ -1526,8 +1548,12 @@ exports.SelectionBridge = /*#__PURE__*/ function() {
                             offset: toAfter ? parentPosition.endIndex : parentPosition.startIndex
                         };
                     }
-                    excludeNodes.push(node);
-                    return this.findFocusNode(parentNode, toAfter, excludeNodes);
+                    excludeNodes.push(parentNode);
+                    var nextNode1 = toAfter ? parentNode.nextSibling : parentNode.previousSibling;
+                    if (nextNode1) {
+                        return this.findFocusNode(nextNode1, toAfter, excludeNodes);
+                    }
+                    return this.findFocusNodeByParent(parentNode, toAfter, excludeNodes);
                 }
                 return null;
             }
@@ -1551,6 +1577,14 @@ exports.SelectionBridge = _ts_decorate$3([
     ])
 ], exports.SelectionBridge);
 
+function _array_like_to_array$2(arr, len) {
+    if (len == null || len > arr.length) len = arr.length;
+    for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
+    return arr2;
+}
+function _array_without_holes$1(arr) {
+    if (Array.isArray(arr)) return _array_like_to_array$2(arr);
+}
 function _assert_this_initialized$1(self) {
     if (self === void 0) {
         throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
@@ -1611,6 +1645,12 @@ function _inherits$1(subClass, superClass) {
     });
     if (superClass) _set_prototype_of$1(subClass, superClass);
 }
+function _iterable_to_array$1(iter) {
+    if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
+}
+function _non_iterable_spread$1() {
+    throw new TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
 function _possible_constructor_return$1(self, call) {
     if (call && (_type_of$1(call) === "object" || typeof call === "function")) {
         return call;
@@ -1624,10 +1664,21 @@ function _set_prototype_of$1(o, p) {
     };
     return _set_prototype_of$1(o, p);
 }
+function _to_consumable_array$1(arr) {
+    return _array_without_holes$1(arr) || _iterable_to_array$1(arr) || _unsupported_iterable_to_array$2(arr) || _non_iterable_spread$1();
+}
 function _type_of$1(obj) {
     "@swc/helpers - typeof";
     return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
 }
+function _unsupported_iterable_to_array$2(o, minLen) {
+    if (!o) return;
+    if (typeof o === "string") return _array_like_to_array$2(o, minLen);
+    var n = Object.prototype.toString.call(o).slice(8, -1);
+    if (n === "Object" && o.constructor) n = o.constructor.name;
+    if (n === "Map" || n === "Set") return Array.from(n);
+    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array$2(o, minLen);
+}
 function _is_native_reflect_construct$1() {
     try {
         var result = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function() {}));
@@ -1985,25 +2036,49 @@ var ExperimentalCaret = /*#__PURE__*/ function() {
         {
             key: "scrollCaretIntoViewIfNeeded",
             value: function scrollCaretIntoViewIfNeeded(layoutElRect, clipContext) {
-                var _scrollContainer_ownerDocument;
                 if (!this.changeFromSelf) {
                     return;
                 }
                 this.changeFromSelf = false;
-                var scrollContainer = clipContext.firstScrollContainer;
-                var doc = (_scrollContainer_ownerDocument = scrollContainer.ownerDocument) !== null && _scrollContainer_ownerDocument !== void 0 ? _scrollContainer_ownerDocument : document;
-                var scrollRect = scrollContainer === doc.documentElement ? {
-                    top: 0,
-                    bottom: doc.documentElement.clientHeight
-                } : scrollContainer.getBoundingClientRect();
                 var limit = this.getLimit();
-                var scrollTop = Math.max(limit.top, scrollRect.top);
-                var scrollBottom = Math.min(limit.bottom, scrollRect.bottom);
-                var layoutBottom = layoutElRect.top + layoutElRect.height;
-                if (layoutElRect.top < scrollTop) {
-                    scrollContainer.scrollTop -= scrollTop - layoutElRect.top;
-                } else if (layoutBottom > scrollBottom) {
-                    scrollContainer.scrollTop += layoutBottom - scrollBottom;
+                var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+                try {
+                    // 从外到内逐层处理，每滚动一层后重新获取光标位置再处理内层
+                    for(var _iterator = _to_consumable_array$1(clipContext.scrollContainers).reverse()[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+                        var scrollContainer = _step.value;
+                        var _scrollContainer_ownerDocument;
+                        var doc = (_scrollContainer_ownerDocument = scrollContainer.ownerDocument) !== null && _scrollContainer_ownerDocument !== void 0 ? _scrollContainer_ownerDocument : document;
+                        var isDoc = scrollContainer === doc.documentElement;
+                        var scrollRect = isDoc ? {
+                            top: 0,
+                            bottom: doc.documentElement.clientHeight
+                        } : scrollContainer.getBoundingClientRect();
+                        var visibleTop = Math.max(limit.top, scrollRect.top);
+                        var visibleBottom = Math.min(limit.bottom, scrollRect.bottom);
+                        var caretBottom = layoutElRect.top + layoutElRect.height;
+                        if (layoutElRect.top >= visibleTop && caretBottom <= visibleBottom) {
+                            continue; // 光标已在当前容器可视区域内，无需滚动
+                        }
+                        if (layoutElRect.top < visibleTop) {
+                            scrollContainer.scrollTop -= visibleTop - layoutElRect.top;
+                        } else if (caretBottom > visibleBottom) {
+                            scrollContainer.scrollTop += caretBottom - visibleBottom;
+                        }
+                        layoutElRect = this.elementRef.getBoundingClientRect();
+                    }
+                } catch (err) {
+                    _didIteratorError = true;
+                    _iteratorError = err;
+                } finally{
+                    try {
+                        if (!_iteratorNormalCompletion && _iterator.return != null) {
+                            _iterator.return();
+                        }
+                    } finally{
+                        if (_didIteratorError) {
+                            throw _iteratorError;
+                        }
+                    }
                 }
             }
         }
@@ -2382,7 +2457,8 @@ exports.MagicInput = /*#__PURE__*/ function(Input) {
                         width: '100%',
                         display: 'block',
                         height: '16px',
-                        position: 'relative',
+                        position: 'absolute',
+                        left: 0,
                         bottom: this.isWindows ? '3px' : '0'
                     }
                 });
@@ -2406,13 +2482,13 @@ exports.MagicInput = _ts_decorate$2([
     ])
 ], exports.MagicInput);
 
-function _array_like_to_array(arr, len) {
+function _array_like_to_array$1(arr, len) {
     if (len == null || len > arr.length) len = arr.length;
     for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
     return arr2;
 }
 function _array_without_holes(arr) {
-    if (Array.isArray(arr)) return _array_like_to_array(arr);
+    if (Array.isArray(arr)) return _array_like_to_array$1(arr);
 }
 function _class_call_check$2(instance, Constructor) {
     if (!(instance instanceof Constructor)) {
@@ -2452,15 +2528,15 @@ function _non_iterable_spread() {
     throw new TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
 function _to_consumable_array(arr) {
-    return _array_without_holes(arr) || _iterable_to_array(arr) || _unsupported_iterable_to_array(arr) || _non_iterable_spread();
+    return _array_without_holes(arr) || _iterable_to_array(arr) || _unsupported_iterable_to_array$1(arr) || _non_iterable_spread();
 }
-function _unsupported_iterable_to_array(o, minLen) {
+function _unsupported_iterable_to_array$1(o, minLen) {
     if (!o) return;
-    if (typeof o === "string") return _array_like_to_array(o, minLen);
+    if (typeof o === "string") return _array_like_to_array$1(o, minLen);
     var n = Object.prototype.toString.call(o).slice(8, -1);
     if (n === "Object" && o.constructor) n = o.constructor.name;
     if (n === "Map" || n === "Set") return Array.from(n);
-    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
+    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array$1(o, minLen);
 }
 function _ts_decorate$1(decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
@@ -2793,6 +2869,14 @@ exports.CollaborateCursor = _ts_decorate$1([
     ])
 ], exports.CollaborateCursor);
 
+function _array_like_to_array(arr, len) {
+    if (len == null || len > arr.length) len = arr.length;
+    for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
+    return arr2;
+}
+function _array_with_holes(arr) {
+    if (Array.isArray(arr)) return arr;
+}
 function _assert_this_initialized(self) {
     if (self === void 0) {
         throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
@@ -2861,6 +2945,33 @@ function _instanceof$1(left, right) {
         return left instanceof right;
     }
 }
+function _iterable_to_array_limit(arr, i) {
+    var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"];
+    if (_i == null) return;
+    var _arr = [];
+    var _n = true;
+    var _d = false;
+    var _s, _e;
+    try {
+        for(_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true){
+            _arr.push(_s.value);
+            if (i && _arr.length === i) break;
+        }
+    } catch (err) {
+        _d = true;
+        _e = err;
+    } finally{
+        try {
+            if (!_n && _i["return"] != null) _i["return"]();
+        } finally{
+            if (_d) throw _e;
+        }
+    }
+    return _arr;
+}
+function _non_iterable_rest() {
+    throw new TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
 function _possible_constructor_return(self, call) {
     if (call && (_type_of(call) === "object" || typeof call === "function")) {
         return call;
@@ -2874,10 +2985,21 @@ function _set_prototype_of(o, p) {
     };
     return _set_prototype_of(o, p);
 }
+function _sliced_to_array(arr, i) {
+    return _array_with_holes(arr) || _iterable_to_array_limit(arr, i) || _unsupported_iterable_to_array(arr, i) || _non_iterable_rest();
+}
 function _type_of(obj) {
     "@swc/helpers - typeof";
     return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
 }
+function _unsupported_iterable_to_array(o, minLen) {
+    if (!o) return;
+    if (typeof o === "string") return _array_like_to_array(o, minLen);
+    var n = Object.prototype.toString.call(o).slice(8, -1);
+    if (n === "Object" && o.constructor) n = o.constructor.name;
+    if (n === "Map" || n === "Set") return Array.from(n);
+    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
+}
 function _is_native_reflect_construct() {
     try {
         var result = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function() {}));
@@ -2895,6 +3017,150 @@ function _ts_decorate(decorators, target, key, desc) {
 function _ts_metadata(k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 }
+/**
+ * 轻量级 DOM 文本变化记录器，仅在 composition 期间激活。
+ * 记录 composition 期间 DOM 中新增/修改的文本节点，在 compositionend 时从 DOM 读取最终文本。
+ * 写入模型后清理浏览器创建的新文本节点，避免残留在文档中。
+ */ var CompositionRecorder = /*#__PURE__*/ function() {
+    function CompositionRecorder() {
+        _class_call_check$1(this, CompositionRecorder);
+        _define_property$1(this, "observer", null);
+        _define_property$1(this, "nodeOldValues", new Map());
+    }
+    _create_class$1(CompositionRecorder, [
+        {
+            key: "start",
+            value: function start(target) {
+                var _this = this;
+                this.nodeOldValues.clear();
+                this.observer = new MutationObserver(function(mutations) {
+                    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+                    try {
+                        for(var _iterator = mutations[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+                            var m = _step.value;
+                            if (m.type === 'childList') {
+                                var _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = undefined;
+                                try {
+                                    for(var _iterator1 = Array.from(m.addedNodes)[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true){
+                                        var node = _step1.value;
+                                        if (node.nodeType === Node.TEXT_NODE && !_this.nodeOldValues.has(node)) {
+                                            _this.nodeOldValues.set(node, null);
+                                        }
+                                    }
+                                } catch (err) {
+                                    _didIteratorError1 = true;
+                                    _iteratorError1 = err;
+                                } finally{
+                                    try {
+                                        if (!_iteratorNormalCompletion1 && _iterator1.return != null) {
+                                            _iterator1.return();
+                                        }
+                                    } finally{
+                                        if (_didIteratorError1) {
+                                            throw _iteratorError1;
+                                        }
+                                    }
+                                }
+                            } else if (m.type === 'characterData') {
+                                var _$target = m.target;
+                                if (!_this.nodeOldValues.has(_$target)) {
+                                    _this.nodeOldValues.set(_$target, m.oldValue);
+                                }
+                            }
+                        }
+                    } catch (err) {
+                        _didIteratorError = true;
+                        _iteratorError = err;
+                    } finally{
+                        try {
+                            if (!_iteratorNormalCompletion && _iterator.return != null) {
+                                _iterator.return();
+                            }
+                        } finally{
+                            if (_didIteratorError) {
+                                throw _iteratorError;
+                            }
+                        }
+                    }
+                });
+                this.observer.observe(target, {
+                    childList: true,
+                    subtree: true,
+                    characterData: true,
+                    characterDataOldValue: true
+                });
+            }
+        },
+        {
+            key: "readText",
+            value: function readText() {
+                var text = '';
+                var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+                try {
+                    for(var _iterator = this.nodeOldValues[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+                        var _step_value = _sliced_to_array(_step.value, 2), node = _step_value[0], oldValue = _step_value[1];
+                        if (!node.isConnected) continue;
+                        var current = node.textContent || '';
+                        if (!current) continue;
+                        if (oldValue === null) {
+                            text += current;
+                        } else {
+                            text += this.diffText(oldValue, current);
+                        }
+                    }
+                } catch (err) {
+                    _didIteratorError = true;
+                    _iteratorError = err;
+                } finally{
+                    try {
+                        if (!_iteratorNormalCompletion && _iterator.return != null) {
+                            _iterator.return();
+                        }
+                    } finally{
+                        if (_didIteratorError) {
+                            throw _iteratorError;
+                        }
+                    }
+                }
+                return text;
+            }
+        },
+        {
+            /** 移除 composition 期间浏览器创建的文本节点（焦点处），光标位置不可能被协作触及 */ key: "cleanup",
+            value: function cleanup(committedText, focusNode) {
+                if (_instanceof$1(focusNode, Text) && focusNode.isConnected && focusNode.textContent === committedText && this.nodeOldValues.has(focusNode) && focusNode.parentNode) {
+                    focusNode.parentNode.removeChild(focusNode);
+                }
+                this.nodeOldValues.clear();
+            }
+        },
+        {
+            key: "stop",
+            value: function stop() {
+                var _this_observer;
+                (_this_observer = this.observer) === null || _this_observer === void 0 ? void 0 : _this_observer.disconnect();
+                this.observer = null;
+            }
+        },
+        {
+            key: "diffText",
+            value: function diffText(oldStr, newStr) {
+                var start = 0;
+                while(start < oldStr.length && start < newStr.length && oldStr[start] === newStr[start]){
+                    start++;
+                }
+                var oldEnd = oldStr.length - 1;
+                var newEnd = newStr.length - 1;
+                while(oldEnd >= start && newEnd >= start && oldStr[oldEnd] === newStr[newEnd]){
+                    oldEnd--;
+                    newEnd--;
+                }
+                return newStr.slice(start, newEnd + 1);
+            }
+        }
+    ]);
+    return CompositionRecorder;
+}();
 var NativeCaret = /*#__PURE__*/ function() {
     function NativeCaret() {
         _class_call_check$1(this, NativeCaret);
@@ -2966,8 +3232,7 @@ exports.NativeInput = /*#__PURE__*/ function(Input) {
         _class_call_check$1(this, NativeInput);
         var _this;
         _this = _call_super(this, NativeInput), _define_property$1(_this, "parser", void 0), _define_property$1(_this, "selection", void 0), _define_property$1(_this, "keyboard", void 0), _define_property$1(_this, "domAdapter", void 0), _define_property$1(_this, "commander", void 0), _define_property$1(_this, "controller", void 0), _define_property$1(_this, "caret", void 0), _define_property$1(_this, "composition", void 0), // compositionState: CompositionState | null = null
-        _define_property$1(_this, "onReady", void 0), _define_property$1(_this, "_disabled", void 0), _define_property$1(_this, "documentView", void 0), _define_property$1(_this, "nativeSelection", void 0), _define_property$1(_this, "subscription", void 0), _define_property$1(_this, "nativeRange", void 0), _define_property$1(_this, "isSafari", void 0), _define_property$1(_this, "isMac", void 0), _define_property$1(_this, "isMobileBrowser", void 0), _define_property$1(_this, "ignoreComposition", void 0 // 有 bug 版本搜狗拼音
-        ), _this.parser = parser, _this.selection = selection, _this.keyboard = keyboard, _this.domAdapter = domAdapter, _this.commander = commander, _this.controller = controller, _this.caret = new NativeCaret(), _this.composition = false, _this.onReady = Promise.resolve(), _this._disabled = false, _this.nativeSelection = document.getSelection(), _this.subscription = new stream.Subscription(), _this.nativeRange = null, _this.isSafari = isSafari(), _this.isMac = isMac(), _this.isMobileBrowser = isMobileBrowser(), _this.ignoreComposition = false;
+        _define_property$1(_this, "onReady", void 0), _define_property$1(_this, "_disabled", void 0), _define_property$1(_this, "documentView", void 0), _define_property$1(_this, "nativeSelection", void 0), _define_property$1(_this, "subscription", void 0), _define_property$1(_this, "nativeRange", void 0), _define_property$1(_this, "isSafari", void 0), _define_property$1(_this, "isMac", void 0), _define_property$1(_this, "compositionEndedAt", void 0), _this.parser = parser, _this.selection = selection, _this.keyboard = keyboard, _this.domAdapter = domAdapter, _this.commander = commander, _this.controller = controller, _this.caret = new NativeCaret(), _this.composition = false, _this.onReady = Promise.resolve(), _this._disabled = false, _this.nativeSelection = document.getSelection(), _this.subscription = new stream.Subscription(), _this.nativeRange = null, _this.isSafari = isSafari(), _this.isMac = isMac(), _this.compositionEndedAt = 0;
         _this.documentView = textbus.get(VIEW_DOCUMENT);
         if (!controller.readonly) {
             _this.documentView.contentEditable = 'true';
@@ -3115,27 +3380,15 @@ exports.NativeInput = /*#__PURE__*/ function(Input) {
             key: "handleShortcut",
             value: function handleShortcut(input) {
                 var _this = this;
-                var isWriting = false;
-                var isIgnore = false;
-                this.subscription.add(stream.fromEvent(input, 'compositionstart').subscribe(function() {
-                    isWriting = true;
-                }), stream.fromEvent(input, 'compositionend').subscribe(function() {
-                    isWriting = false;
-                }), stream.fromEvent(input, 'beforeinput').subscribe(function(ev) {
-                    if (_this.isSafari) {
-                        if (ev.inputType === 'insertFromComposition') {
-                            isIgnore = true;
-                        }
-                    }
-                }), stream.fromEvent(input, 'keydown').pipe(stream.filter(function() {
-                    if (_this.isSafari && isIgnore) {
-                        isIgnore = false;
+                this.subscription.add(stream.fromEvent(input, 'keydown').pipe(stream.filter(function() {
+                    // Safari: IME 确认键（Enter）会在 compositionend 后紧接着触发 keydown
+                    // 用时间戳窗口检测并忽略
+                    if (_this.isSafari && _this.compositionEndedAt > 0 && Date.now() - _this.compositionEndedAt < 500) {
+                        _this.compositionEndedAt = 0;
                         return false;
                     }
-                    return !isWriting // || !this.textarea.value
-                    ;
+                    return !_this.composition;
                 })).subscribe(function(ev) {
-                    _this.ignoreComposition = false;
                     var key = ev.key;
                     var keys = ')!@#$%^Z&*(';
                     var b = key === 'Process' && /Digit\d/.test(ev.code) && ev.shiftKey;
@@ -3155,7 +3408,6 @@ exports.NativeInput = /*#__PURE__*/ function(Input) {
                         }
                     });
                     if (is) {
-                        _this.ignoreComposition = true;
                         ev.preventDefault();
                     }
                 }));
@@ -3164,101 +3416,70 @@ exports.NativeInput = /*#__PURE__*/ function(Input) {
         {
             key: "handleInput",
             value: function handleInput(input) {
-                if (this.isMobileBrowser) {
-                    this.handleMobileInput(input);
-                } else {
-                    this.handlePCInput(input);
-                }
-            }
-        },
-        {
-            key: "handleMobileInput",
-            value: function handleMobileInput(input) {
                 var _this = this;
-                var isCompositionStart = true;
-                var startIndex;
-                var compositionStart = function compositionStart() {
+                var recorder = new CompositionRecorder();
+                var startIndex = 0;
+                this.subscription.add(// ===== Composition 事件：纯开关，不读 ev.data 做模型决策 =====
+                stream.fromEvent(input, 'compositionstart').subscribe(function() {
                     _this.composition = true;
+                    recorder.start(input);
                     startIndex = _this.selection.startOffset;
                     var startSlot = _this.selection.startSlot;
                     var event = new core$1.Event(startSlot, {
                         index: startIndex
                     });
                     core$1.invokeListener(startSlot.parent, 'onCompositionStart', event);
-                };
-                var compositionUpdate = function compositionUpdate(data) {
+                }), stream.fromEvent(input, 'compositionupdate').subscribe(function(ev) {
                     var startSlot = _this.selection.startSlot;
-                    var event = new core$1.Event(startSlot, {
-                        index: startIndex,
-                        data: data
-                    });
-                    core$1.invokeListener(startSlot.parent, 'onCompositionUpdate', event);
-                };
-                var compositionEnd = function compositionEnd(data) {
+                    if (startSlot) {
+                        core$1.invokeListener(startSlot.parent, 'onCompositionUpdate', new core$1.Event(startSlot, {
+                            index: startIndex,
+                            data: ev.data
+                        }));
+                    }
+                }), stream.fromEvent(input, 'compositionend').subscribe(function() {
+                    if (!_this.composition) return;
                     _this.composition = false;
-                    if (data) {
-                        _this.commander.write(data);
+                    _this.compositionEndedAt = Date.now();
+                    // Safari: WebKit 在 compositionend 之后才更新 DOM，通过 microtask 延迟读取
+                    if (_this.isSafari) {
+                        queueMicrotask(function() {
+                            return _this.syncCompositionText(recorder);
+                        });
+                    } else {
+                        _this.syncCompositionText(recorder);
                     }
-                    var startSlot = _this.selection.startSlot;
-                    if (startSlot) {
-                        var event = new core$1.Event(startSlot, null);
-                        core$1.invokeListener(startSlot.parent, 'onCompositionEnd', event);
+                }), // ===== beforeinput：仅处理非 IME 输入 =====
+                stream.fromEvent(input, 'beforeinput').subscribe(function(ev) {
+                    if (ev.isComposing || _this.composition) {
+                        return;
                     }
-                };
-                this.subscription.add(stream.fromEvent(input, 'compositionstart').subscribe(function() {
-                    compositionStart();
-                }), stream.fromEvent(input, 'compositionupdate').subscribe(function(ev) {
-                    compositionUpdate(ev.data);
-                }), stream.fromEvent(input, 'compositionend').subscribe(function(ev) {
-                    compositionEnd(ev.data);
-                    var startContainer = _this.nativeSelection.focusNode;
-                    if (_instanceof$1(startContainer, Text) && startContainer.textContent === ev.data) {
-                        startContainer.remove();
-                    }
-                }), stream.fromEvent(input, 'beforeinput').subscribe(function(ev) {
+                    ev.preventDefault();
                     switch(ev.inputType){
                         case 'insertText':
                             if (ev.data) {
                                 _this.commander.write(ev.data);
-                                ev.preventDefault();
                             }
                             break;
-                        case 'insertCompositionText':
-                            if (isCompositionStart) {
-                                isCompositionStart = false;
-                                compositionStart();
-                            } else {
-                                compositionUpdate(ev.data || '');
-                            }
+                        case 'deleteContentBackward':
+                            _this.commander.delete(true);
                             break;
-                        case 'deleteCompositionText':
-                            _this.composition = false;
+                        case 'deleteContentForward':
+                            _this.commander.delete();
                             break;
-                        case 'deleteContentBackward':
-                            {
-                                _this.composition = false;
-                                var range = ev.getTargetRanges()[0];
-                                if (!range) {
-                                    break;
-                                }
-                                var location = _this.domAdapter.getLocationByNativeNode(range.startContainer);
-                                var startSlot = _this.selection.startSlot;
-                                if (startSlot) {
-                                    _this.selection.setBaseAndExtent(startSlot, location.startIndex + range.startOffset, startSlot, location.startIndex + range.endOffset);
-                                    _this.commander.delete();
-                                }
-                                break;
-                            }
                         case 'insertReplacementText':
                             {
                                 var _ev_dataTransfer;
-                                _this.composition = false;
-                                var range1 = ev.getTargetRanges()[0];
-                                var location1 = _this.domAdapter.getLocationByNativeNode(range1.startContainer);
-                                var startSlot1 = _this.selection.startSlot;
-                                _this.selection.setBaseAndExtent(startSlot1, location1.startIndex + range1.startOffset, startSlot1, location1.startIndex + range1.endOffset);
-                                _this.commander.delete();
-                                var text = ((_ev_dataTransfer = ev.dataTransfer) === null || _ev_dataTransfer === void 0 ? void 0 : _ev_dataTransfer.getData('text')) || ev.data || null;
+                                var range = ev.getTargetRanges()[0];
+                                if (range) {
+                                    var location = _this.domAdapter.getLocationByNativeNode(range.startContainer);
+                                    if (location) {
+                                        var startSlot = _this.selection.startSlot;
+                                        _this.selection.setBaseAndExtent(startSlot, location.startIndex + range.startOffset, startSlot, location.startIndex + range.endOffset);
+                                        _this.commander.delete();
+                                    }
+                                }
+                                var text = ((_ev_dataTransfer = ev.dataTransfer) === null || _ev_dataTransfer === void 0 ? void 0 : _ev_dataTransfer.getData('text')) || ev.data;
                                 if (text) {
                                     _this.commander.write(text);
                                 }
@@ -3269,89 +3490,19 @@ exports.NativeInput = /*#__PURE__*/ function(Input) {
             }
         },
         {
-            key: "handlePCInput",
-            value: function handlePCInput(input) {
-                var _this = this;
-                var startIndex = 0;
-                var isCompositionEnd = false;
-                this.subscription.add(stream.fromEvent(input, 'compositionstart').pipe(stream.filter(function() {
-                    return !_this.ignoreComposition;
-                })).subscribe(function() {
-                    _this.composition = true;
-                    startIndex = _this.selection.startOffset;
-                    var startSlot = _this.selection.startSlot;
-                    var event = new core$1.Event(startSlot, {
-                        index: startIndex
-                    });
-                    core$1.invokeListener(startSlot.parent, 'onCompositionStart', event);
-                }), stream.fromEvent(input, 'compositionupdate').pipe(stream.filter(function() {
-                    return !_this.ignoreComposition;
-                })).subscribe(function(ev) {
-                    var startSlot = _this.selection.startSlot;
-                    var event = new core$1.Event(startSlot, {
-                        index: startIndex,
-                        data: ev.data
-                    });
-                    core$1.invokeListener(startSlot.parent, 'onCompositionUpdate', event);
-                }), stream.merge(stream.fromEvent(input, 'beforeinput').pipe(stream.map(function(ev) {
-                    ev.preventDefault();
-                    if (ev.inputType === 'insertCompositionText') {
-                        return null;
-                    }
-                    if (ev.inputType === 'insertReplacementText') {
-                        var _ev_dataTransfer;
-                        var range = ev.getTargetRanges()[0];
-                        var location = _this.domAdapter.getLocationByNativeNode(range.startContainer);
-                        var startSlot = _this.selection.startSlot;
-                        _this.selection.setBaseAndExtent(startSlot, location.startIndex + range.startOffset, startSlot, location.startIndex + range.endOffset);
-                        _this.commander.delete();
-                        return ((_ev_dataTransfer = ev.dataTransfer) === null || _ev_dataTransfer === void 0 ? void 0 : _ev_dataTransfer.getData('text')) || ev.data || null;
-                    }
-                    isCompositionEnd = ev.inputType === 'insertFromComposition';
-                    if (isCompositionEnd && _this.composition) {
-                        return null;
-                    }
-                    if (_this.isSafari) {
-                        if (ev.inputType === 'insertText' || isCompositionEnd) {
-                            return ev.data;
-                        }
-                    }
-                    if (!ev.isComposing && !!ev.data) {
-                        return ev.data;
-                    }
-                    return null;
-                }), stream.filter(function(text) {
-                    return text;
-                })), this.isSafari ? new stream.Observable() : stream.fromEvent(input, 'compositionend').pipe(stream.filter(function() {
-                    return !_this.ignoreComposition;
-                })).pipe(stream.filter(function() {
-                    return _this.composition;
-                }), stream.map(function(ev) {
-                    isCompositionEnd = true;
-                    ev.preventDefault();
-                    return ev.data;
-                }), stream.filter(function() {
-                    var b = _this.ignoreComposition;
-                    _this.ignoreComposition = false;
-                    return !b;
-                }))).subscribe(function(text) {
-                    _this.composition = false;
-                    if (text) {
-                        var startContainer = _this.nativeSelection.focusNode;
-                        if (_instanceof$1(startContainer, Text) && startContainer.textContent === text) {
-                            startContainer.remove();
-                        }
-                        _this.commander.write(text);
-                    }
-                    if (isCompositionEnd) {
-                        var startSlot = _this.selection.startSlot;
-                        if (startSlot) {
-                            var event = new core$1.Event(startSlot, null);
-                            core$1.invokeListener(startSlot.parent, 'onCompositionEnd', event);
-                        }
-                    }
-                    isCompositionEnd = false;
-                }));
+            key: "syncCompositionText",
+            value: function syncCompositionText(recorder) {
+                var text = recorder.readText();
+                recorder.stop();
+                if (text) {
+                    // 先清理 composition 期间浏览器创建的节点，确保写入模型时 DOM 是干净的
+                    recorder.cleanup(text, this.nativeSelection.focusNode);
+                    this.commander.write(text);
+                }
+                var startSlot = this.selection.startSlot;
+                if (startSlot) {
+                    core$1.invokeListener(startSlot.parent, 'onCompositionEnd', new core$1.Event(startSlot, null));
+                }
             }
         }
     ]);