Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions src/PickerPanel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -241,12 +241,18 @@ function PickerPanel<DateType>(props: PickerPanelProps<DateType>) {
() => mergedMode,
);

const onInternalPanelChange = (newMode: PanelMode, viewValue: DateType) => {
const nextMode = getInternalNextMode(newMode);
const onInternalPanelChange = (
newMode: PanelMode | null,
viewValue: DateType,
) => {
const nextMode = getInternalNextMode(newMode || mergedMode);
setSourceMode(mergedMode);
setInnerMode(nextMode);

if (onPanelChange && mergedMode !== nextMode) {
if (
onPanelChange &&
(mergedMode !== nextMode || isEqual(generateConfig, viewDate, viewDate))
) {
onPanelChange(viewValue, nextMode);
}
};
Expand Down
2 changes: 1 addition & 1 deletion src/interface.ts
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ export interface PanelSharedProps<DateType> {

onSelect: OnSelect<DateType>;
onViewDateChange: (value: DateType) => void;
onPanelChange: (mode: PanelMode, viewValue: DateType) => void;
onPanelChange: (mode: PanelMode | null, viewValue: DateType) => void;
}

export interface DisabledTimes {
Expand Down
8 changes: 6 additions & 2 deletions src/panels/DatePanel/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,14 @@ function DatePanel<DateType>(props: DatePanelProps<DateType>) {

// ==================== View Operation ====================
const onYearChange = (diff: number) => {
onViewDateChange(generateConfig.addYear(viewDate, diff));
const newDate = generateConfig.addYear(viewDate, diff);
onViewDateChange(newDate);
onPanelChange(null, newDate);
};
const onMonthChange = (diff: number) => {
onViewDateChange(generateConfig.addMonth(viewDate, diff));
const newDate = generateConfig.addMonth(viewDate, diff);
onViewDateChange(newDate);
onPanelChange(null, newDate);
};

return (
Expand Down
7 changes: 5 additions & 2 deletions src/panels/DecadePanel/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,12 @@ function DecadePanel<DateType>(props: DecadePanelProps<DateType>) {

// ==================== View Operation ====================
const onDecadesChange = (diff: number) => {
onViewDateChange(
generateConfig.addYear(viewDate, diff * DECADE_DISTANCE_COUNT),
const newDate = generateConfig.addYear(
viewDate,
diff * DECADE_DISTANCE_COUNT,
);
onViewDateChange(newDate);
onPanelChange(null, newDate);
};

const onInternalSelect = (date: DateType) => {
Expand Down
4 changes: 3 additions & 1 deletion src/panels/MonthPanel/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,9 @@ function MonthPanel<DateType>(props: MonthPanelProps<DateType>) {

// ==================== View Operation ====================
const onYearChange = (diff: number) => {
onViewDateChange(generateConfig.addYear(viewDate, diff));
const newDate = generateConfig.addYear(viewDate, diff);
onViewDateChange(newDate);
onPanelChange(null, newDate);
};

return (
Expand Down
4 changes: 3 additions & 1 deletion src/panels/YearPanel/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,9 @@ function YearPanel<DateType>(props: YearPanelProps<DateType>) {

// ==================== View Operation ====================
const onDecadeChange = (diff: number) => {
onViewDateChange(generateConfig.addYear(viewDate, diff * 10));
const newDate = generateConfig.addYear(viewDate, diff * 10);
onViewDateChange(newDate);
onPanelChange(null, newDate);
};

return (
Expand Down
1 change: 1 addition & 0 deletions tests/picker.spec.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -372,6 +372,7 @@ describe('Picker.Basic', () => {

// Next page
wrapper.find('.rc-picker-header-super-next-btn').simulate('click');
expectPanelChange('2090-09-03', 'decade');

// Select decade
wrapper.selectCell('2010-2019');
Expand Down