keep the day of the month when shifting the date range forward or bac…

…kward if the selected date range is a full month
mayswind · Nov 4, 2024 · c3a880e · c3a880e
1 parent 1c90611
commit c3a880e
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/src/lib/datetime.js b/src/lib/datetime.js
@@ -355,6 +355,7 @@ export function getShiftedDateRange(minTime, maxTime, scale) {
     const firstDayOfMonth = minDateTime.clone().startOf('month');
     const lastDayOfMonth = maxDateTime.clone().endOf('month');
 
+    // check whether the date range matches full months
     if (firstDayOfMonth.unix() === minDateTime.unix() && lastDayOfMonth.unix() === maxDateTime.unix()) {
         const months = getYear(maxDateTime) * 12 + getMonth(maxDateTime) - getYear(minDateTime) * 12 - getMonth(minDateTime) + 1;
         const newMinDateTime = minDateTime.add(months * scale, 'months');
@@ -366,6 +367,18 @@ export function getShiftedDateRange(minTime, maxTime, scale) {
         };
     }
 
+    // check whether the date range matches one full month
+    if (minDateTime.clone().add(1, 'months').subtract(1, 'seconds').unix() === maxDateTime.unix() ||
+        maxDateTime.clone().subtract(1, 'months').add(1, 'seconds').unix() === minDateTime.unix()) {
+        const newMinDateTime = minDateTime.add(1 * scale, 'months');
+        const newMaxDateTime = maxDateTime.add(1 * scale, 'months');
+
+        return {
+            minTime: newMinDateTime.unix(),
+            maxTime: newMaxDateTime.unix()
+        };
+    }
+
     const range = (maxTime - minTime + 1) * scale;
 
     return {