From 588914ecd76ec61de04b93a52bf6b5aeaf865840 Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 2 Feb 2016 11:52:00 +0800 Subject: [PATCH] fix nested Popconfirm, close #977 --- components/popconfirm/demo/basic.md | 1 - components/popconfirm/index.jsx | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/components/popconfirm/demo/basic.md b/components/popconfirm/demo/basic.md index 0c16cf6960..28eb5eee5d 100644 --- a/components/popconfirm/demo/basic.md +++ b/components/popconfirm/demo/basic.md @@ -23,4 +23,3 @@ ReactDOM.render( , mountNode); ```` - diff --git a/components/popconfirm/index.jsx b/components/popconfirm/index.jsx index c16db5945d..7b9f89b443 100644 --- a/components/popconfirm/index.jsx +++ b/components/popconfirm/index.jsx @@ -62,7 +62,7 @@ export default React.createClass({ } }, render() { - const { title, okText, cancelText, placement, overlayStyle, trigger } = this.props; + const { title, okText, cancelText, placement, overlayStyle, trigger, ...restProps } = this.props; const overlay = (
@@ -81,7 +81,7 @@ export default React.createClass({ const transitionName = transitionNames[placement]; return ( -