Merge branch 'master' into ganastasov/fix-14151-master

Author: kdinev

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

@@ -90,7 +90,7 @@ export class IgxDateTimeEditorDirective extends IgxMaskDirective implements OnCh
     @Input()
     public set minValue(value: string | Date) {
         this._minValue = value;
-        this.onValidatorChange();
+        this._onValidatorChange();
     }
 
     /**
@@ -111,7 +111,7 @@ export class IgxDateTimeEditorDirective extends IgxMaskDirective implements OnCh
     @Input()
     public set maxValue(value: string | Date) {
         this._maxValue = value;
-        this.onValidatorChange();
+        this._onValidatorChange();
     }
 
     /**
@@ -216,7 +216,6 @@ export class IgxDateTimeEditorDirective extends IgxMaskDirective implements OnCh
     private _dateValue: Date;
     private _onClear: boolean;
     private document: Document;
-    private _isFocused: boolean;
     private _defaultInputFormat: string;
     private _value: Date | string;
     private _minValue: Date | string;
@@ -230,9 +229,9 @@ export class IgxDateTimeEditorDirective extends IgxMaskDirective implements OnCh
         minutes: 1,
         seconds: 1
     };
-    private onTouchCallback: (...args: any[]) => void = noop;
+
     private onChangeCallback: (...args: any[]) => void = noop;
-    private onValidatorChange: (...args: any[]) => void = noop;
+    private _onValidatorChange: (...args: any[]) => void = noop;
 
     private get datePartDeltas(): DatePartDeltas {
         return Object.assign({}, this._datePartDeltas, this.spinDelta);
@@ -289,7 +288,7 @@ export class IgxDateTimeEditorDirective extends IgxMaskDirective implements OnCh
 
     @HostListener('wheel', ['$event'])
     public onWheel(event: WheelEvent): void {
-        if (!this._isFocused) {
+        if (!this._focused) {
             return;
         }
         event.preventDefault();
@@ -392,7 +391,7 @@ export class IgxDateTimeEditorDirective extends IgxMaskDirective implements OnCh
 
     /** @hidden @internal */
     public registerOnValidatorChange?(fn: () => void): void {
-        this.onValidatorChange = fn;
+        this._onValidatorChange = fn;
     }
 
     /** @hidden @internal */
@@ -402,7 +401,7 @@ export class IgxDateTimeEditorDirective extends IgxMaskDirective implements OnCh
 
     /** @hidden @internal */
     public override registerOnTouched(fn: any): void {
-        this.onTouchCallback = fn;
+        this._onTouchedCallback = fn;
     }
 
     /** @hidden @internal */
@@ -471,16 +470,16 @@ export class IgxDateTimeEditorDirective extends IgxMaskDirective implements OnCh
         if (this.nativeElement.readOnly) {
             return;
         }
-        this._isFocused = true;
-        this.onTouchCallback();
+        this._focused = true;
+        this._onTouchedCallback();
         this.updateMask();
         super.onFocus();
         this.nativeElement.select();
     }
 
     /** @hidden @internal */
     public override onBlur(value: string): void {
-        this._isFocused = false;
+        this._focused = false;
         if (!this.inputIsComplete() && this.inputValue !== this.emptyMask) {
             this.updateValue(this.parseDate(this.inputValue));
         } else {
@@ -504,7 +503,7 @@ export class IgxDateTimeEditorDirective extends IgxMaskDirective implements OnCh
     }
 
     private updateMask(): void {
-        if (this._isFocused) {
+        if (this._focused) {
             // store the cursor position as it will be moved during masking
             const cursor = this.selectionEnd;
             this.inputValue = this.getMaskedValue();

projects/igniteui-angular/src/lib/directives/mask/mask.directive.ts

@@ -130,21 +130,21 @@ export class IgxMaskDirective implements OnInit, AfterViewChecked, ControlValueA
 
     protected _composing: boolean;
     protected _compositionStartIndex: number;
+    protected _focused = false;
     private _compositionValue: string;
     private _end = 0;
     private _start = 0;
     private _key: string;
     private _mask: string;
     private _oldText = '';
     private _dataValue = '';
-    private _focused = false;
     private _droppedData: string;
     private _hasDropAction: boolean;
 
     private readonly defaultMask = 'CCCCCCCCCC';
 
-    private _onTouchedCallback: () => void = noop;
-    private _onChangeCallback: (_: any) => void = noop;
+    protected _onTouchedCallback: () => void = noop;
+    protected _onChangeCallback: (_: any) => void = noop;
 
     constructor(
         protected elementRef: ElementRef<HTMLInputElement>,