shineout 3.8.0-beta.18 → 3.8.0-beta.19

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.8.0-beta.18'
+  version: '3.8.0-beta.19'
 };

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.8.0-beta.18');
+/* harmony default export */ var version = ('3.8.0-beta.19');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -24084,7 +24084,6 @@ var selectStyle = objectSpread2_default()(objectSpread2_default()({
     height: 32,
     padding: "".concat(src.selectHeaderPaddingY, " ").concat(src.selectHeaderPaddingX),
     borderBottom: "1px solid ".concat(src.selectHeaderBorderColor),
-    marginBottom: 4,
     '& $columnsCheckbox': {
       marginRight: 0,
       marginLeft: 4,
@@ -31203,6 +31202,23 @@ var getCurrentCSSZoom = function getCurrentCSSZoom() {
 //     height: rect.height * zoomRatio,
 //   }
 // }
+
+var getScrollPosition = function getScrollPosition(element) {
+  if (!element) return {
+    scrollTop: 0,
+    scrollLeft: 0
+  };
+  if (element === document.documentElement || element === document.body) {
+    return {
+      scrollTop: document.documentElement.scrollTop || document.body.scrollTop,
+      scrollLeft: document.documentElement.scrollLeft || document.body.scrollLeft
+    };
+  }
+  return {
+    scrollTop: element.scrollTop,
+    scrollLeft: element.scrollLeft
+  };
+};
 ;// CONCATENATED MODULE: ../hooks/src/common/use-position-style/index.ts
 
 
@@ -31459,17 +31475,18 @@ var usePositionStyle = function usePositionStyle(config) {
     };
   };
   var getAbsoluteStyle = function getAbsoluteStyle(position) {
-    var _scrollElRef$current, _scrollElRef$current2, _scrollElRef$current3;
+    var _scrollElRef$current;
     if (!parentElRef.current) return {
       style: hideStyle
     };
     var rect = context.parentRect;
     var needCheck = !show || !shallow_equal(context.prevParentPosition, parentElNewPosition);
-    var scrollTop = (scrollElRef === null || scrollElRef === void 0 || (_scrollElRef$current = scrollElRef.current) === null || _scrollElRef$current === void 0 ? void 0 : _scrollElRef$current.scrollTop) || 0;
-    var scrollLeft = (scrollElRef === null || scrollElRef === void 0 || (_scrollElRef$current2 = scrollElRef.current) === null || _scrollElRef$current2 === void 0 ? void 0 : _scrollElRef$current2.scrollLeft) || 0;
-    if (needCheck && scrollElRef !== null && scrollElRef !== void 0 && scrollElRef.current && (_scrollElRef$current3 = scrollElRef.current) !== null && _scrollElRef$current3 !== void 0 && _scrollElRef$current3.contains(parentElRef.current)) {
-      var _scrollElRef$current4;
-      var visibleRect = ((_scrollElRef$current4 = scrollElRef.current) === null || _scrollElRef$current4 === void 0 ? void 0 : _scrollElRef$current4.getBoundingClientRect()) || {};
+    var _getScrollPosition = getScrollPosition(scrollElRef === null || scrollElRef === void 0 ? void 0 : scrollElRef.current),
+      scrollTop = _getScrollPosition.scrollTop,
+      scrollLeft = _getScrollPosition.scrollLeft;
+    if (needCheck && scrollElRef !== null && scrollElRef !== void 0 && scrollElRef.current && (_scrollElRef$current = scrollElRef.current) !== null && _scrollElRef$current !== void 0 && _scrollElRef$current.contains(parentElRef.current)) {
+      var _scrollElRef$current2;
+      var visibleRect = ((_scrollElRef$current2 = scrollElRef.current) === null || _scrollElRef$current2 === void 0 ? void 0 : _scrollElRef$current2.getBoundingClientRect()) || {};
       if (rect.bottom < visibleRect.top || rect.top > visibleRect.bottom + scrollTop || rect.right < visibleRect.left || rect.left > visibleRect.right + scrollLeft) {
         return {
           style: hideStyle
@@ -31543,7 +31560,9 @@ var usePositionStyle = function usePositionStyle(config) {
     }
 
     // 当父元素的滚动容器滚动时，判断是否需要更新弹出层位置，包括是否隐藏弹出层（通过hideStyle隐藏，不是show状态）
-    context.prevParentPosition = parentElNewPosition;
+    if (show) {
+      context.prevParentPosition = parentElNewPosition;
+    }
   });
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(updateStyle, [show, position, absolute, updateKey, fixedWidth, parentElNewPosition, popupElSize]);
   return {
@@ -39739,8 +39758,8 @@ var useTree = function useTree(props) {
     var _context$value;
     if (mode !== MODE.MODE_0) return;
     (_context$value = context.value) === null || _context$value === void 0 || _context$value.forEach(function (id) {
-      var _ref3 = context.pathMap.get(id),
-        children = _ref3.children;
+      var node = context.pathMap.get(id);
+      var children = node === null || node === void 0 ? void 0 : node.children;
       if (children && children.length) {
         var noCheckedChildren = children.filter(function (cid) {
           var _context$value2;
@@ -40225,7 +40244,8 @@ var VirtualList = function VirtualList(props) {
       preIndex: null,
       topTimer: null,
       rateTimer: null,
-      shouldUpdateHeight: true
+      shouldUpdateHeight: true,
+      prevWrapperRefHeight: 0
     }),
     context = _useRef.current;
   var getContentHeight = function getContentHeight(index) {
@@ -40385,11 +40405,14 @@ var VirtualList = function VirtualList(props) {
     context.preIndex = startIndex;
   }, [startIndex]);
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useLayoutEffect)(function () {
-    if (keepScrollHeight) return;
+    var _wrapperRef$current2;
+    var currentWrapperRefHeight = ((_wrapperRef$current2 = wrapperRef.current) === null || _wrapperRef$current2 === void 0 ? void 0 : _wrapperRef$current2.clientHeight) || 0;
+    if (keepScrollHeight && currentWrapperRefHeight === context.prevWrapperRefHeight) return;
     if (keepScrollTop) return;
     // 数据变化的时候清空掉 preIndex, 如果之前有缓存的index, setRowHeight 会有问题
     setTop(0);
     setStartIndex(0);
+    context.prevWrapperRefHeight = currentWrapperRefHeight;
     return function () {
       context.preIndex = null;
     };
@@ -41559,25 +41582,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) {
@@ -51035,7 +51077,7 @@ var useForm = function useForm(props) {
     var _props$onChange;
     var newValue = typeof change === 'function' ? utils_immer_produce(context.value, change) : change;
     context.value = newValue;
-    (_props$onChange = props.onChange) === null || _props$onChange === void 0 || _props$onChange.call(props, deepClone(context.value));
+    (_props$onChange = props.onChange) === null || _props$onChange === void 0 || _props$onChange.call(props, newValue);
   });
   var scrollToField = use_persist_fn(function (name) {
     var _document;
@@ -55578,7 +55620,8 @@ var VirtualNode = function VirtualNode(props) {
     className: rootClass,
     dir: config.direction,
     style: {
-      paddingLeft: level * indent
+      paddingLeft: level * indent,
+      height: props.lineHeight
     },
     children: [$indents, /*#__PURE__*/(0,jsx_runtime.jsx)(tree_content, {
       virtual: true,
@@ -55862,7 +55905,8 @@ var TreeVirtual = function TreeVirtual(props) {
       onNodeClick: onNodeClick,
       onToggle: onToggle,
       onChange: onChange,
-      size: datum.size
+      size: datum.size,
+      lineHeight: lineHeight
     }, id);
   };
   return /*#__PURE__*/(0,jsx_runtime.jsx)(virtual_scroll_list, {
@@ -56545,7 +56589,8 @@ var ColumnsList = function ColumnsList(props) {
       colNum: columns,
       lineHeight: lineHeight,
       rowsInView: itemsInView,
-      renderItem: renderItem
+      renderItem: renderItem,
+      paddingY: 4
     });
   };
   var renderSelectAll = function renderSelectAll() {
@@ -56953,7 +56998,8 @@ function Select(props0) {
     if (hideCreate) {
       // optionListRef.current?.hoverMove(filterData.length - 1, true);
     }
-    onFilter === null || onFilter === void 0 || onFilter(trim ? text.trim() : text, from);
+    // onFilter?.(trim ? text.trim() : text, from);
+    onFilter === null || onFilter === void 0 || onFilter(text.trim(), from);
   };
   var handleOptionClick = function handleOptionClick() {
     if (multiple) return;
@@ -72193,7 +72239,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.8.0-beta.18'
+  version: '3.8.0-beta.19'
 });
 }();
 /******/ 	return __webpack_exports__;