Merge branch 'master' into antd-3.0

CHANGELOG.en-US.md

@@ -1372,8 +1372,8 @@ The following change will throw some warnings in the console and it will still w
 
   ```diff
   {
-  -  "plugins": [["antd", { style: "css" }]]
-  +  "plugins": [["import", { libraryName: "antd", style: "css" }]]
+  -  "plugins": [["antd", { "style": "css" }]]
+  +  "plugins": [["import", { "libraryName": "antd", "style": "css" }]]
   }
   ```
 

CHANGELOG.zh-CN.md

@@ -1438,8 +1438,8 @@ timeline: true
 
   ```diff
   {
-  -  "plugins": [["antd", { style: "css" }]]
-  +  "plugins": [["import", { libraryName: "antd", style: "css" }]]
+  -  "plugins": [["antd", { "style": "css" }]]
+  +  "plugins": [["import", { "libraryName": "antd", "style": "css" }]]
   }
   ```
 

README.md

@@ -72,7 +72,7 @@ import 'antd/dist/antd.css';  // or 'antd/dist/antd.less'
    // .babelrc or babel-loader option
    {
      "plugins": [
-       ["import", { libraryName: "antd", style: "css" }] // `style: true` for less
+       ["import", { "libraryName": "antd", "style": "css" }] // `style: true` for less
      ]
    }
    ```

components/spin/index.tsx

@@ -9,6 +9,7 @@ export interface SpinProps {
   prefixCls?: string;
   className?: string;
   spinning?: boolean;
+  style?: React.CSSProperties;
   size?: 'small' | 'default' | 'large';
   tip?: string;
   delay?: number;

components/tooltip/index.en-US.md

@@ -32,6 +32,7 @@ The following APIs are shared by Tooltip, Popconfirm, Popover.
 | overlayStyle | Style of the tooltip card | object | - |
 | placement | The position of the tooltip relative to the target, which can be one of `top` `left` `right` `bottom` `topLeft` `topRight` `bottomLeft` `bottomRight` `leftTop` `leftBottom` `rightTop` `rightBottom` | string | `top` |
 | trigger | Tooltip trigger mode | `hover` \| `focus` \| `click` | `hover` |
+| defaultVisible | Whether the floating tooltip card is visible by default | boolean | `false` |
 | visible | Whether the floating tooltip card is visible or not | boolean | `false` |
 | onVisibleChange | Callback executed when visibility of the tooltip card is changed | (visible) => void | - |
 

components/tooltip/index.tsx

@@ -19,6 +19,7 @@ export interface AbstractTooltipProps {
   overlayStyle?: React.CSSProperties;
   placement?: TooltipPlacement;
   builtinPlacements?: Object;
+  defaultVisible?: boolean;
   visible?: boolean;
   onVisibleChange?: (visible: boolean) => void;
   mouseEnterDelay?: number;
@@ -70,7 +71,7 @@ export default class Tooltip extends React.Component<TooltipProps, any> {
     super(props);
 
     this.state = {
-      visible: !!props.visible,
+      visible: !!props.visible || !!props.defaultVisible,
     };
   }
 

components/tooltip/index.zh-CN.md

@@ -34,6 +34,7 @@ title: Tooltip
 | overlayStyle | 卡片样式 | object | 无 |
 | placement | 气泡框位置，可选 `top` `left` `right` `bottom` `topLeft` `topRight` `bottomLeft` `bottomRight` `leftTop` `leftBottom` `rightTop` `rightBottom` | string | top |
 | trigger | 触发行为，可选 `hover/focus/click` | string | hover |
+| defaultVisible | 默认是否显隐 | boolean | false |
 | visible | 用于手动控制浮层显隐 | boolean | false |
 | onVisibleChange | 显示隐藏的回调 | (visible) => void | 无 |
 

docs/react/introduce.en-US.md

@@ -41,7 +41,7 @@ Following the Ant Design specification, we developed a React UI library `antd` t
 ## Version
 
 - Stable: [![npm package](https://img.shields.io/npm/v/antd.svg?style=flat-square)](https://www.npmjs.org/package/antd)
-- Next: [![](https://cnpmjs.org/badge/v/antd.svg?&tag=next&subject=npm)](https://www.npmjs.org/package/antd)
+- Next：  [![npm (next)](https://img.shields.io/npm/v/antd/next.svg?style=flat-square)](https://www.npmjs.org/package/antd)
 
 You can subscribe to this feed for new version notifications: https://github.com/ant-design/ant-design/releases.atom
 
@@ -90,7 +90,7 @@ import 'antd/dist/antd.css';  // or 'antd/dist/antd.less'
    // .babelrc or babel-loader option
    {
      "plugins": [
-       ["import", { libraryName: "antd", style: "css" }] // `style: true` for less
+       ["import", { "libraryName": "antd", "style": "css" }] // `style: true` for less
      ]
    }
    ```

docs/react/introduce.zh-CN.md

@@ -41,7 +41,7 @@ title: Ant Design of React
 ## 版本
 
 - 稳定版：[![npm package](https://img.shields.io/npm/v/antd.svg?style=flat-square)](https://www.npmjs.org/package/antd)
-- 预览版：[![](https://cnpmjs.org/badge/v/antd.svg?&tag=next&subject=npm)](https://www.npmjs.org/package/antd)
+- 预览版：[![npm (next)](https://img.shields.io/npm/v/antd/next.svg?style=flat-square)](https://www.npmjs.org/package/antd)
 
 你可以订阅：https://github.com/ant-design/ant-design/releases.atom 来获得稳定版发布的通知。
 
@@ -93,7 +93,7 @@ import 'antd/dist/antd.css';  // or 'antd/dist/antd.less'
    // .babelrc or babel-loader option
    {
      "plugins": [
-       ["import", { libraryName: "antd", style: "css" }] // `style: true` 会加载 less 文件
+       ["import", { "libraryName": "antd", "style": "css" }] // `style: true` 会加载 less 文件
      ]
    }
    ```