Merge branch 'master' of github.com:react-component/time-picker

2 files changed, 6 insertions, 2 deletions

diff --git a/package.json b/package.json
index 1a4d828..1f8b474 100644
--- a/package.json
+++ b/package.json
@@ -49,7 +49,7 @@
     "jquery": "1.x",
     "pre-commit": "1.x",
     "rc-tools": "5.x",
-    "rc-util": "^3.1.2",
+    "rc-util": "^4.0.0",
     "react": "15.x",
     "react-addons-test-utils": "15.x",
     "react-dom": "15.x"
diff --git a/src/TimePicker.jsx b/src/TimePicker.jsx
index 509bcc7..4d7d4d6 100644
--- a/src/TimePicker.jsx
+++ b/src/TimePicker.jsx
@@ -107,7 +107,7 @@ const Picker = React.createClass({
 
   onEsc() {
     this.setOpen(false);
-    this.picker.focus();
+    this.focus();
   },
 
   onKeyDown(e) {
@@ -186,6 +186,10 @@ const Picker = React.createClass({
     }
   },
 
+  focus() {
+    this.picker.focus();
+  },
+
   render() {
     const {
       prefixCls, placeholder, placement, align,