fix CalendarDateTime add and subtract (#3316)

Author: LFDanLu

packages/@internationalized/date/src/manipulation.ts

@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {AnyCalendarDate, AnyTime, CycleOptions, CycleTimeOptions, DateDuration, DateField, DateFields, DateTimeDuration, Disambiguation, TimeDuration, TimeField, TimeFields} from './types';
+import {AnyCalendarDate, AnyDateTime, AnyTime, CycleOptions, CycleTimeOptions, DateDuration, DateField, DateFields, DateTimeDuration, Disambiguation, TimeDuration, TimeField, TimeFields} from './types';
 import {CalendarDate, CalendarDateTime, Time, ZonedDateTime} from './CalendarDate';
 import {epochFromDate, fromAbsolute, toAbsolute, toCalendar, toCalendarDateTime} from './conversion';
 import {GregorianCalendar} from './calendars/GregorianCalendar';
@@ -22,8 +22,8 @@ export function add(date: CalendarDateTime, duration: DateTimeDuration): Calenda
 export function add(date: CalendarDate, duration: DateDuration): CalendarDate;
 export function add(date: CalendarDate | CalendarDateTime, duration: DateTimeDuration): CalendarDate | CalendarDateTime;
 export function add(date: CalendarDate | CalendarDateTime, duration: DateTimeDuration) {
-  let mutableDate: Mutable<AnyCalendarDate> = date.copy();
-  let days = 'hour' in date ? addTimeFields(date, duration) : 0;
+  let mutableDate: Mutable<AnyCalendarDate | AnyDateTime> = date.copy();
+  let days = 'hour' in mutableDate ? addTimeFields(mutableDate, duration) : 0;
 
   addYears(mutableDate, duration.years || 0);
   if (mutableDate.calendar.balanceYearMonth) {

packages/@internationalized/date/tests/manipulation.test.js

@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {BuddhistCalendar, CalendarDate, CopticCalendar, EthiopicAmeteAlemCalendar, EthiopicCalendar, HebrewCalendar, IndianCalendar, IslamicCivilCalendar, IslamicTabularCalendar, IslamicUmalquraCalendar, JapaneseCalendar, PersianCalendar, TaiwanCalendar} from '..';
+import {BuddhistCalendar, CalendarDate, CalendarDateTime, CopticCalendar, EthiopicAmeteAlemCalendar, EthiopicCalendar, HebrewCalendar, IndianCalendar, IslamicCivilCalendar, IslamicTabularCalendar, IslamicUmalquraCalendar, JapaneseCalendar, PersianCalendar, TaiwanCalendar} from '..';
 
 describe('CalendarDate manipulation', function () {
   describe('add', function () {
@@ -682,3 +682,31 @@ describe('CalendarDate manipulation', function () {
     });
   });
 });
+
+describe('CalendarDateTime manipulation', function () {
+  describe('add', function () {
+    it.each`
+      Unit              | Expected
+      ${'hours'}        | ${new CalendarDateTime(2020, 1, 1, 5, 0, 0, 0)}
+      ${'minutes'}      | ${new CalendarDateTime(2020, 1, 1, 0, 5, 0, 0)}
+      ${'seconds'}      | ${new CalendarDateTime(2020, 1, 1, 0, 0, 5, 0)}
+      ${'milliseconds'} | ${new CalendarDateTime(2020, 1, 1, 0, 0, 0, 5)}
+    `('should add $Unit', ({Unit, Expected}) => {
+      let date = new CalendarDateTime(2020, 1, 1, 0, 0, 0, 0);
+      expect(date.add({[`${Unit}`]: 5})).toEqual(Expected);
+    });
+  });
+
+  describe('subtract', function () {
+    it.each`
+      Unit              | Expected
+      ${'hours'}        | ${new CalendarDateTime(2020, 1, 1, 0, 5, 5, 5)}
+      ${'minutes'}      | ${new CalendarDateTime(2020, 1, 1, 5, 0, 5, 5)}
+      ${'seconds'}      | ${new CalendarDateTime(2020, 1, 1, 5, 5, 0, 5)}
+      ${'milliseconds'} | ${new CalendarDateTime(2020, 1, 1, 5, 5, 5, 0)}
+    `('should subtract $Unit', ({Unit, Expected}) => {
+      let date = new CalendarDateTime(2020, 1, 1, 5, 5, 5, 5);
+      expect(date.subtract({[`${Unit}`]: 5})).toEqual(Expected);
+    });
+  });
+});