Merge branch 'master' into 0.26

mattlewis92 · mattlewis92 · commit e3d665200f81 · 2018-08-05T14:02:45.000-07:00
diff --git a/demos/demo-modules/kitchen-sink/component.ts b/demos/demo-modules/kitchen-sink/component.ts
@@ -124,14 +124,14 @@ export class DemoComponent {
 
   dayClicked({ date, events }: { date: Date; events: CalendarEvent[] }): void {
     if (isSameMonth(date, this.viewDate)) {
+      this.viewDate = date;
       if (
         (isSameDay(this.viewDate, date) && this.activeDayIsOpen === true) ||
         events.length === 0
       ) {
         this.activeDayIsOpen = false;
       } else {
         this.activeDayIsOpen = true;
-        this.viewDate = date;
       }
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -124,14 +124,14 @@ export class DemoComponent {`
`124`	`124`
`125`	`125`	`dayClicked({ date, events }: { date: Date; events: CalendarEvent[] }): void {`
`126`	`126`	`if (isSameMonth(date, this.viewDate)) {`
	`127`	`+ this.viewDate = date;`
`127`	`128`	`if (`
`128`	`129`	`(isSameDay(this.viewDate, date) && this.activeDayIsOpen === true) \|\|`
`129`	`130`	`events.length === 0`
`130`	`131`	`) {`
`131`	`132`	`this.activeDayIsOpen = false;`
`132`	`133`	`} else {`
`133`	`134`	`this.activeDayIsOpen = true;`
`134`		`- this.viewDate = date;`
`135`	`135`	`}`
`136`	`136`	`}`
`137`	`137`	`}`