X2-7813 fix range date picker year select (xola#285)

rushi · Nov 16, 2023 · e10c872 · e10c872
1 parent 21a3d45
commit e10c872
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/components/DatePicker/DatePicker.jsx b/src/components/DatePicker/DatePicker.jsx
@@ -44,7 +44,9 @@ export const DatePicker = ({
     const [currentMonth, setCurrentMonth] = useState(initialValue);
     const [startMonth, setStartMonth] = useState(value?.from);
     const [endMonth, setEndMonth] = useState(
-        dayjs(value?.to).isSame(dayjs(value?.from), "month") ? dayjs(value?.from).add(1, "month").toDate() : value?.to,
+        dayjs(value?.to).isSame(dayjs(value?.from), "month")
+            ? dayjs(value?.from).add(1, "month").toDate()
+            : value?.to ?? dayjs(value?.from).add(1, "month").toDate(),
     );
     const [rangeName, setRangeName] = useState("");
     const isRangeVariant = variant === variants.range;