parsec-hooks 0.0.156 → 0.0.160

package/lib/effectStateHooks/index.js

@@ -28,18 +28,13 @@ function _default(depState) {
       state = _useState2[0],
       setState = _useState2[1];
 
-  var effectRef = (0, _react.useRef)(true);
+  var timeRef = (0, _react.useRef)(+new Date());
   (0, _debounceEffectHooks.default)(function () {
-    if (effectRef.current === true) {
+    if (+new Date() - timeRef.current > 10) {
       setState(depState);
-    } else {
-      effectRef.current = false;
     }
   }, [depState], (0, _objectSpread2.default)({
     wait: wait
   }, other));
-  return [state, (0, _react.useCallback)(function (state) {
-    setState(state);
-    effectRef.current = false;
-  }, [])];
+  return [state, setState];
 }

package/lib/loadMoreHooks/index.d.ts

@@ -28,7 +28,7 @@ export default function <D>(getListFn: LoadMoreGetListFn<D>, { defaultLimit, def
     };
     loading: boolean;
     refreshList: (retainList?: boolean) => Promise<void>;
-    getNext: () => Promise<void>;
+    getNext: (callback?: () => void) => void;
     isEnd: boolean;
     page: number;
     limit: number;

package/lib/loadMoreHooks/index.js

@@ -114,27 +114,30 @@ function _default(getListFn, _ref) {
 
 
   var refreshList = (0, _react.useCallback)(function (retainList) {
+    if (!needGet) {
+      return;
+    }
+
     if (!retainList) {
       setData(initData);
     }
 
     return handleGetList(retainList);
-  }, [handleGetList, initData, setData]);
+  }, [handleGetList, initData, needGet, setData]);
   var visibleRef = (0, _stateRefHooks.default)(loadMoreVisible);
-  var getNext = (0, _react.useCallback)(function () {
-    if (!isEnd && !loadingRef.current && needGet) {
-      return handleGetList();
+  var isEndRef = (0, _stateRefHooks.default)(isEnd);
+  var getNext = (0, _react.useCallback)(function (callback) {
+    if (!isEndRef.current && !loadingRef.current && needGet) {
+      handleGetList().then(callback);
     }
-
-    return Promise.resolve();
-  }, [handleGetList, isEnd, loadingRef, needGet]);
+  }, [handleGetList, isEndRef, loadingRef, needGet]);
   (0, _react.useEffect)(function () {
     if (needGet) {
       // 当handleGetList发生变化清空数据
       refreshList().then(function () {
         var fn = function fn() {
           if (visibleRef.current) {
-            getNext().then(fn);
+            getNext(fn);
           }
         };
 

package/lib/webLoadMoreHooks/index.d.ts

@@ -11,7 +11,7 @@ declare const _default: <D extends unknown>(getList: LoadMoreGetListFn<D>, optio
     };
     loading: boolean;
     refreshList: (retainList?: boolean) => Promise<void>;
-    getNext: () => 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.156",
+  "version": "0.0.160",
   "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": [