Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 7 commits into from
Feb 27, 2019
Merged

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

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
edc4196
fix(date-picker): Fixed spinning only when the editor is focused #3034
sboykova Feb 26, 2019
e3e81e4
Merge branch 'master' into sboykova/editable-date-picker-fixes
sboykova Feb 26, 2019
663bb8b
Merge branch 'master' into sboykova/editable-date-picker-fixes
sboykova Feb 26, 2019
b1d6347
fix(date-picker): Hidden internal event #4027
sboykova Feb 27, 2019
b25678e
Merge branch 'master' into sboykova/editable-date-picker-fixes
SAndreeva Feb 27, 2019
a2035e6
fix(date-picker): Added missing disabled prop for editable date picke…
sboykova Feb 27, 2019
7e219d6
Merge branch 'master' into sboykova/editable-date-picker-fixes
bkulov Feb 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion projects/igniteui-angular/src/lib/date-picker/date-picker.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()">
Expand Down
14 changes: 9 additions & 5 deletions projects/igniteui-angular/src/lib/date-picker/date-picker.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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);
}
}

/**
Expand Down