one-design-next 0.0.30 → 0.0.32

package/dist/composer/index.d.ts

@@ -104,6 +104,17 @@ export interface ComposerProps {
     toolsLabeled?: boolean;
     /** 技能列表；当 tools 包含 'skill' 时生效 */
     skills?: SkillItem[];
+    /**
+     * skill 弹窗列表的最大高度（px）。超出此高度后出现滚动条。
+     * 不传则不限高（适合 skill 较少的场景）。
+     * @default undefined（不限高）
+     */
+    skillMenuMaxHeight?: number;
+    /**
+     * skill 弹窗的宽度（px）。影响弹窗整体宽度（即每行 item 的宽度）。
+     * @default 260
+     */
+    skillMenuWidth?: number;
     /**
      * 提交模式：
      * - `'enter'`（默认）：Enter 发送，Shift+Enter 换行

package/dist/composer/index.js

@@ -66,6 +66,8 @@ export var Composer = /*#__PURE__*/forwardRef(function Composer(_ref, ref) {
     _ref$toolsLabeled = _ref.toolsLabeled,
     toolsLabeled = _ref$toolsLabeled === void 0 ? true : _ref$toolsLabeled,
     skills = _ref.skills,
+    skillMenuMaxHeight = _ref.skillMenuMaxHeight,
+    skillMenuWidth = _ref.skillMenuWidth,
     _ref$submitType = _ref.submitType,
     submitType = _ref$submitType === void 0 ? 'enter' : _ref$submitType,
     onEnter = _ref.onEnter,
@@ -634,6 +636,10 @@ export var Composer = /*#__PURE__*/forwardRef(function Composer(_ref, ref) {
       popup: /*#__PURE__*/React.createElement(SkillSlot, {
         variant: "menu",
         skills: skills,
+        menuMaxHeight: skillMenuMaxHeight,
+        style: {
+          width: skillMenuWidth !== null && skillMenuWidth !== void 0 ? skillMenuWidth : 260
+        },
         onSelect: function onSelect(s) {
           return handleSelectSkill(s, 'btn');
         }
@@ -851,6 +857,10 @@ export var Composer = /*#__PURE__*/forwardRef(function Composer(_ref, ref) {
       skills: filteredSkills !== null && filteredSkills !== void 0 ? filteredSkills : [],
       activeIndex: triggerActiveIndex,
       onActiveIndexChange: setTriggerActiveIndex,
+      menuMaxHeight: skillMenuMaxHeight,
+      style: {
+        width: skillMenuWidth !== null && skillMenuWidth !== void 0 ? skillMenuWidth : 260
+      },
       onSelect: function onSelect(s) {
         return handleSelectSkill(s, 'trigger');
       }

package/dist/composer/style/index.css

@@ -303,7 +303,8 @@
 
 [data-odn-popup][data-type=popover] [data-odn-popup-content].odn-composer-skill-popup {
   padding: 0;
-  width: 260px;
+  /* 覆盖全局 --odn-popup-max-width(250px)，宽度完全由 SkillSlot 的 style.width 决定 */
+  --odn-popup-max-width: none;
   border-radius: 6px;
   overflow: hidden;
 }

package/dist/date-picker/index.js

@@ -130,8 +130,9 @@ var DatePicker = function DatePicker(props) {
       if (isSameDay(maxDateProp, thisQuarterEnd)) {
         return thisQuarterEnd;
       }
-      var prevQuarterEnd = new Date(thisQuarterEnd);
-      prevQuarterEnd.setMonth(thisQuarterEnd.getMonth() - 3);
+      // 上一季度末 = 当前季度起始月的前一天，避免直接 setMonth(-3) 时
+      // 保留 day 数导致 Q2→Q1(30 vs 31) 或 Q4→Q3(31 溢出 Oct 1) 等错误
+      var prevQuarterEnd = new Date(thisQuarterEnd.getFullYear(), thisQuarterEnd.getMonth() - 2, 0);
       return prevQuarterEnd;
     }
     if (picker === 'month') {

package/dist/skill-slot/index.d.ts

@@ -19,6 +19,17 @@ export interface SkillSlotProps {
      */
     activeIndex?: number;
     onActiveIndexChange?: (index: number) => void;
+    /**
+     * menu 变体：超出此高度后出现滚动条。
+     * 不传则不限高。单位 px。
+     * @default undefined（不限高）
+     */
+    menuMaxHeight?: number;
+    /**
+     * bar / card 变体：每个 skill 块的固定宽度（px）。
+     * 不传则保持默认布局宽度。
+     */
+    itemWidth?: number;
     className?: string;
     style?: React.CSSProperties;
 }

package/dist/skill-slot/index.js

@@ -1,3 +1,12 @@
+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); }
+var _excluded = ["width"];
+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 _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { 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 _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(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(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -24,6 +33,8 @@ export var SkillSlot = /*#__PURE__*/forwardRef(function SkillSlot(_ref, ref) {
     onSelect = _ref.onSelect,
     activeIndex = _ref.activeIndex,
     onActiveIndexChange = _ref.onActiveIndexChange,
+    menuMaxHeight = _ref.menuMaxHeight,
+    itemWidth = _ref.itemWidth,
     className = _ref.className,
     style = _ref.style;
   /* menu 变体：HoverFill 完全只管鼠标交互（命令式状态机，不变）；键盘 ↑↓
@@ -164,7 +175,18 @@ export var SkillSlot = /*#__PURE__*/forwardRef(function SkillSlot(_ref, ref) {
     setInternalActiveIndex(-1);
   };
   if (skills.length === 0) return null;
-  return /*#__PURE__*/React.createElement("div", {
+
+  /* menu variant 有 scroll-wrap 时，width 挂在外层 scroll-wrap 上；
+   * 没有 scroll-wrap 时 width 留在 list div 上。
+   * 这里把 style 拆成两部分：widthStyle 单独提取，listStyle 是其余属性。 */
+  var hasScrollWrap = variant === 'menu' && menuMaxHeight != null;
+  var _ref2 = style !== null && style !== void 0 ? style : {},
+    styleWidth = _ref2.width,
+    listStyleRest = _objectWithoutProperties(_ref2, _excluded);
+  var widthStyle = styleWidth != null ? {
+    width: styleWidth
+  } : {};
+  var listContent = /*#__PURE__*/React.createElement("div", {
     "data-odn-skill-slot": true,
     "data-odn-skill-slot-variant": variant,
     id: variant === 'menu' ? listboxId : undefined,
@@ -175,7 +197,9 @@ export var SkillSlot = /*#__PURE__*/forwardRef(function SkillSlot(_ref, ref) {
     onFocus: variant === 'menu' ? handleMenuFocus : undefined,
     onBlur: variant === 'menu' ? handleMenuBlur : undefined,
     className: className,
-    style: style
+    style: _objectSpread(_objectSpread({}, hasScrollWrap ? listStyleRest : style), variant !== 'menu' && itemWidth != null ? {
+      '--odn-skill-slot-item-width': "".concat(itemWidth, "px")
+    } : {})
   }, skills.map(function (skill, index) {
     var active = value === skill.id;
     var highlighted = currentIndex === index;
@@ -289,6 +313,16 @@ export var SkillSlot = /*#__PURE__*/forwardRef(function SkillSlot(_ref, ref) {
     }
     return barButton;
   }));
+  if (hasScrollWrap) {
+    return /*#__PURE__*/React.createElement("div", {
+      "data-odn-skill-slot-scroll-wrap": true,
+      style: _objectSpread({
+        maxHeight: menuMaxHeight,
+        overflowY: 'auto'
+      }, widthStyle)
+    }, listContent);
+  }
+  return listContent;
 });
 SkillSlot.displayName = 'SkillSlot';
 export default SkillSlot;

package/dist/skill-slot/style/index.css

@@ -19,6 +19,19 @@
   border-radius: 0;
 }
 
+/* ---- menu 滚动包装层 ----
+ * max-height 由外部通过 style 传入；overflow-y: auto 由 JS 内联写入。
+ * 统一细滚动条样式，并继承 popup 圆角裁剪。 */
+[data-odn-skill-slot-scroll-wrap] {
+  overflow-y: auto;
+  scrollbar-width: thin;
+  scrollbar-color: var(--odn-color-border) transparent;
+  /* 内层 list 撑满 scroll-wrap 宽度 */
+}
+[data-odn-skill-slot-scroll-wrap] > [data-odn-skill-slot] {
+  width: 100%;
+}
+
 /* ---- variant: menu ---- */
 [data-odn-skill-slot][data-odn-skill-slot-variant=menu] {
   display: flex;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "one-design-next",
-  "version": "0.0.30",
+  "version": "0.0.32",
   "description": "One Design Next from TAD@tencent.com",
   "packageManager": "pnpm@10.33.0",
   "module": "dist/index.js",