From cb268f2ebefa62d595db57af3973a5fd3063fdd3 Mon Sep 17 00:00:00 2001 From: Cilibiu Bogdan Date: Thu, 24 Oct 2019 07:55:57 +0300 Subject: [PATCH] [ACA-2489] - Drag and Drop is not operable with keyboard alone (#1235) * filter out image-viewer for key navigation * cancel keyboard navigation for cdk-overlay-container children --- src/app/components/preview/preview.component.spec.ts | 4 ++-- src/app/components/preview/preview.component.ts | 3 ++- src/app/components/viewer/viewer.component.ts | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/app/components/preview/preview.component.spec.ts b/src/app/components/preview/preview.component.spec.ts index e7c14f29d..ccff15fba 100644 --- a/src/app/components/preview/preview.component.spec.ts +++ b/src/app/components/preview/preview.component.spec.ts @@ -777,9 +777,9 @@ describe('PreviewComponent', () => { expect(router.navigate).not.toHaveBeenCalled(); }); - it('should not navigate on keyboard event if target is child of dialog container', () => { + it('should not navigate on keyboard event if target is child of cdk overlay', () => { const parent = document.createElement('div'); - parent.className = 'mat-dialog-container'; + parent.className = 'cdk-overlay-container'; const child = document.createElement('button'); child.addEventListener('keyup', function(e) { diff --git a/src/app/components/preview/preview.component.ts b/src/app/components/preview/preview.component.ts index ce4b7103c..f2224cac6 100644 --- a/src/app/components/preview/preview.component.ts +++ b/src/app/components/preview/preview.component.ts @@ -115,7 +115,8 @@ export class PreviewComponent extends PageComponent private containersSkipNavigation = [ 'adf-viewer__sidebar', - 'mat-dialog-container' + 'cdk-overlay-container', + 'adf-image-viewer' ]; constructor( diff --git a/src/app/components/viewer/viewer.component.ts b/src/app/components/viewer/viewer.component.ts index ea1023472..69b4d0764 100644 --- a/src/app/components/viewer/viewer.component.ts +++ b/src/app/components/viewer/viewer.component.ts @@ -114,7 +114,8 @@ export class AppViewerComponent implements OnInit, OnDestroy { private previewLocation: string; private containersSkipNavigation = [ 'adf-viewer__sidebar', - 'mat-dialog-container' + 'cdk-overlay-container', + 'adf-image-viewer' ]; constructor(