Skip to content

Commit ec62c51

Browse files
committed
chore(dropdown): addressing comments#6809
1 parent 2947007 commit ec62c51

File tree

2 files changed

+17
-21
lines changed

2 files changed

+17
-21
lines changed

projects/igniteui-angular/src/lib/drop-down/drop-down.component.spec.ts

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ describe('IgxDropDown ', () => {
349349
tick();
350350
fixture.detectChanges();
351351
const dropdownElement = fixture.debugElement.query(By.css(`.${CSS_CLASS_DROP_DOWN_BASE}`));
352-
dropdownElement.triggerEventHandler('keydown', UIInteractions.arrowDownEvent);
352+
dropdownElement.triggerEventHandler('keydown', UIInteractions.getKeyboardEvent('keydown', 'ArrowDown'));
353353
tick();
354354
fixture.detectChanges();
355355
let focusedItem = fixture.debugElement.query(By.css(`.${CSS_CLASS_FOCUSED}`));
@@ -791,11 +791,11 @@ describe('IgxDropDown ', () => {
791791
expect(dropdown.focusedItem).toEqual(dropdown.items[0]);
792792

793793
const dropdownItem = dropdown.items[0];
794-
input.triggerEventHandler('keydown', UIInteractions.enterEvent);
794+
input.triggerEventHandler('keydown', UIInteractions.getKeyboardEvent('keydown', 'Enter'));
795795
tick();
796796
fixture.detectChanges();
797797
expect(dropdown.selectItem).toHaveBeenCalledTimes(1);
798-
expect(dropdown.selectItem).toHaveBeenCalledWith(dropdownItem, UIInteractions.enterEvent);
798+
expect(dropdown.selectItem).toHaveBeenCalledWith(dropdownItem, UIInteractions.getKeyboardEvent('keydown', 'Enter'));
799799
expect(dropdown.selectedItem).toEqual(dropdownItem);
800800
expect(dropdown.collapsed).toEqual(true);
801801
}));
@@ -1215,9 +1215,7 @@ describe('IgxDropDown ', () => {
12151215
template: `
12161216
<button (click)="toggleDropDown()">Toggle</button>
12171217
<igx-drop-down id="test-id" igxDropDownItemNavigation [maxHeight]="maxHeight"
1218-
[displayDensity]="density" (onSelection)="onSelection($event)" [allowItemsFocus]="true"
1219-
(onOpening)="onToggleOpening($event)" (onOpened)="onToggleOpened()"
1220-
(onClosing)="onToggleClosing($event)" (onClosed)="onToggleClosed()" >
1218+
[displayDensity]="density" [allowItemsFocus]="true">
12211219
<igx-drop-down-item *ngFor="let item of items"
12221220
[disabled]="item.disabled" [isHeader]="item.header" [selected]="item.selected">
12231221
{{item.field}}
@@ -1252,15 +1250,6 @@ class IgxDropDownTestComponent {
12521250
public toggleDropDown() {
12531251
this.dropdown.toggle();
12541252
}
1255-
public onSelection(ev) {
1256-
}
1257-
public onToggleOpening() { }
1258-
1259-
public onToggleOpened() { }
1260-
1261-
public onToggleClosing() { }
1262-
1263-
public onToggleClosed() { }
12641253
}
12651254
@Component({
12661255
template: `

projects/igniteui-angular/src/lib/test-utils/ui-interactions.spec.ts

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,22 @@ declare var Touch: {
99
new(prop): Touch;
1010
};
1111
export class UIInteractions {
12-
public static enterEvent = { key: 'Enter', stopPropagation: () => { }, preventDefault: () => { } };
13-
public static endEvent = { key: 'End', stopPropagation: () => { }, preventDefault: () => { } };
14-
public static homeEvent = { key: 'Home', stopPropagation: () => { }, preventDefault: () => { } };
1512
public static escapeEvent = { key: 'Escape', stopPropagation: () => { }, preventDefault: () => { } };
16-
public static spaceEvent = { key: 'Space', stopPropagation: () => { }, preventDefault: () => { }, stopImmediatePropagation: () => { } };
17-
public static arrowDownEvent = { key: 'ArrowDown', stopPropagation: () => { }, preventDefault: () => { } };
18-
public static arrowUpEvent = { key: 'ArrowUp', stopPropagation: () => { }, preventDefault: () => { } };
1913
public static clickEvent = new MouseEvent('click');
2014

15+
public static getKeyboardEvent(eventType: string, keyPressed: string, altKey = false, shift = false, ctrl = false) {
16+
const keyboardEvent = {
17+
key: keyPressed,
18+
altKey: altKey,
19+
shiftKey: shift,
20+
ctrlKey: ctrl,
21+
stopPropagation: () => { },
22+
stopImmediatePropagation: () => { },
23+
preventDefault: () => { }
24+
};
25+
return new KeyboardEvent(eventType, keyboardEvent); return new KeyboardEvent(eventType, keyboardEvent);
26+
}
27+
2128
public static triggerEventHandlerKeyDown(keyPressed: string, elem: DebugElement, altKey = false, shift = false, ctrl = false) {
2229
const event = {
2330
key: keyPressed,

0 commit comments

Comments
 (0)