parsec-hooks 0.0.158 → 0.0.162

package/lib/loadMoreHooks/index.d.ts

@@ -17,7 +17,7 @@ export interface LoadMoreOptions {
      */
     customSetLoading?: (loading: boolean) => void;
 }
-export default function <D>(getListFn: LoadMoreGetListFn<D>, { defaultLimit, defaultPage, needGet, cacheKey, customSetLoading, loadMoreVisible }: LoadMoreOptions): {
+export default function <D>(getListFn: LoadMoreGetListFn<D>, { defaultLimit, defaultPage, needGet, cacheKey, loadMoreVisible }: LoadMoreOptions): {
     error: any;
     dataRef: {
         current: {
@@ -28,7 +28,6 @@ export default function <D>(getListFn: LoadMoreGetListFn<D>, { defaultLimit, def
     };
     loading: boolean;
     refreshList: (retainList?: boolean) => Promise<void>;
-    getNext: (callback?: () => void) => void;
     isEnd: boolean;
     page: number;
     limit: number;

package/lib/loadMoreHooks/index.js

@@ -15,12 +15,14 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 
 var _react = require("react");
 
-var _stateRefHooks = _interopRequireDefault(require("../stateRefHooks"));
-
 var _promiseHooks = _interopRequireDefault(require("../promiseHooks"));
 
 var _cacheStateHooks = _interopRequireDefault(require("../cacheStateHooks"));
 
+var _refStateHooks = _interopRequireDefault(require("../refStateHooks"));
+
+var _previousHooks = _interopRequireDefault(require("../previousHooks"));
+
 function _default(getListFn, _ref) {
   var _ref$defaultLimit = _ref.defaultLimit,
       defaultLimit = _ref$defaultLimit === void 0 ? 10 : _ref$defaultLimit,
@@ -30,7 +32,6 @@ function _default(getListFn, _ref) {
       needGet = _ref$needGet === void 0 ? true : _ref$needGet,
       _ref$cacheKey = _ref.cacheKey,
       cacheKey = _ref$cacheKey === void 0 ? '' : _ref$cacheKey,
-      customSetLoading = _ref.customSetLoading,
       loadMoreVisible = _ref.loadMoreVisible;
 
   var _useCacheState = (0, _cacheStateHooks.default)(getListFn.toString() + cacheKey, (0, _react.useMemo)(function () {
@@ -53,18 +54,20 @@ function _default(getListFn, _ref) {
     };
   }, [defaultPage, defaultLimit, dataRef]);
 
-  var _useState = (0, _react.useState)(false),
-      _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-      isEnd = _useState2[0],
-      setIsEnd = _useState2[1];
+  var _useRefState = (0, _refStateHooks.default)(false),
+      _useRefState2 = (0, _slicedToArray2.default)(_useRefState, 3),
+      isEnd = _useRefState2[0],
+      setIsEnd = _useRefState2[1],
+      isEndRef = _useRefState2[2];
 
-  var _useState3 = (0, _react.useState)(),
-      _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
-      error = _useState4[0],
-      setError = _useState4[1];
+  var _useState = (0, _react.useState)(),
+      _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+      error = _useState2[0],
+      setError = _useState2[1];
 
   var loadingRef = (0, _react.useRef)(false);
   var countRef = (0, _react.useRef)(0);
+  var preVisible = (0, _previousHooks.default)(loadMoreVisible);
 
   var _usePromise = (0, _promiseHooks.default)((0, _react.useCallback)(function (retainList) {
     var _dataRef$current = dataRef.current,
@@ -98,11 +101,7 @@ function _default(getListFn, _ref) {
         return Promise.reject();
       }
     });
-  }, [dataRef, defaultLimit, defaultPage, getListFn, setData]), {
-    customSetLoading: customSetLoading ? (0, _react.useCallback)(function (loading) {
-      loadingRef.current = loading;
-      customSetLoading(loading);
-    }, [customSetLoading]) : undefined,
+  }, [dataRef, defaultLimit, defaultPage, getListFn, setData, setIsEnd]), {
     needInit: false
   }),
       handleGetList = _usePromise.handle,
@@ -114,25 +113,28 @@ function _default(getListFn, _ref) {
 
 
   var refreshList = (0, _react.useCallback)(function (retainList) {
+    if (!needGet) {
+      return;
+    }
+
     if (!retainList) {
       setData(initData);
     }
 
     return handleGetList(retainList);
-  }, [handleGetList, initData, setData]);
-  var visibleRef = (0, _stateRefHooks.default)(loadMoreVisible);
-  var isEndRef = (0, _stateRefHooks.default)(isEnd);
+  }, [handleGetList, initData, needGet, setData]);
   var getNext = (0, _react.useCallback)(function (callback) {
     if (!isEndRef.current && !loadingRef.current && needGet) {
       handleGetList().then(callback);
     }
   }, [handleGetList, isEndRef, loadingRef, needGet]);
+  var preVisibleRef = (0, _react.useRef)(preVisible);
   (0, _react.useEffect)(function () {
     if (needGet) {
       // 当handleGetList发生变化清空数据
       refreshList().then(function () {
         var fn = function fn() {
-          if (visibleRef.current) {
+          if (preVisibleRef.current) {
             getNext(fn);
           }
         };
@@ -140,18 +142,17 @@ function _default(getListFn, _ref) {
         fn();
       });
     }
-  }, [refreshList, handleGetList, needGet, visibleRef, getNext]);
+  }, [refreshList, handleGetList, needGet, preVisibleRef, getNext]);
   (0, _react.useEffect)(function () {
-    if (loadMoreVisible) {
+    if (loadMoreVisible && preVisible !== loadMoreVisible) {
       getNext();
     }
-  }, [getNext, loadMoreVisible]);
+  }, [getNext, loadMoreVisible, preVisible]);
   return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, data), {}, {
     error: error,
     dataRef: dataRef,
     loading: loading,
     refreshList: refreshList,
-    getNext: getNext,
     isEnd: (0, _react.useMemo)(function () {
       return isEnd || !data.list.length;
     }, [isEnd, data])

package/lib/webLoadMoreHooks/index.d.ts

@@ -11,7 +11,6 @@ declare const _default: <D extends unknown>(getList: LoadMoreGetListFn<D>, optio
     };
     loading: boolean;
     refreshList: (retainList?: boolean) => Promise<void>;
-    getNext: (callback?: () => void) => void;
     isEnd: boolean;
     page: number;
     limit: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "parsec-hooks",
-  "version": "0.0.158",
+  "version": "0.0.162",
   "description": "秒差距前端常用的hooks工具",
   "author": "mushan0x0",
   "license": "MIT",
@@ -36,28 +36,28 @@
     "@babel/runtime": "^7.10.3",
     "classnames": "^2.2.6",
     "crypto-js": "^4.0.0",
-    "dayjs": "^1.8.21",
     "import-cdn-js": "^0.0.2",
     "intersection-observer": "^0.8.0",
     "qs": "^6.9.4",
-    "rc-field-form": "^1.2.0",
-    "remax": "^2.11.4",
     "resize-observer-polyfill": "^1.5.1",
     "unstated-next": "^1.1.0"
   },
   "peerDependencies": {
+    "dayjs": "^1.8.0",
     "prop-types": "^15.5.4",
+    "rc-field-form": "^1.2.0",
     "react": "^15.0.0 || ^16.0.0",
     "react-dom": "^15.0.0 || ^16.0.0",
-    "remax": "^2.11.4"
+    "remax": "^2.0.0"
   },
   "devDependencies": {
     "@babel/helper-call-delegate": "^7.10.3",
     "@babel/plugin-syntax-typescript": "^7.10.4",
     "@types/qs": "^6.9.3",
-    "@types/react": "^16.3.13",
+    "@types/react": "^17.0.38",
     "@types/react-dom": "^16.0.5",
     "@types/vfile-message": "^2.0.0",
+    "dayjs": "^1.8.21",
     "dumi": "^1.0.34",
     "eslint": "^6.8.0",
     "eslint-config-prettier": "^6.10.0",
@@ -75,8 +75,10 @@
     "np": "^6.2.4",
     "prettier": "^1.19.1",
     "pretty-quick": "^2.0.1",
+    "rc-field-form": "^1.2.0",
     "react": "^16.4.1",
     "react-dom": "^16.4.1",
+    "remax": "^2.11.4",
     "typescript": "^3.9.5"
   },
   "files": [