Merge branch '12.0.4' of github.com:vlio20/angular-datepicker into 12.0.4

Author: Vlad Ioffe

src/lib/day-calendar/day-calendar.service.spec.ts

@@ -97,6 +97,21 @@ describe('Service: Calendar', () => {
       expect(monthWeeks[5][6].date.format('DD-MM-YYYY')).toBe('06-11-2016');
       expect(monthWeeks[2][1].selected).toBe(false);
       expect(monthWeeks[2][3].selected).toBe(false);
+
+
+      const today = moment('11-10-2016', 'DD-MM-YYYY').toDate();
+      jasmine.clock().mockDate(today);
+      monthWeeks = service.generateMonthArray(
+        {
+          firstDayOfWeek: 'mo'
+        },
+        moment('test', 'DD-MM-YYYY'),
+        []
+      );
+      expect(monthWeeks[0][0].date.format('DD-MM-YYYY')).toBe('26-09-2016');
+      expect(monthWeeks[5][6].date.format('DD-MM-YYYY')).toBe('06-11-2016');
+      expect(monthWeeks[2][1].selected).toBe(false);
+      expect(monthWeeks[2][3].selected).toBe(false);
     }));
 
   it('should check the generateWeekdays method', inject([DayCalendarService],

src/lib/day-calendar/day-calendar.service.ts

@@ -51,25 +51,26 @@ export class DayCalendarService {
   }
 
   generateMonthArray(config: IDayCalendarConfigInternal, month: Moment, selected: Moment[]): IDay[][] {
+    const parsedMonth = month.isValid() ? month.clone() : moment();
     let monthArray: IDay[][] = [];
     const firstDayOfWeekIndex = this.DAYS.indexOf(config.firstDayOfWeek);
-    const firstDayOfBoard = month.clone().startOf('month');
+    const firstDayOfBoard = parsedMonth.clone().startOf('month');
 
     while (firstDayOfBoard.day() !== firstDayOfWeekIndex) {
       firstDayOfBoard.subtract(1, 'day');
     }
 
     const current = firstDayOfBoard.clone();
-    const prevMonth = month.clone().subtract(1, 'month');
-    const nextMonth = month.clone().add(1, 'month');
+    const prevMonth = parsedMonth.clone().subtract(1, 'month');
+    const nextMonth = parsedMonth.clone().add(1, 'month');
     const today = moment();
 
     const daysOfCalendar: IDay[] = this.utilsService.createArray(42)
       .reduce((array: IDay[]) => {
         array.push({
           date: current.clone(),
           selected: !!selected.find(selectedDay => current.isSame(selectedDay, 'day')),
-          currentMonth: current.isSame(month, 'month'),
+          currentMonth: current.isSame(parsedMonth, 'month'),
           prevMonth: current.isSame(prevMonth, 'month'),
           nextMonth: current.isSame(nextMonth, 'month'),
           currentDay: current.isSame(today, 'day'),
@@ -91,7 +92,7 @@ export class DayCalendarService {
     });
 
     if (!config.showNearMonthDays) {
-      monthArray = this.removeNearMonthWeeks(month, monthArray);
+      monthArray = this.removeNearMonthWeeks(parsedMonth, monthArray);
     }
 
     return monthArray;