@@ -138,7 +138,7 @@ function PickerPanel<DateType>(props: PickerPanelProps<DateType>) {
138138 const panelContext = React . useContext ( PanelContext ) ;
139139 const { operationRef, panelRef : panelDivRef } = panelContext ;
140140
141- const { extraFooterSelections } = React . useContext ( RangeContext ) ;
141+ const { extraFooterSelections, inRange } = React . useContext ( RangeContext ) ;
142142 const panelRef = React . useRef < PanelRefProps > ( { } ) ;
143143
144144 // Handle init logic
@@ -390,22 +390,20 @@ function PickerPanel<DateType>(props: PickerPanelProps<DateType>) {
390390 }
391391
392392 let extraSelectionNode : React . ReactNode ;
393- if ( ( extraFooterSelections && extraFooterSelections . length ) || showTime ) {
394- let mergedSelections : FooterSelection [ ] = [ ] ;
395-
396- if ( showTime ) {
397- mergedSelections . push ( {
398- label : locale . now ,
399- onClick : ( ) => {
400- triggerSelect ( generateConfig . getNow ( ) ) ;
401- } ,
402- } ) ;
403- }
404-
405- if ( extraFooterSelections ) {
406- mergedSelections = [ ...mergedSelections , ...extraFooterSelections ] ;
407- }
393+ let mergedSelections : FooterSelection [ ] = [ ] ;
394+
395+ if ( extraFooterSelections && extraFooterSelections . length ) {
396+ mergedSelections = extraFooterSelections ;
397+ } else if ( showTime && ! inRange ) {
398+ mergedSelections . push ( {
399+ label : locale . now ,
400+ onClick : ( ) => {
401+ triggerSelect ( generateConfig . getNow ( ) ) ;
402+ } ,
403+ } ) ;
404+ }
408405
406+ if ( mergedSelections . length ) {
409407 extraSelectionNode = (
410408 < ul className = { `${ prefixCls } -ranges` } >
411409 { mergedSelections . map ( ( { label, onClick } ) => (
0 commit comments