shineout 3.1.14 → 3.1.15

package/cjs/index.js

@@ -476,5 +476,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.1.14'
+  version: '3.1.15'
 };

package/dist/shineout.js

@@ -11949,7 +11949,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.1.14');
+/* harmony default export */ var version = ('3.1.15');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -15504,7 +15504,9 @@ var cardStyle = {
   headerContent: objectSpread2_default()(objectSpread2_default()({}, headerCommon), {}, {
     flex: 1
   }),
-  simpleHeader: objectSpread2_default()({}, headerCommon),
+  simpleHeader: objectSpread2_default()(objectSpread2_default()({}, headerCommon), {}, {
+    display: 'block'
+  }),
   center: {
     textAlign: 'center'
   },
@@ -23454,10 +23456,10 @@ var tableStyle = objectSpread2_default()(objectSpread2_default()({}, globalStyle
             background: src.tableCellBorderColor,
             borderLeft: "1px solid ".concat(src.tableCellBorderColor)
           },
-          '&[dir=ltr]::after': {
+          '[dir=ltr]&::after': {
             right: 0
           },
-          '&[dir=rtl]::after': {
+          '[dir=rtl]&::after': {
             left: 0
           }
         }
@@ -30184,11 +30186,12 @@ var CardHeader = function CardHeader(props) {
       })
     });
   };
-  var headerContentClassName = classnames_default()(cardClasses === null || cardClasses === void 0 ? void 0 : cardClasses.headerContent, align === 'center' && (cardClasses === null || cardClasses === void 0 ? void 0 : cardClasses.center), align === 'right' && (cardClasses === null || cardClasses === void 0 ? void 0 : cardClasses.right));
+  var alignClass = classnames_default()(align === 'center' && (cardClasses === null || cardClasses === void 0 ? void 0 : cardClasses.center), align === 'right' && (cardClasses === null || cardClasses === void 0 ? void 0 : cardClasses.right));
+  var headerContentClassName = classnames_default()(cardClasses === null || cardClasses === void 0 ? void 0 : cardClasses.headerContent, alignClass);
   if (!props.extra && !collapsible) {
+    var simpleHeaderClassName = classnames_default()(cardClasses === null || cardClasses === void 0 ? void 0 : cardClasses.header, cardClasses === null || cardClasses === void 0 ? void 0 : cardClasses.simpleHeader, alignClass, props.className);
     return /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
-      className: classnames_default()(cardClasses === null || cardClasses === void 0 ? void 0 : cardClasses.header, cardClasses === null || cardClasses === void 0 ? void 0 : cardClasses.simpleHeader, props.className),
-      style: props.style,
+      className: simpleHeaderClassName,
       children: props.children
     });
   }
@@ -35997,8 +36000,8 @@ var result_Result = function Result(props) {
   var handleResetMore = function handleResetMore() {
     if (!compressed) return;
     if (isCompressedBound()) return;
-    setMore(-1);
     setShouldResetMore(true);
+    setMore(-1);
   };
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
     if (!focus && mounted.current) {
@@ -36009,11 +36012,11 @@ var result_Result = function Result(props) {
     }
     mounted.current = true;
   }, [focus]);
-  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
+  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useLayoutEffect)(function () {
     setTimeout(handleResetMore);
   }, [valueProp, data]);
-  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
-    if (shouldResetMore && more === -1 && compressed && resultRef.current && (props.value || [].length)) {
+  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useLayoutEffect)(function () {
+    if (shouldResetMore && more === -1 && compressed && resultRef.current && (props.value || []).length) {
       var tagClassName = ".".concat(styles.tag.split(' ')[0]);
       if (shouldResetMore && result_isArray(value) && (value || []).length) {
         var newMore = getResetMore(showInput, resultRef.current, resultRef.current.querySelectorAll(tagClassName));
@@ -46722,7 +46725,7 @@ var Scroll = function Scroll(props) {
     position: 'sticky'
   }, isRtl ? 'right' : 'left', 0), "top", 0);
   var placeStyle = defineProperty_default()(defineProperty_default()(defineProperty_default()(defineProperty_default()({
-    marginTop: Math.max(0, Math.floor(scrollHeight - height))
+    marginTop: height > 0 && scrollHeight > 0 ? Math.max(0, Math.floor(scrollHeight - height)) : 0
   }, "margin".concat(isRtl ? 'Left' : 'Right'), scrollWidth), "height", 0), "width", 0), "overflow", 'hidden');
   var handleScroll = usePersistFn(function (e) {
     var target = e.currentTarget;
@@ -48931,16 +48934,6 @@ function Select(props0) {
     }),
     groupData = _useGroup.data,
     groupKey = _useGroup.groupKey;
-
-  // const triggerOpen = usePersistFn(() => {
-  //   if (disabled === true) return;
-  //   if (open) {
-  //     closePop();
-  //   } else {
-  //     openPop();
-  //   }
-  // });
-
   var focusAndOpen = function focusAndOpen() {
     if (!focused) {
       var _inputRef$current2;
@@ -49347,7 +49340,7 @@ function Select(props0) {
     children: [tipNode, renderResult(), /*#__PURE__*/(0,jsx_runtime.jsx)(absolute_list, {
       adjust: true,
       focus: open,
-      fixedWidth: autoAdapt ? 'min' : true,
+      fixedWidth: !props.columns && (autoAdapt ? 'min' : true),
       absolute: props.absolute,
       zIndex: props.zIndex,
       position: position,
@@ -53269,6 +53262,7 @@ StepsComp.Step = StepsStep;
 var sticky_cssSupport = cssSupport;
 var supportSticky = sticky_cssSupport('position', 'sticky');
 var defaultZIndex = 900;
+var events = ['scroll', 'pageshow', 'load', 'resize'];
 
 // const getFirstScrollParent = (el: HTMLElement) => {
 //   let parent = el.parentNode as HTMLElement;
@@ -53287,7 +53281,6 @@ var defaultZIndex = 900;
 // };
 
 var Sticky = function Sticky(props) {
-  var _props$style;
   var children = props.children,
     top = props.top,
     bottom = props.bottom;
@@ -53297,7 +53290,8 @@ var Sticky = function Sticky(props) {
       div: null,
       observer: null,
       parentObserver: null,
-      isTop: false
+      isTop: false,
+      bodyObserver: null
     }),
     context = _useRef.current;
   var _useState = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)({}),
@@ -53314,10 +53308,6 @@ var Sticky = function Sticky(props) {
     setParentVisible = _useState6[1];
   var forceRender = useRender();
   var elementRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)(null);
-  var elementSize = useResize({
-    targetRef: elementRef,
-    timer: 0
-  });
   var getTarget = function getTarget() {
     var scrollContainer = props.scrollContainer;
     if (typeof scrollContainer === 'string') {
@@ -53327,11 +53317,10 @@ var Sticky = function Sticky(props) {
     if (scrollContainer && scrollContainer.nodeType === 1) {
       return scrollContainer;
     }
-    return document.body;
+    return null;
   };
   var updateStyle = usePersistFn(function () {
     if (context.div && !context.isTop && show) {
-      var shouldFixed = context.target === document.body;
       var scrollRect = context.target.getBoundingClientRect();
       var targetRect = elementRef.current.getBoundingClientRect();
       var targetLeft = targetRect.left;
@@ -53340,7 +53329,7 @@ var Sticky = function Sticky(props) {
       if (typeof bottom === 'number') {
         var outRootRect = context.target.getBoundingClientRect();
         var _style = {
-          position: shouldFixed ? 'fixed' : 'absolute',
+          position: 'absolute',
           width: "".concat(width, "px"),
           height: "".concat(height, "px"),
           top: "".concat(scrollRect.bottom - (props.bottom || 0) - outRootRect.top, "px"),
@@ -53351,19 +53340,13 @@ var Sticky = function Sticky(props) {
       }
     }
   });
-  var handlePosition = usePersistFn(function (entries) {
+  var handleTargetPosition = usePersistFn(function (entries) {
     var entry = entries[0];
     var scrollRect = entry.rootBounds;
     var targetRect = entry.boundingClientRect;
-    var shouldFixed = context.target === document.body;
     if (!entry.isIntersecting) {
       var targetLeft = targetRect.left;
-      var outRootRect = shouldFixed ? {
-        top: 0,
-        bottom: 0,
-        left: 0,
-        right: 0
-      } : context.div.getBoundingClientRect();
+      var outRootRect = context.div.getBoundingClientRect();
       var width = targetRect.width,
         height = targetRect.height;
       if (scrollRect && targetRect.bottom < scrollRect.bottom) {
@@ -53372,7 +53355,7 @@ var Sticky = function Sticky(props) {
         if (typeof top === 'number') {
           setShow(true);
           var _style2 = {
-            position: shouldFixed ? 'fixed' : 'absolute',
+            position: 'absolute',
             width: "".concat(width, "px"),
             height: "".concat(height, "px"),
             top: "".concat(scrollRect.top - outRootRect.top, "px"),
@@ -53387,7 +53370,7 @@ var Sticky = function Sticky(props) {
           setShow(true);
           var _outRootRect = context.target.getBoundingClientRect();
           var _style3 = {
-            position: shouldFixed ? 'fixed' : 'absolute',
+            position: 'absolute',
             width: "".concat(width, "px"),
             height: "".concat(height, "px"),
             top: "".concat(scrollRect.bottom - _outRootRect.top, "px"),
@@ -53410,7 +53393,58 @@ var Sticky = function Sticky(props) {
       setParentVisible(false);
     }
   });
-  var cleanEvents = function cleanEvents() {
+  var handleFixedPosition = usePersistFn(function () {
+    var element = elementRef.current;
+    if (!element) return;
+    var selfRect = element.getBoundingClientRect();
+    if (selfRect === null) return;
+    // If the element is hidden, the width and height will be 0
+    if (selfRect && selfRect.width === 0 && selfRect.height === 0) return;
+    // const { marginBottom, marginTop } = getComputedStyle(element);
+    // selfRect.height += parseFloat(marginBottom) + parseFloat(marginTop);
+    var scrollElement = document.body;
+    var scrollRect = scrollElement.getBoundingClientRect();
+    var top = props.top,
+      bottom = props.bottom;
+    if (top !== undefined && Math.ceil(selfRect.top) <= top) {
+      setShow(true);
+      setStyle({
+        position: 'fixed',
+        top: top,
+        left: "".concat(selfRect.left, "px"),
+        width: "".concat(selfRect.width, "px")
+      });
+      return;
+    } else if (bottom !== undefined && Math.ceil(selfRect.bottom) + bottom > scrollRect.bottom) {
+      setShow(true);
+      setStyle({
+        position: 'fixed',
+        bottom: bottom,
+        left: "".concat(selfRect.left, "px"),
+        width: "".concat(selfRect.width, "px")
+      });
+      return;
+    } else {
+      setShow(false);
+    }
+  });
+  var elementSize = useResize({
+    targetRef: elementRef,
+    timer: 0,
+    cb: handleFixedPosition
+  });
+  var createBodyObserver = function createBodyObserver() {
+    if (context.bodyObserver) {
+      context.bodyObserver.disconnect();
+    }
+    context.bodyObserver = new IntersectionObserver(handleFixedPosition, {
+      root: null,
+      rootMargin: "-".concat(top || 0, "px 0px -").concat(bottom || 0, "px 0px"),
+      threshold: 1.0
+    });
+    context.bodyObserver.observe(elementRef.current);
+  };
+  var cancelObserver = function cancelObserver() {
     if (context.observer) {
       context.observer.disconnect();
       context.observer = null;
@@ -53419,18 +53453,15 @@ var Sticky = function Sticky(props) {
       context.parentObserver.disconnect();
       context.parentObserver = null;
     }
-    window.removeEventListener('resize', updateStyle);
   };
-  var createObserver = function createObserver() {
-    var target = getTarget();
-    if (!context.div && target !== document.body) {
+  var createObserver = function createObserver(target) {
+    if (!context.div) {
       context.div = document.createElement('div');
       context.div.style.position = 'relative';
     }
-    if (target && target !== context.target) {
+    if (target) {
       forceRender();
-      context.target = target;
-      cleanEvents();
+      cancelObserver();
       if (context.div) {
         // append div
         if (target === document.body) {
@@ -53448,7 +53479,7 @@ var Sticky = function Sticky(props) {
         }
       }
       if (window.IntersectionObserver) {
-        var observer = new IntersectionObserver(handlePosition, {
+        var observer = new IntersectionObserver(handleTargetPosition, {
           root: target,
           rootMargin: "-".concat(top || 0, "px 0px -").concat(bottom || 0, "px 0px"),
           threshold: 1.0
@@ -53471,17 +53502,34 @@ var Sticky = function Sticky(props) {
     }
   };
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
-    if (!css) {
-      createObserver();
+    if (css) return;
+    var target = getTarget();
+    context.target = target;
+    if (target) {
+      createObserver(target);
       window.addEventListener('resize', updateStyle);
+      return function () {
+        cancelObserver();
+        window.removeEventListener('resize', updateStyle);
+        if (context.div) {
+          context.div.remove();
+        }
+      };
+    } else {
+      // fixed 布局
+      createBodyObserver();
+      events.forEach(function (event) {
+        window.addEventListener(event, handleFixedPosition);
+      });
+      return function () {
+        if (context.bodyObserver) {
+          context.bodyObserver.disconnect();
+        }
+        events.forEach(function (event) {
+          window.removeEventListener(event, handleFixedPosition);
+        });
+      };
     }
-    return function () {
-      cleanEvents();
-      if (context.div) {
-        context.div.remove();
-        context.div = null;
-      }
-    };
   }, [css]);
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
     if (props.parent && context.parentObserver) {
@@ -53523,12 +53571,14 @@ var Sticky = function Sticky(props) {
     })
   }) : null;
   var isFixed = style.position === 'fixed';
+  var hideStyle = {
+    opacity: 0,
+    pointerEvents: 'none'
+  };
   return /*#__PURE__*/(0,jsx_runtime.jsxs)(jsx_runtime.Fragment, {
     children: [isFixed ? StickyEl : context.target && context.div && /*#__PURE__*/(0,external_root_ReactDOM_commonjs2_react_dom_commonjs_react_dom_amd_react_dom_.createPortal)(StickyEl, context.div), /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
       className: props.className,
-      style: objectSpread2_default()(objectSpread2_default()({}, props.style), {}, {
-        opacity: show && parentVisible ? 0 : (_props$style = props.style) === null || _props$style === void 0 ? void 0 : _props$style.opacity
-      }),
+      style: objectSpread2_default()(objectSpread2_default()({}, props.style), show && parentVisible ? hideStyle : {}),
       ref: handleElementRef,
       children: children
     })]
@@ -62214,7 +62264,7 @@ var upload_interface = __webpack_require__(4412);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.1.14'
+  version: '3.1.15'
 });
 }();
 /******/ 	return __webpack_exports__;