@sheinx/base 3.1.14 → 3.1.16

package/esm/select/select.js

@@ -245,16 +245,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;
@@ -661,7 +651,7 @@ function Select(props0) {
     children: [tipNode, renderResult(), /*#__PURE__*/_jsx(AbsoluteList, {
       adjust: true,
       focus: open,
-      fixedWidth: autoAdapt ? 'min' : true,
+      fixedWidth: !props.columns && (autoAdapt ? 'min' : true),
       absolute: props.absolute,
       zIndex: props.zIndex,
       position: position,

package/esm/sticky/sticky.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sticky.d.ts","sourceRoot":"","sources":["sticky.tsx"],"names":[],"mappings":";AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAsB5C,QAAA,MAAM,MAAM,UAAW,WAAW,gBAmPjC,CAAC;AAEF,eAAe,MAAM,CAAC"}
+{"version":3,"file":"sticky.d.ts","sourceRoot":"","sources":["sticky.tsx"],"names":[],"mappings":";AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAuB5C,QAAA,MAAM,MAAM,UAAW,WAAW,gBA2XjC,CAAC;AAEF,eAAe,MAAM,CAAC"}

package/esm/sticky/sticky.js

@@ -12,13 +12,14 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { usePersistFn, util, useResize, useRender } from '@sheinx/hooks';
 import { createPortal } from 'react-dom';
-import React, { useEffect, useRef, useState } from 'react';
+import React, { useLayoutEffect, useRef, useState } from 'react';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 var cssSupport = util.cssSupport;
 var supportSticky = cssSupport('position', 'sticky');
 var defaultZIndex = 900;
+var events = ['scroll', 'pageshow', 'load', 'resize'];
 
 // const getFirstScrollParent = (el: HTMLElement) => {
 //   let parent = el.parentNode as HTMLElement;
@@ -37,17 +38,19 @@ var defaultZIndex = 900;
 // };
 
 var Sticky = function Sticky(props) {
-  var _props$style;
   var children = props.children,
     top = props.top,
     bottom = props.bottom;
-  var css = props.css || props.target;
+  // 是否使用css sticky
+  var css = (props.css || props.target) && supportSticky;
+  var forceUpdate = useRender();
   var _useRef = useRef({
       target: null,
       div: null,
-      observer: null,
+      position: '',
+      targetObserver: null,
       parentObserver: null,
-      isTop: false
+      fixedObserver: null
     }),
     context = _useRef.current;
   var _useState = useState({}),
@@ -62,12 +65,7 @@ var Sticky = function Sticky(props) {
     _useState6 = _slicedToArray(_useState5, 2),
     parentVisible = _useState6[0],
     setParentVisible = _useState6[1];
-  var forceRender = useRender();
   var elementRef = useRef(null);
-  var elementSize = useResize({
-    targetRef: elementRef,
-    timer: 0
-  });
   var getTarget = function getTarget() {
     var scrollContainer = props.scrollContainer;
     if (typeof scrollContainer === 'string') {
@@ -77,22 +75,19 @@ var Sticky = function Sticky(props) {
     if (scrollContainer && scrollContainer.nodeType === 1) {
       return scrollContainer;
     }
-    return document.body;
+    return null;
   };
+
+  // window resize 时需要重新计算底部附着的位置
   var updateStyle = usePersistFn(function () {
-    if (context.div && !context.isTop && show) {
-      var shouldFixed = context.target === document.body;
+    if (context.div && context.position === 'bottom' && show) {
       var scrollRect = context.target.getBoundingClientRect();
       var targetRect = elementRef.current.getBoundingClientRect();
       var targetLeft = targetRect.left;
-      var width = targetRect.width,
-        height = targetRect.height;
       if (typeof bottom === 'number') {
         var outRootRect = context.target.getBoundingClientRect();
         var _style = {
-          position: shouldFixed ? 'fixed' : 'absolute',
-          width: "".concat(width, "px"),
-          height: "".concat(height, "px"),
+          position: 'absolute',
           top: "".concat(scrollRect.bottom - (props.bottom || 0) - outRootRect.top, "px"),
           left: "".concat(targetLeft - outRootRect.left, "px"),
           transform: 'translateY(-100%)'
@@ -101,30 +96,22 @@ 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 width = targetRect.width,
-        height = targetRect.height;
+      var outRootRect = context.div.getBoundingClientRect();
       if (scrollRect && targetRect.bottom < scrollRect.bottom) {
         // top in
-        context.isTop = true;
+        context.position = 'top';
         if (typeof top === 'number') {
           setShow(true);
           var _style2 = {
-            position: shouldFixed ? 'fixed' : 'absolute',
-            width: "".concat(width, "px"),
-            height: "".concat(height, "px"),
+            position: 'absolute',
             top: "".concat(scrollRect.top - outRootRect.top, "px"),
             left: "".concat(targetLeft - outRootRect.left, "px")
           };
@@ -132,16 +119,13 @@ var Sticky = function Sticky(props) {
         }
       } else if (scrollRect) {
         // bottom in
-        context.isTop = false;
+        context.position = 'bottom';
         if (typeof bottom === 'number') {
           setShow(true);
-          var _outRootRect = context.target.getBoundingClientRect();
           var _style3 = {
-            position: shouldFixed ? 'fixed' : 'absolute',
-            width: "".concat(width, "px"),
-            height: "".concat(height, "px"),
-            top: "".concat(scrollRect.bottom - _outRootRect.top, "px"),
-            left: "".concat(targetLeft - _outRootRect.left, "px"),
+            position: 'absolute',
+            top: "".concat(scrollRect.bottom - outRootRect.top, "px"),
+            left: "".concat(targetLeft - outRootRect.left, "px"),
             transform: 'translateY(-100%)'
           };
           setStyle(_style3);
@@ -150,8 +134,11 @@ var Sticky = function Sticky(props) {
     }
     if (entry.isIntersecting) {
       setShow(false);
+      context.position = '';
     }
   });
+
+  // 父元素是否可见
   var handleParentVisible = usePersistFn(function (entries) {
     var entry = entries[0];
     if (entry.isIntersecting) {
@@ -160,35 +147,118 @@ var Sticky = function Sticky(props) {
       setParentVisible(false);
     }
   });
-  var cleanEvents = function cleanEvents() {
-    if (context.observer) {
-      context.observer.disconnect();
-      context.observer = null;
+  var setFixedStyle = usePersistFn(function (s, m) {
+    var l = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
+    if (s !== show) {
+      setShow(s);
     }
-    if (context.parentObserver) {
-      context.parentObserver.disconnect();
-      context.parentObserver = null;
+    if (s && m) {
+      var newStyle = _defineProperty(_defineProperty({
+        position: 'fixed'
+      }, m, m === 'top' ? top : bottom), "left", l);
+      if (!util.shallowEqual(style, newStyle)) {
+        setStyle(newStyle);
+      }
+    }
+  });
+
+  // 无滚动容器的时候，body 滚动 resize 计算
+  var handleFixedPosition = usePersistFn(function () {
+    if (css || context.target) return;
+    var element = elementRef.current;
+    if (!parentVisible) {
+      setFixedStyle(false);
+      return;
+    }
+    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;
+    var scrollRect = document.body.getBoundingClientRect();
+    var top = props.top,
+      bottom = props.bottom;
+    if (top !== undefined && Math.ceil(selfRect.top) <= top) {
+      setFixedStyle(true, 'top', selfRect.left);
+      return;
+    } else if (bottom !== undefined && Math.ceil(selfRect.bottom) + bottom > scrollRect.bottom) {
+      setFixedStyle(true, 'bottom', selfRect.left);
+      return;
+    } else {
+      setFixedStyle(false);
+    }
+  });
+
+  // 无滚动容器时内滚场景触发
+  var handleFixedInter = usePersistFn(function (entries) {
+    if (!parentVisible) {
+      setFixedStyle(false);
+      return;
+    }
+    var entry = entries[0];
+    var scrollRect = entry.rootBounds;
+    var targetRect = entry.boundingClientRect;
+    if (scrollRect && scrollRect.top === 0 && scrollRect.bottom === 0) {
+      return;
+    }
+    if (!entry.isIntersecting) {
+      var targetLeft = targetRect.left;
+      var outRootRect = document.body.getBoundingClientRect();
+      if (scrollRect && targetRect.bottom < scrollRect.bottom) {
+        // top in
+        if (typeof top === 'number') {
+          setFixedStyle(true, 'top', targetLeft - outRootRect.left);
+        }
+      } else if (scrollRect) {
+        // bottom in
+        if (typeof bottom === 'number') {
+          setFixedStyle(true, 'bottom', targetLeft - outRootRect.left);
+        }
+      }
+    }
+    if (entry.isIntersecting) {
+      setFixedStyle(false);
+    }
+  });
+  var elementSize = useResize({
+    targetRef: elementRef,
+    timer: 10,
+    cb: handleFixedPosition
+  });
+  var cancelFixedObserver = function cancelFixedObserver() {
+    if (context.fixedObserver) {
+      context.fixedObserver.disconnect();
+      context.fixedObserver = null;
+    }
+  };
+  var createFixedObserver = function createFixedObserver() {
+    cancelFixedObserver();
+    context.fixedObserver = new IntersectionObserver(handleFixedInter, {
+      root: null,
+      rootMargin: "-".concat(top || 0, "px 0px -").concat(bottom || 0, "px 0px"),
+      threshold: 1.0
+    });
+  };
+  var cancelObserver = function cancelObserver() {
+    if (context.targetObserver) {
+      context.targetObserver.disconnect();
+      context.targetObserver = null;
     }
-    window.removeEventListener('resize', updateStyle);
   };
   var createObserver = function createObserver() {
-    var target = getTarget();
-    if (!context.div && target !== document.body) {
+    if (!context.div) {
       context.div = document.createElement('div');
       context.div.style.position = 'relative';
     }
-    if (target && target !== context.target) {
-      forceRender();
-      context.target = target;
-      cleanEvents();
+    if (context.target) {
       if (context.div) {
         // append div
-        if (target === document.body) {
-          document.body.appendChild(context.div);
+        if (context.target === document.body) {
+          document.body.insertBefore(context.div, document.body.firstChild);
         } else {
-          target.parentNode.insertBefore(context.div, target);
+          context.target.parentNode.insertBefore(context.div, context.target);
         }
-        var _style4 = window.getComputedStyle(target);
+        var _style4 = window.getComputedStyle(context.target);
         if (_style4.position === 'absolute' || _style4.position === 'fixed') {
           context.div.style.position = _style4.position;
           context.div.style.top = _style4.top;
@@ -197,59 +267,109 @@ var Sticky = function Sticky(props) {
           context.div.style.bottom = _style4.bottom;
         }
       }
+      cancelFixedObserver();
       if (window.IntersectionObserver) {
-        var observer = new IntersectionObserver(handlePosition, {
-          root: target,
+        var observer = new IntersectionObserver(handleTargetPosition, {
+          root: context.target,
           rootMargin: "-".concat(top || 0, "px 0px -").concat(bottom || 0, "px 0px"),
           threshold: 1.0
         });
-        context.observer = observer;
-        context.parentObserver = new IntersectionObserver(handleParentVisible, {
-          root: target,
-          rootMargin: "-".concat(top || 0, "px 0px -").concat(bottom || 0, "px 0px"),
-          threshold: 0
-        });
+        context.targetObserver = observer;
       }
     }
   };
+  var cancelParentObserver = function cancelParentObserver() {
+    if (context.parentObserver) {
+      context.parentObserver.disconnect();
+      context.parentObserver = null;
+    }
+  };
+  var createParentObserver = function createParentObserver() {
+    if (!props.parent) return;
+    cancelParentObserver();
+    context.parentObserver = new IntersectionObserver(handleParentVisible, {
+      root: context.target,
+      rootMargin: "-".concat(top || 0, "px 0px -").concat(bottom || 0, "px 0px"),
+      threshold: 0
+    });
+    context.parentObserver.observe(props.parent);
+  };
+
+  // 存在滚动容器时的定位
+  var createTargetEvents = function createTargetEvents() {
+    createObserver();
+    window.addEventListener('resize', updateStyle);
+  };
+  var cancelTargetEvents = function cancelTargetEvents() {
+    cancelObserver();
+    window.removeEventListener('resize', updateStyle);
+    if (context.div) {
+      context.div.remove();
+      context.div = null;
+    }
+  };
+  var createFixedEvents = function createFixedEvents() {
+    createFixedObserver();
+    events.forEach(function (event) {
+      window.addEventListener(event, handleFixedPosition);
+    });
+  };
+  var cancelFixedEvents = function cancelFixedEvents() {
+    cancelFixedObserver();
+    events.forEach(function (event) {
+      window.removeEventListener(event, handleFixedPosition);
+    });
+  };
   var handleElementRef = function handleElementRef(el) {
     if (el) {
       elementRef.current = el;
-      if (el && context.observer) {
-        context.observer.observe(el);
+      if (context.targetObserver) {
+        if (!el) {
+          context.targetObserver.disconnect();
+        } else {
+          context.targetObserver.observe(el);
+        }
+      }
+      if (context.fixedObserver) {
+        if (!el) {
+          context.fixedObserver.disconnect();
+        } else {
+          context.fixedObserver.observe(el);
+        }
       }
     }
   };
-  useEffect(function () {
-    if (!css) {
-      createObserver();
-      window.addEventListener('resize', updateStyle);
+  useLayoutEffect(function () {
+    if (css) return;
+    var target = getTarget();
+    if (context.target !== target) {
+      context.target = target;
+      forceUpdate();
     }
-    return function () {
-      cleanEvents();
-      if (context.div) {
-        context.div.remove();
-        context.div = null;
-      }
-    };
-  }, [css]);
-  useEffect(function () {
-    if (props.parent && context.parentObserver) {
+    if (context.target) {
+      createTargetEvents();
+      return cancelTargetEvents;
+    } else {
+      // fixed 布局
+      createFixedEvents();
+      return cancelFixedEvents;
+    }
+  }, [css, top, bottom]);
+  useLayoutEffect(function () {
+    if (props.parent && !css) {
+      // createParentObserver 用到context.target
+      createParentObserver();
       context.parentObserver.observe(props.parent);
     }
-    return function () {
-      if (context.parentObserver) {
-        context.parentObserver.disconnect();
-      }
-    };
-  }, [props.parent]);
+    return cancelParentObserver;
+  }, [props.parent, css, context.target, top, bottom]);
 
   // 纯css方法 直接使用css
   // js方法
   // 1. 不指定滚动容器 基于document.body 使用fixed + js计算
   // 2. 指定滚动容器 在滚动容器上方插入一个dom占位 基于该dom渲染和定位
   // 3. 使用 intersectionObserver 来判断是否需要sticky
-  if (css && supportSticky) {
+  if (css) {
     return /*#__PURE__*/_jsx("div", {
       className: props.className,
       style: _objectSpread(_objectSpread({
@@ -273,12 +393,14 @@ var Sticky = function Sticky(props) {
     })
   }) : null;
   var isFixed = style.position === 'fixed';
+  var hideStyle = {
+    opacity: 0,
+    pointerEvents: 'none'
+  };
   return /*#__PURE__*/_jsxs(_Fragment, {
     children: [isFixed ? StickyEl : context.target && context.div && /*#__PURE__*/createPortal(StickyEl, context.div), /*#__PURE__*/_jsx("div", {
       className: props.className,
-      style: _objectSpread(_objectSpread({}, props.style), {}, {
-        opacity: show && parentVisible ? 0 : (_props$style = props.style) === null || _props$style === void 0 ? void 0 : _props$style.opacity
-      }),
+      style: _objectSpread(_objectSpread({}, props.style), show && parentVisible ? hideStyle : {}),
       ref: handleElementRef,
       children: children
     })]

package/esm/virtual-scroll/scroll.js

@@ -39,7 +39,7 @@ var Scroll = function Scroll(props) {
     position: 'sticky'
   }, isRtl ? 'right' : 'left', 0), "top", 0);
   var placeStyle = _defineProperty(_defineProperty(_defineProperty(_defineProperty({
-    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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sheinx/base",
-  "version": "3.1.14",
+  "version": "3.1.16",
   "description": "",
   "keywords": [],
   "license": "MIT",
@@ -10,7 +10,7 @@
   "module": "./esm/index.js",
   "typings": "./cjs/index.d.ts",
   "dependencies": {
-    "@sheinx/hooks": "3.1.14",
+    "@sheinx/hooks": "3.1.16",
     "immer": "^10.0.0",
     "classnames": "^2.0.0",
     "@shined/reactive": "^0.1.3-alpha.0"