fixes #28 and on Blank input open current date will not be selected

Author: chintan13

projects/ionic4-datepicker/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@logisticinfotech/ionic4-datepicker",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "ionic4-datepicker inspired by rajeshwar patlolla ionic1 datepicker",
   "keywords": ["Ionic-datepicker", "ionic", "ionic datepicker", "datepicker", "datepicker ionic", "datepicker for ionic", "datepicker for ionic framework"],
   "license": "SEE LICENSE IN LICENSE",

projects/ionic4-datepicker/src/lib/ionic4-datepicker-modal/ionic4-datepicker-modal.component.html

@@ -90,8 +90,10 @@ <h1 *ngIf="mainObj?.titleLabel">{{mainObj?.titleLabel}}</h1>
           </ion-button>
         </ion-col>
         <ion-col no-padding *ngIf="!mainObj?.closeOnSelect">
-          <ion-button class="ion-button" expand="{{mainObj?.btnProperties?.expand}}" fill="{{mainObj?.btnProperties?.fill}}"
-            size="{{mainObj?.btnProperties?.size}}" color="{{mainObj?.btnProperties?.color}}" disabled="{{mainObj?.btnProperties?.disabled}}"
+          <ion-button class="ion-button" expand="{{mainObj?.btnProperties?.expand}}"
+            fill="{{mainObj?.btnProperties?.fill}}" size="{{mainObj?.btnProperties?.size}}"
+            color="{{mainObj?.btnProperties?.color}}"
+            disabled="{{mainObj?.btnProperties?.disabled || !isSelectedDateFound}}"
             strong="{{mainObj?.btnProperties?.strong}}" (click)="setIonicDatePickerDate()">
             {{mainObj?.setLabel}}
           </ion-button>

projects/ionic4-datepicker/src/lib/ionic4-datepicker-modal/ionic4-datepicker-modal.component.ts

@@ -21,7 +21,7 @@ export class Ionic4DatepickerModalComponent implements OnInit {
   selectedDate: any = {};
 
   // component variables
-  selctedDateEpoch;
+  selctedDateEpoch = 0;
   firstDayEpoch;
   lastDayEpoch;
 
@@ -55,6 +55,8 @@ export class Ionic4DatepickerModalComponent implements OnInit {
   isMonthSelect;
   scrollingMonthOrYearArray: any = [];
 
+  isSelectedDateFound = false;
+
   constructor(
     private navParams: NavParams,
     private modalCtrl: ModalController
@@ -63,6 +65,7 @@ export class Ionic4DatepickerModalComponent implements OnInit {
     if (this.navParams.get('selectedDate')) {
       // console.log('Selected date =>', this.navParams.get('selectedDate'));
       this.selectedDate.date = this.navParams.get('selectedDate');
+      this.isSelectedDateFound = true;
     }
     this.mainObj = this.initDatePickerObj(this.navParams.get('objConfig'));
   }
@@ -178,6 +181,7 @@ export class Ionic4DatepickerModalComponent implements OnInit {
     // console.log('dateSelected =>', selectedDate);
     if (selectedDate && !selectedDate.disabled) {
       if (!selectedDate || Object.keys(selectedDate).length === 0) { return; }
+      this.isSelectedDateFound = true;
       this.selctedDateEpoch = selectedDate.epoch;
       this.selectedDateString = this.formatDate();
       if (this.mainObj.closeOnSelect) {
@@ -320,8 +324,13 @@ export class Ionic4DatepickerModalComponent implements OnInit {
   setInitialObj(ipObj) {
     // console.log('setInitialObj =>', ipObj);
     this.mainObj = ipObj;
-    this.selctedDateEpoch = this.resetHMSM(this.mainObj.inputDate).getTime();
+    if (this.isSelectedDateFound) {
+      this.isSelectedDateFound = true;
+      this.selctedDateEpoch = this.resetHMSM(this.mainObj.inputDate).getTime();
+    }
+
     this.selectedDateString = this.formatDate();
+
     if (this.mainObj.weeksList && this.mainObj.weeksList.length === 7) {
       this.weeksList = this.mainObj.weeksList;
     }

projects/ionic4-datepicker/src/lib/li-ionic4-datepicker.directive.ts

@@ -18,7 +18,7 @@ export class LiIonic4DatepickerDirective implements OnInit {
 
   closeIcon;
   selectedDate: any = {};
-  isModalOpen: any = false;
+  // isModalOpen: any = false;
 
   constructor(
     private modalCtrl: ModalController,
@@ -95,13 +95,13 @@ export class LiIonic4DatepickerDirective implements OnInit {
 
   @HostListener('ionFocus')
   onFocus() {
-    // console.log('on focus of component =>', this.inputDateConfig);
-    if (!this.isModalOpen) {
-      this.isModalOpen = true;
-      this.openDatePicker();
-    }
+    // if (!this.isModalOpen) {
+    // this.isModalOpen = true;
+    this.openDatePicker();
+    // }
   }
 
+
   async openDatePicker() {
     // console.log('openDatePicker');
 
@@ -114,8 +114,7 @@ export class LiIonic4DatepickerDirective implements OnInit {
 
     datePickerModal.onDidDismiss()
       .then((data) => {
-        this.isModalOpen = false;
-        // console.log(data);
+        // this.isModalOpen = false;
         if (data.data && data.data.date && data.data.date !== 'Invalid date') {
           this.selectedDate.date = data.data.date;
           this.control.control.setValue(data.data.date);