From c3333e09fbbcb037006a42a4cfc33f4270cc77de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@youzan.com>
Date: Tue, 28 May 2019 16:58:17 +0800
Subject: [PATCH] [improvement] Picker: optimize transition duration

---
 packages/picker/PickerColumn.js | 3 ++-
 packages/picker/index.less      | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/picker/PickerColumn.js b/packages/picker/PickerColumn.js
index 76ae1851a..e2686f7d7 100644
--- a/packages/picker/PickerColumn.js
+++ b/packages/picker/PickerColumn.js
@@ -8,7 +8,7 @@ const DEFAULT_DURATION = 200;
 // 惯性滑动思路:
 // 在手指离开屏幕时，如果和上一次 move 时的间隔小于 `MOMENTUM_LIMIT_TIME` 且 move
 // 距离大于 `MOMENTUM_LIMIT_DISTANCE` 时，执行惯性滑动，持续 `MOMENTUM_DURATION`
-const MOMENTUM_DURATION = 1500;
+const MOMENTUM_DURATION = 1000;
 const MOMENTUM_LIMIT_TIME = 300;
 const MOMENTUM_LIMIT_DISTANCE = 15;
 
@@ -132,6 +132,7 @@ export default sfc({
       this.moving = false;
 
       if (this.transitionEndTrigger) {
+        this.duration = DEFAULT_DURATION;
         this.transitionEndTrigger();
         this.transitionEndTrigger = null;
       }
diff --git a/packages/picker/index.less b/packages/picker/index.less
index 202760efe..4bd674483 100644
--- a/packages/picker/index.less
+++ b/packages/picker/index.less
@@ -81,7 +81,7 @@
     text-align: center;
 
     &__wrapper {
-      transition-timing-function: cubic-bezier(0.23, 1, 0.32, 1);
+      transition-timing-function: cubic-bezier(0.23, 1, 0.68, 1);
     }
 
     &__item {