one-design-next 0.0.83 → 0.0.85

package/dist/composer/index.js

@@ -187,27 +187,35 @@ export var Composer = /*#__PURE__*/forwardRef(function Composer(_ref, ref) {
     setTriggerActiveIndex = _useState8[1];
   /** trigger menu 的命令式句柄：导航语义在 SkillSlot 内，composer 只转发 ↑↓。 */
   var triggerSkillSlotRef = useRef(null);
-  /** lite 模式下由内容高度驱动的单行 / 多行布局状态。 */
+  /** 同步标记：handleTriggerKeyDown 已在本轮事件中取消了 trigger，
+   *  onPressEnter 检测此标记以跳过 stale triggerMenuVisible 拦截。 */
+  var triggerDismissedRef = useRef(false);
+  /** 当 trigger 被 dismiss（无匹配 skill 按 Enter）时跳过 Popover 关闭动画 */
   var _useState9 = useState(false),
     _useState10 = _slicedToArray(_useState9, 2),
-    expanded = _useState10[0],
-    setExpanded = _useState10[1];
-  /** full 模式下由右上角按钮控制的 50vh 展开态。 */
+    skipTriggerTransition = _useState10[0],
+    setSkipTriggerTransition = _useState10[1];
+  /** lite 模式下由内容高度驱动的单行 / 多行布局状态。 */
   var _useState11 = useState(false),
     _useState12 = _slicedToArray(_useState11, 2),
-    fullExpanded = _useState12[0],
-    setFullExpanded = _useState12[1];
-  /** ComposerEditor 反馈的 editor 自然高度（offsetHeight，未 clamp），用于 lite 升格判断 */
-  var _useState13 = useState(0),
+    expanded = _useState12[0],
+    setExpanded = _useState12[1];
+  /** full 模式下由右上角按钮控制的 50vh 展开态。 */
+  var _useState13 = useState(false),
     _useState14 = _slicedToArray(_useState13, 2),
-    editorHeight = _useState14[0],
-    setEditorHeight = _useState14[1];
+    fullExpanded = _useState14[0],
+    setFullExpanded = _useState14[1];
+  /** ComposerEditor 反馈的 editor 自然高度（offsetHeight，未 clamp），用于 lite 升格判断 */
+  var _useState15 = useState(0),
+    _useState16 = _slicedToArray(_useState15, 2),
+    editorHeight = _useState16[0],
+    setEditorHeight = _useState16[1];
   /** editor 内容是否真正达到 maxRows 触顶——配合 SCSS 控制 viewport overflow，
    *  阻止升格 transition / 换行未触顶时的 scrollbar 闪现 */
-  var _useState15 = useState(false),
-    _useState16 = _slicedToArray(_useState15, 2),
-    atMax = _useState16[0],
-    setAtMax = _useState16[1];
+  var _useState17 = useState(false),
+    _useState18 = _slicedToArray(_useState17, 2),
+    atMax = _useState18[0],
+    setAtMax = _useState18[1];
   var fileInputRef = useRef(null);
   var editorRef = useRef(null);
   var boxRef = useRef(null);
@@ -226,10 +234,10 @@ export var Composer = /*#__PURE__*/forwardRef(function Composer(_ref, ref) {
       preventScroll: true
     });
   }, [disabled]);
-  var _useState17 = useState(null),
-    _useState18 = _slicedToArray(_useState17, 2),
-    paramEdit = _useState18[0],
-    setParamEdit = _useState18[1];
+  var _useState19 = useState(null),
+    _useState20 = _slicedToArray(_useState19, 2),
+    paramEdit = _useState20[0],
+    setParamEdit = _useState20[1];
   var openParamPanel = useCallback(function (chipId) {
     if (!renderParamPanel) return;
     requestAnimationFrame(function () {
@@ -564,10 +572,10 @@ export var Composer = /*#__PURE__*/forwardRef(function Composer(_ref, ref) {
      * 不夺回焦点时 Enter 会再次激活按钮而不是发送 */
     (_editorRef$current15 = editorRef.current) === null || _editorRef$current15 === void 0 || _editorRef$current15.focus();
   };
-  var _useState19 = useState(false),
-    _useState20 = _slicedToArray(_useState19, 2),
-    fileDragOver = _useState20[0],
-    setFileDragOver = _useState20[1];
+  var _useState21 = useState(false),
+    _useState22 = _slicedToArray(_useState21, 2),
+    fileDragOver = _useState22[0],
+    setFileDragOver = _useState22[1];
   var composerBoxFileDragAttrs = fileDragOver ? {
     'data-odn-composer-file-drag': ''
   } : {};
@@ -686,18 +694,26 @@ export var Composer = /*#__PURE__*/forwardRef(function Composer(_ref, ref) {
       return true;
     }
     if (e.key === 'Enter' && !e.shiftKey || e.key === 'Tab') {
-      var _ref6, _triggerSkillSlotRef$3, _triggerSkillSlotRef$4;
-      e.preventDefault();
+      var _ref6, _triggerSkillSlotRef$3, _triggerSkillSlotRef$4, _editorRef$current19;
       var _skill = (_ref6 = (_triggerSkillSlotRef$3 = (_triggerSkillSlotRef$4 = triggerSkillSlotRef.current) === null || _triggerSkillSlotRef$4 === void 0 ? void 0 : _triggerSkillSlotRef$4.getActiveSkill()) !== null && _triggerSkillSlotRef$3 !== void 0 ? _triggerSkillSlotRef$3 : filteredSkills === null || filteredSkills === void 0 ? void 0 : filteredSkills[triggerActiveIndex]) !== null && _ref6 !== void 0 ? _ref6 : filteredSkillGroups === null || filteredSkillGroups === void 0 ? void 0 : filteredSkillGroups.flatMap(function (g) {
         return g.skills;
       })[triggerActiveIndex];
-      if (_skill) handleSelectSkill(_skill, 'trigger');
-      return true;
+      if (_skill) {
+        e.preventDefault();
+        handleSelectSkill(_skill, 'trigger');
+        return true;
+      }
+      /* 过滤后列表为空（无匹配 skill）：取消 trigger，让 Enter 继续走发送流程 */
+      (_editorRef$current19 = editorRef.current) === null || _editorRef$current19 === void 0 || _editorRef$current19.cancelTrigger();
+      setTriggerInfo(null);
+      setSkipTriggerTransition(true);
+      triggerDismissedRef.current = true;
+      return false;
     }
     if (e.key === 'Escape') {
-      var _editorRef$current19;
+      var _editorRef$current20;
       e.preventDefault();
-      (_editorRef$current19 = editorRef.current) === null || _editorRef$current19 === void 0 || _editorRef$current19.cancelTrigger();
+      (_editorRef$current20 = editorRef.current) === null || _editorRef$current20 === void 0 || _editorRef$current20.cancelTrigger();
       setTriggerInfo(null);
       return true;
     }
@@ -705,15 +721,26 @@ export var Composer = /*#__PURE__*/forwardRef(function Composer(_ref, ref) {
   }, [filteredSkills, filteredSkillGroups, handleSelectSkill, triggerActiveIndex, triggerMenuVisible]);
 
   /* trigger 浮 anchor：跟随 caret 的 0×0 隐形元素，给 Popover 当 children。
-   * Popover 需要 DOM children 当 reference，没有"虚拟 anchor" API，只能这么搞。 */
+   * Popover 需要 DOM children 当 reference，没有"虚拟 anchor" API，只能这么搞。
+   *
+   * 使用 position: absolute 而非 fixed——Drawer 等容器的 transform 会创建
+   * 新的 containing block，导致 fixed 定位失准。absolute 相对于最近 positioned
+   * 祖先（[data-odn-composer] 有 position:relative），通过减去 offsetParent
+   * 的 viewport rect 得到正确的局部坐标。 */
   var triggerAnchorRef = useRef(null);
   useLayoutEffect(function () {
     var el = triggerAnchorRef.current;
     if (!el || !triggerInfo) return;
-    el.style.left = "".concat(triggerInfo.rect.left, "px");
-    /* 锚到 caret 行顶部，配合 placement=topLeft 让 menu 浮在输入内容上方，
-     * 不遮挡正在输入的文字（空间不足时 Popover flip 会自动回落到下方）。 */
-    el.style.top = "".concat(triggerInfo.rect.top, "px");
+    var offsetParent = el.offsetParent;
+    if (offsetParent) {
+      var parentRect = offsetParent.getBoundingClientRect();
+      el.style.left = "".concat(triggerInfo.rect.left - parentRect.left, "px");
+      el.style.top = "".concat(triggerInfo.rect.top - parentRect.top, "px");
+    } else {
+      // fallback：没有 offsetParent（比如 display:none），用 viewport 坐标
+      el.style.left = "".concat(triggerInfo.rect.left, "px");
+      el.style.top = "".concat(triggerInfo.rect.top, "px");
+    }
   }, [triggerInfo]);
 
   /* ---- Derived ---- */
@@ -1025,9 +1052,9 @@ export var Composer = /*#__PURE__*/forwardRef(function Composer(_ref, ref) {
     "data-odn-composer-file-input": true,
     onChange: handleFileChange
   });
-  var paramPanelNode = function (_editorRef$current$ge4, _editorRef$current20, _boxRef$current) {
+  var paramPanelNode = function (_editorRef$current$ge4, _editorRef$current21, _boxRef$current) {
     if (!paramEdit || !renderParamPanel) return null;
-    var chips = (_editorRef$current$ge4 = (_editorRef$current20 = editorRef.current) === null || _editorRef$current20 === void 0 ? void 0 : _editorRef$current20.getChips()) !== null && _editorRef$current$ge4 !== void 0 ? _editorRef$current$ge4 : [];
+    var chips = (_editorRef$current$ge4 = (_editorRef$current21 = editorRef.current) === null || _editorRef$current21 === void 0 ? void 0 : _editorRef$current21.getChips()) !== null && _editorRef$current$ge4 !== void 0 ? _editorRef$current$ge4 : [];
     var chip = chips.find(function (c) {
       return c.id === paramEdit.chipId;
     });
@@ -1037,8 +1064,8 @@ export var Composer = /*#__PURE__*/forwardRef(function Composer(_ref, ref) {
       chip: chip,
       anchor: paramEdit.anchor,
       onApply: function onApply(patch) {
-        var _editorRef$current21;
-        (_editorRef$current21 = editorRef.current) === null || _editorRef$current21 === void 0 || _editorRef$current21.updateChipData(chip.id, patch);
+        var _editorRef$current22;
+        (_editorRef$current22 = editorRef.current) === null || _editorRef$current22 === void 0 || _editorRef$current22.updateChipData(chip.id, patch);
       },
       onClose: closeParamPanel
     };
@@ -1067,7 +1094,10 @@ export var Composer = /*#__PURE__*/forwardRef(function Composer(_ref, ref) {
     onInlineRefClick: renderParamPanel ? handleInlineRefClick : undefined
     /* 本轮只接 `/`，`@` 留给业务接 mention 搜索时再加 */,
     triggers: ['/'],
-    onTriggerChange: setTriggerInfo,
+    onTriggerChange: function onTriggerChange(info) {
+      setTriggerInfo(info);
+      if (info) setSkipTriggerTransition(false);
+    },
     onTriggerKeyDown: handleTriggerKeyDown,
     onPasteFiles: addFilesFromList,
     onHeightChange: function onHeightChange(height, overflow) {
@@ -1079,9 +1109,14 @@ export var Composer = /*#__PURE__*/forwardRef(function Composer(_ref, ref) {
     onPressEnter: function onPressEnter(e) {
       if (e.nativeEvent.isComposing || e.keyCode === 229) return;
       // trigger 浮层激活时，普通 Enter 留给浮层做选择；Shift+Enter 继续换行
+      // 但若 handleTriggerKeyDown 已在本轮事件中取消了 trigger（列表为空），则放行
       if (triggerMenuVisible && !e.shiftKey) {
-        e.preventDefault();
-        return false;
+        if (triggerDismissedRef.current) {
+          triggerDismissedRef.current = false;
+        } else {
+          e.preventDefault();
+          return false;
+        }
       }
       var isSubmitKey = submitType === 'enter' ? !e.shiftKey : e.shiftKey;
       if (!isSubmitKey) return; // 不阻止 → 让 editor 走默认 <br>
@@ -1103,11 +1138,14 @@ export var Composer = /*#__PURE__*/forwardRef(function Composer(_ref, ref) {
     placement: "topLeft",
     offset: 4,
     visible: triggerMenuVisible,
+    transitionDuration: skipTriggerTransition ? 0 : undefined,
     onVisibleChange: function onVisibleChange(v) {
       if (!v) {
-        var _editorRef$current22;
-        (_editorRef$current22 = editorRef.current) === null || _editorRef$current22 === void 0 || _editorRef$current22.cancelTrigger();
+        var _editorRef$current23;
+        (_editorRef$current23 = editorRef.current) === null || _editorRef$current23 === void 0 || _editorRef$current23.cancelTrigger();
         setTriggerInfo(null);
+      } else {
+        setSkipTriggerTransition(false);
       }
     },
     popupClassName: "odn-composer-skill-popup",
@@ -1131,7 +1169,7 @@ export var Composer = /*#__PURE__*/forwardRef(function Composer(_ref, ref) {
     ref: triggerAnchorRef,
     "data-odn-composer-trigger-anchor": true,
     style: {
-      position: 'fixed',
+      position: 'absolute',
       width: 0,
       height: 0,
       pointerEvents: 'none'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "one-design-next",
-  "version": "0.0.83",
+  "version": "0.0.85",
   "description": "One Design Next from TAD@tencent.com",
   "license": "MIT",
   "type": "module",