Merge branch 'master' into antd-3.0

7 years ago · 2ebf70013b
2 changed files with 3 additions and 3 deletions
--- a/components/checkbox/style/mixin.less
+++ b/components/checkbox/style/mixin.less
@ -153,8 +153,8 @@
    .reset-component;
    cursor: pointer;
    display: inline-block;
-    &:not(:last-child) {
-      margin-right: 8px;
+    & + & {
+      margin-left: 8px;
    }
  }

--- a/components/upload/UploadList.tsx
+++ b/components/upload/UploadList.tsx
@ -26,7 +26,7 @@ export default class UploadList extends React.Component<UploadListProps, any> {
  };

  handleClose = (file: UploadFile) => {
-    const onRemove = this.props.onRemove;
+    const { onRemove } = this.props;
    if (onRemove) {
      onRemove(file);
    }