From 5228c421150d85eab6665cc910d6d184b69ad3ca Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Wed, 27 Apr 2016 15:25:57 +0800
Subject: [PATCH 1/6] fix vertical sub menu border

---
 style/components/menu.less | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/style/components/menu.less b/style/components/menu.less
index 2f334fbc0..4faa00a32 100644
--- a/style/components/menu.less
+++ b/style/components/menu.less
@@ -87,6 +87,13 @@
     }
   }
 
+  &-vertical &-sub {
+    border-right: 0;
+    .@{menu-prefix-cls}-item {
+      border-right: 0;
+    }
+  }
+
   &-inline {
     .@{menu-prefix-cls}-selected,
     .@{menu-prefix-cls}-item-selected {

From 85ec9a87434628e84c132ecd54e475da74290029 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Wed, 27 Apr 2016 15:26:03 +0800
Subject: [PATCH 2/6] Fix Menu switch mode behavious
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

切换菜单模式时，子菜单有异常的表现
---
 components/common/openAnimation.js  |  1 +
 components/menu/demo/switch-mode.md | 65 +++++++++++++++++++++++++++++
 components/menu/index.jsx           | 15 ++++++-
 3 files changed, 80 insertions(+), 1 deletion(-)
 create mode 100644 components/menu/demo/switch-mode.md

diff --git a/components/common/openAnimation.js b/components/common/openAnimation.js
index 80d857a05..84e2b75ff 100644
--- a/components/common/openAnimation.js
+++ b/components/common/openAnimation.js
@@ -9,6 +9,7 @@ function animate(node, show, transitionName, done) {
   function complete() {
     if (!ok) {
       ok = true;
+      node.style.display = '';
       done();
     }
   }
diff --git a/components/menu/demo/switch-mode.md b/components/menu/demo/switch-mode.md
new file mode 100644
index 000000000..75170f34e
--- /dev/null
+++ b/components/menu/demo/switch-mode.md
@@ -0,0 +1,65 @@
+# 切换
+
+- order: 5
+
+展示动态切换模式。
+
+---
+
+````jsx
+import { Menu, Icon, Switch } from 'antd';
+const SubMenu = Menu.SubMenu;
+const MenuItemGroup = Menu.ItemGroup;
+
+const Sider = React.createClass({
+  getInitialState() {
+    return {
+      mode: 'inline',
+    };
+  },
+  changeMode(value) {
+    this.setState({
+      mode: value ? 'vertical' : 'inline',
+    });
+  },
+  render() {
+    return (
+      <div>
+        <Switch onChange={this.changeMode} />
+        <br />
+        <br />
+        <Menu
+          style={{ width: 240 }}
+          defaultOpenKeys={['sub1']}
+          mode={this.state.mode}>
+          <SubMenu key="sub1" title={<span><Icon type="mail" /><span>导航一</span></span>}>
+            <MenuItemGroup title="分组1">
+              <Menu.Item key="1">选项1</Menu.Item>
+              <Menu.Item key="2">选项2</Menu.Item>
+            </MenuItemGroup>
+            <MenuItemGroup title="分组2">
+              <Menu.Item key="3">选项3</Menu.Item>
+              <Menu.Item key="4">选项4</Menu.Item>
+            </MenuItemGroup>
+          </SubMenu>
+          <SubMenu key="sub2" title={<span><Icon type="appstore" /><span>导航二</span></span>}>
+            <Menu.Item key="5">选项5</Menu.Item>
+            <Menu.Item key="6">选项6</Menu.Item>
+            <SubMenu key="sub3" title="三级导航">
+              <Menu.Item key="7">选项7</Menu.Item>
+              <Menu.Item key="8">选项8</Menu.Item>
+            </SubMenu>
+          </SubMenu>
+          <SubMenu key="sub4" title={<span><Icon type="setting" /><span>导航三</span></span>}>
+            <Menu.Item key="9">选项9</Menu.Item>
+            <Menu.Item key="10">选项10</Menu.Item>
+            <Menu.Item key="11">选项11</Menu.Item>
+            <Menu.Item key="12">选项12</Menu.Item>
+          </SubMenu>
+        </Menu>
+      </div>
+    );
+  }
+});
+ReactDOM.render(<Sider />, mountNode);
+````
diff --git a/components/menu/index.jsx b/components/menu/index.jsx
index 341810ca5..118edef81 100644
--- a/components/menu/index.jsx
+++ b/components/menu/index.jsx
@@ -21,6 +21,12 @@ const AntMenu = React.createClass({
       openKeys: []
     };
   },
+  componentWillReceiveProps(nextProps) {
+    if (this.props.mode === 'inline' &&
+        nextProps.mode !== 'inline') {
+      this.switchModeFromInline = true;
+    }
+  },
   handleClick(e) {
     this.setState({
       openKeys: []
@@ -47,7 +53,14 @@ const AntMenu = React.createClass({
           openAnimation = 'slide-up';
           break;
         case 'vertical':
-          openAnimation = 'zoom-big';
+          // When mode switch from inline
+          // submenu should hide without animation
+          if (this.switchModeFromInline) {
+            openAnimation = '';
+            this.switchModeFromInline = false;
+          } else {
+            openAnimation = 'zoom-big';
+          }
           break;
         case 'inline':
           openAnimation = animation;

From 1d72c8abcc534bacfbf5f462d456568fa20fb017 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Wed, 27 Apr 2016 17:01:55 +0800
Subject: [PATCH 3/6] update menu doc

---
 components/menu/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/menu/index.md b/components/menu/index.md
index ab108f256..2d3ac5441 100644
--- a/components/menu/index.md
+++ b/components/menu/index.md
@@ -31,7 +31,7 @@
 | 参数     | 说明           | 类型     | 默认值       |
 |----------|----------------|----------|--------------|
 | theme    | 主题颜色 | enum: `light` `dark` | 'light' |
-| mode    | 菜单类型 | enum: `vertical` `horizontal` `inline` | vertical |
+| mode    | 菜单类型，现在支持垂直、水平、和内嵌模式三种 | enum: `vertical` `horizontal` `inline` | vertical |
 | selectedKeys | 当前选中的菜单项 key 数组 |  |      |
 | defaultSelectedKeys | 初始选中的菜单项 key 数组 |  |      |
 | openKeys | 当前展开的菜单项 key 数组 |  |      |

From 0858413691d57a8384a1e19e7b86766b0710a8a5 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Wed, 27 Apr 2016 17:02:50 +0800
Subject: [PATCH 4/6] fix FormItem help and extra render

---
 components/form/FormItem.jsx | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/components/form/FormItem.jsx b/components/form/FormItem.jsx
index dc5480b30..e1af709d2 100644
--- a/components/form/FormItem.jsx
+++ b/components/form/FormItem.jsx
@@ -40,16 +40,16 @@ class FormItem extends React.Component {
     const props = this.props;
     const prefixCls = props.prefixCls;
     const help = this.getHelpMsg();
-    return (
-      <div className={!!help ? prefixClsFn(prefixCls, 'explain') : ''} key="help">
-        { help }
+    return help ? (
+      <div className={prefixClsFn(prefixCls, 'explain')} key="help">
+        {help}
       </div>
-    );
+    ) : null;
   }
 
   renderExtra() {
     const { prefixCls, extra } = this.props;
-    return <div className={prefixClsFn(prefixCls, 'extra')}>{extra}</div>;
+    return <span className={prefixClsFn(prefixCls, 'extra')}>{extra}</span>;
   }
 
   getValidateStatus() {

From affda966e5009287d0c7c061452b174c9625804b Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Wed, 27 Apr 2016 17:15:05 +0800
Subject: [PATCH 5/6] fix #1528

---
 components/button/button.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/button/button.jsx b/components/button/button.jsx
index 053dd6fbe..193f9050c 100644
--- a/components/button/button.jsx
+++ b/components/button/button.jsx
@@ -83,7 +83,7 @@ export default class Button extends React.Component {
 Button.propTypes = {
   type: React.PropTypes.oneOf(['primary', 'ghost', 'dashed']),
   shape: React.PropTypes.oneOf(['circle', 'circle-outline']),
-  size: React.PropTypes.oneOf(['large', 'small']),
+  size: React.PropTypes.oneOf(['large', 'default', 'small']),
   htmlType: React.PropTypes.oneOf(['submit', 'button', 'reset']),
   onClick: React.PropTypes.func,
   loading: React.PropTypes.bool,

From b988dd940bc2d5d0949c329cf4cabb057482f008 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Wed, 27 Apr 2016 17:25:35 +0800
Subject: [PATCH 6/6] bump 0.12.16

---
 CHANGELOG.md | 10 ++++++++++
 package.json |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 010a7ce0c..af6722878 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,16 @@
 
 ---
 
+## 0.12.16
+
+- 修复 Collapse 在 safari 中切换动画异常的问题。[#1494](https://github.com/ant-design/ant-design/issues/1494)
+- 修复 Table 的 selectedRowKeys 在初次渲染时失效的问题。[#1501](https://github.com/ant-design/ant-design/issues/1501)
+- Table 现在点击选择框时将不再触发 `onRowClick`。[#1470](https://github.com/ant-design/ant-design/issues/1470)
+- 修复一个 Calender 服务端渲染时提示 `Option is not defined` 的问题。[#1521](https://github.com/ant-design/ant-design/issues/1521)
+- 修复 Menu 动态切换模式时的一些细节问题。
+- 优化了 export 导出图标。
+- 修复 Form 的一些样式细节。
+
 ## 0.12.15
 
 - 升级 rc-collapse 修复一个性能问题。
diff --git a/package.json b/package.json
index 922424715..1d5a4d4a5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "antd",
-  "version": "0.12.15",
+  "version": "0.12.16",
   "title": "Ant Design",
   "description": "一个 UI 设计语言",
   "homepage": "http://ant.design/",