From 335cc46e37e1507179409d1b4052b4c0faca3571 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Fri, 25 Jan 2019 20:24:18 +0800
Subject: [PATCH] [improvement] Popup: jsx (#2614)

---
 .../test/__snapshots__/index.spec.js.snap     |  4 +-
 .../test/__snapshots__/demo.spec.js.snap      |  4 +-
 packages/popup/index.js                       | 38 +++++++++++++++++
 packages/popup/index.less                     | 40 +++++++++---------
 packages/popup/index.vue                      | 41 -------------------
 5 files changed, 62 insertions(+), 65 deletions(-)
 create mode 100644 packages/popup/index.js
 delete mode 100644 packages/popup/index.vue

diff --git a/packages/address-edit/test/__snapshots__/index.spec.js.snap b/packages/address-edit/test/__snapshots__/index.spec.js.snap
index 1f620db12..a2a322fad 100644
--- a/packages/address-edit/test/__snapshots__/index.spec.js.snap
+++ b/packages/address-edit/test/__snapshots__/index.spec.js.snap
@@ -31,7 +31,7 @@ exports[`create a AddressEdit 1`] = `
     </div>
   </div>
   <div class="van-address-edit__buttons"><button class="van-button van-button--danger van-button--normal van-button--block"><span class="van-button__text">保存</span></button></div>
-  <div name="popup-slide-bottom" class="van-popup van-popup--bottom" style="display:none;">
+  <div name="van-popup-slide-bottom" class="van-popup van-popup--bottom" style="display:none;">
     <div class="van-picker van-area">
       <div class="van-hairline--top-bottom van-picker__toolbar">
         <div class="van-picker__cancel">取消</div>
@@ -104,7 +104,7 @@ exports[`create a AddressEdit with props 1`] = `
     </div>
   </div>
   <div class="van-address-edit__buttons"><button class="van-button van-button--danger van-button--normal van-button--block"><span class="van-button__text">保存</span></button></div>
-  <div name="popup-slide-bottom" class="van-popup van-popup--bottom" style="display:none;">
+  <div name="van-popup-slide-bottom" class="van-popup van-popup--bottom" style="display:none;">
     <div class="van-picker van-area">
       <div class="van-hairline--top-bottom van-picker__toolbar">
         <div class="van-picker__cancel">取消</div>
diff --git a/packages/contact-card/test/__snapshots__/demo.spec.js.snap b/packages/contact-card/test/__snapshots__/demo.spec.js.snap
index 0413b7a7a..e2b29b9c2 100644
--- a/packages/contact-card/test/__snapshots__/demo.spec.js.snap
+++ b/packages/contact-card/test/__snapshots__/demo.spec.js.snap
@@ -8,7 +8,7 @@ exports[`renders demo correctly 1`] = `
       <div class="van-cell__value van-cell__value--alone">添加联系人</div><i class="van-icon van-icon-arrow van-cell__right-icon" style="color:undefined;font-size:undefined;">
         <!----></i>
     </div>
-    <div name="popup-slide-bottom" class="van-popup van-popup--bottom" style="display:none;">
+    <div name="van-popup-slide-bottom" class="van-popup van-popup--bottom" style="display:none;">
       <div class="van-contact-list">
         <div class="van-radio-group">
           <div class="van-cell van-cell--clickable">
@@ -20,7 +20,7 @@ exports[`renders demo correctly 1`] = `
         </div><button class="van-button van-button--danger van-button--large van-button--square van-contact-list__add"><span class="van-button__text">新建联系人</span></button>
       </div>
     </div>
-    <div name="popup-slide-bottom" class="van-popup van-popup--bottom" style="display:none;">
+    <div name="van-popup-slide-bottom" class="van-popup van-popup--bottom" style="display:none;">
       <div class="van-contact-edit">
         <div maxlength="30" placeholder="请填写姓名" class="van-cell van-field">
           <div class="van-cell__title"><span>张三</span></div>
diff --git a/packages/popup/index.js b/packages/popup/index.js
new file mode 100644
index 000000000..b7dd5661c
--- /dev/null
+++ b/packages/popup/index.js
@@ -0,0 +1,38 @@
+import { use } from '../utils';
+import Popup from '../mixins/popup';
+
+const [sfc, bem] = use('popup');
+
+export default sfc({
+  mixins: [Popup],
+
+  props: {
+    position: String,
+    transition: String,
+    overlay: {
+      type: Boolean,
+      default: true
+    },
+    closeOnClickOverlay: {
+      type: Boolean,
+      default: true
+    }
+  },
+
+  render(h) {
+    if (!this.shouldRender) {
+      return;
+    }
+
+    const { position } = this;
+    const transitionName = this.transition || (position ? `van-popup-slide-${position}` : 'van-fade');
+
+    return (
+      <transition name={transitionName}>
+        <div vShow={this.value} class={bem({ [position]: position })}>
+          {this.$slots.default}
+        </div>
+      </transition>
+    );
+  }
+});
diff --git a/packages/popup/index.less b/packages/popup/index.less
index 36266fae2..e52f89c60 100644
--- a/packages/popup/index.less
+++ b/packages/popup/index.less
@@ -49,25 +49,25 @@
       left: 0;
       transform: translate3d(0, -50%, 0);
     }
+
+    &-slide-top-enter,
+    &-slide-top-leave-active {
+      transform: translate3d(-50%, -100%, 0);
+    }
+
+    &-slide-right-enter,
+    &-slide-right-leave-active {
+      transform: translate3d(100%, -50%, 0);
+    }
+
+    &-slide-bottom-enter,
+    &-slide-bottom-leave-active {
+      transform: translate3d(-50%, 100%, 0);
+    }
+
+    &-slide-left-enter,
+    &-slide-left-leave-active {
+      transform: translate3d(-100%, -50%, 0);
+    }
   }
 }
-
-.popup-slide-top-enter,
-.popup-slide-top-leave-active {
-  transform: translate3d(-50%, -100%, 0);
-}
-
-.popup-slide-right-enter,
-.popup-slide-right-leave-active {
-  transform: translate3d(100%, -50%, 0);
-}
-
-.popup-slide-bottom-enter,
-.popup-slide-bottom-leave-active {
-  transform: translate3d(-50%, 100%, 0);
-}
-
-.popup-slide-left-enter,
-.popup-slide-left-leave-active {
-  transform: translate3d(-100%, -50%, 0);
-}
diff --git a/packages/popup/index.vue b/packages/popup/index.vue
deleted file mode 100644
index b5ef23ed9..000000000
--- a/packages/popup/index.vue
+++ /dev/null
@@ -1,41 +0,0 @@
-<template>
-  <transition :name="currentTransition">
-    <div
-      v-if="shouldRender"
-      v-show="value"
-      :class="b({ [position]: position })"
-    >
-      <slot />
-    </div>
-  </transition>
-</template>
-
-<script>
-import create from '../utils/create';
-import Popup from '../mixins/popup';
-
-export default create({
-  name: 'popup',
-
-  mixins: [Popup],
-
-  props: {
-    position: String,
-    transition: String,
-    overlay: {
-      type: Boolean,
-      default: true
-    },
-    closeOnClickOverlay: {
-      type: Boolean,
-      default: true
-    }
-  },
-
-  computed: {
-    currentTransition() {
-      return this.transition || (this.position ? `popup-slide-${this.position}` : 'van-fade');
-    }
-  }
-});
-</script>