shineout 3.7.4 → 3.7.5-beta.10

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.7.4'
+  version: '3.7.5-beta.10'
 };

package/dist/shineout.js

@@ -7389,7 +7389,7 @@ var Alert = function Alert(props) {
   if (dismiss === HIDE) {
     return null;
   }
-  if ('title' in props && title !== undefined) {
+  if (title) {
     return /*#__PURE__*/(0,jsx_runtime.jsxs)("div", objectSpread2_default()(objectSpread2_default()({
       className: rootClass
     }, getRootProps()), {}, {
@@ -12234,7 +12234,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.7.4');
+/* harmony default export */ var version = ('3.7.5-beta.10');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -30375,10 +30375,13 @@ var usePopup = function usePopup(props) {
     }
   };
   var handleMouseEnter = use_persist_fn(function (e) {
-    var _targetEvents$onMouse;
+    var _targetEvents$onMouse, _targetRef$current;
     targetEvents === null || targetEvents === void 0 || (_targetEvents$onMouse = targetEvents.onMouseEnter) === null || _targetEvents$onMouse === void 0 || _targetEvents$onMouse.call(targetEvents, e);
     if (trigger !== 'hover') return;
-    handleHoverToggle(true);
+    var isParentContainsCurrent = (_targetRef$current = targetRef.current) === null || _targetRef$current === void 0 ? void 0 : _targetRef$current.contains(e.target);
+    if (isParentContainsCurrent) {
+      handleHoverToggle(true);
+    }
   });
   var handleMouseLeave = use_persist_fn(function (e) {
     var _targetEvents$onMouse2, _popupRef$current2;
@@ -39402,14 +39405,18 @@ var useTree = function useTree(props) {
   var getFlatData = function getFlatData() {
     return context.dataFlat;
   };
-  var updateExpanded = usePersistFn(function (expanded) {
+  var updateExpanded = usePersistFn(function (expanded, ignoreExpanded) {
     var tempExpandMap = new Set(expanded);
     if (!expanded) return;
     if (virtual) {
       expandedFlat(expanded);
     }
-    context.updateMap.forEach(function (update, id) {
-      update('expanded', tempExpandMap.has(id));
+    context.updateMap.forEach(function (call, id) {
+      if (ignoreExpanded) {
+        var nodeStatus = call('get', true);
+        if (nodeStatus && nodeStatus.hasTriggered) return;
+      }
+      call('expanded', tempExpandMap.has(id));
     });
   });
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
@@ -39421,16 +39428,17 @@ var useTree = function useTree(props) {
         }
       });
       onExpand(nextExpanded);
+      updateExpanded(nextExpanded, true);
     }
-  }, [context.dataMap]);
+  }, [context.dataMap, props.data]);
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
     if (props.datum) return;
     if (!dataUpdate) return;
     setData(data);
     var nextExpanded = props.expanded || props.defaultExpanded || [];
-    if (!shallowEqual(nextExpanded, expanded)) {
+    if (!defaultExpandAll && !shallowEqual(nextExpanded, expanded)) {
       onExpand(nextExpanded);
-      updateExpanded(nextExpanded);
+      updateExpanded(nextExpanded, true);
     }
     updateInnerCheckStatus();
   }, [props.data]);
@@ -40062,8 +40070,8 @@ var CascaderNode = function CascaderNode(props) {
     _useState2 = slicedToArray_default()(_useState, 2),
     loading = _useState2[0],
     setLoading = _useState2[1];
-  // const [activeState, setActiveState] = useState(false);
   var checkboxRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)();
+  var hasHandleSelectRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)(false);
   var isDisabled = datum.isDisabled(id);
   var children = data[childrenKey];
   var hasChildren = children && children.length > 0;
@@ -40104,13 +40112,17 @@ var CascaderNode = function CascaderNode(props) {
     }
     if (isHoverAble) {
       events.onMouseEnter = handlePathChange;
-      if (multiple) events.onClick = handleSelect;
+      if (multiple) {
+        events.onClick = handleSelect;
+        hasHandleSelectRef.current = true;
+      }
     } else if (isRealLeafNode && multiple) {
       // 非hover模式下: 末级节点支持整个节点区域点击选中checkbox
       events.onClick = function (e) {
         handleClick(e);
         handleSelect(e);
       };
+      hasHandleSelectRef.current = true;
     }
     return events;
   };
@@ -40166,7 +40178,7 @@ var CascaderNode = function CascaderNode(props) {
         className: styles.optionCheckbox,
         checked: datum.getChecked(id),
         disabled: isDisabled,
-        onChange: isRealLeafNode && multiple ? undefined : handleChange
+        onChange: hasHandleSelectRef.current ? undefined : handleChange
       }), renderContent(), renderIcon()]
     })
   }));
@@ -41089,44 +41101,25 @@ function getResetMore(onFilter, container, doms) {
   var hideMargin = parsePxToNumber(hideElStyle.marginLeft) + parsePxToNumber(hideElStyle.marginRight);
   var num = 0;
   var sumWidth = 0;
-  var itemWidthArr = items.map(function (item) {
-    var itemStyle = getComputedStyle(item);
-    var itemLen = item.offsetWidth + parsePxToNumber(itemStyle.marginLeft) + parsePxToNumber(itemStyle.marginRight);
-    sumWidth += itemLen;
-    return itemLen;
-  });
-  if (sumWidth <= contentWidth) {
-    num = -1;
-  } else {
-    var len = 0;
-    for (var i = 0; i < itemWidthArr.length; i++) {
-      var itemLen = itemWidthArr[i];
-      // number length
-      var resetNum = items.length - 1 - i;
-      var moreWidth = void 0;
-      if (resetNum <= 0) {
-        moreWidth = 0;
-      } else {
-        var reset = "+".concat(resetNum);
-        hideEl.childNodes[0].innerText = reset;
-        // (+num) width
-        moreWidth = hideEl.offsetWidth + hideMargin;
-      }
-      len += itemLen;
-      if (len > contentWidth - moreWidth) {
-        break;
-      }
-      num += 1;
-      if (i === items.length - 1) {
-        // not show more
-        num = -1;
-      }
+  for (var i = 0; i < doms.length; i++) {
+    var _item2 = doms[i];
+    var itemStyle = getComputedStyle(_item2);
+    var itemWidth = _item2.offsetWidth + parsePxToNumber(itemStyle.marginLeft) + parsePxToNumber(itemStyle.marginRight);
+    sumWidth += itemWidth;
+    var moreWidth = 0;
+    var resetNum = items.length - 1 - i;
+    if (resetNum > 0) {
+      var reset = "+".concat(resetNum);
+      hideEl.childNodes[0].innerText = reset;
+      moreWidth = hideEl.offsetWidth + hideMargin;
+    }
+    if (sumWidth > contentWidth - moreWidth) {
+      num = i;
+      break;
     }
+    num = -1;
   }
-  // at least show one
-  if (num === 0 && itemWidthArr[0]) {
-    num = 1;
-  }
+  ;
   return num;
 }
 var More = function More(props) {
@@ -41148,16 +41141,7 @@ var More = function More(props) {
   var shouldShowMore = showNum < 0 || showNum >= data.length;
   var before = [];
   var after = [];
-  var itemsLength = 0;
-  var tagStyle = shouldShowMore ? {
-    position: 'absolute',
-    zIndex: -100,
-    userSelect: 'none',
-    msUserSelect: 'none',
-    contain: 'layout',
-    opacity: 0,
-    pointerEvents: 'none'
-  } : {};
+  var afterLength = 0;
   if (!shouldShowMore) {
     before = new Array(showNum).fill(undefined).map(function (_item, index) {
       return data[index];
@@ -41165,9 +41149,9 @@ var More = function More(props) {
     after = new Array(data.length - showNum).fill(undefined).map(function (_item, index) {
       return data[showNum + index];
     });
-    itemsLength = after.length;
+    afterLength = after.length;
   }
-  if (showNum < 0 || showNum >= data.length) {
+  if (shouldShowMore) {
     return /*#__PURE__*/(0,jsx_runtime.jsxs)((external_root_React_commonjs2_react_commonjs_react_amd_react_default()).Fragment, {
       children: [data, /*#__PURE__*/(0,jsx_runtime.jsx)(src_tag_tag, {
         className: styles.tag,
@@ -41194,10 +41178,9 @@ var More = function More(props) {
         className: styles.tag,
         jssStyle: jssStyle,
         size: size,
-        style: tagStyle,
         mode: visible ? 'fill' : 'bright',
         color: visible ? 'info' : 'default',
-        children: shouldShowMore ? '+' : "+".concat(itemsLength)
+        children: shouldShowMore ? '+' : "+".concat(afterLength)
       }, 'more'), compressed !== 'hide-popover' && /*#__PURE__*/(0,jsx_runtime.jsx)(src_popover_popover, {
         jssStyle: jssStyle,
         className: compressedClassName,
@@ -41295,7 +41278,11 @@ var result_Result = function Result(props) {
     setShouldResetMore = _useState4[1];
   var render = useRender();
   var resultRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)(null);
-  var prevMore = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)(more);
+  var _useRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)({
+      prevMore: more,
+      maxMore: 0
+    }),
+    context = _useRef.current;
   var removeLock = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)(false);
   var showInput = allowOnFilter;
   var mounted = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)(false);
@@ -41498,7 +41485,6 @@ var result_Result = function Result(props) {
     data: result,
     datas: renderMultipleResult.datas,
     size: size,
-    more: moreNumber,
     compressed: compressed,
     renderCompressed: renderCompressed,
     compressedClassName: compressedClassName,
@@ -41528,13 +41514,22 @@ var result_Result = function Result(props) {
     }
     return result;
   };
-  var handleResetMore = function handleResetMore() {
+  var handleResetMore = function handleResetMore(valueLength) {
     if (!compressed) return;
     if (isCompressedBound()) return;
     if (removeLock.current) {
       removeLock.current = false;
       return;
     }
+
+    // 性能优化：当选项数量远超容器承载能力时，跳过昂贵的DOM计算
+    // 在1000+选项时，重新计算会导致INP超过1000ms
+    var hasExistingCompression = context.prevMore > 0;
+    var hasValidEstimate = context.maxMore > 0;
+    var exceedsCapacity = valueLength && valueLength > context.maxMore;
+    if (hasExistingCompression && hasValidEstimate && exceedsCapacity) {
+      return; // 跳过重新计算，保持现有的压缩状态
+    }
     setMore(-1);
     setShouldResetMore(true);
   };
@@ -41591,7 +41586,7 @@ var result_Result = function Result(props) {
     }
   }, [focus, multiple]);
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useLayoutEffect)(function () {
-    handleResetMore();
+    handleResetMore((valueProp === null || valueProp === void 0 ? void 0 : valueProp.length) || 0);
   }, [valueProp, data]);
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
     // datum.getDataByValues(value); 需要等待 useTree useEffect  执行完毕 才能获取到
@@ -41602,7 +41597,7 @@ var result_Result = function Result(props) {
       var tagClassName = ".".concat(styles.tag.split(' ')[0]);
       if (shouldResetMore && result_isArray(value) && (value || []).length) {
         var newMore = getResetMore(showInput, resultRef.current, resultRef.current.querySelectorAll(tagClassName));
-        prevMore.current = newMore;
+        context.prevMore = newMore;
         setMore(newMore);
         setShouldResetMore(false);
       } else {
@@ -41616,6 +41611,7 @@ var result_Result = function Result(props) {
     if (!resultRef.current) return;
     if (!compressed) return;
     if (isCompressedBound()) return;
+    context.maxMore = Math.floor(resultRef.current.clientWidth / 20);
     var cancelObserver = addResizeObserver(resultRef.current, handleResetMore, {
       direction: 'x'
     });
@@ -45261,6 +45257,7 @@ var useDatePickerFormat = function useDatePickerFormat(props) {
         return getFormatValueArr(dateArr, props.formatResult);
       } else if (typeof props.formatResult === 'function') {
         return dateArr.map(function (item) {
+          if (!item) return '';
           return props.formatResult(item);
         });
       } else {
@@ -49032,7 +49029,9 @@ var Item_Item = /*#__PURE__*/function (_React$PureComponent) {
           contentPropsClassName = _ref2$className === void 0 ? '' : _ref2$className,
           contentPropsOnClick = _ref2.onClick,
           otherContentProps = objectWithoutProperties_default()(_ref2, Item_excluded2);
-        var className = classnames_default()(propsClassName, contentPropsClassName);
+        var className = classnames_default()(
+        // 如果content是Tooltip，则不传递className(就是dropdown-item的className)
+        content.type.displayName !== 'ShineoutTooltip' ? propsClassName : '', contentPropsClassName);
         return /*#__PURE__*/(0,external_root_React_commonjs2_react_commonjs_react_amd_react_.cloneElement)(content, Object.assign(otherProps, otherContentProps, {
           className: className,
           onClick: function onClick(e) {
@@ -50823,6 +50822,9 @@ var useForm = function useForm(props) {
         context.names.delete(n);
         delete context.defaultValues[n];
       }
+      if (context.errors[n]) {
+        delete context.errors[n];
+      }
       var finalReserveAble = (_props$reserveAble = props.reserveAble) !== null && _props$reserveAble !== void 0 ? _props$reserveAble : reserveAble;
       if (!finalReserveAble && !context.removeLock) {
         addRemove(n);
@@ -54461,6 +54463,7 @@ var NodeContent = function NodeContent(props) {
     onToggle = props.onToggle,
     onDragOver = props.onDragOver,
     onNodeClick = props.onNodeClick,
+    onTriggered = props.onTriggered,
     actionOnClick = props.actionOnClick;
   var forceUpdate = useRender();
   var _useTreeContext = useTreeContext(),
@@ -54490,6 +54493,7 @@ var NodeContent = function NodeContent(props) {
   };
   var handleNodeExpand = function handleNodeExpand() {
     onToggle === null || onToggle === void 0 || onToggle(id);
+    onTriggered === null || onTriggered === void 0 || onTriggered();
     if (data[childrenKey] !== undefined) return;
     if (loader) {
       setFetching(true);
@@ -54678,6 +54682,18 @@ var useTreeNode = function useTreeNode(props) {
     _useState6 = slicedToArray_default()(_useState5, 2),
     fetching = _useState6[0],
     setFetching = _useState6[1];
+  var _useState7 = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(false),
+    _useState8 = slicedToArray_default()(_useState7, 2),
+    hasTriggered = _useState8[0],
+    setHasTriggered = _useState8[1];
+  var get = function get() {
+    return {
+      hasTriggered: hasTriggered,
+      active: active,
+      expanded: expanded,
+      fetching: fetching
+    };
+  };
   var update = use_persist_fn(function (key, value) {
     switch (key) {
       case 'active':
@@ -54693,9 +54709,14 @@ var useTreeNode = function useTreeNode(props) {
           setFetching(value);
         }
         break;
+      case 'get':
+        return get();
     }
   });
   var handleToggle = function handleToggle() {};
+  var handleTriggered = function handleTriggered() {
+    setHasTriggered(true);
+  };
   var isLeaf = function isLeaf() {
     var children = data[childrenKey];
     if (children && children.length > 0) return false;
@@ -54719,7 +54740,8 @@ var useTreeNode = function useTreeNode(props) {
     isLeaf: isLeaf,
     setFetching: setFetching,
     setExpanded: setExpanded,
-    onToggle: handleToggle
+    onToggle: handleToggle,
+    onTriggered: handleTriggered
   };
 };
 /* harmony default export */ var use_tree_node = (useTreeNode);
@@ -54810,7 +54832,8 @@ var Node = function Node(props) {
     fetching = _useTreeNode.fetching,
     setFetching = _useTreeNode.setFetching,
     expanded = _useTreeNode.expanded,
-    setExpanded = _useTreeNode.setExpanded;
+    setExpanded = _useTreeNode.setExpanded,
+    onTriggered = _useTreeNode.onTriggered;
   var children = data[childrenKey];
   var hasChildren = children && children.length > 0;
   var contentStyle = (jssStyle === null || jssStyle === void 0 ? void 0 : jssStyle.tree()) || {};
@@ -54996,6 +55019,7 @@ var Node = function Node(props) {
       onChange: onChange,
       onFetch: handleFetch,
       onNodeClick: onNodeClick,
+      onTriggered: onTriggered,
       onDragOver: handleDragOver,
       onToggle: handleToggle,
       actionOnClick: actionOnClick
@@ -55161,7 +55185,19 @@ var VirtualNode = function VirtualNode(props) {
     });
     if (onToggle) onToggle(id, nextExpanded);
   };
-  var indent = size === "large" ? 32 : 24;
+  var getIndent = function getIndent() {
+    if (size === "large") {
+      if (line && level === 1) {
+        return 16;
+      }
+      return 32;
+    }
+    if (line && level === 1) {
+      return 8;
+    }
+    return 24;
+  };
+  var indent = getIndent();
   var $indents;
   if (line) {
     $indents = Array.from({
@@ -57462,7 +57498,8 @@ var usePagination = function usePagination(props) {
     return objectSpread2_default()({}, mergedEventHandlers);
   };
   return {
-    current: current,
+    // current,
+    current: currentProp !== undefined ? currentProp : current,
     pageSize: pageSize,
     total: total,
     onChange: handleChange,
@@ -71610,7 +71647,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.7.4'
+  version: '3.7.5-beta.10'
 });
 }();
 /******/ 	return __webpack_exports__;