Skip to content

Commit b2a88b0

Browse files
authored
Merge branch '9.1.x' into header-title-9-1-x
2 parents 9bc0832 + 80bc542 commit b2a88b0

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

projects/igniteui-angular/src/lib/time-picker/time-picker.component.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<igx-prefix (click)="openDialog(group.element.nativeElement)">
55
<igx-icon>access_time</igx-icon>
66
</igx-prefix>
7-
<input
7+
<input
88
type="text"
99
[igxMask]="mask"
1010
igxInput
@@ -14,6 +14,7 @@
1414
[focusedValuePipe]="inputFormat"
1515
[promptChar]="promptChar"
1616
[value]="displayValue"
17+
[igxTextSelection]="true"
1718
(input)="onInput($event)"
1819
(blur)="onBlur($event)"
1920
(focus)="onFocus($event)"

projects/igniteui-angular/src/lib/time-picker/time-picker.component.spec.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2023,6 +2023,7 @@ describe('IgxTimePicker', () => {
20232023
it('Should set time picker status to invalid when it is required and has no value onBlur', fakeAsync(() => {
20242024
timePickerOnBlurComponent.mode = InteractionMode.DropDown;
20252025
timePickerOnBlurComponent.mask = 'dd/mm/yyyy';
2026+
20262027
fixture.detectChanges();
20272028

20282029
const inputDirectiveElements = fixture.debugElement.queryAll(By.directive(IgxInputDirective));
@@ -2032,6 +2033,7 @@ describe('IgxTimePicker', () => {
20322033
expect(inputDirective.valid).toEqual(IgxInputState.INITIAL);
20332034

20342035
inputDirectiveElement.triggerEventHandler('focus', { target: { value: null }});
2036+
tick(16);
20352037
fixture.detectChanges();
20362038

20372039
expect(inputDirective.valid).toEqual(IgxInputState.INITIAL);

projects/igniteui-angular/src/lib/time-picker/time-picker.component.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ import { ITimePickerResourceStrings } from '../core/i18n/time-picker-resources';
5050
import { CurrentResourceStrings } from '../core/i18n/resources';
5151
import { KEYS, CancelableBrowserEventArgs, IBaseEventArgs } from '../core/utils';
5252
import { InteractionMode } from '../core/enums';
53+
import { IgxTextSelectionModule} from '../directives/text-selection/text-selection.directive';
5354

5455
let NEXT_ID = 0;
5556
const ITEMS_COUNT = 7;
@@ -2124,7 +2125,8 @@ export class IgxTimePickerComponent implements
21242125
IgxIconModule,
21252126
IgxButtonModule,
21262127
IgxMaskModule,
2127-
IgxToggleModule
2128+
IgxToggleModule,
2129+
IgxTextSelectionModule
21282130
],
21292131
providers: []
21302132
})

0 commit comments

Comments
 (0)