acud 1.2.17 → 1.2.18

package/lib/virtual-list/List.js

@@ -1,56 +1,32 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 var _typeof = require("@babel/runtime/helpers/typeof");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.RawList = RawList;
 exports["default"] = void 0;
-
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
 var _extends3 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-
 var React = _interopRequireWildcard(require("react"));
-
 var _classnames = _interopRequireDefault(require("classnames"));
-
 var _useLayoutEffect = _interopRequireDefault(require("rc-util/lib/hooks/useLayoutEffect"));
-
 var _Filler = _interopRequireDefault(require("./Filler"));
-
 var _ScrollBar = _interopRequireDefault(require("./ScrollBar"));
-
 var _useChildren = _interopRequireDefault(require("./hooks/useChildren"));
-
 var _useHeights3 = _interopRequireDefault(require("./hooks/useHeights"));
-
 var _useScrollTo = _interopRequireDefault(require("./hooks/useScrollTo"));
-
 var _useDiffItem3 = _interopRequireDefault(require("./hooks/useDiffItem"));
-
 var _useFrameWheel3 = _interopRequireDefault(require("./hooks/useFrameWheel"));
-
 var _useMobileTouchMove = _interopRequireDefault(require("./hooks/useMobileTouchMove"));
-
 var _useOriginScroll = _interopRequireDefault(require("./hooks/useOriginScroll"));
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 var __rest = void 0 && (void 0).__rest || function (s, e) {
   var t = {};
-
-  for (var p in s) {
-    if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
-  }
-
+  for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
   if (s != null && typeof Object.getOwnPropertySymbols === "function") for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
     if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) t[p[i]] = s[p[i]];
   }
@@ -58,231 +34,196 @@ var __rest = void 0 && (void 0).__rest || function (s, e) {
 };
 /* eslint-disable @typescript-eslint/consistent-type-definitions */
 
-
 var EMPTY_DATA = [];
 var ScrollStyle = {
   overflowY: 'auto',
   overflowAnchor: 'none'
 };
-
 function RawList(props, ref) {
   var _props$prefixCls = props.prefixCls,
-      prefixCls = _props$prefixCls === void 0 ? 'virtual-list' : _props$prefixCls,
-      className = props.className,
-      height = props.height,
-      itemHeight = props.itemHeight,
-      _props$fullHeight = props.fullHeight,
-      fullHeight = _props$fullHeight === void 0 ? true : _props$fullHeight,
-      style = props.style,
-      data = props.data,
-      children = props.children,
-      itemKey = props.itemKey,
-      virtual = props.virtual,
-      _props$component = props.component,
-      Component = _props$component === void 0 ? 'div' : _props$component,
-      onScroll = props.onScroll,
-      onVisibleChange = props.onVisibleChange,
-      restProps = __rest(props, ["prefixCls", "className", "height", "itemHeight", "fullHeight", "style", "data", "children", "itemKey", "virtual", "component", "onScroll", "onVisibleChange"]); // ================================= MISC =================================
-
-
+    prefixCls = _props$prefixCls === void 0 ? 'virtual-list' : _props$prefixCls,
+    className = props.className,
+    height = props.height,
+    itemHeight = props.itemHeight,
+    _props$fullHeight = props.fullHeight,
+    fullHeight = _props$fullHeight === void 0 ? true : _props$fullHeight,
+    style = props.style,
+    data = props.data,
+    children = props.children,
+    itemKey = props.itemKey,
+    virtual = props.virtual,
+    _props$component = props.component,
+    Component = _props$component === void 0 ? 'div' : _props$component,
+    onScroll = props.onScroll,
+    onVisibleChange = props.onVisibleChange,
+    restProps = __rest(props, ["prefixCls", "className", "height", "itemHeight", "fullHeight", "style", "data", "children", "itemKey", "virtual", "component", "onScroll", "onVisibleChange"]);
+  // ================================= MISC =================================
   var useVirtual = !!(virtual !== false && height && itemHeight);
   var inVirtual = useVirtual && data && itemHeight * data.length > height;
-
   var _useState = (0, React.useState)(0),
-      _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
-      scrollTop = _useState2[0],
-      setScrollTop = _useState2[1];
-
+    _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
+    scrollTop = _useState2[0],
+    setScrollTop = _useState2[1];
   var _useState3 = (0, React.useState)(false),
-      _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
-      scrollMoving = _useState4[0],
-      setScrollMoving = _useState4[1];
-
+    _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
+    scrollMoving = _useState4[0],
+    setScrollMoving = _useState4[1];
   var mergedClassName = (0, _classnames["default"])(prefixCls, className);
   var mergedData = data || EMPTY_DATA;
   var componentRef = (0, React.useRef)();
   var fillerInnerRef = (0, React.useRef)();
   var scrollBarRef = (0, React.useRef)(); // Hack on scrollbar to enable flash call
   // =============================== Item Key ===============================
-
   var getKey = React.useCallback(function (item) {
     if (typeof itemKey === 'function') {
       return itemKey(item);
     }
-
     return item === null || item === void 0 ? void 0 : item[itemKey];
   }, [itemKey]);
   var sharedConfig = {
     getKey: getKey
-  }; // ================================ Scroll ================================
-
+  };
+  // ================================ Scroll ================================
   function syncScrollTop(newTop) {
     setScrollTop(function (origin) {
       var value;
-
       if (typeof newTop === 'function') {
         value = newTop(origin);
       } else {
         value = newTop;
       }
-
       var alignedTop = keepInRange(value);
       componentRef.current.scrollTop = alignedTop;
       return alignedTop;
     });
-  } // ================================ Legacy ================================
+  }
+  // ================================ Legacy ================================
   // Put ref here since the range is generate by follow
-
-
   var rangeRef = (0, React.useRef)({
     start: 0,
     end: mergedData.length
   });
   var diffItemRef = (0, React.useRef)();
-
   var _useDiffItem = (0, _useDiffItem3["default"])(mergedData, getKey),
-      _useDiffItem2 = (0, _slicedToArray2["default"])(_useDiffItem, 1),
-      diffItem = _useDiffItem2[0];
-
-  diffItemRef.current = diffItem; // ================================ Height ================================
-
+    _useDiffItem2 = (0, _slicedToArray2["default"])(_useDiffItem, 1),
+    diffItem = _useDiffItem2[0];
+  diffItemRef.current = diffItem;
+  // ================================ Height ================================
   var _useHeights = (0, _useHeights3["default"])(getKey, null, null),
-      _useHeights2 = (0, _slicedToArray2["default"])(_useHeights, 4),
-      setInstanceRef = _useHeights2[0],
-      collectHeight = _useHeights2[1],
-      heights = _useHeights2[2],
-      heightUpdatedMark = _useHeights2[3]; // ========================== Visible Calculation =========================
-
-
+    _useHeights2 = (0, _slicedToArray2["default"])(_useHeights, 4),
+    setInstanceRef = _useHeights2[0],
+    collectHeight = _useHeights2[1],
+    heights = _useHeights2[2],
+    heightUpdatedMark = _useHeights2[3];
+  // ========================== Visible Calculation =========================
   var _React$useMemo = React.useMemo(function () {
-    var _a;
-
-    if (!useVirtual) {
-      return {
-        scrollHeight: undefined,
-        start: 0,
-        end: mergedData.length - 1,
-        offset: undefined
-      };
-    } // Always use virtual scroll bar in avoid shaking
-
-
-    if (!inVirtual) {
+      var _a;
+      if (!useVirtual) {
+        return {
+          scrollHeight: undefined,
+          start: 0,
+          end: mergedData.length - 1,
+          offset: undefined
+        };
+      }
+      // Always use virtual scroll bar in avoid shaking
+      if (!inVirtual) {
+        return {
+          scrollHeight: ((_a = fillerInnerRef.current) === null || _a === void 0 ? void 0 : _a.offsetHeight) || 0,
+          start: 0,
+          end: mergedData.length - 1,
+          offset: undefined
+        };
+      }
+      var itemTop = 0;
+      var startIndex;
+      var startOffset;
+      var endIndex;
+      var dataLen = mergedData.length;
+      for (var i = 0; i < dataLen; i += 1) {
+        var item = mergedData[i];
+        var key = getKey(item);
+        var cacheHeight = heights.get(key);
+        var currentItemBottom = itemTop + (cacheHeight === undefined ? itemHeight : cacheHeight);
+        // Check item top in the range
+        if (currentItemBottom >= scrollTop && startIndex === undefined) {
+          startIndex = i;
+          startOffset = itemTop;
+        }
+        // Check item bottom in the range. We will render additional one item for motion usage
+        if (currentItemBottom > scrollTop + height && endIndex === undefined) {
+          endIndex = i;
+        }
+        itemTop = currentItemBottom;
+      }
+      // Fallback to normal if not match. This code should never reach
+      /* istanbul ignore next */
+      if (startIndex === undefined) {
+        startIndex = 0;
+        startOffset = 0;
+      }
+      if (endIndex === undefined) {
+        endIndex = mergedData.length - 1;
+      }
+      // Give cache to improve scroll experience
+      endIndex = Math.min(endIndex + 1, mergedData.length);
       return {
-        scrollHeight: ((_a = fillerInnerRef.current) === null || _a === void 0 ? void 0 : _a.offsetHeight) || 0,
-        start: 0,
-        end: mergedData.length - 1,
-        offset: undefined
+        scrollHeight: itemTop,
+        start: startIndex,
+        end: endIndex,
+        offset: startOffset
       };
-    }
-
-    var itemTop = 0;
-    var startIndex;
-    var startOffset;
-    var endIndex;
-    var dataLen = mergedData.length;
-
-    for (var i = 0; i < dataLen; i += 1) {
-      var item = mergedData[i];
-      var key = getKey(item);
-      var cacheHeight = heights.get(key);
-      var currentItemBottom = itemTop + (cacheHeight === undefined ? itemHeight : cacheHeight); // Check item top in the range
-
-      if (currentItemBottom >= scrollTop && startIndex === undefined) {
-        startIndex = i;
-        startOffset = itemTop;
-      } // Check item bottom in the range. We will render additional one item for motion usage
-
-
-      if (currentItemBottom > scrollTop + height && endIndex === undefined) {
-        endIndex = i;
-      }
-
-      itemTop = currentItemBottom;
-    } // Fallback to normal if not match. This code should never reach
-
-    /* istanbul ignore next */
-
-
-    if (startIndex === undefined) {
-      startIndex = 0;
-      startOffset = 0;
-    }
-
-    if (endIndex === undefined) {
-      endIndex = mergedData.length - 1;
-    } // Give cache to improve scroll experience
-
-
-    endIndex = Math.min(endIndex + 1, mergedData.length);
-    return {
-      scrollHeight: itemTop,
-      start: startIndex,
-      end: endIndex,
-      offset: startOffset
-    };
-  }, [inVirtual, useVirtual, scrollTop, mergedData, heightUpdatedMark, height]),
-      scrollHeight = _React$useMemo.scrollHeight,
-      start = _React$useMemo.start,
-      end = _React$useMemo.end,
-      offset = _React$useMemo.offset;
-
+    }, [inVirtual, useVirtual, scrollTop, mergedData, heightUpdatedMark, height]),
+    scrollHeight = _React$useMemo.scrollHeight,
+    start = _React$useMemo.start,
+    end = _React$useMemo.end,
+    offset = _React$useMemo.offset;
   rangeRef.current.start = start;
-  rangeRef.current.end = end; // =============================== In Range ===============================
-
+  rangeRef.current.end = end;
+  // =============================== In Range ===============================
   var maxScrollHeight = scrollHeight - height;
   var maxScrollHeightRef = (0, React.useRef)(maxScrollHeight);
   maxScrollHeightRef.current = maxScrollHeight;
-
   function keepInRange(newScrollTop) {
     var newTop = newScrollTop;
-
     if (!Number.isNaN(maxScrollHeightRef.current)) {
       newTop = Math.min(newTop, maxScrollHeightRef.current);
     }
-
     newTop = Math.max(newTop, 0);
     return newTop;
   }
-
   var isScrollAtTop = scrollTop <= 0;
   var isScrollAtBottom = scrollTop >= maxScrollHeight;
-  var originScroll = (0, _useOriginScroll["default"])(isScrollAtTop, isScrollAtBottom); // ================================ Scroll ================================
-
+  var originScroll = (0, _useOriginScroll["default"])(isScrollAtTop, isScrollAtBottom);
+  // ================================ Scroll ================================
   function onScrollBar(newScrollTop) {
     var newTop = newScrollTop;
     syncScrollTop(newTop);
-  } // When data size reduce. It may trigger native scroll event back to fit scroll position
-
-
+  }
+  // When data size reduce. It may trigger native scroll event back to fit scroll position
   function onFallbackScroll(e) {
     var newScrollTop = e.currentTarget.scrollTop;
-
     if (newScrollTop !== scrollTop) {
       syncScrollTop(newScrollTop);
-    } // Trigger origin onScroll
-
-
+    }
+    // Trigger origin onScroll
     onScroll === null || onScroll === void 0 ? void 0 : onScroll(e);
-  } // Since this added in global,should use ref to keep update
-
-
+  }
+  // Since this added in global,should use ref to keep update
   var _useFrameWheel = (0, _useFrameWheel3["default"])(useVirtual, isScrollAtTop, isScrollAtBottom, function (offsetY) {
-    syncScrollTop(function (top) {
-      var newTop = top + offsetY;
-      return newTop;
-    });
-  }),
-      _useFrameWheel2 = (0, _slicedToArray2["default"])(_useFrameWheel, 2),
-      onRawWheel = _useFrameWheel2[0],
-      onFireFoxScroll = _useFrameWheel2[1]; // Mobile touch move
-
-
+      syncScrollTop(function (top) {
+        var newTop = top + offsetY;
+        return newTop;
+      });
+    }),
+    _useFrameWheel2 = (0, _slicedToArray2["default"])(_useFrameWheel, 2),
+    onRawWheel = _useFrameWheel2[0],
+    onFireFoxScroll = _useFrameWheel2[1];
+  // Mobile touch move
   (0, _useMobileTouchMove["default"])(useVirtual, componentRef, function (deltaY, smoothOffset) {
     if (originScroll(deltaY, smoothOffset)) {
       return false;
     }
-
     onRawWheel({
       preventDefault: function preventDefault() {},
       deltaY: deltaY
@@ -296,7 +237,6 @@ function RawList(props, ref) {
         e.preventDefault();
       }
     }
-
     componentRef.current.addEventListener('wheel', onRawWheel);
     componentRef.current.addEventListener('DOMMouseScroll', onFireFoxScroll);
     componentRef.current.addEventListener('MozMousePixelScroll', onMozMousePixelScroll);
@@ -305,43 +245,37 @@ function RawList(props, ref) {
       componentRef.current.removeEventListener('DOMMouseScroll', onFireFoxScroll);
       componentRef.current.removeEventListener('MozMousePixelScroll', onMozMousePixelScroll);
     };
-  }, [useVirtual]); // ================================= Ref ==================================
-
+  }, [useVirtual]);
+  // ================================= Ref ==================================
   var scrollTo = (0, _useScrollTo["default"])(componentRef, mergedData, heights, itemHeight, getKey, collectHeight, syncScrollTop, function () {
     var _a;
-
     (_a = scrollBarRef.current) === null || _a === void 0 ? void 0 : _a.delayHidden();
   });
   React.useImperativeHandle(ref, function () {
     return {
       scrollTo: scrollTo
     };
-  }); // ================================ Effect ================================
-
+  });
+  // ================================ Effect ================================
   /** We need told outside that some list not rendered */
-
   (0, _useLayoutEffect["default"])(function () {
     if (onVisibleChange) {
       var renderList = mergedData.slice(start, end + 1);
       onVisibleChange(renderList, mergedData);
     }
-  }, [start, end, mergedData]); // ================================ Render ================================
-
+  }, [start, end, mergedData]);
+  // ================================ Render ================================
   var listChildren = (0, _useChildren["default"])(mergedData, start, end, setInstanceRef, children, sharedConfig);
   var componentStyle = null;
-
   if (height) {
     componentStyle = (0, _extends3["default"])((0, _defineProperty2["default"])({}, fullHeight ? 'height' : 'maxHeight', height), ScrollStyle);
-
     if (useVirtual) {
       componentStyle.overflowY = 'hidden';
-
       if (scrollMoving) {
         componentStyle.pointerEvents = 'none';
       }
     }
   }
-
   return /*#__PURE__*/React.createElement("div", (0, _extends3["default"])({
     style: (0, _extends3["default"])((0, _extends3["default"])({}, style), {
       position: 'relative'
@@ -374,7 +308,6 @@ function RawList(props, ref) {
     }
   }));
 }
-
 var List = /*#__PURE__*/React.forwardRef(RawList);
 List.displayName = 'List';
 var _default = List;

package/lib/virtual-list/ScrollBar.d.ts

@@ -38,6 +38,6 @@ export default class ScrollBar extends React.Component<ScrollBarProps, ScrollBar
     getEnableHeightRange: () => number;
     getTop: () => number;
     showScroll: () => boolean;
-    render(): JSX.Element;
+    render(): React.JSX.Element;
 }
 export {};