@@ -258,7 +258,6 @@ export class DatePickerInputImpl extends DisableableInput<DatePickerInputImplPro
258258 const isTimeOnly = queryColumn . isTimeColumn ;
259259 const picker = (
260260 < DatePicker
261- ref = { this . input }
262261 autoComplete = "off"
263262 autoFocus = { autoFocus }
264263 className = { inputClassName }
@@ -267,23 +266,24 @@ export class DatePickerInputImpl extends DisableableInput<DatePickerInputImplPro
267266 id = { queryColumn . fieldKey }
268267 isClearable = { isClearable }
269268 name = { name ? name : queryColumn . fieldKey }
269+ onBlur = { inlineEdit ? onBlur : undefined }
270270 onCalendarClose = { onCalendarClose }
271271 onChange = { this . onChange }
272272 onChangeRaw = { allowRelativeInput || isTimeOnly ? this . onChangeRaw : undefined }
273273 onKeyDown = { onKeyDown }
274- openToDate = { this . getOpenToDate ( ) }
275274 onMonthChange = { this . onChange }
275+ onSelect = { inlineEdit ? this . onSelect : undefined }
276+ openToDate = { this . getOpenToDate ( ) }
276277 placeholderText = { placeholderText ?? `Select ${ queryColumn . caption . toLowerCase ( ) } ` }
278+ ref = { this . input }
277279 selected = { invalid ? null : selectedDate }
280+ shouldCloseOnSelect = { inlineEdit ? false : undefined }
278281 showTimeSelect = { ! hideTime && ( isDateTimeCol ( queryColumn ) || isTimeOnly ) && ! validValueInvalidStart }
279282 showTimeSelectOnly = { ! hideTime && isTimeOnly }
280- timeIntervals = { isTimeOnly ? 10 : 30 }
281283 timeFormat = { timeFormat }
284+ timeIntervals = { isTimeOnly ? 10 : 30 }
282285 value = { allowRelativeInput && ! isTimeOnly && isRelativeDateFilterValue ( value ) ? value : undefined }
283286 wrapperClassName = { inputWrapperClassName }
284- onSelect = { inlineEdit ? this . onSelect : undefined }
285- onBlur = { inlineEdit ? onBlur : undefined }
286- shouldCloseOnSelect = { inlineEdit ? false : undefined }
287287 />
288288 ) ;
289289
@@ -309,6 +309,8 @@ export class DatePickerInputImpl extends DisableableInput<DatePickerInputImplPro
309309 </ label >
310310 ) : (
311311 < FieldLabel
312+ column = { queryColumn }
313+ isDisabled = { isDisabled }
312314 label = { label }
313315 labelOverlayProps = { {
314316 isFormsy : false ,
@@ -319,8 +321,6 @@ export class DatePickerInputImpl extends DisableableInput<DatePickerInputImplPro
319321 } }
320322 showLabel = { showLabel }
321323 showToggle = { allowDisable }
322- column = { queryColumn }
323- isDisabled = { isDisabled }
324324 toggleProps = { {
325325 onClick : this . toggleDisabled ,
326326 } }
0 commit comments