@@ -17,6 +17,7 @@ import {
1717 getSeconds ,
1818 getMinutes ,
1919 getHours ,
20+ getTime ,
2021 addDays ,
2122 addMonths ,
2223 addWeeks ,
@@ -39,6 +40,7 @@ import {
3940 setDefaultLocale ,
4041 getDefaultLocale ,
4142 DEFAULT_YEAR_ITEM_NUMBER ,
43+ correctDateString ,
4244 isSameDay ,
4345} from "./date_utils" ;
4446import onClickOutside from "react-onclickoutside" ;
@@ -497,11 +499,19 @@ export default class DatePicker extends React.Component {
497499 this . props . showTimeSelectOnly &&
498500 ! isSameDay ( date , this . props . selected )
499501 ) {
500- date = set ( this . props . selected , {
501- hours : getHours ( date ) ,
502- minutes : getMinutes ( date ) ,
503- seconds : getSeconds ( date ) ,
504- } ) ;
502+ if ( date == null ) {
503+ date = set ( this . props . selected , {
504+ hours : getHours ( this . props . selected ) ,
505+ minutes : getMinutes ( this . props . selected ) ,
506+ seconds : getSeconds ( this . props . selected ) ,
507+ } ) ;
508+ } else {
509+ date = set ( this . props . selected , {
510+ hours : getHours ( date ) ,
511+ minutes : getMinutes ( date ) ,
512+ seconds : getSeconds ( date ) ,
513+ } ) ;
514+ }
505515 }
506516 if ( date || ! event . target . value ) {
507517 this . setSelected ( date , event , true ) ;
0 commit comments