@4399ywkf/design 1.3.7 → 1.3.9

package/dist/WaterfallVirtual/index.js

@@ -18,7 +18,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 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 { useDebounceFn } from 'ahooks';
-import { cloneDeep } from 'lodash-es';
+import { cloneDeep, debounce } from 'lodash-es';
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import "./styles/index.less";
 import "./styles/test.less";
@@ -52,7 +52,8 @@ var WaterfallVirtual = function WaterfallVirtual(props) {
     _props$overscan = props.overscan,
     overscan = _props$overscan === void 0 ? 0 : _props$overscan,
     _props$atBottomThresh = props.atBottomThreshold,
-    atBottomThreshold = _props$atBottomThresh === void 0 ? 100 : _props$atBottomThresh;
+    atBottomThreshold = _props$atBottomThresh === void 0 ? 100 : _props$atBottomThresh,
+    components = props.components;
 
   // 状态管理
   var _useState = useState(column),
@@ -201,25 +202,40 @@ var WaterfallVirtual = function WaterfallVirtual(props) {
     });
   }, [cardList, scrollPos, isInitialized, overscan]);
 
+  // 在组件顶部添加
+  var queueDataRef = useRef(queueData);
+
+  // 在 queueData 更新时同步 ref
+  useEffect(function () {
+    queueDataRef.current = queueData;
+  }, [queueData]);
+
   // 变更queueData中list的具体高度
-  var changeQueueDataHeight = useCallback(function (columnIndex, index, height) {
+  var changeQueueDataHeight = useCallback(debounce(function (columnIndex, index, height) {
     setQueueData(function (prev) {
-      var newQueueData = _toConsumableArray(prev);
-      var item = newQueueData[columnIndex].list[index];
+      // 使用最新的状态进行计算
+      var currentData = queueDataRef.current;
+
+      // 添加边界检查，防止索引越界
+      if (!currentData[columnIndex] || !currentData[columnIndex].list[index]) {
+        return prev; // 如果索引无效，返回原数据
+      }
+      var item = currentData[columnIndex].list[index];
       item.style.height = "".concat(height, "px");
       item.h = height;
       var currentHeight = item.y + item.h + gap;
       // index 之后的item 的 y 需要重新计算
-      for (var i = index + 1; i < newQueueData[columnIndex].list.length; i++) {
-        var _item = newQueueData[columnIndex].list[i];
+      for (var i = index + 1; i < currentData[columnIndex].list.length; i++) {
+        var _item = currentData[columnIndex].list[i];
         _item.y = currentHeight;
         currentHeight += _item.h + gap;
         _item.style.transform = "translate3d(".concat(_item.x, "px, ").concat(_item.y, "px, 0)");
       }
-      newQueueData[columnIndex].height = newQueueData[columnIndex].list[newQueueData[columnIndex].list.length - 1].y + newQueueData[columnIndex].list[newQueueData[columnIndex].list.length - 1].h + gap;
-      return cloneDeep(newQueueData);
+      currentData[columnIndex].height = currentData[columnIndex].list[currentData[columnIndex].list.length - 1].y + currentData[columnIndex].list[currentData[columnIndex].list.length - 1].h + gap;
+      return cloneDeep(currentData);
     });
-  }, [queueData]);
+  }, 16), [gap] // 只依赖 gap，移除 queueData 依赖
+  );
 
   // 初始化滚动状态
   var initScrollState = useCallback(function () {
@@ -615,6 +631,6 @@ var WaterfallVirtual = function WaterfallVirtual(props) {
     style: listStyle
   }, renderList.map(function (item) {
     return renderItem(item, getItemRenderProps(item), changeQueueDataHeight);
-  })));
+  })), components === null || components === void 0 ? void 0 : components.Footer);
 };
 export default /*#__PURE__*/React.memo(WaterfallVirtual);

package/dist/WaterfallVirtual/types.d.ts

@@ -26,6 +26,9 @@ export interface IVirtualWaterFallProps {
     };
     atBottomThreshold?: number;
     atTopThreshold?: number;
+    components?: {
+        Footer?: React.ReactNode;
+    };
 }
 export interface IItemRenderProps {
     key: string | number;

package/dist/hooks/index.d.ts

@@ -2,3 +2,4 @@ export * from './useCopyData';
 export * from './useDownloadImage';
 export * from './useImgToClipboard';
 export * from './useScreenshot';
+export * from './useScrolling';

package/dist/hooks/index.js

@@ -1,4 +1,5 @@
 export * from "./useCopyData";
 export * from "./useDownloadImage";
 export * from "./useImgToClipboard";
-export * from "./useScreenshot";
+export * from "./useScreenshot";
+export * from "./useScrolling";

package/dist/hooks/useScrolling/index.d.ts

@@ -0,0 +1,2 @@
+import { RefObject } from 'react';
+export declare function useScrolling(ref: RefObject<HTMLElement>, checkInterval?: number): boolean;

package/dist/hooks/useScrolling/index.js

@@ -0,0 +1,43 @@
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+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 { useEffect, useRef, useState } from 'react';
+export function useScrolling(ref) {
+  var checkInterval = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 60;
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    isScrolling = _useState2[0],
+    setIsScrolling = _useState2[1];
+  var lastScrollTop = useRef(0);
+  var frame = useRef(null);
+  var stillCount = useRef(0);
+  useEffect(function () {
+    var el = ref.current;
+    if (!el) return;
+    var checkScrolling = function checkScrolling() {
+      var current = el.scrollTop;
+      if (current !== lastScrollTop.current) {
+        if (!isScrolling) setIsScrolling(true);
+        lastScrollTop.current = current;
+        stillCount.current = 0;
+      } else {
+        stillCount.current++;
+        // 连续几帧没变化，认为停止滚动
+        if (isScrolling && stillCount.current >= checkInterval) {
+          setIsScrolling(false);
+        }
+      }
+      frame.current = requestAnimationFrame(checkScrolling);
+    };
+    frame.current = requestAnimationFrame(checkScrolling);
+    return function () {
+      if (frame.current !== null) {
+        cancelAnimationFrame(frame.current);
+      }
+    };
+  }, [ref, isScrolling, checkInterval]);
+  return isScrolling;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@4399ywkf/design",
-  "version": "1.3.7",
+  "version": "1.3.9",
   "description": "4399ywkf Design React UI Library.",
   "license": "MIT",
   "module": "dist/index.js",