Skip to content

Commit 2e92b25

Browse files
committed
feat(day-view): merge the week and day view components
BREAKING CHANGE: The day and week view have now merged. For most users this should be a seamless migration, however there are some edge cases that you may need to take account for: Any custom styles you used for the day view will need to be adjusted. The `cal-day-view-theme` sass mixin is now gone as all the styles are shared between the week and day view. The `eventWidth` option is removed, events now fill the available width. If using `[daysInWeek]="1"` on the week view, the date and title formatters for the day view will be used instead. The week view now has a border top applied to the top of the component container, rather than the top of the day headers container. The `getDayView` and `getDayViewHourGrid` functions have been removed from the `CalendarUtils` service. The following interfaces from `calendar-utils` were renamed: `DayViewHourSegment` -> `WeekViewHourSegment`, `DayViewHour` -> `WeekViewHour`, `DayViewEvent` -> `WeekViewTimeEvent` The day view scheduler demo is now based off the week view instead, please check the updated demo code for how to migrate: https://mattlewis92.github.io/angular-calendar/#/day-view-scheduler If using a custom template for the `hourSegmentTemplate`, you must pass `let-isTimeLabel="isTimeLabel"` as a local variable and then change `<div class="cal-time">` to `<div class="cal-time" *ngIf="isTimeLabel">` Closes #889
1 parent fd6e7e8 commit 2e92b25

19 files changed

+187
-1265
lines changed

package-lock.json

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@
149149
"dependencies": {
150150
"angular-draggable-droppable": "^4.3.2",
151151
"angular-resizable-element": "^3.2.4",
152-
"calendar-utils": "^0.5.0",
152+
"calendar-utils": "^0.6.0",
153153
"positioning": "^2.0.0"
154154
},
155155
"sideEffects": [

projects/angular-calendar/src/angular-calendar.scss

-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,5 @@
66
@mixin cal-theme($overrides) {
77
@include cal-month-view-theme($overrides);
88
@include cal-week-view-theme($overrides);
9-
@include cal-day-view-theme($overrides);
109
@include cal-tooltip-theme($overrides);
1110
}

projects/angular-calendar/src/modules/common/calendar-utils.provider.ts

-14
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,7 @@ import {
55
GetWeekViewHeaderArgs,
66
WeekDay,
77
GetWeekViewArgs,
8-
GetDayViewArgs,
9-
DayView,
10-
GetDayViewHourGridArgs,
11-
DayViewHour,
128
WeekView,
13-
getDayView,
14-
getDayViewHourGrid,
159
getMonthView,
1610
getWeekViewHeader,
1711
getWeekView
@@ -33,12 +27,4 @@ export class CalendarUtils {
3327
getWeekView(args: GetWeekViewArgs): WeekView {
3428
return getWeekView(this.dateAdapter, args);
3529
}
36-
37-
getDayView(args: GetDayViewArgs): DayView {
38-
return getDayView(this.dateAdapter, args);
39-
}
40-
41-
getDayViewHourGrid(args: GetDayViewHourGridArgs): DayViewHour[] {
42-
return getDayViewHourGrid(this.dateAdapter, args);
43-
}
4430
}

projects/angular-calendar/src/modules/common/util.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import {
22
CalendarEvent,
3-
DayViewEvent,
4-
DayViewHour,
5-
DayViewHourSegment,
3+
WeekViewTimeEvent,
4+
WeekViewHour,
5+
WeekViewHourSegment,
66
validateEvents as validateEventsWithoutLog,
77
ViewPeriod,
88
WeekDay,
@@ -40,15 +40,15 @@ export const trackByWeekDayHeaderDate = (index: number, day: WeekDay) =>
4040

4141
export const trackByHourSegment = (
4242
index: number,
43-
segment: DayViewHourSegment
43+
segment: WeekViewHourSegment
4444
) => segment.date.toISOString();
4545

46-
export const trackByHour = (index: number, hour: DayViewHour) =>
46+
export const trackByHour = (index: number, hour: WeekViewHour) =>
4747
hour.segments[0].date.toISOString();
4848

4949
export const trackByDayOrWeekEvent = (
5050
index: number,
51-
weekEvent: WeekViewAllDayEvent | DayViewEvent
51+
weekEvent: WeekViewAllDayEvent | WeekViewTimeEvent
5252
) => (weekEvent.event.id ? weekEvent.event.id : weekEvent.event);
5353

5454
const MINUTES_IN_HOUR = 60;

projects/angular-calendar/src/modules/day/calendar-day-view-event.component.ts

-94
This file was deleted.

projects/angular-calendar/src/modules/day/calendar-day-view-hour-segment.component.ts

-44
This file was deleted.

0 commit comments

Comments
 (0)