focus dialog on files added (#5124)

This commit is contained in:
Cilibiu Bogdan
2019-10-06 20:09:51 +03:00
committed by Eugenio Romano
parent 6857213db6
commit b637cea059
2 changed files with 22 additions and 0 deletions

View File

@@ -88,6 +88,26 @@ describe('FileUploadingDialogComponent', () => {
expect(document.activeElement.id).toBe('upload-dialog'); expect(document.activeElement.id).toBe('upload-dialog');
})); }));
it('should refocus on dialog when uploading another file', fakeAsync(() => {
uploadService.addToQueue(...fileList);
uploadService.uploadFilesInTheQueue(emitter);
fixture.detectChanges();
tick(100);
(document.querySelector('#upload-dialog') as HTMLElement).blur();
expect(document.activeElement.id).not.toBe('upload-dialog');
uploadService.addToQueue(...fileList);
uploadService.uploadFilesInTheQueue(emitter);
fixture.detectChanges();
tick(100);
expect(document.activeElement.id).toBe('upload-dialog');
}));
it('should update uploading file list', () => { it('should update uploading file list', () => {
uploadService.addToQueue(...fileList); uploadService.addToQueue(...fileList);
uploadService.uploadFilesInTheQueue(emitter); uploadService.uploadFilesInTheQueue(emitter);

View File

@@ -98,6 +98,8 @@ export class FileUploadingDialogComponent implements OnInit, OnDestroy {
if (this.filesUploadingList.length && !this.isDialogActive) { if (this.filesUploadingList.length && !this.isDialogActive) {
this.isDialogActive = true; this.isDialogActive = true;
this.dialogActive.next(); this.dialogActive.next();
} else {
this.dialogActive.next();
} }
}); });