shineout 3.9.10-beta.2 → 3.9.10-beta.4

package/cjs/index.js

@@ -522,5 +522,5 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 // 此文件由脚本自动生成，请勿直接修改。
 // This file was generated automatically by a script. Please do not modify it directly.
 var _default = exports.default = {
-  version: '3.9.10-beta.2'
+  version: '3.9.10-beta.4'
 };

package/dist/shineout.js

@@ -12402,7 +12402,7 @@ var handleStyle = function handleStyle(style) {
 };
 /* harmony default export */ var jss_style_handleStyle = (handleStyle);
 ;// CONCATENATED MODULE: ../shineout-style/src/version.ts
-/* harmony default export */ var version = ('3.9.10-beta.2');
+/* harmony default export */ var version = ('3.9.10-beta.4');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -28748,7 +28748,7 @@ var textarea_input = objectSpread2_default()(objectSpread2_default()(objectSprea
     padding: 4,
     color: src.textareaClearColor,
     opacity: 0,
-    '$wrapperWithClear:hover &': {
+    '$wrapperWithClear:hover &, $wrapperWithClear$wrapperFocus &': {
       opacity: 1
     },
     '$wrapperSmall &': {
@@ -28788,7 +28788,14 @@ var textarea_input = objectSpread2_default()(objectSpread2_default()(objectSprea
     '&&$wrapperLarge > $textarea': {
       paddingRight: "calc(".concat(src.textareaLargePaddingX, " + ").concat(src.textareaLargeClearSize, " + 12px)")
     }
-  }
+  },
+  wrapperShowClear: {
+    '& $clear': {
+      display: 'block',
+      opacity: 1
+    }
+  },
+  wrapperHasValue: {}
 });
 /* harmony default export */ var src_textarea_textarea = (textarea_input);
 ;// CONCATENATED MODULE: ../shineout-style/src/textarea/index.ts
@@ -51871,7 +51878,7 @@ var useTextarea = function useTextarea(props) {
 
 
 
-var simple_textarea_excluded = ["jssStyle", "className", "style", "status", "size", "prefix", "suffix", "underline", "autosize", "border", "resize", "onEnterPress", "onStatusChange", "renderTextarea", "limit", "clearable"];
+var simple_textarea_excluded = ["jssStyle", "className", "style", "status", "size", "prefix", "suffix", "underline", "autosize", "border", "resize", "onEnterPress", "onStatusChange", "renderTextarea", "limit", "clearable", "showClear"];
 
 
 
@@ -51900,6 +51907,7 @@ var Textarea = function Textarea(props) {
     renderTextarea = props.renderTextarea,
     limit = props.limit,
     clearable = props.clearable,
+    showClear = props.showClear,
     rest = objectWithoutProperties_default()(props, simple_textarea_excluded);
   var config = useConfig();
   var textareaClasses = jssStyle === null || jssStyle === void 0 || (_jssStyle$textarea = jssStyle.textarea) === null || _jssStyle$textarea === void 0 ? void 0 : _jssStyle$textarea.call(jssStyle);
@@ -51910,7 +51918,8 @@ var Textarea = function Textarea(props) {
     disabled = _useTextarea.disabled;
   var _useContext = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useContext)(FormFieldContext),
     fieldId = _useContext.fieldId;
-  var rootClass = classnames_default()(className, textareaClasses === null || textareaClasses === void 0 ? void 0 : textareaClasses.rootClass, textareaClasses === null || textareaClasses === void 0 ? void 0 : textareaClasses.wrapper, !!focused && (textareaClasses === null || textareaClasses === void 0 ? void 0 : textareaClasses.wrapperFocus), !!disabled && (textareaClasses === null || textareaClasses === void 0 ? void 0 : textareaClasses.wrapperDisabled), status === 'error' && (textareaClasses === null || textareaClasses === void 0 ? void 0 : textareaClasses.wrapperError), size === 'small' && (textareaClasses === null || textareaClasses === void 0 ? void 0 : textareaClasses.wrapperSmall), size === 'large' && (textareaClasses === null || textareaClasses === void 0 ? void 0 : textareaClasses.wrapperLarge), !!underline && (textareaClasses === null || textareaClasses === void 0 ? void 0 : textareaClasses.wrapperUnderline), !border && (textareaClasses === null || textareaClasses === void 0 ? void 0 : textareaClasses.wrapperNoBorder));
+  var showClearFromProp = showClear && !disabled;
+  var rootClass = classnames_default()(className, textareaClasses === null || textareaClasses === void 0 ? void 0 : textareaClasses.rootClass, textareaClasses === null || textareaClasses === void 0 ? void 0 : textareaClasses.wrapper, !!focused && (textareaClasses === null || textareaClasses === void 0 ? void 0 : textareaClasses.wrapperFocus), !!disabled && (textareaClasses === null || textareaClasses === void 0 ? void 0 : textareaClasses.wrapperDisabled), status === 'error' && (textareaClasses === null || textareaClasses === void 0 ? void 0 : textareaClasses.wrapperError), size === 'small' && (textareaClasses === null || textareaClasses === void 0 ? void 0 : textareaClasses.wrapperSmall), size === 'large' && (textareaClasses === null || textareaClasses === void 0 ? void 0 : textareaClasses.wrapperLarge), !!underline && (textareaClasses === null || textareaClasses === void 0 ? void 0 : textareaClasses.wrapperUnderline), !border && (textareaClasses === null || textareaClasses === void 0 ? void 0 : textareaClasses.wrapperNoBorder), showClearFromProp && (textareaClasses === null || textareaClasses === void 0 ? void 0 : textareaClasses.wrapperShowClear));
   var keyHandler = useKeyEvent({
     onEnterPress: function onEnterPress(e) {
       _onEnterPress === null || _onEnterPress === void 0 || _onEnterPress(e.target.value || '', e);
@@ -51948,7 +51957,7 @@ var Textarea = function Textarea(props) {
     });
   }
   var clearEl = null;
-  if (clearable && props.value && !disabled) {
+  if ((showClearFromProp || clearable) && props.value && !disabled) {
     clearEl = /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
       className: textareaClasses === null || textareaClasses === void 0 ? void 0 : textareaClasses.clear,
       onClick: function onClick() {
@@ -52240,7 +52249,7 @@ var textarea_Textarea = function Textarea(props0) {
     rows: 4,
     jssStyle: jssStyle
   }, forwardProps), formatProps), {}, {
-    className: classnames_default()(innerTitleProps.innerTitle && (textareaClasses === null || textareaClasses === void 0 ? void 0 : textareaClasses.wrapperInnerTitle), props.clearable && (textareaClasses === null || textareaClasses === void 0 ? void 0 : textareaClasses.wrapperWithClear), resetProps.className),
+    className: classnames_default()(innerTitleProps.innerTitle && (textareaClasses === null || textareaClasses === void 0 ? void 0 : textareaClasses.wrapperInnerTitle), (props.clearable || props.showClear) && (textareaClasses === null || textareaClasses === void 0 ? void 0 : textareaClasses.wrapperWithClear), resetProps.className),
     renderTextarea: renderTextarea,
     limit: limit,
     status: tipProps.error ? 'error' : status,
@@ -61210,7 +61219,12 @@ function useCollapseAnimation(elementRef, options) {
 
   // 使用 useLayoutEffect 确保动画状态在 DOM 更新前同步设置
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
-    if (!elementRef.current) return;
+    if (!elementRef.current) {
+      // 元素不在 DOM 中（如懒渲染），清除首次渲染标记，
+      // 确保元素出现时状态变化被当作过渡（触发动画）而非初始化。
+      isFirstRenderRef.current = false;
+      return;
+    }
     var el = elementRef.current;
 
     // 如果禁用动画，清除所有样式并返回
@@ -61395,6 +61409,12 @@ var MenuItem = function MenuItem(props) {
     handleMouseEnter = _useMenuItem.handleMouseEnter,
     handleMouseLeave = _useMenuItem.handleMouseLeave;
 
+  // inline 模式懒渲染：跟踪子菜单是否曾被展开过
+  var hasBeenOpened = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)(isOpen);
+  if (isOpen) {
+    hasBeenOpened.current = true;
+  }
+
   // 为 inline 模式添加折叠动画（仅当 inlineAnimate 为 true 时启用）
   var _useCollapseAnimation = useCollapseAnimation(childrenRef, {
       isOpen: isOpen,
@@ -61430,6 +61450,11 @@ var MenuItem = function MenuItem(props) {
         return null;
       }
     }
+
+    // inline 模式懒渲染：未曾展开过的子菜单不渲染 DOM
+    if (!shoudPop && !isOpen && !hasBeenOpened.current) {
+      return null;
+    }
     var content = function content(close) {
       return /*#__PURE__*/(0,jsx_runtime.jsx)("ul", {
         ref: childrenRef,
@@ -61505,7 +61530,7 @@ var MenuItem = function MenuItem(props) {
     }) : null;
     var indent = props.mode === 'inline' && props.level ? /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
       style: {
-        width: props.level * inlineIndent,
+        width: props.level * inlineIndent + (props.frontCaret ? 8 : 0),
         flexShrink: 0
       }
     }) : null;
@@ -61592,6 +61617,7 @@ var MenuItem = function MenuItem(props) {
 
 
 
+
 // import Scroll from './scroll';
 
 
@@ -61625,10 +61651,33 @@ var Menu = function Menu(props) {
     _useState2 = slicedToArray_default()(_useState, 2),
     hasOpen = _useState2[0],
     setHasOpen = _useState2[1];
+
+  // 当使用 active 函数且 openKeys 非受控时，自动展开激活项的父级菜单
+  // eslint-disable-next-line react-hooks/exhaustive-deps
+  var mergedDefaultOpenKeys = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(function () {
+    if (props.openKeys !== undefined || !props.active) return props.defaultOpenKeys;
+    var parentKeys = [];
+    var walk = function walk(items, ancestors) {
+      items.forEach(function (item, index) {
+        var _item$children;
+        var key = getKey(props.keygen, item, index);
+        if (props.active(item)) {
+          parentKeys.push.apply(parentKeys, toConsumableArray_default()(ancestors));
+        }
+        if ((_item$children = item.children) !== null && _item$children !== void 0 && _item$children.length) {
+          walk(item.children, [].concat(toConsumableArray_default()(ancestors), [key]));
+        }
+      });
+    };
+    walk(data, []);
+    if (!parentKeys.length) return props.defaultOpenKeys;
+    var merged = new Set([].concat(toConsumableArray_default()(props.defaultOpenKeys || []), parentKeys));
+    return Array.from(merged);
+  }, []);
   var _useMenu = use_menu({
       data: data,
       active: props.active,
-      defaultOpenKeys: props.defaultOpenKeys,
+      defaultOpenKeys: mergedDefaultOpenKeys,
       openKeys: props.openKeys,
       onOpenChange: props.onOpenChange
     }),
@@ -75519,7 +75568,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.9.10-beta.2'
+  version: '3.9.10-beta.4'
 });
 }();
 /******/ 	return __webpack_exports__;