From b889ab09e8c0b2004523da4aaad98f24174ff72b Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@youzan.com>
Date: Fri, 22 Nov 2019 10:32:17 +0800
Subject: [PATCH] fix(SwipeCell): compatible with desktop scenario (#5077)

---
 src/swipe-cell/demo/index.vue                 |  7 ++---
 src/swipe-cell/index.js                       | 26 +++++++++++--------
 .../test/__snapshots__/demo.spec.js.snap      |  5 ----
 src/swipe-cell/test/index.spec.js             |  2 +-
 4 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/src/swipe-cell/demo/index.vue b/src/swipe-cell/demo/index.vue
index 61647da77..673fa787e 100644
--- a/src/swipe-cell/demo/index.vue
+++ b/src/swipe-cell/demo/index.vue
@@ -1,7 +1,6 @@
 <template>
   <div>
     <demo-section>
-      <van-notice-bar>{{ $t('tips') }}</van-notice-bar>
       <demo-block :title="$t('basicUsage')">
         <van-swipe-cell>
           <template #left>
@@ -67,8 +66,7 @@ export default {
       collect: '收藏',
       title: '单元格',
       title2: '异步关闭',
-      confirm: '确定删除吗？',
-      tips: '建议在手机模式下浏览本示例'
+      confirm: '确定删除吗？'
     },
     'en-US': {
       select: 'Select',
@@ -76,8 +74,7 @@ export default {
       collect: 'Collect',
       title: 'Cell',
       title2: 'Async close',
-      confirm: 'Are you sure to delete?',
-      tips: 'Please try this demo in mobile mode'
+      confirm: 'Are you sure to delete?'
     }
   },
 
diff --git a/src/swipe-cell/index.js b/src/swipe-cell/index.js
index 4cff3a78c..314423897 100644
--- a/src/swipe-cell/index.js
+++ b/src/swipe-cell/index.js
@@ -91,7 +91,6 @@ export default createComponent({
         return;
       }
 
-      this.dragging = true;
       this.startOffset = this.offset;
       this.touchStart(event);
     },
@@ -104,6 +103,9 @@ export default createComponent({
       this.touchMove(event);
 
       if (this.direction === 'horizontal') {
+        this.dragging = true;
+        this.lockClick = true;
+
         const isPrevent = !this.opened || this.deltaX * this.startOffset < 0;
 
         if (isPrevent) {
@@ -121,9 +123,13 @@ export default createComponent({
 
       if (this.dragging) {
         this.toggle(this.offset > 0 ? 'left' : 'right');
-      }
+        this.dragging = false;
 
-      this.dragging = false;
+        // compatible with desktop scenario
+        setTimeout(() => {
+          this.lockClick = false;
+        }, 0);
+      }
     },
 
     toggle(direction) {
@@ -151,14 +157,12 @@ export default createComponent({
     onClick(position = 'outside') {
       this.$emit('click', position);
 
-      if (!this.offset) {
-        return;
-      }
-
-      if (this.onClose) {
-        this.onClose(position, this, { name: this.name });
-      } else {
-        this.swipeMove(0);
+      if (this.opened && !this.lockClick) {
+        if (this.onClose) {
+          this.onClose(position, this, { name: this.name });
+        } else {
+          this.swipeMove(0);
+        }
       }
     },
 
diff --git a/src/swipe-cell/test/__snapshots__/demo.spec.js.snap b/src/swipe-cell/test/__snapshots__/demo.spec.js.snap
index 5cf95a5a5..7174bf5c8 100644
--- a/src/swipe-cell/test/__snapshots__/demo.spec.js.snap
+++ b/src/swipe-cell/test/__snapshots__/demo.spec.js.snap
@@ -3,11 +3,6 @@
 exports[`renders demo correctly 1`] = `
 <div>
   <div>
-    <div role="alert" class="van-notice-bar">
-      <div role="marquee" class="van-notice-bar__wrap">
-        <div class="van-notice-bar__content" style="padding-left: 0px; animation-delay: 1s; animation-duration: 0s;">建议在手机模式下浏览本示例</div>
-      </div>
-    </div>
     <div>
       <div class="van-swipe-cell">
         <div class="van-swipe-cell__wrapper" style="transform: translate3d(0px, 0, 0); transition-duration: .6s;">
diff --git a/src/swipe-cell/test/index.spec.js b/src/swipe-cell/test/index.spec.js
index f1af38b43..91100ec43 100644
--- a/src/swipe-cell/test/index.spec.js
+++ b/src/swipe-cell/test/index.spec.js
@@ -59,7 +59,7 @@ it('on-close prop', () => {
   wrapper.trigger('click');
   expect(position).toEqual(undefined);
 
-  wrapper.setData({ offset: 100 });
+  wrapper.vm.open('left');
   wrapper.trigger('click');
   expect(position).toEqual('cell');