Merge branch 'master' into feature-3.9.0

components/button/demo/ghost.md

@@ -7,7 +7,7 @@ title:
 
 ## zh-CN
 
-幽灵按钮将其他按钮的内容反色，背景变为透明，常用在有色背景上。
+幽灵按钮将按钮的内容反色，背景变为透明，常用在有色背景上。
 
 ## en-US
 

components/drawer/index.tsx

@@ -78,14 +78,14 @@ export default class Drawer extends React.Component<DrawerProps, IDrawerState> {
     push: false,
   };
 
-  praentDrawer: Drawer;
+  parentDrawer: Drawer;
   destoryClose: boolean;
   public componentDidUpdate(preProps: DrawerProps) {
-    if (preProps.visible !== this.props.visible && this.praentDrawer) {
+    if (preProps.visible !== this.props.visible && this.parentDrawer) {
       if (this.props.visible) {
-        this.praentDrawer.push();
+        this.parentDrawer.push();
       } else {
-        this.praentDrawer.pull();
+        this.parentDrawer.pull();
       }
     }
   }
@@ -211,7 +211,7 @@ export default class Drawer extends React.Component<DrawerProps, IDrawerState> {
     let { zIndex, style, placement, className, wrapClassName, width, height, ...rest } = this.props;
     warning(wrapClassName === undefined, 'wrapClassName is deprecated, please use className instead.');
 
-    this.praentDrawer = value;
+    this.parentDrawer = value;
     const offsetStyle: any = {};
     if (placement === 'left' || placement === 'right') {
       offsetStyle.width = width;

components/drawer/style/drawer.less

@@ -8,7 +8,6 @@
   width: 0%;
   height: 100%;
   z-index: @zindex-modal;
-  transition: transform @animation-duration-slow @ease-base-in;
   > * {
     transition: transform @animation-duration-slow @ease-base-in;
   }
@@ -19,8 +18,6 @@
   .@{dawer-prefix-cls}-content {
     width: 100%;
     height: 100%;
-    opacity: 0;
-    transition: opacity @animation-duration-slow linear;
   }
   &-left,
   &-right {
@@ -86,9 +83,6 @@
 
   &.@{dawer-prefix-cls}-open {
     .@{dawer-prefix-cls} {
-      &-content {
-        opacity: 1;
-      }
       &-mask {
         opacity: 0.3;
         height: 100%;

components/form/Form.tsx

@@ -117,8 +117,8 @@ export type WrappedFormUtils = {
   isFieldsTouched(names?: Array<string>): boolean;
   /** 重置一组输入控件的值与状态，如不传入参数，则重置所有组件 */
   resetFields(names?: Array<string>): void;
-
-  getFieldDecorator(id: string, options?: GetFieldDecoratorOptions): (node: React.ReactNode) => React.ReactNode;
+  // tslint:disable-next-line:max-line-length
+  getFieldDecorator<T extends Object = {}>(id: keyof T, options?: GetFieldDecoratorOptions): (node: React.ReactNode) => React.ReactNode;
 };
 
 export interface FormComponentProps {

components/layout/index.en-US.md

@@ -99,7 +99,6 @@ The sidebar.
 | trigger | specify the customized trigger, set to null to hide the trigger | string\|ReactNode | - |
 | width | width of the sidebar | number\|string | 200 |
 | onCollapse | the callback function, executed by clicking the trigger or activating the responsive layout | (collapsed, type) => {} | - |
-| theme | color theme of the sidebar | string: `light` `dark` | `dark` |
 | onBreakpoint | the callback function, executed when [breakpoints](/components/grid#api) changed | (broken) => {} | - |
 
 #### breakpoint width

components/menu/style/index.less

@@ -180,7 +180,7 @@
       border-radius: @border-radius-base;
       z-index: @zindex-dropdown;
 
-      &:after {
+      &:before {
         position: absolute;
         top: -7px;
         left: -6px;

components/tooltip/style/index.less

@@ -47,7 +47,7 @@
     border-radius: @border-radius-base;
     box-shadow: @box-shadow-base;
     min-height: 32px;
-    word-break: break-all;
+    word-wrap: break-word;
   }
 
   // Arrows

components/tree/Tree.tsx

@@ -37,6 +37,8 @@ export interface AntTreeNodeProps {
   selectable?: boolean;
   icon?: ((treeNode: AntdTreeNodeAttribute) => React.ReactNode) | React.ReactNode;
   children?: React.ReactNode;
+
+  [customProp: string]: any;
 }
 
 export interface AntTreeNode extends React.Component<AntTreeNodeProps, {}> { }

components/upload/interface.tsx

@@ -22,7 +22,6 @@ export interface UploadFile {
   status?: UploadFileStatus;
   percent?: number;
   thumbUrl?: string;
-  isNotImage?: boolean;
   originFileObj?: File;
   response?: any;
   error?: any;