Skip to content

Commit c6b095a

Browse files
committed
feat(day-view): remove the mwl-calendar-all-day-event component
BREAKING CHANGE: the allDayEventTemplate option was removed from the day view. To migrate use the eventTemplate input and check if dayEvent.event.allDay is set in the template
1 parent 66e9223 commit c6b095a

5 files changed

+14
-78
lines changed

src/modules/day/calendar-all-day-event.component.ts

-58
This file was deleted.

src/modules/day/calendar-day-view.component.ts

+8-10
Original file line numberDiff line numberDiff line change
@@ -82,18 +82,22 @@ export interface DayViewEventResize {
8282
dragOverClass="cal-drag-over"
8383
dragActiveClass="cal-drag-active"
8484
(drop)="eventDropped($event, view.period.start, true)">
85-
<mwl-calendar-all-day-event
85+
<mwl-calendar-day-view-event
8686
*ngFor="let event of view.allDayEvents; trackBy:trackByEventId"
87-
[event]="event"
88-
[customTemplate]="allDayEventTemplate"
87+
[dayEvent]="{event: event}"
88+
[tooltipPlacement]="tooltipPlacement"
89+
[tooltipTemplate]="tooltipTemplate"
90+
[tooltipAppendToBody]="tooltipAppendToBody"
91+
[customTemplate]="eventTemplate"
8992
[eventTitleTemplate]="eventTitleTemplate"
9093
[eventActionsTemplate]="eventActionsTemplate"
9194
(eventClicked)="eventClicked.emit({event: event})"
95+
[class.cal-draggable]="!snapDraggedEvents && event.draggable"
9296
mwlDraggable
9397
dragActiveClass="cal-drag-active"
9498
[dropData]="{event: event}"
9599
[dragAxis]="{x: !snapDraggedEvents && event.draggable, y: !snapDraggedEvents && event.draggable}">
96-
</mwl-calendar-all-day-event>
100+
</mwl-calendar-day-view-event>
97101
</div>
98102
<div
99103
class="cal-hour-rows"
@@ -258,12 +262,6 @@ export class CalendarDayViewComponent implements OnChanges, OnInit, OnDestroy {
258262
@Input()
259263
hourSegmentTemplate: TemplateRef<any>;
260264

261-
/**
262-
* A custom template to use for all day events
263-
*/
264-
@Input()
265-
allDayEventTemplate: TemplateRef<any>;
266-
267265
/**
268266
* A custom template to use for day view events
269267
*/

src/modules/day/calendar-day-view.scss

+5-6
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,7 @@
5757
}
5858
}
5959

60-
.cal-event,
61-
.cal-all-day-event {
60+
.cal-event {
6261
padding: 5px;
6362
font-size: 12px;
6463
background-color: #d1e8ff;
@@ -74,6 +73,10 @@
7473
height: 100%;
7574
}
7675

76+
.cal-all-day-events > * {
77+
cursor: pointer;
78+
}
79+
7780
.cal-draggable {
7881
cursor: move;
7982
}
@@ -88,10 +91,6 @@
8891
border-bottom-right-radius: 5px;
8992
}
9093

91-
.cal-all-day-event {
92-
cursor: pointer;
93-
}
94-
9594
.cal-drag-active {
9695
z-index: 1;
9796

src/modules/day/calendar-day.module.ts

-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import { CommonModule } from '@angular/common';
33
import { ResizableModule } from 'angular-resizable-element';
44
import { DragAndDropModule } from 'angular-draggable-droppable';
55
import { CalendarDayViewComponent } from './calendar-day-view.component';
6-
import { CalendarAllDayEventComponent } from './calendar-all-day-event.component';
76
import { CalendarDayViewHourSegmentComponent } from './calendar-day-view-hour-segment.component';
87
import { CalendarDayViewEventComponent } from './calendar-day-view-event.component';
98
import { CalendarCommonModule } from '../common/calendar-common.module';
@@ -22,15 +21,13 @@ export {
2221
],
2322
declarations: [
2423
CalendarDayViewComponent,
25-
CalendarAllDayEventComponent,
2624
CalendarDayViewHourSegmentComponent,
2725
CalendarDayViewEventComponent
2826
],
2927
exports: [
3028
ResizableModule,
3129
DragAndDropModule,
3230
CalendarDayViewComponent,
33-
CalendarAllDayEventComponent,
3431
CalendarDayViewHourSegmentComponent,
3532
CalendarDayViewEventComponent
3633
]

test/calendar-day-view.component.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1427,7 +1427,7 @@ describe('CalendarDayViewComponent component', () => {
14271427
fixture.detectChanges();
14281428
document.body.appendChild(fixture.nativeElement);
14291429
const event = fixture.nativeElement.querySelector(
1430-
'.cal-all-day-events mwl-calendar-all-day-event'
1430+
'.cal-all-day-events mwl-calendar-day-view-event'
14311431
);
14321432
const rect: ClientRect = event.getBoundingClientRect();
14331433
let dragEvent: CalendarEventTimesChangedEvent;

0 commit comments

Comments
 (0)