fix(calendar): use last defined week day to determine week numb… (#1969)

akveo · Sep 20, 2019 · ba78d94 · ba78d94
1 parent bf14c47
commit ba78d94
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/...components/calendar-kit/components/calendar-day-picker/calendar-day-picker.component.scss b/...components/calendar-kit/components/calendar-day-picker/calendar-day-picker.component.scss
@@ -0,0 +1,7 @@
+:host {
+  display: flex;
+}
+
+.days-container {
+  width: 100%;
+}
diff --git a/...e/components/calendar-kit/components/calendar-day-picker/calendar-day-picker.component.ts b/...e/components/calendar-kit/components/calendar-day-picker/calendar-day-picker.component.ts
@@ -27,14 +27,13 @@ import { convertToBoolProperty } from '../../../helpers';
  * */
 @Component({
   selector: 'nb-calendar-day-picker',
-  styles: [` :host { display: flex; } `],
   template: `
     <nb-calendar-week-numbers *ngIf="showWeekNumber"
                               [weeks]="weeks"
                               [size]="size"
                               [weekNumberSymbol]="weekNumberSymbol">
     </nb-calendar-week-numbers>
-    <div>
+    <div class="days-container">
       <nb-calendar-days-names></nb-calendar-days-names>
       <nb-calendar-picker
           [data]="weeks"
@@ -48,6 +47,7 @@ import { convertToBoolProperty } from '../../../helpers';
       </nb-calendar-picker>
     </div>
   `,
+  styleUrls: ['./calendar-day-picker.component.scss'],
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class NbCalendarDayPickerComponent<D, T> implements OnChanges {

diff --git a/...ponents/calendar-kit/components/calendar-week-number/nb-calendar-week-number.component.ts b/...ponents/calendar-kit/components/calendar-week-number/nb-calendar-week-number.component.ts
@@ -44,9 +44,12 @@ export class NbCalendarWeekNumberComponent<D> {
 
   getWeeks(): number[] {
     return this.weeks.map((week: D[]) => {
+      // Find last defined day as week could contain null days in case
+      // boundingMonth set to false
+      const lastDay = [ ...week ].reverse().find((day: D) => !!day);
       // Use last day of the week to determine week number.
       // This way weeks which span between sibling years is marked first
-      return this.dateService.getWeekNumber(week[6]);
+      return this.dateService.getWeekNumber(lastDay);
     });
   }
 }