feat: v7.16.3

heliomarpm · Oct 15, 2023 · 442deb8 · 442deb8
1 parent 4ce45ab
commit 442deb8
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 13 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "ion-calendar",
-	"version": "7.16.2",
+	"version": "7.16.3",
 	"scripts": {
 		"ng": "ng",
 		"prepare": "npm run build && cd dist/ion-calendar && npm link && cd ../../projects/demo && npm link @heliomarpm/ion-calendar",

diff --git a/projects/ion-calendar/package.json b/projects/ion-calendar/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@heliomarpm/ion-calendar",
-	"version": "7.16.2",
+	"version": "7.16.3",
 	"description": "A date picker super component for ionic6+",
 	"author": "Heliomar P. Marques",
 	"license": "MIT",

diff --git a/projects/ion-calendar/src/lib/ion-calendar.service.ts b/projects/ion-calendar/src/lib/ion-calendar.service.ts
@@ -144,7 +144,7 @@ export class IonCalendarService {
     const isToday = DateTimeHelper.now().hasSame(date, 'day')
     const dayConfig = this.findDayConfig(date, options);
 
-    var { title, subTitle, disable } = this.getCalendarDayAttributes(date, dayConfig, options);
+    const { title, subTitle, disable } = this.getCalendarDayAttributes(date, dayConfig, options);
 
     return {
       time,
@@ -184,21 +184,20 @@ export class IonCalendarService {
       const dayOfWeek = DateTimeHelper.weekday(date);
       disable = options.disableWeeks?.includes(dayOfWeek) || false;
 
-      if (!disable) {
+      if (!disable && !options.canBackwardsSelected) {
         const dateFrom = options.from === undefined ? undefined : DateTimeHelper.parse(options.from).startOf("day");
         const dateTo = options.to === undefined ? undefined : DateTimeHelper.parse(options.to).startOf("day");
 
-        if (!options.canBackwardsSelected) {
-          // Check if the date is between the specified range
-          if (dateFrom !== undefined && dateTo !== undefined) {
-            disable = !(date >= dateFrom && date <= dateTo);
-          } else if (dateFrom !== undefined) {
-            disable = date < dateFrom;
-          } else if (dateTo !== undefined) {
-            disable = date > dateTo;
-          }
+        // Check if the date is between the specified range
+        if (dateFrom !== undefined && dateTo !== undefined) {
+          disable = !(date >= dateFrom && date <= dateTo);
+        } else if (dateFrom !== undefined) {
+          disable = date < dateFrom;
+        } else if (dateTo !== undefined) {
+          disable = date > dateTo;
         }
       }
+
     }
 
     // Determine the title and subtitle for the calendar day