Merge pull request #602 from vlio20/14.0.1

Fixing #595 (#601)

Author: vlio20

CHANGELOG.md

@@ -1,6 +1,11 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+# [14.0.1] (2022-07-23)
+
+### Bug Fixes
+- Error when min config is used as string([601](https://github.com/vlio20/angular-datepicker/pull/601)) closes [#595](https://github.com/vlio20/angular-datepicker/issues/595) - Reported by [@tomulticolaure](https://github.com/slickam)
+
 # [14.0.0] (2022-07-23) 
 
 ### Improvements

projects/ng2-date-picker/src/lib/common/services/utils/utils.service.ts

@@ -330,7 +330,7 @@ export class UtilsService {
     return date.isBetween(from, to, 'day', '[]');
   }
 
-  convertPropsToDayjs(obj: { [key: string]: any }, format: string, props: string[]) {
+  convertPropsToDayjs(obj: { [key: string]: any }, format: string, props: string[]): void {
     props.forEach((prop) => {
       if (obj.hasOwnProperty(prop)) {
         obj[prop] = this.convertToDayjs(obj[prop], format);

projects/ng2-date-picker/src/lib/date-picker/date-picker.component.ts

@@ -292,8 +292,8 @@ export class DatePickerComponent implements OnChanges,
           this.componentConfig.min
         );
     this.dayCalendarConfig = this.dayPickerService.getDayConfigService(this.componentConfig);
-    this.dayTimeCalendarConfig = this.dayPickerService.getDayTimeConfigService(this.componentConfig);
-    this.timeSelectConfig = this.dayPickerService.getTimeConfigService(this.componentConfig);
+    this.dayTimeCalendarConfig = this.dayPickerService.getDayTimeConfig(this.componentConfig);
+    this.timeSelectConfig = this.dayPickerService.getTimeConfig(this.componentConfig);
     this.initValidators();
     this.overlayPosition = this.dayPickerService.getOverlayPosition(this.componentConfig);
     this.origin = this.utilsService.getNativeElement(this.componentConfig.inputElementContainer);

projects/ng2-date-picker/src/lib/date-picker/date-picker.service.ts

@@ -87,11 +87,11 @@ export class DatePickerService {
     };
   }
 
-  getDayTimeConfigService(pickerConfig: IDatePickerConfig): IDayTimeCalendarConfig {
+  getDayTimeConfig(pickerConfig: IDatePickerConfig): IDayTimeCalendarConfig {
     return this.daytimeCalendarService.getConfig(pickerConfig);
   }
 
-  getTimeConfigService(pickerConfig: IDatePickerConfig): ITimeSelectConfig {
+  getTimeConfig(pickerConfig: IDatePickerConfig): ITimeSelectConfig {
     return this.timeSelectService.getConfig(pickerConfig);
   }
 

projects/ng2-date-picker/src/lib/day-calendar/day-calendar.service.ts

@@ -30,14 +30,14 @@ export class DayCalendarService {
   }
 
   getConfig(config: IDayCalendarConfig): IDayCalendarConfigInternal {
-    const _config = <IDayCalendarConfigInternal>{
+    const _config = {
       ...this.DEFAULT_CONFIG,
       ...this.utilsService.clearUndefined(config)
     };
 
     this.utilsService.convertPropsToDayjs(_config, _config.format, ['min', 'max']);
 
-    return _config;
+    return _config as IDayCalendarConfigInternal;
   }
 
   generateDaysMap(firstDayOfWeek: WeekDays) {

projects/ng2-date-picker/src/lib/day-time-calendar/day-time-calendar-config.model.ts

@@ -1,5 +1,8 @@
-import {ITimeSelectConfig} from '../time-select/time-select-config.model';
-import {IDayCalendarConfig} from '../day-calendar/day-calendar-config.model';
+import {ITimeSelectConfig, ITimeSelectConfigInternal} from '../time-select/time-select-config.model';
+import {IDayCalendarConfig, IDayCalendarConfigInternal} from '../day-calendar/day-calendar-config.model';
 
 export interface IDayTimeCalendarConfig extends ITimeSelectConfig, IDayCalendarConfig {
 }
+
+export interface IDayTimeCalendarConfigInternal extends ITimeSelectConfigInternal, IDayCalendarConfigInternal {
+}

projects/ng2-date-picker/src/lib/day-time-calendar/day-time-calendar.component.ts

@@ -29,7 +29,7 @@ import {UtilsService} from '../common/services/utils/utils.service';
 import {IDate} from '../common/models/date.model';
 import {DayCalendarService} from '../day-calendar/day-calendar.service';
 import {TimeSelectService} from '../time-select/time-select.service';
-import {IDayTimeCalendarConfig} from './day-time-calendar-config.model';
+import {IDayTimeCalendarConfig, IDayTimeCalendarConfigInternal} from './day-time-calendar-config.model';
 import {DayTimeCalendarService} from './day-time-calendar.service';
 import {DateValidator} from '../common/types/validator.type';
 import {DayCalendarComponent} from '../day-calendar/day-calendar.component';
@@ -70,7 +70,7 @@ export class DayTimeCalendarComponent implements OnInit, OnChanges, ControlValue
   @Output() onRightNav: EventEmitter<INavEvent> = new EventEmitter();
   @ViewChild('dayCalendar') dayCalendarRef: DayCalendarComponent;
   isInited: boolean = false;
-  componentConfig: IDayTimeCalendarConfig;
+  componentConfig: IDayTimeCalendarConfigInternal;
   inputValue: CalendarValue;
   inputValueType: ECalendarValue;
   validateFn: DateValidator;
@@ -172,7 +172,7 @@ export class DayTimeCalendarComponent implements OnInit, OnChanges, ControlValue
   }
 
   dateSelected(day: IDate) {
-    this.selected = this.dayTimeCalendarService.updateDay(this.selected, day.date, this.config);
+    this.selected = this.dayTimeCalendarService.updateDay(this.selected, day.date, this.componentConfig);
     this.emitChange();
   }
 

projects/ng2-date-picker/src/lib/day-time-calendar/day-time-calendar.service.ts

@@ -3,9 +3,10 @@ import {Injectable} from '@angular/core';
 import {UtilsService} from '../common/services/utils/utils.service';
 import {DayCalendarService} from '../day-calendar/day-calendar.service';
 import {TimeSelectService} from '../time-select/time-select.service';
-import {IDayTimeCalendarConfig} from './day-time-calendar-config.model';
+import {IDayTimeCalendarConfig, IDayTimeCalendarConfigInternal} from './day-time-calendar-config.model';
 import {dayjsRef} from '../common/dayjs/dayjs.ref';
 import {Dayjs} from 'dayjs';
+import {IDayCalendarConfigInternal} from '../day-calendar/day-calendar-config.model';
 
 const DAY_FORMAT = 'YYYYMMDD';
 const TIME_FORMAT = 'HH:mm:ss';
@@ -22,25 +23,29 @@ export class DayTimeCalendarService {
               private timeSelectService: TimeSelectService) {
   }
 
-  getConfig(config: IDayTimeCalendarConfig): IDayTimeCalendarConfig {
-    return {
+  getConfig(config: IDayTimeCalendarConfig): IDayTimeCalendarConfigInternal {
+    const _config =  {
       ...this.DEFAULT_CONFIG,
       ...this.timeSelectService.getConfig(config),
       ...this.dayCalendarService.getConfig(config)
     };
+
+    this.utilsService.convertPropsToDayjs(_config, _config.format, ['min', 'max']);
+
+    return _config as IDayTimeCalendarConfigInternal;
   }
 
-  updateDay(current: Dayjs, day: Dayjs, config: IDayTimeCalendarConfig): Dayjs {
+  updateDay(current: Dayjs, day: Dayjs, config: IDayCalendarConfigInternal): Dayjs {
     const time = current ? current : dayjsRef();
     let updated = dayjsRef(day.format(DAY_FORMAT) + time.format(TIME_FORMAT), COMBINED_FORMAT);
 
     if (config.min) {
-      const min = <Dayjs>config.min;
+      const min = config.min;
       updated = min.isAfter(updated) ? min : updated;
     }
 
     if (config.max) {
-      const max = <Dayjs>config.max;
+      const max = config.max;
       updated = max.isBefore(updated) ? max : updated;
     }
 

projects/ng2-date-picker/src/public-api.ts

@@ -10,6 +10,7 @@ export {IDayEvent} from './lib/day-calendar/day.model';
 export {IDatePickerConfig} from './lib/date-picker/date-picker-config.model';
 export {IDatePickerDirectiveConfig} from './lib/date-picker/date-picker-directive-config.model';
 export {IMonthCalendarConfig} from './lib/month-calendar/month-calendar-config';
+export {IDayTimeCalendarConfig} from './lib/day-time-calendar/day-time-calendar-config.model';
 export {ISelectionEvent} from './lib/common/types/selection-event.model';
 export {SelectEvent} from './lib/common/types/selection-event.enum';