Merge branch '1.x' into 'dev'

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;
   }
 

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>`;

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();
+});

packages/uploader/index.less

@@ -10,6 +10,7 @@
     left: 0;
     width: 100%;
     height: 100%;
+    overflow: hidden; // to clip file-upload-button
     cursor: pointer;
     opacity: 0;
   }