@@ -157,16 +157,16 @@ export default class DateTimePicker extends Component {
157157 }
158158 }
159159
160- onDateUpdate ( ) {
160+ onDateUpdate ( value ) {
161161 const { date : currentDate , time : currentTime } = this . parseDateTime ( this . props . value ) ;
162- const isValidDate = isDateTime ( this . state . dateValue + ' ' + testTime ) ;
162+ const isValidDate = isDateTime ( value + ' ' + testTime ) ;
163163
164164 if ( isValidDate ) {
165- this . props . onChange ( this . state . dateValue + ' ' + currentTime ) ;
165+ this . props . onChange ( value + ' ' + currentTime ) ;
166166 return ;
167167 }
168168
169- if ( this . state . dateValue === '' ) {
169+ if ( value === '' ) {
170170 this . setState ( {
171171 dateValue : currentDate ,
172172 dateInputClassName : 'datetimepicker-container-date-input' ,
@@ -177,6 +177,7 @@ export default class DateTimePicker extends Component {
177177
178178 render ( ) {
179179 const JSDate = new Date ( this . props . value ) ;
180+ const localeTime = JSDate . toLocaleTimeString ( 'en-US' ) . split ( ' ' ) ;
180181 const currentYear = JSDate . getFullYear ( ) ;
181182
182183 return (
@@ -224,7 +225,8 @@ export default class DateTimePicker extends Component {
224225 month = { JSDate }
225226 onDayClick = { value => {
226227 const plotlyDate = this . toPlotlyJSDate ( value ) . split ( ' ' ) [ 0 ] ;
227- this . updateDate ( plotlyDate ) ;
228+ this . onDateChange ( plotlyDate ) ;
229+ this . onDateUpdate ( plotlyDate ) ;
228230 } }
229231 />
230232 </ div >
@@ -240,7 +242,7 @@ export default class DateTimePicker extends Component {
240242 editableClassName = { this . state . timeInputClassName }
241243 />
242244 < span className = "datetimepicker-date-units" >
243- { JSDate . toLocaleTimeString ( 'en-US' ) . split ( ' ' ) [ 1 ] === 'PM' ? ' PM' : 'AM' }
245+ { localeTime [ 1 ] === 'PM' ? ( localeTime [ 0 ] . startsWith ( '12:' ) ? 'noon' : ' PM') : 'AM' }
244246 </ span >
245247 </ div >
246248 </ div >
0 commit comments