Skip to content

Commit fc79951

Browse files
committed
datepicker input fixes
1 parent 828207e commit fc79951

File tree

2 files changed

+12
-18
lines changed

2 files changed

+12
-18
lines changed

components/SLDSDatepickerSingleSelect/index.jsx

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ const defaultProps = {
6565
'August','September','October',
6666
'November','December'
6767
],
68-
onDateChange (date) {
68+
onDateChange (date, strValue) {
6969
console.log('onDateChange should be defined');
7070
},
7171
parser (str) {
@@ -167,28 +167,22 @@ module.exports = React.createClass({
167167

168168
handleInputChange() {
169169
const string = ReactDOM.findDOMNode(this.refs.date).value;
170-
if(string){
171-
this.setState({
172-
strValue:string
173-
});
174-
if(this.props.onDateChange){
175-
const d = this.props.parser(string)
176-
this.props.onDateChange(d);
177-
}
178-
}
179-
else{
180-
this.setState({
181-
isOpen:false
182-
});
170+
this.setState({
171+
strValue:string
172+
});
173+
if(this.props.onDateChange){
174+
const d = this.props.parser(string)
175+
this.props.onDateChange(d, string);
183176
}
184177
},
185178

186179
handleKeyDown(event) {
187180
if (event.keyCode){
188-
if (event.keyCode === KEYS.ENTER ||
189-
event.keyCode === KEYS.SPACE ||
181+
const isShift = !!event.shiftKey;
182+
if (!isShift && (event.keyCode === KEYS.ENTER ||
183+
// event.keyCode === KEYS.SPACE ||
190184
event.keyCode === KEYS.DOWN ||
191-
event.keyCode === KEYS.UP){
185+
event.keyCode === KEYS.UP)){
192186
EventUtil.trapEvent(event);
193187

194188
this.setState({

components/SLDSTimepicker/index.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ const defaultProps = {
4949
return date.toLocaleTimeString(navigator.language, {hour: '2-digit', minute:'2-digit'});
5050
}
5151
},
52-
onDateChange (date) {
52+
onDateChange (date, strValue) {
5353
console.log('onDateChange should be defined');
5454
},
5555
parser (timeStr) {

0 commit comments

Comments
 (0)