Merge branch 'master' into focus-on-open

5 files changed, 62 insertions, 5 deletions

diff --git a/src/Header.jsx b/src/Header.jsx
index 6bed557..1520d25 100644
--- a/src/Header.jsx
+++ b/src/Header.jsx
@@ -23,6 +23,7 @@ class Header extends Component {
     defaultOpenValue: PropTypes.object,
     currentSelectPanel: PropTypes.string,
     focusOnOpen: PropTypes.bool,
+    onKeyDown: PropTypes.func,
   };
 
   constructor(props) {
@@ -134,9 +135,12 @@ class Header extends Component {
   }
 
   onKeyDown = (e) => {
+    const { onEsc, onKeyDown } = this.props;
     if (e.keyCode === 27) {
-      this.props.onEsc();
+      onEsc();
     }
+
+    onKeyDown(e);
   }
 
   onClear = () => {
diff --git a/src/Panel.jsx b/src/Panel.jsx
index deeba52..957c021 100644
--- a/src/Panel.jsx
+++ b/src/Panel.jsx
@@ -41,6 +41,7 @@ class Panel extends Component {
     use12Hours: PropTypes.bool,
     addon: PropTypes.func,
     focusOnOpen: PropTypes.bool,
+    onKeyDown: PropTypes.func,
   };
 
   static defaultProps = {
@@ -53,6 +54,7 @@ class Panel extends Component {
     defaultOpenValue: moment(),
     use12Hours: false,
     addon: noop,
+    onKeyDown: noop,
   };
 
   constructor(props) {
@@ -90,7 +92,7 @@ class Panel extends Component {
     const {
       prefixCls, className, placeholder, disabledHours, disabledMinutes,
       disabledSeconds, hideDisabledOptions, allowEmpty, showHour, showMinute, showSecond,
-      format, defaultOpenValue, clearText, onEsc, addon, use12Hours, onClear, focusOnOpen,
+      format, defaultOpenValue, clearText, onEsc, addon, use12Hours, onClear, focusOnOpen, onKeyDown,
     } = this.props;
     const {
       value, currentSelectPanel,
@@ -124,6 +126,7 @@ class Panel extends Component {
           onClear={onClear}
           allowEmpty={allowEmpty}
           focusOnOpen={focusOnOpen}
+          onKeyDown={onKeyDown}
         />
         <Combobox
           prefixCls={prefixCls}
diff --git a/src/Select.jsx b/src/Select.jsx
index 49fed5b..a51ffd2 100644
--- a/src/Select.jsx
+++ b/src/Select.jsx
@@ -79,7 +79,7 @@ class Select extends Component {
   scrollToSelected(duration) {
     // move to selected item
     const select = ReactDom.findDOMNode(this);
-    const list = ReactDom.findDOMNode(this.refs.list);
+    const list = ReactDom.findDOMNode(this.list);
     if (!list) {
       return;
     }
@@ -101,6 +101,10 @@ class Select extends Component {
     this.setState({ active: false });
   }
 
+  saveList = (node) => {
+    this.list = node;
+  }
+
   render() {
     if (this.props.options.length === 0) {
       return null;
@@ -118,7 +122,7 @@ class Select extends Component {
         onMouseEnter={this.handleMouseEnter}
         onMouseLeave={this.handleMouseLeave}
       >
-        <ul ref="list">{this.getOptions()}</ul>
+        <ul ref={this.saveList}>{this.getOptions()}</ul>
       </div>
     );
   }
diff --git a/src/TimePicker.jsx b/src/TimePicker.jsx
index e017527..70327d7 100644
--- a/src/TimePicker.jsx
+++ b/src/TimePicker.jsx
@@ -42,11 +42,14 @@ export default class Picker extends Component {
     onChange: PropTypes.func,
     onOpen: PropTypes.func,
     onClose: PropTypes.func,
+    onFocus: PropTypes.func,
+    onBlur: PropTypes.func,
     addon: PropTypes.func,
     name: PropTypes.string,
     autoComplete: PropTypes.string,
     use12Hours: PropTypes.bool,
     focusOnOpen: PropTypes.bool,
+    onKeyDown: PropTypes.func,
   };
 
   static defaultProps = {
@@ -70,9 +73,12 @@ export default class Picker extends Component {
     onChange: noop,
     onOpen: noop,
     onClose: noop,
+    onFocus: noop,
+    onBlur: noop,
     addon: noop,
     use12Hours: false,
     focusOnOpen: false,
+    onKeyDown: noop,
   };
 
   constructor(props) {
@@ -159,7 +165,7 @@ export default class Picker extends Component {
       prefixCls, placeholder, disabledHours,
       disabledMinutes, disabledSeconds, hideDisabledOptions,
       allowEmpty, showHour, showMinute, showSecond, defaultOpenValue, clearText,
-      addon, use12Hours, focusOnOpen,
+      addon, use12Hours, focusOnOpen, onKeyDown,
     } = this.props;
     return (
       <Panel
@@ -184,6 +190,7 @@ export default class Picker extends Component {
         use12Hours={use12Hours}
         addon={addon}
         focusOnOpen={focusOnOpen}
+        onKeyDown={onKeyDown}
       />
     );
   }
@@ -234,6 +241,7 @@ export default class Picker extends Component {
     const {
       prefixCls, placeholder, placement, align,
       disabled, transitionName, style, className, getPopupContainer, name, autoComplete,
+      onFocus, onBlur,
     } = this.props;
     const { open, value } = this.state;
     const popupClassName = this.getPopupClassName();
@@ -263,6 +271,8 @@ export default class Picker extends Component {
             onKeyDown={this.onKeyDown}
             disabled={disabled} value={value && value.format(this.getFormat()) || ''}
             autoComplete={autoComplete}
+            onFocus={onFocus}
+            onBlur={onBlur}
           />
           <span className={`${prefixCls}-icon`}/>
         </span>
diff --git a/tests/TimePicker.spec.jsx b/tests/TimePicker.spec.jsx
index 0dd6c10..d698e48 100644
--- a/tests/TimePicker.spec.jsx
+++ b/tests/TimePicker.spec.jsx
@@ -208,4 +208,40 @@ describe('TimePicker', () => {
       });
     });
   });
+
+  describe('other operations', () => {
+    it('focus/blur correctly', (done) => {
+      let focus = false;
+      let blur = false;
+
+      const picker = renderPicker({
+        onFocus: () => {
+          focus = true;
+        },
+        onBlur: () => {
+          blur = true;
+        },
+      });
+      expect(picker.state.open).not.to.be.ok();
+      const input = TestUtils.scryRenderedDOMComponentsWithClass(picker,
+        'rc-time-picker-input')[0];
+
+      async.series([(next) => {
+        Simulate.focus(input);
+        setTimeout(next, 100);
+      }, (next) => {
+        expect(picker.state.open).to.be(false);
+
+        Simulate.blur(input);
+        setTimeout(next, 100);
+      }, (next) => {
+        expect(focus).to.be(true);
+        expect(blur).to.be(true);
+
+        next();
+      }], () => {
+        done();
+      });
+    });
+  });
 });