@@ -58,8 +58,8 @@ const DATE_TIME_PICKER_VALUE_ACCESSOR = {
5858 template : `
5959 <div class="date-time-container">
6060 <div class="date-time-tabs">
61- <span class="date-tab" (click)="toggleTimePicker ('date')" [@dateTextState]="componentTabState">{{selectedLabel}}</span>
62- <span class="time-tab" (click)="toggleTimePicker ('time')" [@timeTextState]="componentTabState">
61+ <span class="date-tab" (click)="toggleView ('date')" [@dateTextState]="componentTabState">{{selectedLabel}}</span>
62+ <span class="time-tab" (click)="toggleView ('time')" [@timeTextState]="componentTabState">
6363 <span class="hours" data-automation-id="novo-time-picker-hours">{{hours}}</span>:<span
6464 class="minutes" data-automation-id="novo-time-picker-minutes">{{minutes}}</span>
6565 <span *ngIf="!military" class="meridian">{{meridian}}</span>
@@ -101,7 +101,7 @@ export class NovoDateTimePickerElement implements ControlValueAccessor {
101101
102102 constructor ( public labels : NovoLabelService , private element : ElementRef ) { }
103103
104- toggleTimePicker ( tab : string ) : void {
104+ toggleView ( tab : string ) : void {
105105 this . componentTabState = tab ;
106106 }
107107
@@ -140,6 +140,7 @@ export class NovoDateTimePickerElement implements ControlValueAccessor {
140140 this . setDateLabels ( this . model ) ;
141141 this . onModelChange ( this . model ) ;
142142 this . onSelect . emit ( { date : this . model } ) ;
143+ this . toggleView ( 'time' ) ;
143144 }
144145
145146 onTimeSelected ( event : { hours ?: number , minutes ?: number , meridian ?: string , date ?: Date , text ?: string } ) {
@@ -159,6 +160,8 @@ export class NovoDateTimePickerElement implements ControlValueAccessor {
159160 this . model = model ;
160161 if ( Helpers . isEmpty ( model ) ) {
161162 this . model = new Date ( ) ;
163+ } else if ( ! isNaN ( model ) ) {
164+ this . model = new Date ( model ) ;
162165 }
163166 this . datePickerValue = this . model ;
164167 this . timePickerValue = this . model ;
0 commit comments