From fa89c79d8028e1e7148fde962fe922d99f95371f Mon Sep 17 00:00:00 2001 From: wangxueliang Date: Wed, 22 Aug 2018 14:23:20 +0800 Subject: [PATCH 01/10] fix: word error praentDrawer => parentDrawer --- components/drawer/index.tsx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/components/drawer/index.tsx b/components/drawer/index.tsx index a2c3c5e7b1..e97fc822c2 100644 --- a/components/drawer/index.tsx +++ b/components/drawer/index.tsx @@ -75,14 +75,14 @@ export default class Drawer extends React.Component { 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(); } } } @@ -187,7 +187,7 @@ export default class Drawer extends React.Component { transform: `translateX(${placement === 'left' ? 180 : -180}px)`, } : { zIndex }; - this.praentDrawer = value; + this.parentDrawer = value; return ( Date: Wed, 22 Aug 2018 16:06:33 +0800 Subject: [PATCH 02/10] Fix drawer flash (#11833) * fix drawer flash * remove drawer transition --- components/drawer/style/drawer.less | 6 ------ 1 file changed, 6 deletions(-) diff --git a/components/drawer/style/drawer.less b/components/drawer/style/drawer.less index f341eb1d35..1d12654099 100644 --- a/components/drawer/style/drawer.less +++ b/components/drawer/style/drawer.less @@ -7,7 +7,6 @@ top: 0; width: 0%; z-index: @zindex-modal; - transition: transform @animation-duration-slow @ease-base-in; > * { transition: transform @animation-duration-slow @ease-base-in; } @@ -18,8 +17,6 @@ .@{dawer-prefix-cls}-content { width: 100%; height: 100%; - opacity: 0; - transition: opacity @animation-duration-slow linear; } &-left, &-right { @@ -81,9 +78,6 @@ &.@{dawer-prefix-cls}-open { .@{dawer-prefix-cls} { - &-content { - opacity: 1; - } &-mask { opacity: 0.3; height: 100%; From f20a1e4e5d3ee74e17345488d152b2da22cd9e91 Mon Sep 17 00:00:00 2001 From: Bradley Xu Date: Wed, 22 Aug 2018 16:17:33 +0800 Subject: [PATCH 03/10] docs: update button demo doc --- components/button/demo/ghost.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/button/demo/ghost.md b/components/button/demo/ghost.md index 9cff4953e9..7c7f77a522 100644 --- a/components/button/demo/ghost.md +++ b/components/button/demo/ghost.md @@ -7,7 +7,7 @@ title: ## zh-CN -幽灵按钮将其他按钮的内容反色，背景变为透明，常用在有色背景上。 +幽灵按钮将按钮的内容反色，背景变为透明，常用在有色背景上。 ## en-US From 3ffc7f6ac207f45f1743b1b943dd24586b91152b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=A7=A6?= <646382806@qq.com> Date: Wed, 22 Aug 2018 17:04:12 +0800 Subject: [PATCH 04/10] Upload: remove necessary signatures --- components/upload/interface.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/components/upload/interface.tsx b/components/upload/interface.tsx index dc8841a5d3..bd82edd1bc 100755 --- a/components/upload/interface.tsx +++ b/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; From 11d29fb5224d74af978102d9fbe3034c720caa43 Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 22 Aug 2018 23:05:16 +0800 Subject: [PATCH 05/10] use break-word over break-all, close #11722 --- components/tooltip/style/index.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/tooltip/style/index.less b/components/tooltip/style/index.less index b54ed7c5b4..c272377532 100644 --- a/components/tooltip/style/index.less +++ b/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 From 563e34994654fd66a188ad47b6a0153c21f829be Mon Sep 17 00:00:00 2001 From: Nikolay Date: Mon, 20 Aug 2018 14:16:11 +0300 Subject: [PATCH 06/10] add strict mode for submit object property names This feature adds a posibility to validate property names in TypeScript by inserting required object interface. --- components/form/Form.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/form/Form.tsx b/components/form/Form.tsx index db569f0fbf..bc4f0925c8 100755 --- a/components/form/Form.tsx +++ b/components/form/Form.tsx @@ -118,7 +118,7 @@ export type WrappedFormUtils = { /** 重置一组输入控件的值与状态，如不传入参数，则重置所有组件 */ resetFields(names?: Array): void; - getFieldDecorator(id: string, options?: GetFieldDecoratorOptions): (node: React.ReactNode) => React.ReactNode; + getFieldDecorator(id: keyof T, options?: GetFieldDecoratorOptions): (node: React.ReactNode) => React.ReactNode; }; export interface FormComponentProps { From 7bf50c85e1bba6bc202f8e3946e33b0cc196817e Mon Sep 17 00:00:00 2001 From: Nikolay Date: Mon, 20 Aug 2018 14:26:29 +0300 Subject: [PATCH 07/10] Update Form.tsx --- components/form/Form.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/form/Form.tsx b/components/form/Form.tsx index bc4f0925c8..b61840f88b 100755 --- a/components/form/Form.tsx +++ b/components/form/Form.tsx @@ -117,7 +117,7 @@ export type WrappedFormUtils = { isFieldsTouched(names?: Array): boolean; /** 重置一组输入控件的值与状态，如不传入参数，则重置所有组件 */ resetFields(names?: Array): void; - + // tslint:disable-next-line:max-line-length getFieldDecorator(id: keyof T, options?: GetFieldDecoratorOptions): (node: React.ReactNode) => React.ReactNode; }; From 044982ddb77b2c312b2243ab598647100fb7e505 Mon Sep 17 00:00:00 2001 From: Cang Ta Date: Thu, 23 Aug 2018 13:58:37 +0700 Subject: [PATCH 08/10] Remove duplicate `theme` property --- components/layout/index.en-US.md | 1 - 1 file changed, 1 deletion(-) diff --git a/components/layout/index.en-US.md b/components/layout/index.en-US.md index 8abf63356e..7caf7c39f1 100644 --- a/components/layout/index.en-US.md +++ b/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 From 500ef62638868ef332b090b6d6ae701bb91c79be Mon Sep 17 00:00:00 2001 From: zombiej Date: Thu, 23 Aug 2018 20:38:56 +0800 Subject: [PATCH 09/10] fix https://github.com/ant-design/ant-design/issues/11423. TreeNode can accept custom prop --- components/tree/Tree.tsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/components/tree/Tree.tsx b/components/tree/Tree.tsx index aa3da79642..c334bfb822 100644 --- a/components/tree/Tree.tsx +++ b/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 { } From e3aa2aaa84ec6553ae6f23fb528ae45f00b9aee2 Mon Sep 17 00:00:00 2001 From: afc163 Date: Thu, 23 Aug 2018 21:14:16 +0800 Subject: [PATCH 10/10] fix submenu cannot hover --- components/menu/style/index.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/menu/style/index.less b/components/menu/style/index.less index d9ff7d021c..6a9fa764ce 100644 --- a/components/menu/style/index.less +++ b/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;