From d04933530982d57400edb3ad0f3ab723bb71e44c Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Fri, 18 Aug 2023 11:22:08 +0300 Subject: [PATCH] keep hidden annotations hidden --- .../file-preview-screen.component.ts | 4 +--- .../services/annotation-draw.service.ts | 18 +++++++++--------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts b/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts index 09f0279a1..7428f7bd2 100644 --- a/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts @@ -461,9 +461,7 @@ export class FilePreviewScreenComponent tap(annotations => this.deleteAnnotations(...annotations)), ); - const currentPage$ = this.pdf.currentPage$.pipe(tap(() => this._annotationManager.showHidden())); - - const currentPageIfNotHighlightsView$ = combineLatest([currentPage$, this._viewModeService.viewMode$]).pipe( + const currentPageIfNotHighlightsView$ = combineLatest([this.pdf.currentPage$, this._viewModeService.viewMode$]).pipe( filter(([, viewMode]) => viewMode !== ViewModes.TEXT_HIGHLIGHTS), map(([page]) => page), ); diff --git a/apps/red-ui/src/app/modules/pdf-viewer/services/annotation-draw.service.ts b/apps/red-ui/src/app/modules/pdf-viewer/services/annotation-draw.service.ts index e6e11f82c..5ed80f0db 100644 --- a/apps/red-ui/src/app/modules/pdf-viewer/services/annotation-draw.service.ts +++ b/apps/red-ui/src/app/modules/pdf-viewer/services/annotation-draw.service.ts @@ -1,16 +1,16 @@ import { Injectable } from '@angular/core'; -import { Core } from '@pdftron/webviewer'; -import { hexToRgb } from '@utils/functions'; -import { AnnotationWrapper } from '@models/file/annotation.wrapper'; -import { UserPreferenceService } from '@users/user-preference.service'; -import { RedactionLogService } from '@services/files/redaction-log.service'; -import { IRectangle, ISectionRectangle, SuperTypes } from '@red/domain'; -import { PdfViewer } from './pdf-viewer.service'; -import { REDAnnotationManager } from './annotation-manager.service'; import { List } from '@iqser/common-ui/lib/utils'; -import { REDDocumentViewer } from './document-viewer.service'; +import { AnnotationWrapper } from '@models/file/annotation.wrapper'; +import { Core } from '@pdftron/webviewer'; +import { IRectangle, ISectionRectangle, SuperTypes } from '@red/domain'; import { DefaultColorsService } from '@services/entity-services/default-colors.service'; +import { RedactionLogService } from '@services/files/redaction-log.service'; +import { UserPreferenceService } from '@users/user-preference.service'; +import { hexToRgb } from '@utils/functions'; import { BoundingBox, Table } from '../../file-preview/services/tables.service'; +import { REDAnnotationManager } from './annotation-manager.service'; +import { REDDocumentViewer } from './document-viewer.service'; +import { PdfViewer } from './pdf-viewer.service'; import Annotation = Core.Annotations.Annotation; import Quad = Core.Math.Quad;