@sheinx/base 3.6.0-beta.3 → 3.6.0-beta.5

package/esm/virtual-scroll/virtual-scroll-list.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"virtual-scroll-list.d.ts","sourceRoot":"","sources":["virtual-scroll-list.tsx"],"names":[],"mappings":";AAGA,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAE9D,QAAA,MAAM,WAAW,8DAkPhB,CAAC;AAEF,eAAe,WAAW,CAAC"}
+{"version":3,"file":"virtual-scroll-list.d.ts","sourceRoot":"","sources":["virtual-scroll-list.tsx"],"names":[],"mappings":";AAGA,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAE9D,QAAA,MAAM,WAAW,8DAkQhB,CAAC;AAEF,eAAe,WAAW,CAAC"}

package/esm/virtual-scroll/virtual-scroll-list.js

@@ -10,7 +10,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { useState, useEffect, useLayoutEffect, useRef } from 'react';
+import React, { useState, useEffect, useLayoutEffect, useRef, useMemo } from 'react';
 import { usePersistFn } from '@sheinx/hooks';
 import Scroll from "./scroll";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -23,6 +23,7 @@ var VirtualList = function VirtualList(props) {
     className = props.className,
     lineHeight = props.lineHeight,
     height = props.height,
+    keepScrollHeight = props.keepScrollHeight,
     renderItem = props.renderItem,
     customRenderItem = props.customRenderItem,
     _props$tag = props.tag,
@@ -30,6 +31,8 @@ var VirtualList = function VirtualList(props) {
     tagClassName = props.tagClassName,
     dynamicVirtual = props.dynamicVirtual,
     virtualRef = props.virtualRef,
+    scrollerStyle = props.scrollerStyle,
+    paddingY = props.paddingY,
     onControlTypeChange = props.onControlTypeChange;
   var _useState = useState(0),
     _useState2 = _slicedToArray(_useState, 2),
@@ -139,6 +142,12 @@ var VirtualList = function VirtualList(props) {
   var handleMouseMove = function handleMouseMove() {
     onControlTypeChange === null || onControlTypeChange === void 0 || onControlTypeChange('mouse');
   };
+
+  // 设置了容器的paddingY, translateY时需要加上，否则会出现底部滚不到底的问题
+  var addonScrollHeight = useMemo(function () {
+    // paddingY是奇数则加1
+    return paddingY ? paddingY * 2 + (paddingY % 2 === 1 ? 1 : 0) : 0;
+  }, [paddingY]);
   var handleScroll = function handleScroll(info) {
     var _props$onScroll;
     var height = info.height,
@@ -147,7 +156,7 @@ var VirtualList = function VirtualList(props) {
     var scrollTop = info.scrollTop;
     context.shouldUpdateHeight = !fromDrag;
     var sumHeight = getContentHeight(props.data.length - 1);
-    var max = sumHeight - height;
+    var max = sumHeight - height + addonScrollHeight;
     if (scrollTop > max) {
       scrollTop = max;
     }
@@ -169,12 +178,18 @@ var VirtualList = function VirtualList(props) {
     var shouldScroll = getContentHeight(data.length - 1) > height;
     var nextStyle = _objectSpread({}, style);
     if (shouldScroll) nextStyle.height = height;
-    var scrollHeight = getContentHeight(data.length - 1);
+    var scrollHeight = getContentHeight(data.length - 1) + addonScrollHeight;
+    var innerStyle = {
+      transform: "translate3d(0, -".concat(top, "px, 0)"),
+      paddingTop: paddingY,
+      paddingBottom: paddingY
+    };
     return /*#__PURE__*/_jsx(Scroll, {
       className: className,
       style: nextStyle,
       height: height,
       scrollWidth: 0,
+      scrollerStyle: scrollerStyle,
       scrollHeight: scrollHeight,
       childrenStyle: {
         width: '100%'
@@ -184,9 +199,7 @@ var VirtualList = function VirtualList(props) {
       onMouseMove: handleMouseMove,
       children: /*#__PURE__*/_jsx(Tag, {
         className: tagClassName,
-        style: {
-          transform: "translate3d(0, -".concat(top, "px, 0)")
-        },
+        style: innerStyle,
         children: items.map(function (d, i) {
           if (d[groupKey]) {
             return /*#__PURE__*/_jsx(React.Fragment, {
@@ -206,6 +219,7 @@ var VirtualList = function VirtualList(props) {
   }, [startIndex]);
   useLayoutEffect(function () {
     // 数据变化的时候清空掉 preIndex, 如果之前有缓存的index, setRowHeight 会有问题
+    if (keepScrollHeight) return;
     setTop(0);
     setStartIndex(0);
     return function () {

package/esm/virtual-scroll/virtual-scroll-list.type.d.ts

@@ -11,6 +11,7 @@ export type VirtualListType = {
 export interface VirtualListProps<DataItem> extends Pick<CommonType, 'className' | 'style'> {
     data: DataItem[];
     keygen?: KeygenType<DataItem>;
+    paddingY?: number;
     height: number | string;
     lineHeight: number;
     rowsInView: number;
@@ -23,6 +24,7 @@ export interface VirtualListProps<DataItem> extends Pick<CommonType, 'className'
     virtualRef?: React.MutableRefObject<VirtualListType>;
     scrollerStyle?: React.CSSProperties;
     dynamicVirtual?: boolean;
+    keepScrollHeight?: boolean;
     onControlTypeChange?: React.Dispatch<React.SetStateAction<'mouse' | 'keyboard'>>;
     onScroll?: (info: {
         scrollLeft: number;

package/esm/virtual-scroll/virtual-scroll-list.type.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"virtual-scroll-list.type.d.ts","sourceRoot":"","sources":["virtual-scroll-list.type.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,MAAM,MAAM,eAAe,GAAG;IAC5B,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IACpD,eAAe,CAAC,EAAE,MAAM,MAAM,CAAC;IAC/B,MAAM,CAAC,EAAE,MAAM,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,MAAM,CAAC;IAC7B,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CACzC,CAAC;AAEF,MAAM,WAAW,gBAAgB,CAAC,QAAQ,CAAE,SAAQ,IAAI,CAAC,UAAU,EAAE,WAAW,GAAG,OAAO,CAAC;IACzF,IAAI,EAAE,QAAQ,EAAE,CAAC;IACjB,MAAM,CAAC,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC;IAE9B,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,GAAG,CAAC;IAChB,gBAAgB,CAAC,EAAE,GAAG,CAAC;IACvB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;IACjC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,KAAK,CAAC,gBAAgB,CAAC,eAAe,CAAC,CAAC;IACrD,aAAa,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IACpC,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,mBAAmB,CAAC,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,GAAG,UAAU,CAAC,CAAC,CAAC;IACjF,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE;QAChB,UAAU,EAAE,MAAM,CAAC;QACnB,SAAS,EAAE,MAAM,CAAC;QAClB,CAAC,EAAE,MAAM,CAAC;QACV,CAAC,EAAE,MAAM,CAAC;QACV,QAAQ,EAAE,OAAO,CAAC;QAClB,MAAM,EAAE,MAAM,CAAC;QACf,KAAK,EAAE,MAAM,CAAC;KACf,KAAK,IAAI,CAAC;CACZ"}
+{"version":3,"file":"virtual-scroll-list.type.d.ts","sourceRoot":"","sources":["virtual-scroll-list.type.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,MAAM,MAAM,eAAe,GAAG;IAC5B,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IACpD,eAAe,CAAC,EAAE,MAAM,MAAM,CAAC;IAC/B,MAAM,CAAC,EAAE,MAAM,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,MAAM,CAAC;IAC7B,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CACzC,CAAC;AAEF,MAAM,WAAW,gBAAgB,CAAC,QAAQ,CAAE,SAAQ,IAAI,CAAC,UAAU,EAAE,WAAW,GAAG,OAAO,CAAC;IACzF,IAAI,EAAE,QAAQ,EAAE,CAAC;IACjB,MAAM,CAAC,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC;IAC9B,QAAQ,CAAC,EAAE,MAAM,CAAA;IAEjB,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,GAAG,CAAC;IAChB,gBAAgB,CAAC,EAAE,GAAG,CAAC;IACvB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;IACjC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,KAAK,CAAC,gBAAgB,CAAC,eAAe,CAAC,CAAC;IACrD,aAAa,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IACpC,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,mBAAmB,CAAC,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,GAAG,UAAU,CAAC,CAAC,CAAC;IACjF,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE;QAChB,UAAU,EAAE,MAAM,CAAC;QACnB,SAAS,EAAE,MAAM,CAAC;QAClB,CAAC,EAAE,MAAM,CAAC;QACV,CAAC,EAAE,MAAM,CAAC;QACV,QAAQ,EAAE,OAAO,CAAC;QAClB,MAAM,EAAE,MAAM,CAAC;QACf,KAAK,EAAE,MAAM,CAAC;KACf,KAAK,IAAI,CAAC;CACZ"}

package/package.json

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