diff --git a/packages/datetime2/src/components/date-range-picker3/dateRangePicker3.tsx b/packages/datetime2/src/components/date-range-picker3/dateRangePicker3.tsx index 2ff66970eb9..116358d806a 100644 --- a/packages/datetime2/src/components/date-range-picker3/dateRangePicker3.tsx +++ b/packages/datetime2/src/components/date-range-picker3/dateRangePicker3.tsx @@ -452,8 +452,17 @@ function getInitialMonth(props: DateRangePicker3Props, value: DateRange): Date { } return month; } else if (DateUtils.isDayInRange(today, [props.minDate!, props.maxDate!])) { + if (!isSingleMonthOnly && DateUtils.isSameMonth(today, props.maxDate!)) { + // special case: if today is in the maxDate month, display it on the right calendar + today.setMonth(today.getMonth() - 1); + } return today; } else { - return DateUtils.getDateBetween([props.minDate!, props.maxDate!]); + const betweenDate = DateUtils.getDateBetween([props.minDate!, props.maxDate!]); + if (!isSingleMonthOnly && DateUtils.isSameMonth(betweenDate, props.maxDate!)) { + // special case: if betweenDate is in the maxDate month, display it on the right calendar + betweenDate.setMonth(betweenDate.getMonth() - 1); + } + return betweenDate; } }