From c083ee8257ee1f9687d46cfd26f393afef279ef7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@youzan.com>
Date: Sat, 11 May 2019 17:23:50 +0800
Subject: [PATCH 1/4] fix assets typo

---
 docs/src/{asserts => assets}/Logo.sketch | Bin
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename docs/src/{asserts => assets}/Logo.sketch (100%)

diff --git a/docs/src/asserts/Logo.sketch b/docs/src/assets/Logo.sketch
similarity index 100%
rename from docs/src/asserts/Logo.sketch
rename to docs/src/assets/Logo.sketch

From c40cb1275f14a8911ed4197352c20ac9f51ae155 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@youzan.com>
Date: Sat, 11 May 2019 17:24:26 +0800
Subject: [PATCH 2/4] update assets

---
 docs/{src/assets/Logo.sketch => assets/logo.sketch} | Bin
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename docs/{src/assets/Logo.sketch => assets/logo.sketch} (100%)

diff --git a/docs/src/assets/Logo.sketch b/docs/assets/logo.sketch
similarity index 100%
rename from docs/src/assets/Logo.sketch
rename to docs/assets/logo.sketch

From 60710607bca7bf4fccf55e89910169ce369ba273 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@youzan.com>
Date: Mon, 13 May 2019 10:28:39 +0800
Subject: [PATCH 3/4] [bugfix] Tabbar: should not render info when info is
 empty string

---
 packages/info/index.tsx                       |  2 +-
 .../test/__snapshots__/index.spec.js.snap     |  7 ++++
 packages/info/test/index.spec.js              | 32 +++++++++++++++++++
 3 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 packages/info/test/__snapshots__/index.spec.js.snap
 create mode 100644 packages/info/test/index.spec.js

diff --git a/packages/info/index.tsx b/packages/info/index.tsx
index a6c6b2373..9f9421bb9 100644
--- a/packages/info/index.tsx
+++ b/packages/info/index.tsx
@@ -17,7 +17,7 @@ function Info(
   slots: DefaultSlots,
   ctx: RenderContext<InfoProps>
 ) {
-  if (!isDef(props.info)) {
+  if (!isDef(props.info) || props.info === '') {
     return;
   }
 
diff --git a/packages/info/test/__snapshots__/index.spec.js.snap b/packages/info/test/__snapshots__/index.spec.js.snap
new file mode 100644
index 000000000..84b187992
--- /dev/null
+++ b/packages/info/test/__snapshots__/index.spec.js.snap
@@ -0,0 +1,7 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`should not render when info is empty string 1`] = ``;
+
+exports[`should not render when info is empty undefined 1`] = ``;
+
+exports[`should render when info is zero 1`] = `<div class="van-info">0</div>`;
diff --git a/packages/info/test/index.spec.js b/packages/info/test/index.spec.js
new file mode 100644
index 000000000..e7d35db2c
--- /dev/null
+++ b/packages/info/test/index.spec.js
@@ -0,0 +1,32 @@
+import Info from '..';
+import { mount } from '../../../test/utils';
+
+test('should not render when info is empty string', () => {
+  const wrapper = mount(Info, {
+    propsData: {
+      info: ''
+    }
+  });
+
+  expect(wrapper).toMatchSnapshot();
+});
+
+test('should not render when info is empty undefined', () => {
+  const wrapper = mount(Info, {
+    propsData: {
+      info: undefined
+    }
+  });
+
+  expect(wrapper).toMatchSnapshot();
+});
+
+test('should render when info is zero', () => {
+  const wrapper = mount(Info, {
+    propsData: {
+      info: 0
+    }
+  });
+
+  expect(wrapper).toMatchSnapshot();
+});

From f17891bdb354e7c81c46deadfe8206e8679e2de0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@youzan.com>
Date: Mon, 13 May 2019 12:01:43 +0800
Subject: [PATCH 4/4] [bugfix] Uploader: should clip file-upload-button

---
 packages/uploader/index.less | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/packages/uploader/index.less b/packages/uploader/index.less
index e624c585c..34fadd3c3 100644
--- a/packages/uploader/index.less
+++ b/packages/uploader/index.less
@@ -7,16 +7,11 @@
   &__input {
     position: absolute;
     top: 0;
-    right: 0;
-    bottom: 0;
     left: 0;
     width: 100%;
     height: 100%;
     opacity: 0;
     cursor: pointer;
-  }
-
-  input[type="file"]::-webkit-file-upload-button {
-    cursor: pointer;
+    overflow: hidden; // to clip file-upload-button
   }
 }