File tree Expand file tree Collapse file tree 2 files changed +20
-9
lines changed Expand file tree Collapse file tree 2 files changed +20
-9
lines changed Original file line number Diff line number Diff line change @@ -104,6 +104,7 @@ export interface RangePickerSharedProps<DateType> {
104
104
) => void ;
105
105
onFocus ?: React . FocusEventHandler < HTMLInputElement > ;
106
106
onBlur ?: React . FocusEventHandler < HTMLInputElement > ;
107
+ onOk ?: ( ) => void ;
107
108
108
109
/** @private Internal usage. Do not use in your production env */
109
110
components ?: {
@@ -206,6 +207,7 @@ function InnerRangePicker<DateType>(props: RangePickerProps<DateType>) {
206
207
onCalendarChange,
207
208
onFocus,
208
209
onBlur,
210
+ onOk,
209
211
components,
210
212
} = props as MergedRangePickerProps < DateType > ;
211
213
@@ -831,13 +833,16 @@ function InnerRangePicker<DateType>(props: RangePickerProps<DateType>) {
831
833
} ) }
832
834
833
835
{ showTime && (
834
- < li
835
- className = { `${ prefixCls } -ok` }
836
- onClick = { ( ) => {
837
- triggerChange ( selectedValue ) ;
838
- } }
839
- >
840
- < Button disabled = { ! getValue ( selectedValue , activePickerIndex ) } >
836
+ < li className = { `${ prefixCls } -ok` } >
837
+ < Button
838
+ disabled = { ! getValue ( selectedValue , activePickerIndex ) }
839
+ onClick = { ( ) => {
840
+ triggerChange ( selectedValue ) ;
841
+ if ( onOk ) {
842
+ onOk ( ) ;
843
+ }
844
+ } }
845
+ >
841
846
{ locale . ok }
842
847
</ Button >
843
848
</ li >
Original file line number Diff line number Diff line change @@ -714,8 +714,13 @@ describe('Picker.Range', () => {
714
714
715
715
it ( 'datetime display ok button' , ( ) => {
716
716
const onCalendarChange = jest . fn ( ) ;
717
+ const onOk = jest . fn ( ) ;
717
718
const wrapper = mount (
718
- < MomentRangePicker showTime onCalendarChange = { onCalendarChange } /> ,
719
+ < MomentRangePicker
720
+ showTime
721
+ onCalendarChange = { onCalendarChange }
722
+ onOk = { onOk }
723
+ /> ,
719
724
) ;
720
725
wrapper . openPicker ( ) ;
721
726
@@ -725,10 +730,11 @@ describe('Picker.Range', () => {
725
730
// Trigger when valued
726
731
onCalendarChange . mockReset ( ) ;
727
732
wrapper . selectCell ( 11 ) ;
728
- wrapper . find ( '.rc-picker-ok' ) . simulate ( 'click' ) ;
733
+ wrapper . find ( '.rc-picker-ok button ' ) . simulate ( 'click' ) ;
729
734
expect ( onCalendarChange ) . toHaveBeenCalledWith (
730
735
[ expect . anything ( ) , null ] ,
731
736
[ '1990-09-11 00:00:00' , '' ] ,
732
737
) ;
738
+ expect ( onOk ) . toHaveBeenCalled ( ) ;
733
739
} ) ;
734
740
} ) ;
You can’t perform that action at this time.
0 commit comments