Skip to content

Commit 47827b9

Browse files
authored
Merge branch '13.0.x' into simeonoff/icon-service-ssr
2 parents 3070ef7 + bb2b998 commit 47827b9

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
<igx-input-group [displayDensity]="displayDensity" [type]="type" [suppressInputAutofocus]="this.isDropdown"
2-
(click)="!this.isDropdown && this.toggle()">
1+
<igx-input-group [displayDensity]="displayDensity" [type]="type" [suppressInputAutofocus]="this.isDropdown">
32
<input [displayValuePipe]="this.formatter ? displayValue : null" igxInput [igxDateTimeEditor]="this.inputFormat"
43
type="text" [readonly]="!this.isDropdown || this.readOnly" [minValue]="this.minValue" [maxValue]="this.maxValue"
54
[locale]="this.locale" [spinDelta]="this.itemsDelta" [spinLoop]="this.spinLoop" [placeholder]="this.placeholder"
65
[disabled]="this.disabled" [displayFormat]="this.displayFormat"
76
[igxTextSelection]="this.isDropdown && !this.readOnly" role="combobox" aria-haspopup="dialog"
8-
[attr.aria-expanded]="!this.toggleDirective.collapsed" [attr.aria-labelledby]="this.label?.id" />
7+
[attr.aria-expanded]="!this.toggleDirective.collapsed" [attr.aria-labelledby]="this.label?.id"
8+
(click)="!this.isDropdown && this.toggle()"/>
99

1010
<igx-prefix *ngIf="!this.toggleComponents.length" (click)="this.toggle()">
1111
<igx-icon [title]="this.value ? resourceStrings.igx_time_picker_change_time : resourceStrings.igx_time_picker_choose_time">access_time</igx-icon>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,8 @@ describe('IgxTimePicker', () => {
537537
fixture.componentInstance.mode = PickerInteractionMode.Dialog;
538538
fixture.detectChanges();
539539

540-
inputGroup.triggerEventHandler('click', UIInteractions.getMouseEvent('click'));
540+
const input = fixture.debugElement.query(By.css(CSS_CLASS_INPUT));
541+
input.triggerEventHandler('click', UIInteractions.getMouseEvent('click'));
541542
tick();
542543
fixture.detectChanges();
543544
expect(timePicker.collapsed).toBeFalsy();

0 commit comments

Comments
 (0)