shineout 3.7.1-beta.2 → 3.7.1-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.7.1-beta.2'
+  version: '3.7.1-beta.4'
 };

package/dist/shineout.js

@@ -12227,7 +12227,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.1-beta.2');
+/* harmony default export */ var version = ('3.7.1-beta.4');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -16212,7 +16212,7 @@ var ButtonStyle = {
         borderBottomRightRadius: "calc(".concat(src.buttonBorderRadius, " - 1px)")
       }
     },
-    '[data-soui-role="input-group-seperate"] > &': {
+    '[data-soui-role="input-group-separate"] > &': {
       borderRadius: 0,
       marginLeft: -1,
       '&:first-child': {
@@ -17121,13 +17121,13 @@ var useCarouselStyle = styled(carousel_carousel, 'carousel');
     '[data-soui-role="input-group"] [data-soui-input-border] + &&&': {
       borderLeftWidth: '1px'
     },
-    '[data-soui-role="input-group-seperate"] &&&, [data-soui-role="input-group-seperate"] &&&:hover': {
+    '[data-soui-role="input-group-separate"] &&&, [data-soui-role="input-group-separate"] &&&:hover': {
       borderRadius: 0,
       flexShrink: 0,
       width: 'auto',
       'margin-left': "-1px",
       '&:hover': {
-        zIndex: 1050
+        zIndex: 7
       },
       '&:first-child': {
         marginLeft: 0,
@@ -17139,7 +17139,7 @@ var useCarouselStyle = styled(carousel_carousel, 'carousel');
         borderBottomRightRadius: token.borderRadius
       }
     },
-    '[dir=rtl][data-soui-role="input-group-seperate"] &&&, [dir=rtl][data-soui-role="input-group-seperate"] &&&:hover': {
+    '[dir=rtl][data-soui-role="input-group-separate"] &&&, [dir=rtl][data-soui-role="input-group-separate"] &&&:hover': {
       '&:first-child': {
         borderRadius: "0 ".concat(token.borderRadius, " ").concat(token.borderRadius, " 0")
       },
@@ -17187,10 +17187,10 @@ var useCarouselStyle = styled(carousel_carousel, 'carousel');
     borderColor: token.focusBorderColor,
     boxShadow: "0 0 0 2px ".concat(token.focusShadow),
     background: token.focusBackgroundColor,
-    '&[data-soui-role="input-group-seperate"]': {
+    '&[data-soui-role="input-group-separate"]': {
       boxShadow: 'none'
     },
-    '[data-soui-role="input-group-seperate"] &': {
+    '[data-soui-role="input-group-separate"] &': {
       zIndex: 1
     },
     '&:hover': {
@@ -17207,7 +17207,7 @@ var useCarouselStyle = styled(carousel_carousel, 'carousel');
     boxShadow: "0 0 0 2px ".concat(token.errorFocusShadow),
     borderColor: token.errorFocusBorderColor,
     background: token.errorFocusBackgroundColor
-    // '[data-soui-role="input-group-seperate"]&': {
+    // '[data-soui-role="input-group-separate"]&': {
     //   boxShadow: 'none',
     // }
   })), "".concat(name, "Disabled"), {
@@ -20418,7 +20418,7 @@ var groupSpace = function groupSpace(gap) {
     '& > i:last-child, & > span:last-child': {
       paddingRight: gap
     },
-    '[data-soui-role="input-group-seperate"]&': {
+    '[data-soui-role="input-group-separate"]&, [data-soui-role="input-group-seperate"]&': {
       '& > b:first-child': {
         marginLeft: 0,
         borderLeft: "1px solid ".concat(src.inputBorderColor)
@@ -20475,7 +20475,7 @@ var input_input = objectSpread2_default()(objectSpread2_default()(objectSpread2_
     alignItems: 'center',
     position: 'relative'
   }, input_wrapper), {}, {
-    '[data-soui-role="input-group-seperate"] &': {
+    '[data-soui-role="input-group-separate"] &, [data-soui-role="input-group-seperate"] &': {
       flex: 1,
       minWidth: 0
     }
@@ -20566,7 +20566,7 @@ var input_input = objectSpread2_default()(objectSpread2_default()(objectSpread2_
       background: 'transparent'
     }
   }, groupSpace(src.inputPaddingX)),
-  groupSeperate: {
+  groupSeparate: {
     border: 'none',
     '& > b': {
       border: "1px solid ".concat(src.inputBorderColor),
@@ -30802,7 +30802,7 @@ var useCheckElementSize = function useCheckElementSize(targetElementRef) {
         width: rect.width,
         height: rect.height
       };
-      if (newSize.width !== lastSize.current.width || newSize.height !== lastSize.current.height) {
+      if (newSize.width !== lastSize.current.width || newSize.height !== lastSize.current.height && newSize.height !== 0) {
         setSize(newSize);
         lastSize.current = newSize;
       }
@@ -31253,7 +31253,7 @@ var usePositionStyle = function usePositionStyle(config) {
     // 当父元素的滚动容器滚动时，判断是否需要更新弹出层位置，包括是否隐藏弹出层（通过hideStyle隐藏，不是show状态）
     context.prevParentPosition = parentElNewPosition;
   });
-  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(updateStyle, [show, position, absolute, updateKey, fixedWidth, parentElNewPosition, popupElSize === null || popupElSize === void 0 ? void 0 : popupElSize.width]);
+  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(updateStyle, [show, position, absolute, updateKey, fixedWidth, parentElNewPosition, popupElSize]);
   return {
     style: style
   };
@@ -39355,9 +39355,7 @@ var Scroll = function Scroll(props) {
     _props$scrollWidth = props.scrollWidth,
     scrollWidth = _props$scrollWidth === void 0 ? 0 : _props$scrollWidth,
     _props$defaultHeight = props.defaultHeight,
-    defaultHeight = _props$defaultHeight === void 0 ? 0 : _props$defaultHeight,
-    _props$keepScrollTop = props.keepScrollTop,
-    keepScrollTop = _props$keepScrollTop === void 0 ? false : _props$keepScrollTop;
+    defaultHeight = _props$defaultHeight === void 0 ? 0 : _props$defaultHeight;
   var _useResize = useResize({
       targetRef: containerRef,
       timer: 100
@@ -39382,7 +39380,6 @@ var Scroll = function Scroll(props) {
 
   // 当滚动容器的高度为 0 时，paddingTop 为 0，避免滚动条抖动现象
   var paddingTop = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(function () {
-    if (keepScrollTop) return Math.max(0, Math.floor(scrollHeight - height));
     return height === 0 ? 0 : Math.max(0, Math.floor(scrollHeight - height));
   }, [scrollHeight, height]);
   var placeStyle = {
@@ -39496,7 +39493,6 @@ var VirtualList = function VirtualList(props) {
     className = props.className,
     lineHeight = props.lineHeight,
     height = props.height,
-    keepScrollTop = props.keepScrollTop,
     keepScrollHeight = props.keepScrollHeight,
     renderItem = props.renderItem,
     customRenderItem = props.customRenderItem,
@@ -39663,7 +39659,6 @@ var VirtualList = function VirtualList(props) {
       style: nextStyle,
       height: height,
       scrollWidth: 0,
-      keepScrollTop: keepScrollTop,
       scrollerStyle: scrollerStyle,
       scrollHeight: scrollHeight,
       childrenStyle: {
@@ -39693,9 +39688,8 @@ var VirtualList = function VirtualList(props) {
     context.preIndex = startIndex;
   }, [startIndex]);
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useLayoutEffect)(function () {
-    // 数据变化的时候清空掉 preIndex, 如果之前有缓存的index, setRowHeight 会有问题
-    if (keepScrollTop) return;
     if (keepScrollHeight) return;
+    // 数据变化的时候清空掉 preIndex, 如果之前有缓存的index, setRowHeight 会有问题
     setTop(0);
     setStartIndex(0);
     return function () {
@@ -53027,10 +53021,12 @@ var input_input_Input = function Input(props) {
     className = props.className,
     width = props.width,
     style = props.style,
-    seperate = props.seperate;
-  var rootClass = classnames_default()(className, inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.group, seperate && (inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.groupSeperate), size === 'small' && (inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.groupSmall), size === 'large' && (inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.groupLarge), !!disabled && (inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.groupDisabled), !!focus && (inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.groupFocus), (status === 'error' || error) && (inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.groupError));
+    seperate = props.seperate,
+    separate = props.separate;
+  var shouldSeparate = separate !== null && separate !== void 0 ? separate : seperate;
+  var rootClass = classnames_default()(className, inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.group, shouldSeparate && (inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.groupSeparate), size === 'small' && (inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.groupSmall), size === 'large' && (inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.groupLarge), !!disabled && (inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.groupDisabled), !!focus && (inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.groupFocus), (status === 'error' || error) && (inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.groupError));
   return /*#__PURE__*/(0,jsx_runtime.jsx)("div", objectSpread2_default()(objectSpread2_default()({}, getDataAttribute({
-    role: seperate ? 'input-group-seperate' : 'input-group'
+    role: shouldSeparate ? 'input-group-separate' : 'input-group'
   })), {}, {
     className: rootClass,
     style: objectSpread2_default()({
@@ -53873,7 +53869,6 @@ var list_List = function List(props) {
     controlType = props.controlType,
     hideCreateOption = props.hideCreateOption,
     optionListRef = props.optionListRef,
-    keepScrollTop = props.keepScrollTop,
     isAnimationFinish = props.isAnimationFinish,
     _props$renderItem = props.renderItem,
     renderItemProp = _props$renderItem === void 0 ? function (d) {
@@ -54041,7 +54036,6 @@ var list_List = function List(props) {
     return /*#__PURE__*/(0,jsx_runtime.jsx)(virtual_scroll_list, {
       virtualRef: virtualRef,
       data: data,
-      keepScrollTop: keepScrollTop,
       keygen: keygen,
       tag: 'ul',
       groupKey: groupKey,
@@ -56451,7 +56445,6 @@ function Select(props0) {
       renderItem: renderItem,
       controlType: controlType,
       onLoadMore: onLoadMore,
-      keepScrollTop: !!filterText ? false : true,
       isAnimationFinish: isAnimationFinish,
       threshold: threshold,
       onControlTypeChange: setControlType,
@@ -66977,7 +66970,7 @@ var TreeSelect = function TreeSelect(props0) {
     positionProp = _props$position === void 0 ? dfp : _props$position,
     openProp = props.open,
     onCollapseProp = props.onCollapse,
-    disabled = props.disabled,
+    disabledProp = props.disabled,
     style = props.style,
     width = props.width,
     _props$height = props.height,
@@ -67023,6 +67016,7 @@ var TreeSelect = function TreeSelect(props0) {
     width: width
   }, style);
   var showInput = isFunc(props.onAdvancedFilter || onFilterProp);
+  var disabled = isOptionalDisabled(disabledProp) ? disabledProp.disabled : disabledProp;
   var blurEvent = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)();
   var inputRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)();
   var _useRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)({
@@ -67108,7 +67102,7 @@ var TreeSelect = function TreeSelect(props0) {
       unmatch: unmatch,
       tiledData: tiledData,
       virtual: virtual,
-      disabled: disabled,
+      disabled: props.disabled,
       active: multiple ? undefined : value[0],
       childrenKey: childrenKey,
       keygen: keygen,
@@ -67525,7 +67519,7 @@ var TreeSelect = function TreeSelect(props0) {
         expanded: virtual ? virtualExpanded : controlExpanded || unControlExpanded,
         defaultExpandAll: defaultExpandAll,
         expandIcons: tiledExpandIcons,
-        disabled: disabled,
+        disabled: props.disabled,
         parentClickExpand: parentClickExpand,
         contentClass: getContentClass,
         datum: datum,
@@ -71316,7 +71310,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.7.1-beta.2'
+  version: '3.7.1-beta.4'
 });
 }();
 /******/ 	return __webpack_exports__;