@sheinx/base 3.4.0-beta.9 → 3.4.0-fix.1

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, useRef } from 'react';
+import React, { useState, useEffect, useLayoutEffect, useRef } from 'react';
 import { usePersistFn } from '@sheinx/hooks';
 import Scroll from "./scroll";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -46,7 +46,7 @@ var VirtualList = function VirtualList(props) {
   var _useState7 = useState(0),
     _useState8 = _slicedToArray(_useState7, 2),
     startIndex = _useState8[0],
-    setCurrentIndex = _useState8[1];
+    setStartIndex = _useState8[1];
   var wrapperRef = useRef(null);
   var _useRef = useRef({
       cachedHeight: [],
@@ -125,7 +125,7 @@ var VirtualList = function VirtualList(props) {
       }
     }
     if (nextCurrentIndex !== startIndex) {
-      setCurrentIndex(nextCurrentIndex);
+      setStartIndex(nextCurrentIndex);
     }
     setTop(top);
   };
@@ -141,8 +141,7 @@ var VirtualList = function VirtualList(props) {
   };
   var handleScroll = function handleScroll(info) {
     var _props$onScroll;
-    var scrollLeft = info.scrollLeft,
-      height = info.height,
+    var height = info.height,
       y = info.y,
       fromDrag = info.fromDrag;
     var scrollTop = info.scrollTop;
@@ -167,7 +166,7 @@ var VirtualList = function VirtualList(props) {
   var renderList = function renderList() {
     var items = data.slice(startIndex, startIndex + rowsInView);
     var Tag = tag;
-    var shouldScroll = data.length * lineHeight > height;
+    var shouldScroll = getContentHeight(data.length - 1) > height;
     var nextStyle = _objectSpread({}, style);
     if (shouldScroll) nextStyle.height = height;
     var scrollHeight = getContentHeight(data.length - 1);
@@ -202,11 +201,19 @@ var VirtualList = function VirtualList(props) {
     });
   };
   useEffect(function () {
-    setHeight(getContentHeight(props.data.length - 1));
+    // 记录preIndex
+    context.preIndex = startIndex;
+  }, [startIndex]);
+  useLayoutEffect(function () {
+    // 数据变化的时候清空掉 preIndex, 如果之前有缓存的index, setRowHeight 会有问题
+    setTop(0);
+    setStartIndex(0);
+    return function () {
+      context.preIndex = null;
+    };
   }, [data.length]);
   useEffect(function () {
     if (offsetY) {
-      // if (wrapperRef.current && props.innerRef.current) {
       if (wrapperRef.current) {
         setOffsetY(0);
         setTop(function (s) {
@@ -217,11 +224,8 @@ var VirtualList = function VirtualList(props) {
     }
   }, [offsetY, startIndex]);
   useEffect(function () {
-    // 数据变化的时候清空掉 preIndex, 如果之前有缓存的index, setRowHeight 会有问题
-    return function () {
-      context.preIndex = null;
-    };
-  }, [props.data]);
+    setHeight(getContentHeight(props.data.length - 1));
+  }, [data.length]);
   useEffect(function () {
     if (context.heightCallback) {
       var cb = context.heightCallback;
@@ -229,10 +233,6 @@ var VirtualList = function VirtualList(props) {
       cb();
     }
   }, [scrollHeight]);
-  useEffect(function () {
-    // 记录preIndex
-    context.preIndex = startIndex;
-  }, [startIndex]);
   useEffect(function () {
     if (virtualRef !== null && virtualRef !== void 0 && virtualRef.current) {
       virtualRef.current.scrollByStep = handleScrollByStep;

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

@@ -6,6 +6,7 @@ export type VirtualListType = {
     getCurrentIndex?: () => number;
     getTop?: () => number;
     getHoverIndex?: () => number;
+    setStartIndex?: (index: number) => void;
 };
 export interface VirtualListProps<DataItem> extends Pick<CommonType, 'className' | 'style'> {
     data: DataItem[];

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;CAC9B,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;IAEpC,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;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;IAEpC,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"}

package/package.json

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