From 9da3e0ce5a7ee22436d75f8db0a23c0a5f441292 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Tue, 17 Jul 2018 21:33:55 +0800
Subject: [PATCH] [Improvement] Collapse: add transition animation (#1500)

---
 packages/collapse-item/index.vue              | 56 +++++++++++++++++--
 .../test/__snapshots__/demo.spec.js.snap      | 34 ++++++++---
 packages/collapse/test/index.spec.js          |  8 ++-
 packages/vant-css/src/collapse.css            |  6 ++
 4 files changed, 88 insertions(+), 16 deletions(-)

diff --git a/packages/collapse-item/index.vue b/packages/collapse-item/index.vue
index ac9276c05..b143287af 100644
--- a/packages/collapse-item/index.vue
+++ b/packages/collapse-item/index.vue
@@ -8,15 +8,18 @@
     <cell :class="b('title')" is-link @click="onClick">
       <slot name="title">{{ title }}</slot>
     </cell>
-    <div v-show="expanded" :class="b('content')">
-      <slot />
+    <div v-show="show" ref="wrapper" :class="b('wrapper')" @transitionend="onTransitionEnd">
+      <div ref="content" :class="b('content')">
+        <slot />
+      </div>
     </div>
   </div>
 </template>
 
 <script>
-import findParent from '../mixins/find-parent';
+import { raf } from '../utils/raf';
 import create from '../utils/create';
+import findParent from '../mixins/find-parent';
 
 export default create({
   name: 'collapse-item',
@@ -28,6 +31,12 @@ export default create({
     title: String
   },
 
+  data() {
+    return {
+      show: null
+    };
+  },
+
   computed: {
     items() {
       return this.parent.items;
@@ -42,6 +51,10 @@ export default create({
     },
 
     expanded() {
+      if (!this.parent) {
+        return null;
+      }
+
       const { value } = this.parent;
       return this.parent.accordion
         ? value === this.currentName
@@ -52,17 +65,52 @@ export default create({
   created() {
     this.findParent('van-collapse');
     this.items.push(this);
+    this.show = this.expanded;
   },
 
   destroyed() {
     this.items.splice(this.index, 1);
   },
 
+  watch: {
+    expanded(expanded, prev) {
+      if (prev === null) {
+        return;
+      }
+
+      if (expanded) {
+        this.show = true;
+      }
+
+      this.$nextTick(() => {
+        const { content, wrapper } = this.$refs;
+        if (!content || !wrapper) {
+          return;
+        }
+
+        const contentHeight = content.clientHeight + 'px';
+        wrapper.style.height = expanded ? 0 : contentHeight;
+        raf(() => {
+          wrapper.style.height = expanded ? contentHeight : 0;
+        });
+      });
+    }
+  },
+
   methods: {
     onClick() {
       const { parent } = this;
       const name = parent.accordion && this.currentName === parent.value ? '' : this.currentName;
-      this.parent.switch(name, !this.expanded);
+      const expanded = !this.expanded;
+      this.parent.switch(name, expanded);
+    },
+
+    onTransitionEnd() {
+      if (!this.expanded) {
+        this.show = false;
+      } else {
+        this.$refs.wrapper.style.height = null;
+      }
     }
   }
 });
diff --git a/packages/collapse/test/__snapshots__/demo.spec.js.snap b/packages/collapse/test/__snapshots__/demo.spec.js.snap
index 95d7de299..72d5ff2ce 100644
--- a/packages/collapse/test/__snapshots__/demo.spec.js.snap
+++ b/packages/collapse/test/__snapshots__/demo.spec.js.snap
@@ -13,7 +13,9 @@ exports[`renders demo correctly 1`] = `
             <!---->
           </i>
         </div>
-        <div class="van-collapse-item__content">提供多样店铺模板，快速搭建网上商城</div>
+        <div class="van-collapse-item__wrapper">
+          <div class="van-collapse-item__content">提供多样店铺模板，快速搭建网上商城</div>
+        </div>
       </div>
       <div class="van-collapse-item van-hairline--top">
         <div class="van-cell van-cell--clickable van-hairline van-collapse-item__title">
@@ -24,7 +26,9 @@ exports[`renders demo correctly 1`] = `
             <!---->
           </i>
         </div>
-        <div class="van-collapse-item__content" style="display:none;">网店吸粉获客、会员分层营销、一机多种收款，告别经营低效和客户流失</div>
+        <div class="van-collapse-item__wrapper" style="display:none;">
+          <div class="van-collapse-item__content">网店吸粉获客、会员分层营销、一机多种收款，告别经营低效和客户流失</div>
+        </div>
       </div>
       <div class="van-collapse-item van-hairline--top">
         <div class="van-cell van-cell--clickable van-hairline van-collapse-item__title">
@@ -35,7 +39,9 @@ exports[`renders demo correctly 1`] = `
             <!---->
           </i>
         </div>
-        <div class="van-collapse-item__content" style="display:none;">线上拓客，随时预约，贴心顺手的开单收银</div>
+        <div class="van-collapse-item__wrapper" style="display:none;">
+          <div class="van-collapse-item__content">线上拓客，随时预约，贴心顺手的开单收银</div>
+        </div>
       </div>
     </div>
   </div>
@@ -50,7 +56,9 @@ exports[`renders demo correctly 1`] = `
             <!---->
           </i>
         </div>
-        <div class="van-collapse-item__content">提供多样店铺模板，快速搭建网上商城</div>
+        <div class="van-collapse-item__wrapper">
+          <div class="van-collapse-item__content">提供多样店铺模板，快速搭建网上商城</div>
+        </div>
       </div>
       <div class="van-collapse-item van-hairline--top">
         <div class="van-cell van-cell--clickable van-hairline van-collapse-item__title">
@@ -61,7 +69,9 @@ exports[`renders demo correctly 1`] = `
             <!---->
           </i>
         </div>
-        <div class="van-collapse-item__content" style="display:none;">网店吸粉获客、会员分层营销、一机多种收款，告别经营低效和客户流失</div>
+        <div class="van-collapse-item__wrapper" style="display:none;">
+          <div class="van-collapse-item__content">网店吸粉获客、会员分层营销、一机多种收款，告别经营低效和客户流失</div>
+        </div>
       </div>
       <div class="van-collapse-item van-hairline--top">
         <div class="van-cell van-cell--clickable van-hairline van-collapse-item__title">
@@ -72,7 +82,9 @@ exports[`renders demo correctly 1`] = `
             <!---->
           </i>
         </div>
-        <div class="van-collapse-item__content" style="display:none;">线上拓客，随时预约，贴心顺手的开单收银</div>
+        <div class="van-collapse-item__wrapper" style="display:none;">
+          <div class="van-collapse-item__content">线上拓客，随时预约，贴心顺手的开单收银</div>
+        </div>
       </div>
     </div>
   </div>
@@ -93,8 +105,10 @@ exports[`renders demo correctly 1`] = `
             <!---->
           </i>
         </div>
-        <div class="van-collapse-item__content" style="display:none;">
-          提供多样店铺模板，快速搭建网上商城
+        <div class="van-collapse-item__wrapper" style="display:none;">
+          <div class="van-collapse-item__content">
+            提供多样店铺模板，快速搭建网上商城
+          </div>
         </div>
       </div>
       <div class="van-collapse-item van-hairline--top">
@@ -106,7 +120,9 @@ exports[`renders demo correctly 1`] = `
             <!---->
           </i>
         </div>
-        <div class="van-collapse-item__content" style="display:none;">网店吸粉获客、会员分层营销、一机多种收款，告别经营低效和客户流失</div>
+        <div class="van-collapse-item__wrapper" style="display:none;">
+          <div class="van-collapse-item__content">网店吸粉获客、会员分层营销、一机多种收款，告别经营低效和客户流失</div>
+        </div>
       </div>
     </div>
   </div>
diff --git a/packages/collapse/test/index.spec.js b/packages/collapse/test/index.spec.js
index 85fba216c..9d7056947 100644
--- a/packages/collapse/test/index.spec.js
+++ b/packages/collapse/test/index.spec.js
@@ -1,6 +1,6 @@
 import Collapse from '..';
 import CollapseItem from '../../collapse-item';
-import { mount } from '../../../test/utils';
+import { later, mount } from '../../../test/utils';
 
 const component = {
   template: `
@@ -24,7 +24,7 @@ const component = {
   }
 };
 
-test('basic mode', () => {
+test('basic mode', async() => {
   const wrapper = mount(component);
 
   const titles = wrapper.findAll('.van-collapse-item__title');
@@ -34,13 +34,14 @@ test('basic mode', () => {
   titles.at(1).trigger('click');
   expect(wrapper.vm.active).toEqual(['first', 1]);
 
+  await later();
   titles.at(0).trigger('click');
   expect(wrapper.vm.active).toEqual([1]);
 
   wrapper.destroy();
 });
 
-it('accordion', () => {
+it('accordion', async() => {
   const wrapper = mount(component, {
     propsData: {
       accordion: true
@@ -54,6 +55,7 @@ it('accordion', () => {
   titles.at(1).trigger('click');
   expect(wrapper.vm.active).toEqual(1);
 
+  await later();
   titles.at(0).trigger('click');
   expect(wrapper.vm.active).toEqual('first');
 
diff --git a/packages/vant-css/src/collapse.css b/packages/vant-css/src/collapse.css
index c796efa0c..2be6e3701 100644
--- a/packages/vant-css/src/collapse.css
+++ b/packages/vant-css/src/collapse.css
@@ -12,6 +12,12 @@
     }
   }
 
+  &__wrapper {
+    overflow: hidden;
+    will-change: height;
+    transition: height .3s ease-in-out;
+  }
+
   &__content {
     padding: 15px;
     background-color: #fff;