From d76567eeec28a6117213773704fc098fb59e97cb Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@youzan.com>
Date: Fri, 5 Mar 2021 15:33:17 +0800
Subject: [PATCH] fix(Swipe): should render dynamic swipe item correctly
 (#8288)

---
 src/swipe/index.tsx                           |  9 ++---
 .../test/__snapshots__/index.spec.js.snap     | 38 +++++++++++++++++++
 src/swipe/test/index.spec.js                  | 31 +++++++++++++++
 3 files changed, 73 insertions(+), 5 deletions(-)

diff --git a/src/swipe/index.tsx b/src/swipe/index.tsx
index d69fbc1e7..caf4722da 100644
--- a/src/swipe/index.tsx
+++ b/src/swipe/index.tsx
@@ -282,7 +282,9 @@ export default createComponent({
 
       const rect = useRect(root);
 
-      active = Math.min(children.length - 1, active);
+      if (count.value) {
+        active = Math.min(count.value - 1, active);
+      }
 
       state.rect = rect;
       state.swiping = true;
@@ -430,10 +432,7 @@ export default createComponent({
       (value) => initialize(+value)
     );
 
-    watch(
-      () => children.length,
-      () => initialize(state.active)
-    );
+    watch(count, () => initialize(state.active));
 
     watch(
       () => props.autoplay,
diff --git a/src/swipe/test/__snapshots__/index.spec.js.snap b/src/swipe/test/__snapshots__/index.spec.js.snap
index 7a762ba3b..68f97cce8 100644
--- a/src/swipe/test/__snapshots__/index.spec.js.snap
+++ b/src/swipe/test/__snapshots__/index.spec.js.snap
@@ -32,6 +32,44 @@ exports[`should not allow to drag swipe when touchable is false 1`] = `
 </div>
 `;
 
+exports[`should render dynamic SwipeItem correctly 1`] = `
+<div class="van-swipe">
+  <div style="transition-duration: 500ms; transform: translateX(0px);"
+       class="van-swipe__track"
+  >
+  </div>
+</div>
+`;
+
+exports[`should render dynamic SwipeItem correctly 2`] = `
+<div class="van-swipe">
+  <div style="transition-duration: 0ms; transform: translateX(0px); width: 200px;"
+       class="van-swipe__track"
+  >
+    <div class="van-swipe-item"
+         style="width: 100px;"
+    >
+      <span>
+        1
+      </span>
+    </div>
+    <div class="van-swipe-item"
+         style="width: 100px;"
+    >
+      <span>
+        2
+      </span>
+    </div>
+  </div>
+  <div class="van-swipe__indicators">
+    <i class="van-swipe__indicator van-swipe__indicator--active">
+    </i>
+    <i class="van-swipe__indicator">
+    </i>
+  </div>
+</div>
+`;
+
 exports[`should render initial swipe correctly 1`] = `
 <div class="van-swipe">
   <div style="transition-duration: 0ms; transform: translateX(0px); width: 300px;"
diff --git a/src/swipe/test/index.spec.js b/src/swipe/test/index.spec.js
index bcd88fc28..a9db8abb9 100644
--- a/src/swipe/test/index.spec.js
+++ b/src/swipe/test/index.spec.js
@@ -1,3 +1,4 @@
+import { ref, onMounted } from 'vue';
 import {
   mount,
   later,
@@ -296,3 +297,33 @@ test('should render swipe item correctly when using lazy-render prop and loop is
   await wrapper.setData({ active: 2 });
   expectRender([true, true, true, true]);
 });
+
+test('should render dynamic SwipeItem correctly', async () => {
+  const wrapper = mount({
+    setup() {
+      const render = ref(false);
+      onMounted(() => {
+        render.value = true;
+      });
+      return { render };
+    },
+    render() {
+      return (
+        <Swipe>
+          {this.render && [
+            <SwipeItem>
+              <span>1</span>
+            </SwipeItem>,
+            <SwipeItem>
+              <span>2</span>
+            </SwipeItem>,
+          ]}
+        </Swipe>
+      );
+    },
+  });
+
+  expect(wrapper.html()).toMatchSnapshot();
+  await later();
+  expect(wrapper.html()).toMatchSnapshot();
+});