Skip to content

Commit 18b573f

Browse files
author
Matt Lewis
committed
fix(dayView): fix resizing of events
1 parent c19c1eb commit 18b573f

4 files changed

+4
-8
lines changed

scss/day-view.scss

-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
}
4747

4848
.cal-event {
49-
position: absolute;
5049
border: solid 1px;
5150
padding: 5px;
5251
font-size: 12px;

src/components/day/calendarDayView.component.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,9 @@ const SEGMENT_HEIGHT: number = 30;
7474
(dragStart)="dragStart(event, dayViewContainer)"
7575
(dragEnd)="eventDragged(dayEvent, $event.y)"
7676
[style.marginTop.px]="dayEvent.top"
77-
[style.height.px]="dayEvent.height">
77+
[style.height.px]="dayEvent.height"
78+
[style.marginLeft.px]="dayEvent.left + 70"
79+
[style.width.px]="dayEvent.width - 1">
7880
<mwl-calendar-day-view-event
7981
[dayEvent]="dayEvent"
8082
[tooltipPlacement]="tooltipPlacement"

src/components/day/calendarDayViewEvent.component.ts

-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ import { DayViewEvent } from 'calendar-utils';
77
<ng-template #defaultTemplate>
88
<div
99
class="cal-event"
10-
[style.marginLeft.px]="dayEvent.left + 70"
11-
[style.width.px]="dayEvent.width - 1"
1210
[style.backgroundColor]="dayEvent.event.color.secondary"
1311
[style.borderColor]="dayEvent.event.color.primary"
1412
[class.cal-starts-within-day]="!dayEvent.startsBeforeDay"

test/calendarDayView.component.spec.ts

+1-4
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ describe('CalendarDayViewComponent component', () => {
243243
fixture.componentInstance.eventWidth = 300;
244244
fixture.componentInstance.ngOnChanges({viewDate: {}, events: {}, eventWidth: {}});
245245
fixture.detectChanges();
246-
expect(fixture.nativeElement.querySelector('.cal-event').style.width).to.equal('299px');
246+
expect(fixture.nativeElement.querySelector('.cal-event-container').style.width).to.equal('299px');
247247
fixture.destroy();
248248
});
249249

@@ -275,7 +275,6 @@ describe('CalendarDayViewComponent component', () => {
275275
fixture.detectChanges();
276276
document.body.appendChild(fixture.nativeElement);
277277
const event: HTMLElement = fixture.nativeElement.querySelector('.cal-event-container');
278-
event.querySelector('.cal-event')['style'].position = 'inherit'; // hacky fix
279278
const rect: ClientRect = event.getBoundingClientRect();
280279
let resizeEvent: CalendarEventTimesChangedEvent;
281280
fixture.componentInstance.eventTimesChanged.subscribe(event => {
@@ -313,7 +312,6 @@ describe('CalendarDayViewComponent component', () => {
313312
fixture.detectChanges();
314313
document.body.appendChild(fixture.nativeElement);
315314
const event: HTMLElement = fixture.nativeElement.querySelector('.cal-event-container');
316-
event.querySelector('.cal-event')['style'].position = 'inherit'; // hacky fix
317315
const rect: ClientRect = event.getBoundingClientRect();
318316
let resizeEvent: CalendarEventTimesChangedEvent;
319317
fixture.componentInstance.eventTimesChanged.subscribe(event => {
@@ -471,7 +469,6 @@ describe('CalendarDayViewComponent component', () => {
471469
fixture.detectChanges();
472470
document.body.appendChild(fixture.nativeElement);
473471
const event: HTMLElement = fixture.nativeElement.querySelector('.cal-event-container');
474-
event.querySelector('.cal-event')['style'].position = 'inherit'; // hacky fix
475472
const rect: ClientRect = event.getBoundingClientRect();
476473
triggerDomEvent('mousedown', document.body, {clientY: rect.top, clientX: rect.left + 10});
477474
fixture.detectChanges();

0 commit comments

Comments
 (0)