Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

Merge branch 'VM/RED-9944' into 'master'

Browse Source 
RED-9944 - Action Items don't appear in document area in webviewer when...

Closes RED-9944

See merge request redactmanager/red-ui!647
This commit is contained in:
Nicoleta Panaghiu 2024-10-28 16:01:14 +01:00
commit 0259bcee06
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.ts
View File

@ -596,7 +596,7 @@ export class FileWorkloadComponent extends AutoUnsubscribe implements OnInit, On
@HostListener('document: click') @HostListener('document: click')
clickOutsideWorkloadView() { clickOutsideWorkloadView() {
if (this.multiSelectService.active()) { if (this.multiSelectService.active() && !this._dialog.openDialogs.length) {
this.multiSelectService.deactivate(); this.multiSelectService.deactivate();
} }
} }

20
apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts
View File

@ -282,17 +282,21 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni
@Bind() @Bind()
handleViewerClick(event: MouseEvent) { handleViewerClick(event: MouseEvent) {
this._ngZone.run(() => { this._ngZone.run(() => {
if (this._multiSelectService.active()) { if (event.isTrusted) {
const clickedElement = event.target as HTMLElement; const clickedElement = event.target as HTMLElement;
if ( const editingAnnotation =
clickedElement.querySelector('#selectionrect') || (clickedElement as HTMLImageElement).src?.includes('edit.svg') || clickedElement.getAttribute('aria-label') === 'Edit';
clickedElement.id === `pageWidgetContainer${this.pdf.currentPage()}` if (this._multiSelectService.active() && !editingAnnotation) {
) { if (
if (!this._annotationManager.selected.length) { clickedElement.querySelector('#selectionrect') ||
clickedElement.id === `pageWidgetContainer${this.pdf.currentPage()}`
) {
if (!this._annotationManager.selected.length) {
this._multiSelectService.deactivate();
}
} else {
this._multiSelectService.deactivate(); this._multiSelectService.deactivate();
} }
} else {
this._multiSelectService.deactivate();
} }
} }
}); });