diff --git a/DateTime.js b/DateTime.js index 41eb5f3b2..6ce0fdaab 100644 --- a/DateTime.js +++ b/DateTime.js @@ -28,6 +28,10 @@ var Datetime = React.createClass({ onChange: TYPES.func, locale: TYPES.string, input: TYPES.bool, + label: TYPES.oneOfType([ + TYPES.string, + TYPES.element + ]), // dateFormat: TYPES.string | TYPES.bool, // timeFormat: TYPES.string | TYPES.bool, inputProps: TYPES.object, @@ -370,15 +374,43 @@ var Datetime = React.createClass({ ; if ( this.props.input ){ - children = [ DOM.input( assign({ - key: 'i', - type:'text', - className: 'form-control', - onFocus: this.openCalendar, - onChange: this.onInputChange, - onKeyDown: this.onInputKey, - value: this.state.inputValue - }, this.props.inputProps ))]; + if ( this.props.label ) { + children = [ DOM.div({ + key: 'd', + className: 'form-group' + }, + [ DOM.span({ + key: 'i', + className: 'input-group' + }, + [ DOM.span({ + key: 'a', + className: 'input-group-addon', + children: this.props.label + }), + DOM.input( assign({ + key: 'i', + type:'text', + className: 'form-control', + onFocus: this.openCalendar, + onChange: this.onInputChange, + onKeyDown: this.onInputKey, + value: this.state.inputValue + }, this.props.inputProps )) + ] + )] + )]; + } else { + children = [ DOM.input( assign({ + key: 'i', + type:'text', + className: 'form-control', + onFocus: this.openCalendar, + onChange: this.onInputChange, + onKeyDown: this.onInputKey, + value: this.state.inputValue + }, this.props.inputProps ))]; + } } else { className += ' rdtStatic'; }