From 6b85d7b902e75c03e7d382e1a2c5c65a510baa41 Mon Sep 17 00:00:00 2001
From: duxiaodong <duxiaodong@darlin.me>
Date: Tue, 23 Jun 2020 16:15:04 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=A1=B5=E9=9D=A2=20P?=
 =?UTF-8?q?icker=20=E6=97=A0=E5=8F=98=E6=9B=B4=E7=9A=84=E6=B8=B2=E6=9F=93?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E9=80=89=E6=8B=A9=E9=A1=B9=E9=87=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Picker.tsx     |  8 +++++++-
 src/PopupMixin.tsx | 16 +++++++++++++---
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/Picker.tsx b/src/Picker.tsx
index d60f6a9..4251d3d 100644
--- a/src/Picker.tsx
+++ b/src/Picker.tsx
@@ -20,6 +20,8 @@ class Picker extends React.Component<IPickerProp & IPickerProps, any> {
   indicatorRef: any;
   itemHeight: number;
   scrollValue: any;
+  // 在拖动或者动画滚动过程中，不响应 props 更新
+  isMovingOrScrolling = false;
 
   scrollHanders = (() => {
     let scrollY = -1;
@@ -112,6 +114,7 @@ class Picker extends React.Component<IPickerProp & IPickerProps, any> {
       }
 
       isMoving = true;
+      this.isMovingOrScrolling = true;
       startY = y;
       lastY = scrollY;
     };
@@ -243,7 +246,9 @@ class Picker extends React.Component<IPickerProp & IPickerProps, any> {
   }
 
   componentDidUpdate() {
-    this.props.select(this.state.selectedValue, this.itemHeight, this.scrollToWithoutAnimation);
+    if (!this.isMovingOrScrolling) {
+      this.props.select(this.state.selectedValue, this.itemHeight, this.scrollToWithoutAnimation);
+    }
   }
 
   scrollTo = (top) => {
@@ -285,6 +290,7 @@ class Picker extends React.Component<IPickerProp & IPickerProps, any> {
   }
 
   scrollingComplete = () => {
+    this.isMovingOrScrolling = false;
     const top = this.scrollHanders.getValue();
     if (top >= 0) {
       this.props.doScrollingComplete(top, this.itemHeight, this.fireValueChange);
diff --git a/src/PopupMixin.tsx b/src/PopupMixin.tsx
index 74b6ea8..6bfc129 100644
--- a/src/PopupMixin.tsx
+++ b/src/PopupMixin.tsx
@@ -26,9 +26,19 @@ export default function PopupMixin(getModal, platformProps) {
 
     componentWillReceiveProps(nextProps) {
       if ('value' in nextProps) {
-        this.setState({
-          pickerValue: nextProps.value,
-        });
+        // value 有实际的变化才更新
+        if (!Array.isArray(nextProps.value) || !Array.isArray(this.props.value)) {
+          // 不是数组的话，跟原来的逻辑一样，实际上 Picker 不会走到这个逻辑，因为 Picker 在使用的时候必须传数组
+          this.setState({
+            pickerValue: nextProps.value,
+          });
+        } else if (nextProps.value.length !== this.props.value.length || nextProps.value.some(
+          (item, index) => item !== this.props.value[index]
+        )) {
+          this.setState({
+            pickerValue: nextProps.value,
+          });
+        }
       }
       if ('visible' in nextProps) {
         this.setVisibleState(nextProps.visible);