refactor(date-editor): fix failing tests, promptChars

Author: jackofdiamond5

projects/igniteui-angular/src/lib/date-picker/date-picker.pipes.ts

@@ -16,7 +16,7 @@ export class DatePickerDisplayValuePipe implements PipeTransform {
                 return '';
             }
             this._datePicker.rawDateString = value;
-            return DatePickerUtil.trimUnderlines(value);
+            return DatePickerUtil.trimEmptyPlaceholders(value);
         }
         return '';
     }

projects/igniteui-angular/src/lib/date-picker/date-picker.utils.ts

@@ -55,10 +55,10 @@ export abstract class DatePickerUtil {
      * @param inputData masked value to parse
      * @param dateTimeParts Date parts array for the mask
      */
-    public static parseValueFromMask(inputData: string, dateTimeParts: DatePartInfo[]): Date | null {
+    public static parseValueFromMask(inputData: string, dateTimeParts: DatePartInfo[], promptChar?: string): Date | null {
         const parts: { [key in DatePart]: number } = {} as any;
         dateTimeParts.forEach(dp => {
-            let value = parseInt(this.getCleanVal(inputData, dp), 10);
+            let value = parseInt(this.getCleanVal(inputData, dp, promptChar), 10);
             if (!value) {
                 value = dp.type === DatePart.Date || dp.type === DatePart.Month ? 1 : 0;
             }
@@ -256,8 +256,8 @@ export abstract class DatePickerUtil {
         return newDate;
     }
 
-    private static getCleanVal(inputData: string, datePart: DatePartInfo): string {
-        return DatePickerUtil.trimUnderlines(inputData.substring(datePart.start, datePart.end));
+    private static getCleanVal(inputData: string, datePart: DatePartInfo, promptChar?: string): string {
+        return DatePickerUtil.trimEmptyPlaceholders(inputData.substring(datePart.start, datePart.end), promptChar);
     }
 
     private static determineDatePart(char: string): DatePart {
@@ -460,8 +460,8 @@ export abstract class DatePickerUtil {
      * This method replaces prompt chars with empty string.
      * @param value
      */
-    public static trimUnderlines(value: string): string {
-        const result = value.replace(/_/g, '');
+    public static trimEmptyPlaceholders(value: string, promptChar?: string): string {
+        const result = value.replace(new RegExp(promptChar || '_', 'g'), '');
         return result;
     }
 
@@ -654,7 +654,7 @@ export abstract class DatePickerUtil {
                     break;
                 }
                 case DateParts.Year: {
-                    dateStruct[i].formatType = formatterOptions.month;
+                    dateStruct[i].formatType = formatterOptions.year;
                     break;
                 }
             }
@@ -711,7 +711,7 @@ export abstract class DatePickerUtil {
     private static getDateValueFromInput(dateFormatParts: any[], type: DateParts, inputValue: string, trim: boolean = true): string {
         const partPosition = DatePickerUtil.getDateFormatPart(dateFormatParts, type).position;
         const result = inputValue.substring(partPosition[0], partPosition[1]);
-        return (trim) ? DatePickerUtil.trimUnderlines(result) : result;
+        return (trim) ? DatePickerUtil.trimEmptyPlaceholders(result) : result;
     }
 
     private static getDayValueFromInput(dateFormatParts: any[], inputValue: string, trim: boolean = true): string {

projects/igniteui-angular/src/lib/directives/date-time-editor/date-time-editor.directive.spec.ts

@@ -44,7 +44,7 @@ describe('IgxDateTimeEditor', () => {
                 dateTimeEditor.clear();
                 expect(dateTimeEditor.value).toBeNull();
                 expect(dateTimeEditor.valueChange.emit).toHaveBeenCalledTimes(1);
-                expect(dateTimeEditor.valueChange.emit).toHaveBeenCalledWith({ oldValue: date, newValue: null, userInput: inputDate });
+                expect(dateTimeEditor.valueChange.emit).toHaveBeenCalledWith(null);
             });
 
             it('should update mask according to the input format', () => {
@@ -632,7 +632,7 @@ describe('IgxDateTimeEditor', () => {
                 date.setMonth(3);
                 const resultDate =
                     date.toLocaleString('en-GB', { weekday: 'long', day: 'numeric', month: 'long', year: 'numeric' })
-                    .replace(/,/g, '');
+                        .replace(/,/g, '');
                 result = `${resultDate} ${formatShortTime(date)}`;
                 expect(inputElement.nativeElement.value).toEqual(result);
             }));
@@ -695,7 +695,7 @@ describe('IgxDateTimeEditor', () => {
             });
             it('should revert to empty mask on clear()', fakeAsync(() => {
                 const date = new Date(2003, 4, 5);
-                fixture.componentInstance.date =  new Date(2003, 3, 5);
+                fixture.componentInstance.date = new Date(2003, 3, 5);
                 fixture.detectChanges();
                 tick();
                 const result = formatFullDateTime(date);
@@ -706,7 +706,7 @@ describe('IgxDateTimeEditor', () => {
             }));
             it('should move the caret to the start/end of the portion with CTRL + arrow left/right keys.', fakeAsync(() => {
                 const date = new Date(2003, 4, 5);
-                fixture.componentInstance.date =  new Date(2003, 3, 5);
+                fixture.componentInstance.date = new Date(2003, 3, 5);
                 fixture.detectChanges();
                 tick();
                 const result = formatFullDateTime(date);
@@ -833,10 +833,9 @@ describe('IgxDateTimeEditor', () => {
 
                 const year = (newDate.getFullYear().toString()).slice(-2);
                 const result = [newDate.getDate(), newDate.getMonth() + 1, year].join('/');
-                const args = { oldValue: undefined, newValue: newDate, userInput: result };
                 expect(inputElement.nativeElement.value).toEqual(result);
                 expect(dateTimeEditorDirective.valueChange.emit).toHaveBeenCalledTimes(1);
-                expect(dateTimeEditorDirective.valueChange.emit).toHaveBeenCalledWith(args);
+                expect(dateTimeEditorDirective.valueChange.emit).toHaveBeenCalledWith(newDate);
             });
             it('should fire validationFailed when input date is outside date range.', () => {
                 fixture.componentInstance.dateTimeFormat = 'dd-MM-yyyy';

projects/igniteui-angular/src/lib/directives/date-time-editor/date-time-editor.directive.ts

@@ -191,7 +191,7 @@ export class IgxDateTimeEditorDirective extends IgxMaskDirective implements OnCh
   private onValidatorChange = (...args: any[]) => { };
 
   private get emptyMask(): string {
-    return this.maskParser.applyMask(this.inputFormat, this.maskOptions);
+    return this.maskParser.applyMask(null, this.maskOptions);
   }
 
   private get targetDatePart(): DatePart {
@@ -524,7 +524,7 @@ export class IgxDateTimeEditorDirective extends IgxMaskDirective implements OnCh
 
   private parseDate(val: string): Date | null {
     if (!val) { return null; }
-    return DatePickerUtil.parseValueFromMask(val, this._inputDateParts);
+    return DatePickerUtil.parseValueFromMask(val, this._inputDateParts, this.promptChar);
   }
 
   private moveCursor(event: KeyboardEvent): void {