AAE-12245: Migrated from event cancelBubble to stopPropagation (#8311)

This commit is contained in:
Ehsan Rezaei
2023-03-06 21:57:51 +01:00
committed by GitHub
parent cb69f34aa7
commit dd91f2eeb6
8 changed files with 70 additions and 18 deletions

View File

@@ -23,6 +23,7 @@ import { InfoDrawerComponent } from './info-drawer.component';
import { of } from 'rxjs';
import { TranslateService, TranslateModule } from '@ngx-translate/core';
import { CoreTestingModule } from '../testing/core.testing.module';
import { ESCAPE } from '@angular/cdk/keycodes';
describe('InfoDrawerComponent', () => {
let element: HTMLElement;
@@ -64,6 +65,24 @@ describe('InfoDrawerComponent', () => {
expect(title.length).toBe(1);
expect(title[0].nativeElement.innerText).toBe('FakeTitle');
});
it('should stop propagation on keydown event', () => {
const escapeKeyboardEvent = new KeyboardEvent('keydown', { key: ESCAPE.toString() });
const stopPropagationSpy = spyOn(escapeKeyboardEvent, 'stopPropagation');
fixture.debugElement.triggerEventHandler('keydown', escapeKeyboardEvent);
expect(stopPropagationSpy).toHaveBeenCalled();
});
it('should stop propagation on keyup event', () => {
const escapeKeyboardEvent = new KeyboardEvent('keyup', { key: ESCAPE.toString() });
const stopPropagationSpy = spyOn(escapeKeyboardEvent, 'stopPropagation');
fixture.debugElement.triggerEventHandler('keyup', escapeKeyboardEvent);
expect(stopPropagationSpy).toHaveBeenCalled();
});
});
@Component({

View File

@@ -63,13 +63,13 @@ export class InfoDrawerComponent {
contentBlocks: QueryList<InfoDrawerTabComponent>;
@HostListener('keydown', ['$event'])
onKeyDown(event: KeyboardEvent) {
event.cancelBubble = true;
onKeyDown(event: KeyboardEvent): void {
event.stopPropagation();
}
@HostListener('keyup', ['$event'])
onKeyUp(event: KeyboardEvent) {
event.cancelBubble = true;
onKeyUp(event: KeyboardEvent): void {
event.stopPropagation();
}
showTabLayout(): boolean {

View File

@@ -26,12 +26,12 @@ import { ChangeDetectionStrategy, Component, HostListener, ViewEncapsulation } f
})
export class ViewerSidebarComponent {
@HostListener('keydown', ['$event'])
onKeyDown(event: KeyboardEvent) {
event.cancelBubble = true;
onKeyDown(event: KeyboardEvent): void {
event.stopPropagation();
}
@HostListener('keyup', ['$event'])
onKeyUp(event: KeyboardEvent) {
event.cancelBubble = true;
onKeyUp(event: KeyboardEvent): void {
event.stopPropagation();
}
}