Skip to content

Commit 77e9e1b

Browse files
committed
fix: Not show now when in RangePicker
1 parent bbdf1c0 commit 77e9e1b

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

src/PickerPanel.tsx

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -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 }) => (

src/RangeContext.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ interface RangeContextProps {
1313
* Panel only has one value, this is only style effect.
1414
*/
1515
rangedValue?: [NullableDateType<any>, NullableDateType<any>];
16+
inRange?: boolean;
1617
}
1718

1819
const RangeContext = React.createContext<RangeContextProps>({});

src/RangePicker.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -430,6 +430,7 @@ function InternalRangePicker<DateType>(
430430
value={{
431431
extraFooterSelections,
432432
rangedValue: selectedValues,
433+
inRange: true,
433434
}}
434435
>
435436
<div

0 commit comments

Comments
 (0)