shineout 3.7.8-beta.4 → 3.7.8-beta.6

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.8-beta.4'
+  version: '3.7.8-beta.6'
 };

package/dist/shineout.js

@@ -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.8-beta.4');
+/* harmony default export */ var version = ('3.7.8-beta.6');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -30411,20 +30411,20 @@ var usePopup = function usePopup(props) {
     }
   };
   var handleMouseEnter = use_persist_fn(function (e) {
-    var _targetEvents$onMouse, _targetRef$current;
+    var _targetEvents$onMouse, _targetRef$current, _popupRef$current2;
     targetEvents === null || targetEvents === void 0 || (_targetEvents$onMouse = targetEvents.onMouseEnter) === null || _targetEvents$onMouse === void 0 || _targetEvents$onMouse.call(targetEvents, e);
     if (trigger !== 'hover') return;
     var isParentContainsCurrent = (_targetRef$current = targetRef.current) === null || _targetRef$current === void 0 ? void 0 : _targetRef$current.contains(e.target);
-    if (isParentContainsCurrent) {
+    if (isParentContainsCurrent || popupRef !== null && popupRef !== void 0 && (_popupRef$current2 = popupRef.current) !== null && _popupRef$current2 !== void 0 && _popupRef$current2.contains(e.target)) {
       handleHoverToggle(true);
     }
   });
   var handleMouseLeave = use_persist_fn(function (e) {
-    var _targetEvents$onMouse2, _popupRef$current2;
+    var _targetEvents$onMouse2, _popupRef$current3;
     targetEvents === null || targetEvents === void 0 || (_targetEvents$onMouse2 = targetEvents.onMouseLeave) === null || _targetEvents$onMouse2 === void 0 || _targetEvents$onMouse2.call(targetEvents, e);
     if (trigger !== 'hover') return;
     // @ts-ignore
-    if (e.relatedTarget instanceof HTMLElement && (_popupRef$current2 = popupRef.current) !== null && _popupRef$current2 !== void 0 && _popupRef$current2.contains(e.relatedTarget)) {
+    if (e.relatedTarget instanceof HTMLElement && (_popupRef$current3 = popupRef.current) !== null && _popupRef$current3 !== void 0 && _popupRef$current3.contains(e.relatedTarget)) {
       return;
     }
     handleHoverToggle(false);
@@ -41392,25 +41392,44 @@ function getResetMore(onFilter, container, doms) {
   var hideMargin = parsePxToNumber(hideElStyle.marginLeft) + parsePxToNumber(hideElStyle.marginRight);
   var num = 0;
   var sumWidth = 0;
-  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;
-    }
+  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;
+      }
+    }
+  }
+  // at least show one
+  if (num === 0 && itemWidthArr[0]) {
+    num = 1;
   }
-  ;
   return num;
 }
 var More = function More(props) {
@@ -71835,7 +71854,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.7.8-beta.4'
+  version: '3.7.8-beta.6'
 });
 }();
 /******/ 	return __webpack_exports__;