From 8cb653afc7aec79c39a77766ec763d0449e0193e Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@youzan.com>
Date: Fri, 20 Dec 2019 20:23:56 +0800
Subject: [PATCH] fix(CountDown): infinite tick if call reset after finish
 (#5340)

---
 src/count-down/README.md       |  2 +-
 src/count-down/README.zh-CN.md |  2 +-
 src/count-down/demo/index.vue  | 26 +++++---------------------
 src/count-down/index.js        | 19 +++++++++++++++++--
 4 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/src/count-down/README.md b/src/count-down/README.md
index efac70b44..3027a4748 100644
--- a/src/count-down/README.md
+++ b/src/count-down/README.md
@@ -79,7 +79,7 @@ export default {
   :time="3000"
   :auto-start="false"
   format="ss:SSS"
-  @finish="finished"
+  @finish="finish"
 />
 <van-grid clickable :column-num="3">
   <van-grid-item text="Start" icon="play-circle-o" @click="start" />
diff --git a/src/count-down/README.zh-CN.md b/src/count-down/README.zh-CN.md
index 31e4fec86..48ac640bc 100644
--- a/src/count-down/README.zh-CN.md
+++ b/src/count-down/README.zh-CN.md
@@ -89,7 +89,7 @@ export default {
   :time="3000"
   :auto-start="false"
   format="ss:SSS"
-  @finish="finished"
+  @finish="finish"
 />
 <van-grid clickable>
   <van-grid-item text="开始" icon="play-circle-o" @click="start" />
diff --git a/src/count-down/demo/index.vue b/src/count-down/demo/index.vue
index 6c5c624fb..2ddec37fb 100644
--- a/src/count-down/demo/index.vue
+++ b/src/count-down/demo/index.vue
@@ -5,24 +5,15 @@
     </demo-block>
 
     <demo-block :title="$t('customFormat')">
-      <van-count-down
-        :time="time"
-        :format="$t('formatWithDay')"
-      />
+      <van-count-down :time="time" :format="$t('formatWithDay')" />
     </demo-block>
 
     <demo-block :title="$t('millisecond')">
-      <van-count-down
-        millisecond
-        :time="time"
-        format="HH:mm:ss:SS"
-      />
+      <van-count-down millisecond :time="time" format="HH:mm:ss:SS" />
     </demo-block>
 
     <demo-block :title="$t('customStyle')">
-      <van-count-down
-        :time="time"
-      >
+      <van-count-down :time="time">
         <template v-slot="currentTime">
           <span class="item">{{ currentTime.hours }}</span>
           <span class="item">{{ currentTime.minutes }}</span>
@@ -40,10 +31,7 @@
         format="ss:SSS"
         @finish="$toast($t('finished'))"
       />
-      <van-grid
-        clickable
-        :column-num="3"
-      >
+      <van-grid clickable :column-num="3">
         <van-grid-item
           icon="play-circle-o"
           :text="$t('start')"
@@ -54,11 +42,7 @@
           :text="$t('pause')"
           @click="pause"
         />
-        <van-grid-item
-          icon="replay"
-          :text="$t('reset')"
-          @click="reset"
-        />
+        <van-grid-item icon="replay" :text="$t('reset')" @click="reset" />
       </van-grid>
     </demo-block>
   </demo-section>
diff --git a/src/count-down/index.js b/src/count-down/index.js
index b39ba03ff..6331ef602 100644
--- a/src/count-down/index.js
+++ b/src/count-down/index.js
@@ -64,6 +64,7 @@ export default createComponent({
   },
 
   methods: {
+    // @exposed-api
     start() {
       if (this.counting) {
         return;
@@ -74,11 +75,13 @@ export default createComponent({
       this.tick();
     },
 
+    // @exposed-api
     pause() {
       this.counting = false;
       cancelRaf(this.rafId);
     },
 
+    // @exposed-api
     reset() {
       this.pause();
       this.remain = this.time;
@@ -98,9 +101,15 @@ export default createComponent({
 
     microTick() {
       this.rafId = raf(() => {
+        /* istanbul ignore if */
+        // in case of call reset immediately after finish
+        if (!this.counting) {
+          return;
+        }
+
         this.setRemain(this.getRemain());
 
-        if (this.remain !== 0) {
+        if (this.remain > 0) {
           this.microTick();
         }
       });
@@ -108,13 +117,19 @@ export default createComponent({
 
     macroTick() {
       this.rafId = raf(() => {
+        /* istanbul ignore if */
+        // in case of call reset immediately after finish
+        if (!this.counting) {
+          return;
+        }
+
         const remain = this.getRemain();
 
         if (!isSameSecond(remain, this.remain) || remain === 0) {
           this.setRemain(remain);
         }
 
-        if (this.remain !== 0) {
+        if (this.remain > 0) {
           this.macroTick();
         }
       });