parsec-hooks 1.0.12 → 1.0.15

package/lib/downCountHooks/index.d.ts

@@ -1,6 +1,6 @@
 declare const _default: () => {
     countdown: number;
-    clearCountdownTimer: () => void;
+    clearCountdownTimer: () => boolean;
     stopCountdownTimer: () => void;
     setCountdown: (s: number) => Promise<unknown>;
     countdownText: string;

package/lib/downCountHooks/index.js

@@ -19,9 +19,9 @@ var _default = function _default() {
       countdown = _useRefState2[0],
       setCountdown = _useRefState2[1];
 
-  var timer = (0, _react.useRef)();
+  var stopRef = (0, _react.useRef)(false);
   var clearCountdownTimer = (0, _react.useCallback)(function () {
-    return timer.current && clearInterval(timer.current);
+    return stopRef.current = true;
   }, []);
   var stopCountdownTimer = (0, _react.useCallback)(function () {
     clearCountdownTimer();
@@ -33,19 +33,40 @@ var _default = function _default() {
     stopCountdownTimer: stopCountdownTimer,
     setCountdown: (0, _react.useCallback)(function (s) {
       return new Promise(function (resolve) {
-        clearCountdownTimer();
-        var countdown = s;
-        setCountdown(countdown);
-        timer.current = setInterval(function () {
-          setCountdown(--countdown);
-
-          if (!countdown) {
-            clearCountdownTimer();
-            resolve();
+        stopRef.current = false;
+        setCountdown(s);
+        var startTime = +new Date();
+
+        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);
+            });
           }
-        }, 1000);
+        };
+
+        requestAnimationFrame(function () {
+          return start(startTime);
+        });
       });
-    }, [clearCountdownTimer, setCountdown]),
+    }, [setCountdown]),
     countdownText: countdown ? "(".concat(countdown, " s)") : ''
   };
 };

package/lib/globalStateHooks/index.js

@@ -35,13 +35,13 @@ var _default = function _default(name, initState) {
   (0, _react.useLayoutEffect)(function () {
     globalObj[name].sets.push(setGlobalState);
   }, [name]);
-  return [globalState, function (state) {
+  return [globalState, (0, _react.useCallback)(function (state) {
     globalObj[name].state = state;
     setGlobalState(state);
     globalObj[name].sets.forEach(function (fn) {
       return fn(state);
     });
-  }];
+  }, [name])];
 };
 
 exports.default = _default;

package/lib/utils/desenStr/index.js

@@ -61,7 +61,7 @@ var _default = function _default(_ref) {
   }
 
   var firstStr = str.substr(0, newbeginLen);
-  var lastStr = str.substr(newendLen);
+  var lastStr = str.substr(-newendLen);
   var middleStr = '*'.repeat(newendLen - newbeginLen + 1);
   var tempStr = firstStr + middleStr + lastStr;
   return tempStr;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "parsec-hooks",
-  "version": "1.0.12",
+  "version": "1.0.15",
   "description": "秒差距前端常用的hooks工具",
   "author": "mushan0x0",
   "license": "MIT",