Skip to content

fix: use $index tracking in @for loops to prevent DST duplicate key e… #1795

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
devchuckcamp wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: use $index tracking in @for loops to prevent DST duplicate key e… #1795

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .../week/calendar-week-view/calendar-week-view-header/calendar-week-view-header.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import { CalendarDatePipe } from '../../../common/calendar-date/calendar-date.pi
let-dragEnter="dragEnter"
>
<div class="cal-day-headers" role="row">
@for (day of days; track day.date.toISOString()) {
@for (day of days; track $index) {
<div
class="cal-header"
[class.cal-past]="day.isPast"
Expand Down
21 changes: 21 additions & 0 deletions ...angular-calendar/src/modules/week/calendar-week-view/calendar-week-view.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3500,4 +3500,25 @@ describe('calendarWeekView component', () => {
expect(eventDropped).to.have.been.calledOnce;
});
});

it('should not produce duplicate track keys when daysInWeek spans a DST transition', () => {
const fixture: ComponentFixture<CalendarWeekViewComponent> =
TestBed.createComponent(CalendarWeekViewComponent);
fixture.componentInstance.viewDate = new Date('2024-01-01');
fixture.componentInstance.daysInWeek = 140;
fixture.componentInstance.events = [];
fixture.componentInstance.ngOnChanges({
daysInWeek: {},
events: {},
viewDate: {},
});
fixture.detectChanges();
expect(
fixture.nativeElement.querySelectorAll('.cal-header').length,
).to.equal(140);
expect(
fixture.nativeElement.querySelectorAll('.cal-time-events .cal-day-column')
.length,
).to.equal(140);
});
});
27 changes: 6 additions & 21 deletions ...ects/angular-calendar/src/modules/week/calendar-week-view/calendar-week-view.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ export interface CalendarWeekViewBeforeRenderEvent extends WeekView {
<div class="cal-time-label-column">
<ng-container *ngTemplateOutlet="allDayEventsLabelTemplate" />
</div>
@for (day of days; track day.date.toISOString()) {
@for (day of days; track $index) {
<div
class="cal-day-column"
mwlDroppable
Expand Down Expand Up @@ -242,14 +242,11 @@ export interface CalendarWeekViewBeforeRenderEvent extends WeekView {
<div class="cal-time-label-column">
@for (
hour of view.hourColumns[0].hours;
track hour.segments[0].date.toISOString();
track $index;
let odd = $odd
) {
<div class="cal-hour" [class.cal-hour-odd]="odd">
@for (
segment of hour.segments;
track segment.date.toISOString()
) {
@for (segment of hour.segments; track $index) {
<mwl-calendar-week-view-hour-segment
[style.height.px]="hourSegmentHeight"
[segment]="segment"
Expand All @@ -269,12 +266,7 @@ export interface CalendarWeekViewBeforeRenderEvent extends WeekView {
[class.cal-resize-active]="timeEventResizes.size > 0"
#dayColumns
>
@for (
column of view.hourColumns;
track column.hours[0]
? column.hours[0].segments[0].date.toISOString()
: column
) {
@for (column of view.hourColumns; track $index) {
<div class="cal-day-column">
<mwl-calendar-week-view-current-time-marker
[columnDate]="column.date"
Expand Down Expand Up @@ -409,16 +401,9 @@ export interface CalendarWeekViewBeforeRenderEvent extends WeekView {
</div>
}
</div>
@for (
hour of column.hours;
track hour.segments[0].date.toISOString();
let odd = $odd
) {
@for (hour of column.hours; track $index; let odd = $odd) {
<div class="cal-hour" [class.cal-hour-odd]="odd">
@for (
segment of hour.segments;
track segment.date.toISOString()
) {
@for (segment of hour.segments; track $index) {
<mwl-calendar-week-view-hour-segment
[style.height.px]="hourSegmentHeight"
[segment]="segment"
Expand Down