one-design-next 0.0.13 → 0.0.15

package/dist/composer/editor.js

@@ -25,7 +25,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
  *
  * chip 模型（hybrid）：
  *   - DOM 由 contenteditable 自治：每个 chip 是 contentEditable=false 的 span（host），带 data-mention-id
- *   - 视觉由 React Portal 注入到 host 内：chip.tsx 负责
+ *   - 视觉由 React Portal 注入到 host 内：ComposerInlineRef 负责
  *   - chip 状态（id ↔ host）由 useChipManager 维护
  */
 
@@ -34,7 +34,7 @@ import { createPortal } from 'react-dom';
 import { buildClipboardPayload, COMPOSER_CLIPBOARD_MIME, parseClipboardPayload, plainTextFromClipboardPayload, remapClipboardPayload } from "./clipboard";
 import { useChipManager } from "./hooks/useChipManager";
 import { useChipSelectionMarker } from "./hooks/useChipSelectionMarker";
-import { findChipHostBeforeCaret, getPlainText, isEditorEmpty, probeTrigger, resolveCaretJumpAroundChip, ZWSP } from "./utils";
+import { ensureTextAnchorAt, findChipHostAfterCaret, findChipHostBeforeCaret, getPlainText, getVisibleTextBeforeHost, isEditorEmpty, moveCaretBeforeChip, normalizeComposerEditorDom, normalizeEditorDom, probeTrigger, resolveCaretJumpAroundChip, stripInvisibleChars, CARET_SPACER } from "./utils";
 import { ComposerInlineRef } from "./inline-ref";
 import ScrollArea from "../scroll-area";
 
@@ -102,6 +102,9 @@ export var ComposerEditor = /*#__PURE__*/forwardRef(function ComposerEditor(_ref
     onHeightChange = _ref.onHeightChange,
     onPasteFiles = _ref.onPasteFiles,
     onCopyChips = _ref.onCopyChips,
+    _ref$paramEditChipId = _ref.paramEditChipId,
+    paramEditChipId = _ref$paramEditChipId === void 0 ? null : _ref$paramEditChipId,
+    onInlineRefClick = _ref.onInlineRefClick,
     _ref$disabled = _ref.disabled,
     disabled = _ref$disabled === void 0 ? false : _ref$disabled,
     className = _ref.className,
@@ -122,18 +125,29 @@ export var ComposerEditor = /*#__PURE__*/forwardRef(function ComposerEditor(_ref
 
   /** 当前活动 trigger probe；null 表示无触发态。 */
   var triggerRef = useRef(null);
+  /** 最近一次落在 editor 内的 selection（菜单点击导致 blur 后用于恢复插入点）。 */
+  var lastEditorRangeRef = useRef(null);
+  /** 抑制换行后短窗口内的 selection 二次校正，避免首次 chip 后换行闪烁。 */
+  var suppressSelectionNormalizeCountRef = useRef(0);
+  /** 用户刚执行“主动换行”时，允许 empty 判定在一次变更内保持非空。 */
+  var forceNonEmptyOnceRef = useRef(false);
 
   /** 派生：编辑器是否完全空（无文本 + 无 chip），驱动 placeholder。 */
   var _useState = useState(true),
     _useState2 = _slicedToArray(_useState, 2),
     empty = _useState2[0],
     setEmpty = _useState2[1];
+  /** 输入模态：键盘操作时置为 keyboard，用于抑制“鼠标隐藏但 hover 仍生效”的视觉残留。 */
+  var _useState3 = useState('pointer'),
+    _useState4 = _slicedToArray(_useState3, 2),
+    inputModality = _useState4[0],
+    setInputModality = _useState4[1];
 
   /** ScrollArea root 显式高度。Base UI viewport=100%，root 必须有确定 height。 */
-  var _useState3 = useState(null),
-    _useState4 = _slicedToArray(_useState3, 2),
-    scrollHeight = _useState4[0],
-    setScrollHeight = _useState4[1];
+  var _useState5 = useState(null),
+    _useState6 = _slicedToArray(_useState5, 2),
+    scrollHeight = _useState6[0],
+    setScrollHeight = _useState6[1];
 
   /** onHeightChange 用 ref 稳定，避免 ResizeObserver effect 反复 cleanup/重建。 */
   var onHeightChangeRef = useRef(onHeightChange);
@@ -173,14 +187,27 @@ export var ComposerEditor = /*#__PURE__*/forwardRef(function ComposerEditor(_ref
     });
     (_onHeightChangeRef$cu = onHeightChangeRef.current) === null || _onHeightChangeRef$cu === void 0 || _onHeightChangeRef$cu.call(onHeightChangeRef, natural, overflow);
   }, [minHeightPx, maxHeightPx]);
+  var shouldShowPlaceholder = useCallback(function (el) {
+    if (!isEditorEmpty(el)) return false;
+    // placeholder 仅在“单行且空内容”展示
+    var lineCount = el.querySelectorAll('br').length + 1;
+    return lineCount <= 1;
+  }, []);
   var fireChange = useCallback(function () {
     var el = editorRef.current;
     if (!el) return;
-    setEmpty(isEditorEmpty(el));
+    normalizeEditorDom(el);
+    var showPlaceholder = shouldShowPlaceholder(el);
+    if (forceNonEmptyOnceRef.current && showPlaceholder) {
+      setEmpty(false);
+    } else {
+      setEmpty(showPlaceholder);
+    }
+    forceNonEmptyOnceRef.current = false;
     onChange === null || onChange === void 0 || onChange(getPlainText(el));
     // editor.height 锁定时 RO 不触发，主动同步一次，确保升格判定能拿到 scrollHeight
     syncHeight();
-  }, [onChange, syncHeight]);
+  }, [onChange, shouldShowPlaceholder, syncHeight]);
 
   /* ─────────────────────────────────────
    * chip 管理
@@ -194,6 +221,8 @@ export var ComposerEditor = /*#__PURE__*/forwardRef(function ComposerEditor(_ref
     insertSerializedAtRange = _useChipManager.insertSerializedAtRange,
     syncChipsAfterDomMutation = _useChipManager.syncChipsAfterDomMutation,
     removeChip = _useChipManager.removeChip,
+    updateChipData = _useChipManager.updateChipData,
+    getChipHost = _useChipManager.getChipHost,
     resetChips = _useChipManager.resetChips;
   useChipSelectionMarker(editorRef, chips);
 
@@ -253,7 +282,17 @@ export var ComposerEditor = /*#__PURE__*/forwardRef(function ComposerEditor(_ref
       insertChip: function insertChip(data) {
         var el = editorRef.current;
         if (!el) return;
-        _insertChip(data, el);
+        // 优先恢复缓存光标到真实 selection；菜单点击时 selection 已经离开 editor，
+        // 直接走 useChipManager 的 fallback 会落到 editor 末尾，导致“飞到第一/末行”。
+        var cached = lastEditorRangeRef.current;
+        if (cached && cached.startContainer.isConnected && cached.endContainer.isConnected && el.contains(cached.startContainer) && el.contains(cached.endContainer)) {
+          var sel = window.getSelection();
+          if (sel) {
+            sel.removeAllRanges();
+            sel.addRange(cached.cloneRange());
+          }
+        }
+        _insertChip(data, el, cached);
       },
       removeChip: removeChip,
       replaceTriggerWithChip: function replaceTriggerWithChip(data) {
@@ -261,8 +300,8 @@ export var ComposerEditor = /*#__PURE__*/forwardRef(function ComposerEditor(_ref
         if (!el) return;
         var probe = triggerRef.current;
         if (!probe) {
-          // 无活动 trigger，退化为光标处插入
-          _insertChip(data, el);
+          // 无活动 trigger，退化为最近光标处插入
+          _insertChip(data, el, lastEditorRangeRef.current);
           return;
         }
         // 选中 trigger + query 整段，删掉再插 chip
@@ -299,11 +338,13 @@ export var ComposerEditor = /*#__PURE__*/forwardRef(function ComposerEditor(_ref
           return c.data;
         });
       },
+      updateChipData: updateChipData,
+      getChipHost: getChipHost,
       get nativeElement() {
         return editorRef.current;
       }
     };
-  }, [onChange, _insertChip, removeChip, resetChips, onTriggerChange, chips]);
+  }, [onChange, _insertChip, removeChip, resetChips, onTriggerChange, chips, updateChipData, getChipHost]);
 
   /* ─────────────────────────────────────
    * 监听 selection 变化：方向键 / 鼠标点击移位都要重算 trigger
@@ -323,6 +364,28 @@ export var ComposerEditor = /*#__PURE__*/forwardRef(function ComposerEditor(_ref
         }
         return;
       }
+      var range = sel.getRangeAt(0);
+      // 先缓存 editor 内真实光标；即便本次走 suppress 提前 return，也不能丢失插入锚点
+      lastEditorRangeRef.current = range.cloneRange();
+      if (suppressSelectionNormalizeCountRef.current > 0) {
+        suppressSelectionNormalizeCountRef.current -= 1;
+        recomputeTrigger();
+        return;
+      }
+      if (range.collapsed && range.startContainer.nodeType === Node.ELEMENT_NODE) {
+        var hostBefore = findChipHostBeforeCaret(range);
+        var hostAfter = findChipHostAfterCaret(range);
+        if (hostBefore || hostAfter) {
+          var _anchor = ensureTextAnchorAt(range.startContainer, range.startOffset);
+          if (_anchor) {
+            var r = document.createRange();
+            r.setStart(_anchor.node, _anchor.offset);
+            r.collapse(true);
+            sel.removeAllRanges();
+            sel.addRange(r);
+          }
+        }
+      }
       recomputeTrigger();
     };
     document.addEventListener('selectionchange', handler);
@@ -373,7 +436,7 @@ export var ComposerEditor = /*#__PURE__*/forwardRef(function ComposerEditor(_ref
     if (valueProp !== current) {
       el.textContent = valueProp !== null && valueProp !== void 0 ? valueProp : '';
       resetChips();
-      setEmpty(!valueProp);
+      setEmpty(shouldShowPlaceholder(el));
       if (triggerRef.current) {
         triggerRef.current = null;
         onTriggerChange === null || onTriggerChange === void 0 || onTriggerChange(null);
@@ -390,9 +453,15 @@ export var ComposerEditor = /*#__PURE__*/forwardRef(function ComposerEditor(_ref
    * ───────────────────────────────────── */
   var handleInput = useCallback(function () {
     var el = editorRef.current;
-    if (el) setEmpty(isEditorEmpty(el));
+    if (el && !isComposingRef.current) {
+      normalizeComposerEditorDom(el);
+    }
     requestScrollCaretIntoView();
-    if (isComposingRef.current) return;
+    if (isComposingRef.current) {
+      // 合成期只负责隐藏 placeholder，不触发归一化提交链路
+      setEmpty(false);
+      return;
+    }
     fireChange();
     recomputeTrigger();
   }, [fireChange, recomputeTrigger, requestScrollCaretIntoView]);
@@ -403,6 +472,8 @@ export var ComposerEditor = /*#__PURE__*/forwardRef(function ComposerEditor(_ref
   }, []);
   var handleCompositionEnd = useCallback(function () {
     isComposingRef.current = false;
+    var el = editorRef.current;
+    if (el) normalizeComposerEditorDom(el);
     fireChange();
     recomputeTrigger();
     requestScrollCaretIntoView();
@@ -414,18 +485,25 @@ export var ComposerEditor = /*#__PURE__*/forwardRef(function ComposerEditor(_ref
    *   - 默认行为 = 自插 <br>（替代浏览器默认的 <div> 包裹，避免破坏 inline 流）
    * ───────────────────────────────────── */
   var insertLineBreak = useCallback(function () {
-    var _br$parentNode;
+    var _br$parentNode, _tail$textContent;
     var sel = window.getSelection();
     if (!sel || sel.rangeCount === 0) return;
     var range = sel.getRangeAt(0);
     range.deleteContents();
     var br = document.createElement('br');
+    br.setAttribute('data-odn-composer-user-break', 'true');
     range.insertNode(br);
-    // webkit：行尾插 br 时需要 ZWSP 让 caret 落点可见
-    var tail = document.createTextNode(ZWSP);
+    // 用户主动换行后应立即收起 placeholder
+    setEmpty(false);
+    forceNonEmptyOnceRef.current = true;
+    // 本次主动设 range 会触发 selectionchange，短窗口内跳过二次 caret 校正避免闪烁
+    suppressSelectionNormalizeCountRef.current = 2;
+    // webkit：行尾插 br 时需要 spacer 让 caret 落点可见
+    var tail = document.createTextNode(CARET_SPACER);
     (_br$parentNode = br.parentNode) === null || _br$parentNode === void 0 || _br$parentNode.insertBefore(tail, br.nextSibling);
     var newRange = document.createRange();
-    newRange.setStartAfter(tail);
+    // 直接落在 spacer 文本内部，避免 element-boundary caret 在首拍被二次改写
+    newRange.setStart(tail, ((_tail$textContent = tail.textContent) !== null && _tail$textContent !== void 0 ? _tail$textContent : '').length);
     newRange.collapse(true);
     sel.removeAllRanges();
     sel.addRange(newRange);
@@ -433,26 +511,101 @@ export var ComposerEditor = /*#__PURE__*/forwardRef(function ComposerEditor(_ref
     requestScrollCaretIntoView();
   }, [fireChange, requestScrollCaretIntoView]);
   var handleKeyDown = useCallback(function (e) {
+    if (inputModality !== 'keyboard') setInputModality('keyboard');
     if (isComposingRef.current || e.nativeEvent.isComposing || e.keyCode === 229) return;
 
     /* 触发态优先：activeTrigger 时把导航键先吐给父组件（驱动浮层选择）。
      * 父返回 true 表示已处理，editor 直接结束本次 keydown，不再走任何
      * 自身逻辑（避免 Enter 又触发 onPressEnter / 插换行）。 */
-    if (triggerRef.current && onTriggerKeyDown && (e.key === 'ArrowDown' || e.key === 'ArrowUp' || e.key === 'Enter' || e.key === 'Escape' || e.key === 'Tab')) {
+    if (triggerRef.current && onTriggerKeyDown && (e.key === 'ArrowDown' || e.key === 'ArrowUp' || e.key === 'Enter' && !e.shiftKey || e.key === 'Escape' || e.key === 'Tab')) {
       if (onTriggerKeyDown(e) === true) return;
     }
 
-    // Backspace：紧邻 chip 后方时整块删
+    // Backspace：chip 边界——空 text 在 chip 后先退回 chip 前；chip 前无正文再整块删
     if (e.key === 'Backspace') {
+      var el = editorRef.current;
       var sel = window.getSelection();
-      if (sel && sel.rangeCount > 0) {
+      if (el && sel && sel.rangeCount > 0) {
         var range = sel.getRangeAt(0);
-        if (range.collapsed) {
-          var host = findChipHostBeforeCaret(range);
-          var _id = host === null || host === void 0 ? void 0 : host.dataset.mentionId;
-          if (_id) {
+        if (range.collapsed && el.contains(range.startContainer)) {
+          var node = range.startContainer,
+            offset = range.startOffset;
+
+          // 用户换行生成的 "<br> + CARET_SPACER"：一次 Backspace 应合并删除，避免看起来“卡一下”
+          {
+            var spacerText = null;
+            var br = null;
+            if (node.nodeType === Node.TEXT_NODE) {
+              var _t$textContent;
+              var t = node;
+              var s = (_t$textContent = t.textContent) !== null && _t$textContent !== void 0 ? _t$textContent : '';
+              if (s.startsWith(CARET_SPACER) && offset <= 1 && t.previousSibling instanceof HTMLBRElement) {
+                spacerText = t;
+                br = t.previousSibling;
+              }
+            } else if (node.nodeType === Node.ELEMENT_NODE) {
+              var _elNode$childNodes, _elNode$childNodes$of, _textContent, _textContent2;
+              var elNode = node;
+              var prev = (_elNode$childNodes = elNode.childNodes[offset - 1]) !== null && _elNode$childNodes !== void 0 ? _elNode$childNodes : null;
+              var at = (_elNode$childNodes$of = elNode.childNodes[offset]) !== null && _elNode$childNodes$of !== void 0 ? _elNode$childNodes$of : null;
+              if (prev && prev.nodeType === Node.TEXT_NODE && ((_textContent = prev.textContent) !== null && _textContent !== void 0 ? _textContent : '').startsWith(CARET_SPACER) && prev.previousSibling instanceof HTMLBRElement) {
+                spacerText = prev;
+                br = prev.previousSibling;
+              } else if (prev instanceof HTMLBRElement && at && at.nodeType === Node.TEXT_NODE && ((_textContent2 = at.textContent) !== null && _textContent2 !== void 0 ? _textContent2 : '').startsWith(CARET_SPACER)) {
+                spacerText = at;
+                br = prev;
+              }
+            }
+            if (spacerText && br) {
+              e.preventDefault();
+              var parent = br.parentNode;
+              if (parent) {
+                var _spacerText$textConte;
+                var idx = Array.from(parent.childNodes).indexOf(br);
+                var text = (_spacerText$textConte = spacerText.textContent) !== null && _spacerText$textConte !== void 0 ? _spacerText$textConte : '';
+                if (text === CARET_SPACER) {
+                  spacerText.remove();
+                } else {
+                  spacerText.textContent = text.slice(1);
+                }
+                br.remove();
+                var r = document.createRange();
+                if (spacerText.isConnected) {
+                  r.setStart(spacerText, 0);
+                } else {
+                  r.setStart(parent, Math.max(0, idx));
+                }
+                r.collapse(true);
+                sel.removeAllRanges();
+                sel.addRange(r);
+                fireChange();
+                recomputeTrigger();
+              }
+              return;
+            }
+          }
+          var hostBefore = findChipHostBeforeCaret(range);
+          if (hostBefore !== null && hostBefore !== void 0 && hostBefore.dataset.mentionId) {
+            var _node$textContent;
+            var _node = range.startContainer,
+              _offset = range.startOffset;
+            if (_node.nodeType === Node.TEXT_NODE && _offset === 0 && _node.previousSibling === hostBefore && stripInvisibleChars((_node$textContent = _node.textContent) !== null && _node$textContent !== void 0 ? _node$textContent : '') === '') {
+              e.preventDefault();
+              moveCaretBeforeChip(hostBefore, {
+                removeTrailingEmptyText: true,
+                trailingText: _node
+              });
+              return;
+            }
             e.preventDefault();
-            removeChip(_id);
+            removeChip(hostBefore.dataset.mentionId);
+            return;
+          }
+          var hostAfter = findChipHostAfterCaret(range);
+          var idAfter = hostAfter === null || hostAfter === void 0 ? void 0 : hostAfter.dataset.mentionId;
+          if (idAfter && getVisibleTextBeforeHost(el, hostAfter).trim() === '') {
+            e.preventDefault();
+            removeChip(idAfter);
             return;
           }
         }
@@ -469,11 +622,11 @@ export var ComposerEditor = /*#__PURE__*/forwardRef(function ComposerEditor(_ref
           var target = resolveCaretJumpAroundChip(_range, e.key === 'ArrowLeft' ? 'left' : 'right');
           if (target) {
             e.preventDefault();
-            var r = document.createRange();
-            r.setStart(target.node, target.offset);
-            r.collapse(true);
+            var _r = document.createRange();
+            _r.setStart(target.node, target.offset);
+            _r.collapse(true);
             _sel.removeAllRanges();
-            _sel.addRange(r);
+            _sel.addRange(_r);
             return;
           }
         }
@@ -481,15 +634,18 @@ export var ComposerEditor = /*#__PURE__*/forwardRef(function ComposerEditor(_ref
     }
     if (e.key === 'Enter') {
       if (onPressEnter) {
-        var _r = onPressEnter(e);
-        if (_r === false) return;
+        var _r2 = onPressEnter(e);
+        if (_r2 === false) return;
       }
       // 外部（如浮层）已经 preventDefault → 不再插换行
       if (e.defaultPrevented) return;
       e.preventDefault();
       insertLineBreak();
     }
-  }, [onPressEnter, insertLineBreak, removeChip, onTriggerKeyDown]);
+  }, [inputModality, onPressEnter, insertLineBreak, removeChip, onTriggerKeyDown, fireChange, recomputeTrigger]);
+  var handlePointerInput = useCallback(function () {
+    if (inputModality !== 'pointer') setInputModality('pointer');
+  }, [inputModality]);
   var writeClipboardPayload = useCallback(function (e, payload) {
     if (!payload) return false;
     e.clipboardData.setData(COMPOSER_CLIPBOARD_MIME, JSON.stringify(payload));
@@ -600,6 +756,7 @@ export var ComposerEditor = /*#__PURE__*/forwardRef(function ComposerEditor(_ref
     "aria-disabled": disabled || undefined,
     "data-odn-composer-editor": true,
     "data-odn-composer-editor-disabled": disabled || undefined,
+    "data-odn-input-modality": inputModality,
     "data-empty": empty || undefined,
     "data-placeholder": placeholder,
     className: className,
@@ -607,12 +764,19 @@ export var ComposerEditor = /*#__PURE__*/forwardRef(function ComposerEditor(_ref
     onCompositionStart: handleCompositionStart,
     onCompositionEnd: handleCompositionEnd,
     onKeyDown: handleKeyDown,
+    onMouseMove: handlePointerInput,
+    onMouseDown: handlePointerInput,
+    onPointerMove: handlePointerInput,
     onCopy: handleCopy,
     onCut: handleCut,
     onPaste: handlePaste
   })), chips.map(function (chip) {
     return /*#__PURE__*/createPortal( /*#__PURE__*/React.createElement(ComposerInlineRef, {
-      data: chip.data
+      data: chip.data,
+      active: paramEditChipId === chip.data.id,
+      onClick: onInlineRefClick ? function (anchor) {
+        return onInlineRefClick(chip.data.id, anchor);
+      } : undefined
     }), chip.host, chip.data.id);
   }));
 });

package/dist/composer/hooks/useChipManager.d.ts

@@ -7,11 +7,11 @@
  * - DOM 与 React state 的"双向"维护：DOM 由 contenteditable 自治、视觉由 Portal 注入
  *
  * 不负责：
- * - chip 视觉渲染（chip.tsx）
+ * - chip 视觉渲染（inline-ref → Invocation / Mention）
  * - 触发判定（useTriggerMenu，step 4 加）
  * - onChange 抛出（由调用方 onAfterMutate 回调中处理）
  */
-import type { ChipData } from '../chip';
+import type { ChipData } from '../../_genui-types';
 /** chip 在 React 状态中的形态：data + 对应的 DOM host。 */
 export interface ManagedChip {
     data: ChipData;
@@ -22,10 +22,11 @@ export interface UseChipManagerReturn {
     chips: ManagedChip[];
     /**
      * 在编辑器当前光标位置插入 chip：
+     *   - 优先使用 preferredRange（菜单点击时缓存的最近编辑器 selection）
      *   - selection 在编辑器内 → 插入光标处
      *   - selection 在编辑器外 / 无 selection → fallback 到末尾
      */
-    insertChip: (data: ChipData, editor: HTMLElement) => void;
+    insertChip: (data: ChipData, editor: HTMLElement, preferredRange?: Range | null) => void;
     /** 在指定 range 处插入 chip（调用方负责 deleteContents）。 */
     insertChipAtRange: (data: ChipData, range: Range, editor: HTMLElement) => HTMLSpanElement;
     /** 将含 marker 的 raw value + chips 插入 range（粘贴用）。 */
@@ -34,6 +35,10 @@ export interface UseChipManagerReturn {
     syncChipsAfterDomMutation: (editor: HTMLElement) => void;
     /** 按 chip id 移除（同时清理伴随的 ZWSP 锚点）。 */
     removeChip: (id: string) => void;
+    /** 更新 chip 数据（参数面板关闭保存等）。 */
+    updateChipData: (id: string, patch: Partial<ChipData>) => void;
+    /** 按 id 取 chip host（参数面板 anchor）。 */
+    getChipHost: (id: string) => HTMLSpanElement | null;
     /** 清空所有 chip 的 React 状态（DOM 由调用方 editor.innerHTML='' 一并处理）。 */
     resetChips: () => void;
 }

package/dist/composer/hooks/useChipManager.js

@@ -1,3 +1,9 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { 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 _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
@@ -17,13 +23,13 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
  * - DOM 与 React state 的"双向"维护：DOM 由 contenteditable 自治、视觉由 Portal 注入
  *
  * 不负责：
- * - chip 视觉渲染（chip.tsx）
+ * - chip 视觉渲染（inline-ref → Invocation / Mention）
  * - 触发判定（useTriggerMenu，step 4 加）
  * - onChange 抛出（由调用方 onAfterMutate 回调中处理）
  */
 
 import { useCallback, useRef, useState } from 'react';
-import { forEachMarkerSegment } from "../utils";
+import { attachCaretSpacerAfter, CARET_SPACER, detachCaretSpacerAfter, ensureTextAnchorAt, forEachMarkerSegment, normalizeComposerEditorDom, ZWSP } from "../utils";
 
 /** chip 在 React 状态中的形态：data + 对应的 DOM host。 */
 
@@ -42,9 +48,11 @@ onAfterMutate) {
     setChips = _useState2[1];
   var chipsRef = useRef(chips);
   chipsRef.current = chips;
-  var insertChipAtRange = useCallback(function (data, range, _editor) {
+  var insertChipAtRange = useCallback(function (data, range, editor) {
     var host = createChipHost(data);
     range.insertNode(host);
+    attachCaretSpacerAfter(host);
+    normalizeComposerEditorDom(editor);
     var next = [].concat(_toConsumableArray(chipsRef.current), [{
       data: data,
       host: host
@@ -53,26 +61,33 @@ onAfterMutate) {
     setChips(next);
     return host;
   }, []);
-  var insertChip = useCallback(function (data, editor) {
+  var insertChip = useCallback(function (data, editor, preferredRange) {
     var sel = window.getSelection();
     var range = null;
-    if (sel && sel.rangeCount > 0 && editor.contains(sel.anchorNode)) {
+    if (preferredRange && preferredRange.startContainer.isConnected && preferredRange.endContainer.isConnected && editor.contains(preferredRange.startContainer) && editor.contains(preferredRange.endContainer)) {
+      range = preferredRange.cloneRange();
+    } else if (sel && sel.rangeCount > 0 && editor.contains(sel.anchorNode)) {
       range = sel.getRangeAt(0);
     } else {
-      var _sel, _sel2;
       editor.focus();
       range = document.createRange();
       range.selectNodeContents(editor);
       range.collapse(false);
-      sel = window.getSelection();
-      (_sel = sel) === null || _sel === void 0 || _sel.removeAllRanges();
-      (_sel2 = sel) === null || _sel2 === void 0 || _sel2.addRange(range);
     }
+    sel = window.getSelection();
     if (!range || !sel) return;
+    sel.removeAllRanges();
+    sel.addRange(range);
     range.deleteContents();
     var host = insertChipAtRange(data, range, editor);
+    var spacer = host.nextSibling;
     var newRange = document.createRange();
-    newRange.setStartAfter(host);
+    if ((spacer === null || spacer === void 0 ? void 0 : spacer.nodeType) === Node.TEXT_NODE && (spacer.textContent === CARET_SPACER || spacer.textContent === ZWSP)) {
+      newRange.setStart(spacer, 1);
+    } else {
+      var ensured = attachCaretSpacerAfter(host);
+      newRange.setStart(ensured, 1);
+    }
     newRange.collapse(true);
     sel.removeAllRanges();
     sel.addRange(newRange);
@@ -96,6 +111,7 @@ onAfterMutate) {
       if (!data) return;
       var host = createChipHost(data);
       frag.appendChild(host);
+      frag.appendChild(document.createTextNode(CARET_SPACER));
       inserted.push({
         data: data,
         host: host
@@ -103,6 +119,7 @@ onAfterMutate) {
     });
     range.insertNode(frag);
     range.collapse(false);
+    normalizeComposerEditorDom(editor);
     if (inserted.length > 0) {
       var next = [].concat(_toConsumableArray(chipsRef.current), inserted);
       chipsRef.current = next;
@@ -133,14 +150,90 @@ onAfterMutate) {
       return c.data.id === id;
     });
     if (!target) return;
+    var editor = target.host.parentElement;
+    var parent = target.host.parentNode;
+    var hostIndexInParent = parent ? Array.prototype.indexOf.call(parent.childNodes, target.host) : -1;
+
+    // 主锚点：chip 左侧文本尾（跳过尾部 ZWSP）
+    var prev = target.host.previousSibling;
+    var textAnchor = prev && prev.nodeType === Node.TEXT_NODE ? function (_prev$textContent) {
+      var raw = (_prev$textContent = prev.textContent) !== null && _prev$textContent !== void 0 ? _prev$textContent : '';
+      var len = raw.length;
+      while (len > 0 && (raw[len - 1] === CARET_SPACER || raw[len - 1] === ZWSP)) len--;
+      return {
+        node: prev,
+        offset: len
+      };
+    }() : null;
+
+    // 结构锚点：chip 在父节点中的原位置（删后即为“被删 chip 左侧”）
+    var treeAnchor = parent && hostIndexInParent >= 0 ? {
+      parent: parent,
+      offset: hostIndexInParent
+    } : null;
+    detachCaretSpacerAfter(target.host);
     target.host.remove();
+    if (editor instanceof HTMLElement) {
+      normalizeComposerEditorDom(editor);
+    }
     var next = chipsRef.current.filter(function (c) {
       return c.data.id !== id;
     });
     chipsRef.current = next;
     setChips(next);
     onAfterMutate === null || onAfterMutate === void 0 || onAfterMutate();
+
+    // 关键：在 onAfterMutate（含 fireChange/normalizeEditorDom）之后再恢复 selection
+    requestAnimationFrame(function () {
+      var _treeAnchor$parent;
+      var sel = window.getSelection();
+      if (!sel) return;
+      var applyAnchor = function applyAnchor(anchor) {
+        var _anchor$node$textCont;
+        if (!anchor || !anchor.node.isConnected) return false;
+        var r = document.createRange();
+        var safeOffset = anchor.node.nodeType === Node.TEXT_NODE ? Math.min(anchor.offset, ((_anchor$node$textCont = anchor.node.textContent) !== null && _anchor$node$textCont !== void 0 ? _anchor$node$textCont : '').length) : Math.min(anchor.offset, anchor.node.childNodes.length);
+        r.setStart(anchor.node, safeOffset);
+        r.collapse(true);
+        sel.removeAllRanges();
+        sel.addRange(r);
+        return true;
+      };
+      if (applyAnchor(textAnchor)) return;
+      if (treeAnchor !== null && treeAnchor !== void 0 && (_treeAnchor$parent = treeAnchor.parent) !== null && _treeAnchor$parent !== void 0 && _treeAnchor$parent.isConnected) {
+        var textTreeAnchor = ensureTextAnchorAt(treeAnchor.parent, treeAnchor.offset);
+        if (applyAnchor(textTreeAnchor)) return;
+      }
+      if (editor instanceof HTMLElement) {
+        var fallback = ensureTextAnchorAt(editor, 0);
+        if (fallback && applyAnchor(fallback)) return;
+        var r = document.createRange();
+        r.selectNodeContents(editor);
+        r.collapse(true);
+        sel.removeAllRanges();
+        sel.addRange(r);
+      }
+    });
+  }, [onAfterMutate]);
+  var updateChipData = useCallback(function (id, patch) {
+    var idx = chipsRef.current.findIndex(function (c) {
+      return c.data.id === id;
+    });
+    if (idx === -1) return;
+    var next = _toConsumableArray(chipsRef.current);
+    next[idx] = _objectSpread(_objectSpread({}, next[idx]), {}, {
+      data: _objectSpread(_objectSpread({}, next[idx].data), patch)
+    });
+    chipsRef.current = next;
+    setChips(next);
+    onAfterMutate === null || onAfterMutate === void 0 || onAfterMutate();
   }, [onAfterMutate]);
+  var getChipHost = useCallback(function (id) {
+    var _chipsRef$current$fin, _chipsRef$current$fin2;
+    return (_chipsRef$current$fin = (_chipsRef$current$fin2 = chipsRef.current.find(function (c) {
+      return c.data.id === id;
+    })) === null || _chipsRef$current$fin2 === void 0 ? void 0 : _chipsRef$current$fin2.host) !== null && _chipsRef$current$fin !== void 0 ? _chipsRef$current$fin : null;
+  }, []);
   var resetChips = useCallback(function () {
     setChips([]);
     chipsRef.current = [];
@@ -152,6 +245,8 @@ onAfterMutate) {
     insertSerializedAtRange: insertSerializedAtRange,
     syncChipsAfterDomMutation: syncChipsAfterDomMutation,
     removeChip: removeChip,
+    updateChipData: updateChipData,
+    getChipHost: getChipHost,
     resetChips: resetChips
   };
 }