Skip to content

Commit 6aff589

Browse files
committed
Revert "fix(material/menu): not interrupting keyboard events to other overlays (#22928)" (#23306)
This reverts commit 5f529db. (cherry picked from commit 50655e2)
1 parent a752641 commit 6aff589

File tree

3 files changed

+0
-9
lines changed

3 files changed

+0
-9
lines changed

src/material-experimental/mdc-menu/menu.spec.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -439,15 +439,13 @@ describe('MDC-based MatMenu', () => {
439439

440440
const panel = overlayContainerElement.querySelector('.mat-mdc-menu-panel')!;
441441
const event = createKeyboardEvent('keydown', ESCAPE);
442-
spyOn(event, 'stopPropagation').and.callThrough();
443442

444443
dispatchEvent(panel, event);
445444
fixture.detectChanges();
446445
tick(500);
447446

448447
expect(overlayContainerElement.textContent).toBe('');
449448
expect(event.defaultPrevented).toBe(true);
450-
expect(event.stopPropagation).toHaveBeenCalled();
451449
}));
452450

453451
it('should not close the menu when pressing ESCAPE with a modifier', fakeAsync(() => {

src/material/menu/menu.spec.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -440,15 +440,13 @@ describe('MatMenu', () => {
440440

441441
const panel = overlayContainerElement.querySelector('.mat-menu-panel')!;
442442
const event = createKeyboardEvent('keydown', ESCAPE);
443-
spyOn(event, 'stopPropagation').and.callThrough();
444443

445444
dispatchEvent(panel, event);
446445
fixture.detectChanges();
447446
tick(500);
448447

449448
expect(overlayContainerElement.textContent).toBe('');
450449
expect(event.defaultPrevented).toBe(true);
451-
expect(event.stopPropagation).toHaveBeenCalled();
452450
}));
453451

454452
it('should not close the menu when pressing ESCAPE with a modifier', fakeAsync(() => {

src/material/menu/menu.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -337,12 +337,7 @@ export class _MatMenuBase implements AfterContentInit, MatMenuPanel<MatMenuItem>
337337
}
338338

339339
manager.onKeydown(event);
340-
return;
341340
}
342-
343-
// Don't allow the event to propagate if we've already handled it, or it may
344-
// end up reaching other overlays that were opened earlier (see #22694).
345-
event.stopPropagation();
346341
}
347342

348343
/**

0 commit comments

Comments
 (0)