fix(DateTime): correctly calculate start of year (#43)

gravity-ui · Jan 2, 2024 · c902937 · c902937
1 parent 7534665
commit c902937
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/src/dateTime/__tests__/startEndOf.ts b/src/dateTime/__tests__/startEndOf.ts
@@ -2,8 +2,8 @@ import {dateTime} from '../dateTime';
 
 test('start of year', () => {
     const m = dateTime({input: new Date(2011, 1, 2, 3, 4, 5, 6)}).startOf('year');
-    const ms = dateTime({input: new Date(2011, 1, 2, 3, 4, 5, 6)}).startOf('years');
-    const ma = dateTime({input: new Date(2011, 1, 2, 3, 4, 5, 6)}).startOf('y');
+    const ms = dateTime({input: new Date(2011, 7, 2, 3, 4, 5, 6)}).startOf('years');
+    const ma = dateTime({input: new Date(2011, 11, 2, 3, 4, 5, 6)}).startOf('y');
 
     expect(Number(m)).toBe(Number(ms)); // 'Plural or singular should work'
     expect(Number(m)).toBe(Number(ma)); // 'Full or abbreviated should work'
@@ -18,8 +18,8 @@ test('start of year', () => {
 
 test('end of year', () => {
     const m = dateTime({input: new Date(2011, 1, 2, 3, 4, 5, 6)}).endOf('year');
-    const ms = dateTime({input: new Date(2011, 1, 2, 3, 4, 5, 6)}).endOf('years');
-    const ma = dateTime({input: new Date(2011, 1, 2, 3, 4, 5, 6)}).endOf('y');
+    const ms = dateTime({input: new Date(2011, 7, 2, 3, 4, 5, 6)}).endOf('years');
+    const ma = dateTime({input: new Date(2011, 11, 2, 3, 4, 5, 6)}).endOf('y');
 
     expect(Number(m)).toBe(Number(ms)); // 'Plural or singular should work'
     expect(Number(m)).toBe(Number(ma)); // 'Full or abbreviated should work'

diff --git a/src/dateTime/dateTime.ts b/src/dateTime/dateTime.ts
@@ -137,9 +137,12 @@ class DateTimeImpl implements DateTime {
         /* eslint-disable no-fallthrough */
         switch (unit) {
             case 'year':
-                dateComponents.month = 0;
             case 'quarter':
-                dateComponents.month = this.month() - (this.month() % 3);
+                if (unit === 'quarter') {
+                    dateComponents.month = this.month() - (this.month() % 3);
+                } else {
+                    dateComponents.month = 0;
+                }
             case 'month':
             case 'weekNumber':
             case 'isoWeekNumber':
@@ -345,7 +348,7 @@ class DateTimeImpl implements DateTime {
         } else {
             mixed = {...dateComponents, ...newComponents};
 
-            if (newComponents.day === undefined) {
+            if (newComponents.date === undefined) {
                 mixed.date = Math.min(daysInMonth(mixed.year, mixed.month), mixed.date);
             }
         }