Merge pull request #73 from nsnayp13/cursor/bc-c4f07c99-6d42-4fcf-8952-7e24b493c251-b3b4

Исправить отображение предыдущих дней в режиме одного месяца

Author: nsnayp13

projects/angular-datepicker2/src/lib/_service/calendar.service.ts

@@ -80,6 +80,8 @@ export class CalendarService {
       this.showPrevNextDaysInOneMonth = showPrevNextDaysInOneMonth;
       // Trigger calendar recalculation
       this.getShownMonths(this.shownDate);
+      // Notify components about the change
+      this.updateDate.next(new Date());
     }
   }
 
@@ -173,6 +175,8 @@ export class CalendarService {
 
     this.calendar = months;
     this.viewSelectorMode = "days";
+    // Notify components about the change
+    this.updateDate.next(new Date());
   }
 
   goPrev(firstDate: Date) {

projects/angular-datepicker2/src/lib/month-view/month-view.component.ts

@@ -61,6 +61,13 @@ export class MonthViewComponent implements OnInit, OnDestroy {
       })
     );
 
+    // Subscribe to calendar updates to recalculate weeks when showPrevNextDaysInOneMonth changes
+    this.sub.add(
+      this.calendarService.updateDate.subscribe(() => {
+        this.recalculateWeeks();
+      })
+    );
+
     this.recalculateWeeks();
   }
 

projects/angular-datepicker2/src/lib/week-view/week-view.component.html

@@ -1,6 +1,6 @@
 <div *ngFor="let date of dates" class="f1">
-    <app-day-view *ngIf="date" [dayDirective]="getDayDirective(date)!" [date]="date"
+    <app-day-view *ngIf="date && (date.getMonth()===firstMonthDate.getMonth()&&date.getFullYear()===firstMonthDate.getFullYear() || shouldShowPrevNextDays())" [dayDirective]="getDayDirective(date)!" [date]="date"
         [thisMonth]="date.getMonth()===firstMonthDate.getMonth()&&date.getFullYear()===firstMonthDate.getFullYear()"
-        [isPrevNextMonth]="date.getMonth()!==firstMonthDate.getMonth()||date.getFullYear()!==firstMonthDate.getFullYear()">
+        [isPrevNextMonth]="shouldShowPrevNextDays() && (date.getMonth()!==firstMonthDate.getMonth()||date.getFullYear()!==firstMonthDate.getFullYear())">
     </app-day-view>
 </div>

projects/angular-datepicker2/src/lib/week-view/week-view.component.ts

@@ -1,9 +1,11 @@
-import { Component, OnInit, Input } from "@angular/core";
+import { Component, OnInit, Input, OnDestroy, ChangeDetectorRef } from "@angular/core";
 import { CommonModule } from "@angular/common";
 import { DayDirective } from "../day.directive";
 import { WeekService } from "../_service/week.service";
 import { DayViewComponent } from "../day-view/day-view.component";
 import { DateUtils } from "../_utils/date.utils";
+import { CalendarService } from "../_service/calendar.service";
+import { Subscription } from "rxjs";
 
 @Component({
   selector: "app-week-view",
@@ -13,15 +15,32 @@ import { DateUtils } from "../_utils/date.utils";
   styleUrls: ["./week-view.component.scss"],
   providers: [WeekService],
 })
-export class WeekViewComponent implements OnInit {
+export class WeekViewComponent implements OnInit, OnDestroy {
   @Input() date!: Date;
   @Input() firstMonthDate!: Date;
   @Input() dayDirectives!: DayDirective[];
   dates: (Date | null)[] = [];
-  constructor(private weekService: WeekService) {}
+  private subscriptions = new Subscription();
+  
+  constructor(
+    private weekService: WeekService, 
+    private calendarService: CalendarService,
+    private cdr: ChangeDetectorRef
+  ) {}
 
   ngOnInit() {
     this.dates = this.weekService.getWeek(this.date);
+    
+    // Subscribe to calendar updates to trigger change detection
+    this.subscriptions.add(
+      this.calendarService.updateDate.subscribe(() => {
+        this.cdr.detectChanges();
+      })
+    );
+  }
+
+  ngOnDestroy() {
+    this.subscriptions.unsubscribe();
   }
 
   getDayDirective(date: Date | null): DayDirective | undefined {
@@ -31,4 +50,9 @@ export class WeekViewComponent implements OnInit {
     );
     return day;
   }
+
+  shouldShowPrevNextDays(): boolean {
+    return this.calendarService.showPrevNextDaysInOneMonth && 
+           this.calendarService.getCountMonths() === 1;
+  }
 }