From 57abc0434631dc215410992ecf5fd31d18d84b39 Mon Sep 17 00:00:00 2001
From: Li Chuangbo <im@chuangbo.li>
Date: Fri, 22 Dec 2017 17:08:50 +1300
Subject: [PATCH] [Improvement] Mixins: treat empty string as true for boolean
 props (#468)

---
 packages/actionsheet/index.vue           |  2 ++
 packages/dialog/dialog.vue               |  3 +++
 packages/image-preview/image-preview.vue |  4 +++-
 packages/popup/index.vue                 |  3 +++
 test/unit/specs/popup.spec.js            | 12 ++++++++++++
 5 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/packages/actionsheet/index.vue b/packages/actionsheet/index.vue
index d6b19751c..9549a28af 100644
--- a/packages/actionsheet/index.vue
+++ b/packages/actionsheet/index.vue
@@ -51,9 +51,11 @@ export default create({
       default: () => []
     },
     overlay: {
+      type: Boolean,
       default: true
     },
     closeOnClickOverlay: {
+      type: Boolean,
       default: true
     }
   },
diff --git a/packages/dialog/dialog.vue b/packages/dialog/dialog.vue
index 6b92cb5f4..4a8f0349b 100644
--- a/packages/dialog/dialog.vue
+++ b/packages/dialog/dialog.vue
@@ -59,12 +59,15 @@ export default create({
       default: false
     },
     overlay: {
+      type: Boolean,
       default: true
     },
     closeOnClickOverlay: {
+      type: Boolean,
       default: false
     },
     lockOnScroll: {
+      type: Boolean,
       default: true
     }
   },
diff --git a/packages/image-preview/image-preview.vue b/packages/image-preview/image-preview.vue
index cd0b1508c..d206ed45a 100644
--- a/packages/image-preview/image-preview.vue
+++ b/packages/image-preview/image-preview.vue
@@ -12,7 +12,7 @@
         <img class="van-image-preview__image" :src="item" >
       </swipe-item>
     </swipe>
-  </div>  
+  </div>
 </template>
 
 <script>
@@ -33,9 +33,11 @@ export default create({
 
   props: {
     overlay: {
+      type: Boolean,
       default: true
     },
     closeOnClickOverlay: {
+      type: Boolean,
       default: true
     }
   },
diff --git a/packages/popup/index.vue b/packages/popup/index.vue
index 0a707d1aa..5e9821cbe 100644
--- a/packages/popup/index.vue
+++ b/packages/popup/index.vue
@@ -18,12 +18,15 @@ export default create({
   props: {
     transition: String,
     overlay: {
+      type: Boolean,
       default: true
     },
     lockOnScroll: {
+      type: Boolean,
       default: false
     },
     closeOnClickOverlay: {
+      type: Boolean,
       default: true
     },
     position: {
diff --git a/test/unit/specs/popup.spec.js b/test/unit/specs/popup.spec.js
index 5a609dee2..991baf866 100644
--- a/test/unit/specs/popup.spec.js
+++ b/test/unit/specs/popup.spec.js
@@ -113,4 +113,16 @@ describe('Popup', () => {
       }, 300);
     }, 300);
   });
+
+  it('treat empty string as true for boolean props', () => {
+    wrapper = mount(Popup, {
+      propsData: {
+        overlay: '',
+        lockOnScroll: '',
+        closeOnClickOverlay: ''
+      }
+    });
+
+    expect(wrapper.vm.lockOnScroll).to.be.true;
+  });
 });