From bad547c3bb9d13ffeb1e18501217b42b5eed3017 Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 19 Apr 2016 16:58:39 +0800 Subject: [PATCH 1/7] Fix #1321 in 0.12.x pick 28b36d5 manully --- components/input/index.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/input/index.jsx b/components/input/index.jsx index ce007e3462..35cd22f7a8 100644 --- a/components/input/index.jsx +++ b/components/input/index.jsx @@ -3,7 +3,7 @@ import assign from 'object-assign'; import classNames from 'classnames'; function ieGT9() { - if (typeof document === undefined) { + if (typeof document === 'undefined') { return false; } const documentMode = document.documentMode || 0; From 6dc187e5f40bfb7a1f7d5b073e3106b2ce7c9432 Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 20 Apr 2016 12:14:57 +0800 Subject: [PATCH 2/7] Not focus it when click button https://github.com/google/material-design-lite/commit/91117c0faaf258d720bc35318926f2a21a9f92cf#diff-39f43a348016e3a62dc9c315917c402bR108 --- components/button/button.jsx | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/components/button/button.jsx b/components/button/button.jsx index 7ea7ea6bfd..053dd6fbe7 100644 --- a/components/button/button.jsx +++ b/components/button/button.jsx @@ -39,6 +39,13 @@ export default class Button extends React.Component { this.props.onClick(...args); } + // Handle auto focus when click button in Chrome + handleMouseUp(e) { + findDOMNode(this).blur(); + if (this.props.onMouseUp) { + this.props.onMouseUp(e); + } + } render() { const props = this.props; const { type, shape, size, className, htmlType, children, ...others } = props; @@ -65,6 +72,7 @@ export default class Button extends React.Component { From 504409335f6cf9af3afbc338e6c0bba75b50336d Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 20 Apr 2016 18:59:01 +0800 Subject: [PATCH 3/7] upgrade collapse for perfermance problem and close ##1451 --- package.json | 4 ++-- style/components/collapse.less | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index aef1a5f8d2..0e93f3c876 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "dependencies": { "array-tree-filter": "~1.0.0", "classnames": "~2.2.0", - "css-animation": "~1.1.0", + "css-animation": "~1.2.3", "gregorian-calendar": "~4.1.0", "gregorian-calendar-format": "~4.1.0", "object-assign": "~4.0.1", @@ -42,7 +42,7 @@ "rc-calendar": "~5.4.0", "rc-cascader": "~0.9.0", "rc-checkbox": "~1.3.0", - "rc-collapse": "~1.4.4", + "rc-collapse": "~1.6.0", "rc-dialog": "~5.4.0", "rc-dropdown": "~1.4.3", "rc-form": "~0.14.0", diff --git a/style/components/collapse.less b/style/components/collapse.less index bc8a6b6483..28ad62448e 100644 --- a/style/components/collapse.less +++ b/style/components/collapse.less @@ -49,19 +49,19 @@ } &-content { - display: none; overflow: hidden; color: @text-color; padding: 0 16px; background-color: #fff; + transition: height .2s @ease-out; & > &-box { padding-top: 16px; padding-bottom: 16px; } - &-active { - display: block; + &-inactive { + display: none; } } From d0f99aea507b7d235e7a5ec51c942a7252c79c9e Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 20 Apr 2016 19:02:25 +0800 Subject: [PATCH 4/7] Fix radio-button in IE8, close #1459 --- style/components/radio.less | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/style/components/radio.less b/style/components/radio.less index 7dc3a9f686..6de93ff73b 100644 --- a/style/components/radio.less +++ b/style/components/radio.less @@ -123,7 +123,9 @@ span.@{radio-prefix-cls} + * { > span.@{radio-prefix-cls}-button { margin-left: 0; - display: none; + display: block; + width: 0; + height: 0; } .@{radio-group-prefix-cls}-large & { From 6e8bccdf4e7c40eefc7341e8d3eeb0b8103f248c Mon Sep 17 00:00:00 2001 From: afc163 Date: Thu, 21 Apr 2016 12:15:22 +0800 Subject: [PATCH 5/7] fix #1464 --- style/components/menu.less | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/style/components/menu.less b/style/components/menu.less index 86f3571592..2f334fbc0b 100644 --- a/style/components/menu.less +++ b/style/components/menu.less @@ -104,6 +104,10 @@ z-index: @zindex-dropdown; } + &-submenu-vertical { + z-index: 1; + } + &-submenu-vertical > & { top: 0; left: 100%; From 8d3bfae8eeb2c30d50cf3212f7b6fa281f1c2a7b Mon Sep 17 00:00:00 2001 From: afc163 Date: Thu, 21 Apr 2016 12:17:37 +0800 Subject: [PATCH 6/7] fix doc (#1455) --- components/select/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/select/index.md b/components/select/index.md index e5af9007e9..7abe180f70 100644 --- a/components/select/index.md +++ b/components/select/index.md @@ -31,7 +31,7 @@ | filterOption | 是否根据输入项进行筛选，可为一个函数，返回满足要求的 option 即可 | boolean or function(inputValue, option) | true | | tags | 可以把随意输入的条目作为 tag，输入项不需要与下拉选项匹配 | boolean |false | | onSelect | 被选中时调用，参数为选中项的 value 值 | function(value, option) | 无 | -| onDeselect | 取消选中时调用，参数为选中项的 option value 值，仅在 multiple 或 tags 模式下生效 | function(value, option) | 无 | +| onDeselect | 取消选中时调用，参数为选中项的 option value 值，仅在 multiple 或 tags 模式下生效 | function(value) | 无 | | onChange | 选中option，或input的value变化(combobox 模式下)时，调用此函数 | function(value, label) | 无 | | onSearch | 文本框值变化时回调 | function(value: String) | | | placeholder | 选择框默认文字 | string | 无 | From 69f7c4507a72472a0a8501dedf245710703df753 Mon Sep 17 00:00:00 2001 From: afc163 Date: Thu, 21 Apr 2016 12:34:10 +0800 Subject: [PATCH 7/7] bump 0.12.15 --- CHANGELOG.md | 12 ++++++++++++ package.json | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8eddb2c8d8..010a7ce0c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,18 @@ --- +## 0.12.15 + +- 升级 rc-collapse 修复一个性能问题。 +- 修复一个 Collapse 内嵌 Tabs 的选中项样式问题。[#1451](https://github.com/ant-design/ant-design/issues/1451) +- 修复 Input 组件服务端渲染报错的问题。[#1321](https://github.com/ant-design/ant-design/issues/1321) +- 修复 Tag 组件调用了两次 afterClose 的问题。[#1435](https://github.com/ant-design/ant-design/issues/1435) +- 修复一个 Table 控制模式的问题。[#1434](https://github.com/ant-design/ant-design/issues/1434) +- 修复一个 Tabs 相互嵌套的样式问题。[#1435](https://github.com/ant-design/ant-design/issues/1435) +- 修复 Dropdown.Button 点击右边也触发 onClick 的问题。 +- 修复 Radio.Button 在 IE8 下无法选择的问题。[#1459](https://github.com/ant-design/ant-design/issues/1459) +- 优化了 Button 点击后仍然有 focus 效果的问题。 + ## 0.12.14 `2016-04-13` diff --git a/package.json b/package.json index 0e93f3c876..9224247153 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "antd", - "version": "0.12.14", + "version": "0.12.15", "title": "Ant Design", "description": "一个 UI 设计语言", "homepage": "http://ant.design/",