fix(date-picker): Fixed spinning only when the editor is focused #3034 (

#4027) * fix(date-picker): Fixed spinning only when the editor is focused #3034 * fix(date-picker): Hidden internal event #4027 * fix(date-picker): Added missing disabled prop for editable date picker #4027
IgniteUI · Feb 27, 2019 · 6fe0289 · 6fe0289
1 parent 83474d4
commit 6fe0289
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/projects/igniteui-angular/src/lib/date-picker/date-picker.component.html b/projects/igniteui-angular/src/lib/date-picker/date-picker.component.html
@@ -16,7 +16,7 @@
         </igx-prefix>
         <label *ngIf="labelVisibility" igxLabel>{{label}}</label>
         <input #editableInput class="igx-date-picker__input-date" igxInput type="text" [value]="transformedDate"
-            [igxMask]="inputMask" [placeholder]="mask" [displayValuePipe]="displayValuePipe"
+            [igxMask]="inputMask" [placeholder]="mask" [disabled]="disabled" [displayValuePipe]="displayValuePipe"
             [focusedValuePipe]="inputValuePipe" (blur)="onBlur($event)" (wheel)="onWheel($event)"
             (input)="onInput($event)" (keydown)="onKeyDown($event)" (focus)=onFocus() />
         <igx-suffix *ngIf="!isEmpty" (click)="clear()">

diff --git a/projects/igniteui-angular/src/lib/date-picker/date-picker.component.ts b/projects/igniteui-angular/src/lib/date-picker/date-picker.component.ts
@@ -707,6 +707,9 @@ export class IgxDatePickerComponent implements IDatePicker, ControlValueAccessor
     private _modalOverlaySettings: OverlaySettings;
     private _transformedDate;
 
+    /**
+    * @hidden
+    */
     @HostListener('keydown.spacebar', ['$event'])
     @HostListener('keydown.space', ['$event'])
     public onSpaceClick(event: KeyboardEvent) {
@@ -1008,11 +1011,12 @@ export class IgxDatePickerComponent implements IDatePicker, ControlValueAccessor
     * @hidden
     */
     public onWheel(event) {
-        event.preventDefault();
-        event.stopPropagation();
-        const sign = (event.deltaY > 0) ? -1 : 1;
-        this.spinValue(event.target.value, sign, event.type);
-
+        if (this._isInEditMode) {
+            event.preventDefault();
+            event.stopPropagation();
+            const sign = (event.deltaY > 0) ? -1 : 1;
+            this.spinValue(event.target.value, sign, event.type);
+        }
     }
 
     /**