add lastVisible

react-component · Apr 28, 2015 · 734e076 · 734e076
1 parent 1855d75
commit 734e076
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/lib/Dialog.js b/lib/Dialog.js
@@ -37,19 +37,20 @@ var Dialog = React.createClass({
 
   componentDidMount() {
     this.componentDidUpdate();
-    if (this.props.visible) {
-      React.findDOMNode(this.refs.dialog).focus();
-    }
   },
 
   componentDidUpdate() {
     var props = this.props;
     if (props.visible) {
       this.align();
       this.monitorWindowResize();
+      if (!this.lastVisible) {
+        React.findDOMNode(this.refs.dialog).focus();
+      }
     } else {
       this.unMonitorWindowResize();
     }
+    this.lastVisible = props.visible;
   },
 
   componentWillUnmount() {
@@ -90,7 +91,7 @@ var Dialog = React.createClass({
     }
     return (<div className={className.join(' ')}>
       <div {...maskProps} className={prefixClsFn(prefixCls, 'mask')}/>
-      <div className={[prefixClsFn(prefixCls,''), props.className].join(' ')} tabIndex="0" role="dialog" ref='dialog' style={style}>
+      <div className={[prefixClsFn(prefixCls, ''), props.className].join(' ')} tabIndex="0" role="dialog" ref='dialog' style={style}>
         <div className={prefixClsFn(prefixCls, 'content')}>
           <div className={prefixClsFn(prefixCls, 'header')}>
             {closable ?

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rc-dialog",
-  "version": "4.0.2",
+  "version": "4.0.3",
   "description": "dialog ui component for react",
   "keywords": [
     "react",