mirror/ant-design
1
0
Fork 0
mirror of https://github.com/ant-design/ant-design.git synced 2025-01-18 06:03:38 +08:00
Code Issues Actions 29 Packages Projects Releases Wiki Activity

fix nested Popconfirm, close #977

Browse Source
This commit is contained in:
afc163 2016-02-02 11:52:00 +08:00
parent 151708910e
commit 588914ecd7
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
components/popconfirm/demo/basic.md
View File

@ -23,4 +23,3 @@ ReactDOM.render(
</Popconfirm> </Popconfirm>
, mountNode); , mountNode);
```` ````

4
components/popconfirm/index.jsx
View File

@ -62,7 +62,7 @@ export default React.createClass({
} }
}, },
render() { render() {
const { title, okText, cancelText, placement, overlayStyle, trigger } = this.props; const { title, okText, cancelText, placement, overlayStyle, trigger, ...restProps } = this.props;
const overlay = ( const overlay = (
<div> <div>
<div className={prefixCls + '-content'}> <div className={prefixCls + '-content'}>
@ -81,7 +81,7 @@ export default React.createClass({
const transitionName = transitionNames[placement]; const transitionName = transitionNames[placement];
return ( return (
<Tooltip placement={placement} <Tooltip {...restProps} placement={placement}
overlayStyle={overlayStyle} overlayStyle={overlayStyle}
prefixCls={prefixCls} prefixCls={prefixCls}
onVisibleChange={this.onVisibleChange} onVisibleChange={this.onVisibleChange}