shineout 3.7.5-beta.8 → 3.7.5-fix.1

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.5-beta.8'
+  version: '3.7.5-fix.1'
 };

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.5-beta.8');
+/* harmony default export */ var version = ('3.7.5-fix.1');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -17545,6 +17545,9 @@ var cascaderStyle = objectSpread2_default()(objectSpread2_default()({
   },
   compressedWrapper: {
     width: 0,
+    overflow: 'hidden'
+  },
+  compressedBoundWrapper: {
     overflow: 'auto'
   },
   controlMouse: {
@@ -23389,6 +23392,9 @@ var selectStyle = objectSpread2_default()(objectSpread2_default()({
   },
   compressedWrapper: {
     width: 0,
+    overflow: 'hidden'
+  },
+  compressedBoundWrapper: {
     overflow: 'auto'
   },
   controlMouse: {
@@ -28923,6 +28929,9 @@ var treeSelectStyle = objectSpread2_default()(objectSpread2_default()({
   },
   compressedWrapper: {
     width: 0,
+    overflow: 'hidden'
+  },
+  compressedBoundWrapper: {
     overflow: 'auto'
   },
   controlMouse: {
@@ -35538,19 +35547,18 @@ function useInputAble(props) {
   var render = useRender(syncValue);
   var shouldUseState = delay || !control;
   var value = shouldUseState ? stateValue : valuePo;
-  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
-    if (context.timer) {
-      clearTimeout(context.timer);
-      context.timer = null;
-    }
+  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useLayoutEffect)(function () {
     if (delay && control && props.value !== stateValue) {
       changeStateValue(props.value);
+    } else if (context.timer) {
+      clearTimeout(context.timer);
+      context.timer = null;
     }
   }, [props.value, delay, control]);
   var forceDelayChange = use_persist_fn(function () {
-    if (context.timer && context.delayChange) {
+    if (context.delayChange) context.delayChange();
+    if (context.timer) {
       clearTimeout(context.timer);
-      context.delayChange();
       context.timer = null;
       context.delayChange = null;
     }
@@ -40070,8 +40078,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;
@@ -40112,13 +40120,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;
   };
@@ -40174,7 +40186,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()]
     })
   }));
@@ -41097,44 +41109,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) {
@@ -41156,16 +41149,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];
@@ -41173,9 +41157,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,
@@ -41202,10 +41186,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,
@@ -41303,12 +41286,16 @@ 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);
   var styles = props.classes;
-  var rootClass = classnames_default()(styles.resultTextWrapper, compressed && styles.compressedWrapper, multiple && styles.multipleResultWrapper, multiple && compressed && styles.multipleCompressedWrapper);
+  var rootClass = classnames_default()(styles.resultTextWrapper, compressed && styles.compressedWrapper, compressedBound && compressedBound > 0 && styles.compressedBoundWrapper, multiple && styles.multipleResultWrapper, multiple && compressed && styles.multipleCompressedWrapper);
   var renderResultContent = function renderResultContent(data, index, nodes) {
     if (checkUnMatched(data)) {
       var _data = data;
@@ -41506,7 +41493,6 @@ var result_Result = function Result(props) {
     data: result,
     datas: renderMultipleResult.datas,
     size: size,
-    more: moreNumber,
     compressed: compressed,
     renderCompressed: renderCompressed,
     compressedClassName: compressedClassName,
@@ -41536,15 +41522,27 @@ 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;
     }
-    setMore(-1);
-    setShouldResetMore(true);
+
+    // why requestIdleCallback: 当选项数量远超容器承载能力时，延迟昂贵的DOM计算，在1000+选项时，同步的重新计算会导致INP超过1000ms
+    var hasExistingCompression = context.prevMore > 0;
+    var hasValidEstimate = context.maxMore > 0;
+    var exceedsCapacity = valueLength && valueLength > context.maxMore;
+    if (hasExistingCompression && hasValidEstimate && exceedsCapacity && typeof requestIdleCallback !== 'undefined') {
+      requestIdleCallback(function () {
+        setMore(-1);
+        setShouldResetMore(true);
+      });
+    } else {
+      setMore(-1);
+      setShouldResetMore(true);
+    }
   };
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
     if (!focus && mounted.current) {
@@ -41599,7 +41597,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  执行完毕 才能获取到
@@ -41610,7 +41608,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 {
@@ -41624,6 +41622,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'
     });
@@ -71659,7 +71658,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.7.5-beta.8'
+  version: '3.7.5-fix.1'
 });
 }();
 /******/ 	return __webpack_exports__;