From ac8dd1e07f832afb44c172e3169b3d4f6be6be96 Mon Sep 17 00:00:00 2001
From: Felipe BF <fprgw32@gmail.com>
Date: Tue, 10 Mar 2026 19:42:05 -0700
Subject: [PATCH] fix: ensure valid date selection in datetime picker

---
 projects/datetime-picker/src/lib/calendar.html | 6 +++---
 projects/datetime-picker/src/lib/calendar.ts   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/projects/datetime-picker/src/lib/calendar.html b/projects/datetime-picker/src/lib/calendar.html
index 9bb28eb2..520ee43a 100644
--- a/projects/datetime-picker/src/lib/calendar.html
+++ b/projects/datetime-picker/src/lib/calendar.html
@@ -4,7 +4,7 @@
   @switch (currentView()) {
     @case ('month') {
       <ngx-mat-month-view
-        [(activeDate)!]="activeDate"
+        [activeDate]="activeDate"
         [selected]="selected"
         [dateFilter]="dateFilter()"
         [maxDate]="maxDate"
@@ -21,7 +21,7 @@
     }
     @case ('year') {
       <ngx-mat-year-view
-        [(activeDate)!]="activeDate"
+        [activeDate]="activeDate"
         [selected]="selected"
         [dateFilter]="dateFilter()"
         [maxDate]="maxDate"
@@ -32,7 +32,7 @@
     }
     @case ('multi-year') {
       <ngx-mat-multi-year-view
-        [(activeDate)!]="activeDate"
+        [activeDate]="activeDate"
         [selected]="selected"
         [dateFilter]="dateFilter()"
         [maxDate]="maxDate"
diff --git a/projects/datetime-picker/src/lib/calendar.ts b/projects/datetime-picker/src/lib/calendar.ts
index b8682f3f..a528ccf9 100644
--- a/projects/datetime-picker/src/lib/calendar.ts
+++ b/projects/datetime-picker/src/lib/calendar.ts
@@ -358,8 +358,8 @@ export class NgxMatCalendar<D> implements AfterContentInit, AfterViewChecked, On
    * The current active date. This determines which time period is shown and which date is
    * highlighted when using keyboard navigation.
    */
-  get activeDate(): D | null {
-    return this._clampedActiveDate;
+  get activeDate(): D {
+    return this._clampedActiveDate ?? this._dateAdapter.today();
   }
   set activeDate(value: D) {
     this._clampedActiveDate = this._dateAdapter.clampDate(value, this.minDate, this.maxDate);