Bump 3.3.3

This reverts commit ee0bf41672.

CHANGELOG.en-US.md

@@ -14,6 +14,13 @@ timeline: true
 * Major version release is not included in this schedule for breaking change and new features.
 
 ---
+
+## 3.3.3
+
+`2018-03-25`
+
+- Revert Upload `file` type change in previous version  which causes breaking change.
+
 ## 3.3.2
 
 `2018-03-24`

CHANGELOG.zh-CN.md

@@ -14,6 +14,11 @@ timeline: true
 * 主版本号：含有破坏性更新和新特性，不在发布周期内。
 
 ---
+
+`2018-03-25`
+
+- 回退上个版本 Upload 中 `file` 类型的修改。
+
 ## 3.3.2
 
 `2018-03-24`

components/select/index.en-US.md

@@ -40,7 +40,7 @@ Select component to select value from options.
 | mode | Set mode of Select (Support after 2.9) | 'default' \| 'multiple' \| 'tags' \| 'combobox' | 'default' |
 | notFoundContent | Specify content to show when no result matches.. | string | 'Not Found' |
 | optionFilterProp | Which prop value of option will be used for filter if filterOption is true | string | value |
-| optionLabelProp | Which prop value of option will render as content of select. | string | `children` |
+| optionLabelProp | Which prop value of option will render as content of select. | string | `value` for `combobox`, `children` for other modes |
 | placeholder | Placeholder of select | string\|ReactNode | - |
 | showSearch | Whether show search input in single mode. | boolean | false |
 | showArrow | Whether to show the drop-down arrow | boolean |  true |

components/style/themes/default.less

@@ -422,6 +422,7 @@
 // ---
 @switch-height: 22px;
 @switch-sm-height: 16px;
+@switch-sm-checked-margin-left: -(@switch-sm-height - 3px);
 @switch-disabled-opacity: 0.4;
 @switch-color: @primary-color;
 

components/switch/style/index.less

@@ -107,7 +107,7 @@
     &:before,
     &:after {
       left: 100%;
-      margin-left: -12.5px;
+      margin-left: @switch-sm-checked-margin-left;
     }
 
     .@{switch-prefix-cls}-inner {

components/upload/Upload.tsx

@@ -180,14 +180,13 @@ export default class Upload extends React.Component<UploadProps, UploadState> {
   }
 
   beforeUpload = (file: UploadFile, fileList: UploadFile[]) => {
-    const newFile = fileToObject(file);
     if (!this.props.beforeUpload) {
       return true;
     }
-    const result = this.props.beforeUpload(newFile, fileList);
+    const result = this.props.beforeUpload(file, fileList);
     if (result === false) {
       this.onChange({
-        file: newFile,
+        file,
         fileList: uniqBy(fileList.concat(this.state.fileList), (item: any) => item.uid),
       });
       return false;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "antd",
-  "version": "3.3.2",
+  "version": "3.3.3",
   "title": "Ant Design",
   "description": "An enterprise-class UI design language and React-based implementation",
   "homepage": "http://ant.design/",