Skip to content

Set mask to TimePicker's editor on clear - 10.1.x #8236

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

Merged
merged 3 commits into from
Oct 6, 2020
Merged

Set mask to TimePicker's editor on clear - 10.1.x #8236

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a24c2c0
fix(time-picker): set mask to editor on clear
jackofdiamond5 Sep 29, 2020
3eab25e
refactor(IgxTimePicker): suppressInputAutofocus on default dropdown t…
jackofdiamond5 Oct 2, 2020
d1ee3cd
Merge branch '10.1.x' into bpenkov/time-picker-editing-10.1
Lipata Oct 6, 2020
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
17 changes: 17 additions & 0 deletions projects/igniteui-angular/src/lib/time-picker/time-picker.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1852,9 +1852,11 @@ describe('IgxTimePicker', () => {
UIInteractions.simulateClickAndSelectEvent(clearTime);
fixture.detectChanges();
input.nativeElement.dispatchEvent(new Event('focus'));
tick();
fixture.detectChanges();

input.nativeElement.dispatchEvent(new Event('blur'));
tick();
fixture.detectChanges();

expect(input.nativeElement.value).toEqual('');
Expand All @@ -1866,6 +1868,21 @@ describe('IgxTimePicker', () => {
expect(input.nativeElement.value).toBe('-- AM');
}));

it('should allow editing of input after clear', fakeAsync(() => {
fixture.componentInstance.format = 'hh tt';
fixture.componentInstance.customDate = new Date(2018, 10, 27, 17, 45, 0, 0);
fixture.detectChanges();
spyOn(fixture.componentInstance.timePicker, 'onInput');

const clearTime = dom.queryAll(By.css('.igx-icon'))[1];
UIInteractions.simulateClickAndSelectEvent(clearTime);
fixture.detectChanges();
const _input = fixture.debugElement.query(By.css('input'));
UIInteractions.simulateTyping('12 AM', _input);
expect(fixture.componentInstance.timePicker.onInput).not.toThrow();
expect(_input.nativeElement.value).toEqual('12 AM');
}));

it('Should navigate dropdown lists correctly when format contains only hours.', fakeAsync(() => {
fixture.componentInstance.format = 'hh tt';
fixture.componentInstance.customDate = new Date(2018, 10, 27, 17, 45, 0);
Expand Down
25 changes: 15 additions & 10 deletions projects/igniteui-angular/src/lib/time-picker/time-picker.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ import { ITimePickerResourceStrings } from '../core/i18n/time-picker-resources';
import { CurrentResourceStrings } from '../core/i18n/resources';
import { KEYS, CancelableBrowserEventArgs, IBaseEventArgs } from '../core/utils';
import { InteractionMode } from '../core/enums';
import { IgxTextSelectionModule} from '../directives/text-selection/text-selection.directive';
import { IgxTextSelectionModule } from '../directives/text-selection/text-selection.directive';


let NEXT_ID = 0;
Expand Down Expand Up @@ -1945,7 +1945,11 @@ export class IgxTimePickerComponent implements

const oldVal = new Date(this.value);

this.displayValue = '';
this.displayValue = this.parseMask(false);
requestAnimationFrame(() => {
this._setCursorPosition(0);
});
// TODO: refactoring - this.value should be null #8135
this.value.setHours(0, 0);

if (oldVal.getTime() !== this.value.getTime()) {
Expand All @@ -1964,33 +1968,34 @@ export class IgxTimePickerComponent implements
* @hidden
*/
public onInput(event): void {
const val = event.target.value;
const inputMask = event.target.value;
const oldVal = new Date(this.value);

this.isNotEmpty = val !== this.parseMask(false);
this.isNotEmpty = inputMask !== this.parseMask(false);

// handle cases where all empty positions (promts) are filled and we want to update
// timepicker own value property if it is a valid Date
if (val.indexOf(this.promptChar) === -1) {
if (this._isEntryValid(val)) {
const newVal = this.convertMinMaxValue(val);
if (inputMask.indexOf(this.promptChar) === -1) {
if (this._isEntryValid(inputMask)) {
const newVal = this.convertMinMaxValue(inputMask);
if (oldVal.getTime() !== newVal.getTime()) {
this.value = newVal;
}
} else {
const args: IgxTimePickerValidationFailedEventArgs = {
timePicker: this,
currentValue: val,
currentValue: inputMask,
setThroughUI: false
};
this.onValidationFailed.emit(args);
}
// handle cases where the user deletes the display value (when pressing backspace or delete)
} else if (!this.value || !val || val === this.parseMask(false)) {
} else if (inputMask === this.parseMask(false)) {
this.isNotEmpty = false;

// TODO: refactoring - this.value should be null #8135
this.value.setHours(0, 0);
this.displayValue = val;
this.displayValue = inputMask;

if (oldVal.getTime() !== this.value.getTime()) {
const args: IgxTimePickerValueChangedEventArgs = {
Expand Down