Skip to content

Commit ba78d94

Browse files
authored
fix(calendar): use last defined week day to determine week numb… (#1969)
1 parent bf14c47 commit ba78d94

File tree

3 files changed

+13
-3
lines changed

3 files changed

+13
-3
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
:host {
2+
display: flex;
3+
}
4+
5+
.days-container {
6+
width: 100%;
7+
}

src/framework/theme/components/calendar-kit/components/calendar-day-picker/calendar-day-picker.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,13 @@ import { convertToBoolProperty } from '../../../helpers';
2727
* */
2828
@Component({
2929
selector: 'nb-calendar-day-picker',
30-
styles: [` :host { display: flex; } `],
3130
template: `
3231
<nb-calendar-week-numbers *ngIf="showWeekNumber"
3332
[weeks]="weeks"
3433
[size]="size"
3534
[weekNumberSymbol]="weekNumberSymbol">
3635
</nb-calendar-week-numbers>
37-
<div>
36+
<div class="days-container">
3837
<nb-calendar-days-names></nb-calendar-days-names>
3938
<nb-calendar-picker
4039
[data]="weeks"
@@ -48,6 +47,7 @@ import { convertToBoolProperty } from '../../../helpers';
4847
</nb-calendar-picker>
4948
</div>
5049
`,
50+
styleUrls: ['./calendar-day-picker.component.scss'],
5151
changeDetection: ChangeDetectionStrategy.OnPush,
5252
})
5353
export class NbCalendarDayPickerComponent<D, T> implements OnChanges {

src/framework/theme/components/calendar-kit/components/calendar-week-number/nb-calendar-week-number.component.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,12 @@ export class NbCalendarWeekNumberComponent<D> {
4444

4545
getWeeks(): number[] {
4646
return this.weeks.map((week: D[]) => {
47+
// Find last defined day as week could contain null days in case
48+
// boundingMonth set to false
49+
const lastDay = [ ...week ].reverse().find((day: D) => !!day);
4750
// Use last day of the week to determine week number.
4851
// This way weeks which span between sibling years is marked first
49-
return this.dateService.getWeekNumber(week[6]);
52+
return this.dateService.getWeekNumber(lastDay);
5053
});
5154
}
5255
}

0 commit comments

Comments
 (0)