parsec-hooks 1.0.16 → 1.0.19

package/lib/downCountHooks/index.d.ts

@@ -1,8 +1,10 @@
+export declare const setTimeInterval: (fn: () => void, ms: number) => number;
+export declare const clearTimeInterval: (id: number) => void;
 declare const _default: () => {
     countdown: number;
-    clearCountdownTimer: () => boolean;
+    clearCountdownTimer: () => void;
     stopCountdownTimer: () => void;
-    setCountdown: (s: number) => Promise<unknown>;
+    setCountdown: (s: number, onChange?: (count: number) => void) => Promise<unknown>;
     countdownText: string;
 };
 export default _default;

package/lib/downCountHooks/index.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.default = exports.clearTimeInterval = exports.setTimeInterval = void 0;
 
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 
@@ -13,60 +13,85 @@ var _react = require("react");
 
 var _refStateHooks = _interopRequireDefault(require("../refStateHooks"));
 
+var _requestAnimationFramePolyfill = require("request-animation-frame-polyfill");
+
+var stops = {};
+
+var setTimeInterval = function setTimeInterval(fn, ms) {
+  var id = Math.random();
+  var startTime = +new Date();
+
+  var start = function start(prev) {
+    if (stops[id] === false) {
+      return;
+    }
+
+    var now = +new Date();
+
+    if (now - prev > ms) {
+      fn();
+      (0, _requestAnimationFramePolyfill.requestAnimationFrame)(function () {
+        return start(now);
+      });
+    } else {
+      (0, _requestAnimationFramePolyfill.requestAnimationFrame)(function () {
+        return start(prev);
+      });
+    }
+  };
+
+  (0, _requestAnimationFramePolyfill.requestAnimationFrame)(function () {
+    return start(startTime);
+  });
+  return id;
+};
+
+exports.setTimeInterval = setTimeInterval;
+
+var clearTimeInterval = function clearTimeInterval(id) {
+  stops[id] = false;
+};
+
+exports.clearTimeInterval = clearTimeInterval;
+
 var _default = function _default() {
   var _useRefState = (0, _refStateHooks.default)(0),
       _useRefState2 = (0, _slicedToArray2.default)(_useRefState, 2),
       countdown = _useRefState2[0],
       setCountdown = _useRefState2[1];
 
-  var stopRef = (0, _react.useRef)(false);
+  var timer = (0, _react.useRef)();
   var clearCountdownTimer = (0, _react.useCallback)(function () {
-    return stopRef.current = true;
+    return timer.current && clearTimeInterval(timer.current);
   }, []);
   var stopCountdownTimer = (0, _react.useCallback)(function () {
     clearCountdownTimer();
     setCountdown(0);
   }, [clearCountdownTimer, setCountdown]);
+  (0, _react.useEffect)(function () {
+    return clearCountdownTimer;
+  }, [clearCountdownTimer]);
   return {
     countdown: countdown,
     clearCountdownTimer: clearCountdownTimer,
     stopCountdownTimer: stopCountdownTimer,
-    setCountdown: (0, _react.useCallback)(function (s) {
+    setCountdown: (0, _react.useCallback)(function (s, onChange) {
       return new Promise(function (resolve) {
-        stopRef.current = false;
-        setCountdown(s);
-        var startTime = +new Date();
+        clearCountdownTimer();
+        var countdown = s;
+        setCountdown(countdown);
+        timer.current = setTimeInterval(function () {
+          countdown--;
+          onChange === null || onChange === void 0 ? void 0 : onChange(countdown);
+          setCountdown(countdown);
 
-        var start = function start(prev) {
-          var now = +new Date();
-
-          if (stopRef.current) {
-            return;
-          }
-
-          if (now - prev > 1000) {
-            var count = s - Math.round((now - startTime) / 1000);
-            setCountdown(count);
-
-            if (count <= 0) {
-              resolve();
-            } else {
-              requestAnimationFrame(function () {
-                return start(now);
-              });
-            }
-          } else {
-            requestAnimationFrame(function () {
-              return start(prev);
-            });
+          if (!countdown) {
+            clearCountdownTimer();
+            resolve();
           }
-        };
-
-        requestAnimationFrame(function () {
-          return start(startTime);
-        });
+        }, 1000);
       });
-    }, [setCountdown]),
+    }, [clearCountdownTimer, setCountdown]),
     countdownText: countdown ? "(".concat(countdown, " s)") : ''
   };
 };

package/lib/loadMoreHooks/index.js

@@ -70,6 +70,7 @@ function _default(getListFn, _ref) {
   var preVisible = (0, _previousHooks.default)(loadMoreVisible);
 
   var _usePromise = (0, _promiseHooks.default)((0, _react.useCallback)(function (retainList) {
+    console.log(2222, dataRef.current);
     var _dataRef$current = dataRef.current,
         page = _dataRef$current.page,
         limit = _dataRef$current.limit,
@@ -88,6 +89,14 @@ function _default(getListFn, _ref) {
       if (count === countRef.current) {
         var list = pageNum === defaultPage || retainList ? newList : [].concat((0, _toConsumableArray2.default)(resList), (0, _toConsumableArray2.default)(newList));
         setIsEnd(list.length >= total);
+        console.log(1111, {
+          'list.length': list.length,
+          defaultLimit: defaultLimit
+        }, {
+          page: Math.ceil(list.length < defaultLimit ? 1 : list.length / defaultLimit + 1),
+          limit: defaultLimit,
+          list: list
+        });
         setData({
           page: Math.ceil(list.length < defaultLimit ? 1 : list.length / defaultLimit + 1),
           limit: defaultLimit,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "parsec-hooks",
-  "version": "1.0.16",
+  "version": "1.0.19",
   "description": "秒差距前端常用的hooks工具",
   "author": "mushan0x0",
   "license": "MIT",
@@ -39,6 +39,7 @@
     "import-cdn-js": "^0.0.2",
     "intersection-observer": "^0.8.0",
     "qs": "^6.9.4",
+    "request-animation-frame-polyfill": "^1.1.2",
     "resize-observer-polyfill": "^1.5.1",
     "unstated-next": "^1.1.0"
   },