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

RED-5820: cancel resize on annotation deselect

Browse Source
This commit is contained in:
Dan Percic 2023-02-03 19:06:56 +02:00
parent f47e81abd9
commit 2bff5039e8
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
apps/red-ui/src/app/modules/file-preview/services/pdf-proxy.service.ts
View File

@ -29,6 +29,7 @@ import { AnnotationsListingService } from './annotations-listing.service';
import { PdfAnnotationActionsService } from './pdf-annotation-actions.service'; import { PdfAnnotationActionsService } from './pdf-annotation-actions.service';
import { DictionariesMapService } from '@services/entity-services/dictionaries-map.service'; import { DictionariesMapService } from '@services/entity-services/dictionaries-map.service';
import { ROLES } from '@users/roles'; import { ROLES } from '@users/roles';
import { AnnotationActionsService } from './annotation-actions.service';
import Annotation = Core.Annotations.Annotation; import Annotation = Core.Annotations.Annotation;
import Quad = Core.Math.Quad; import Quad = Core.Math.Quad;
@ -57,6 +58,7 @@ export class PdfProxyService {
@Inject(BASE_HREF_FN) private readonly _convertPath: BaseHrefFn, @Inject(BASE_HREF_FN) private readonly _convertPath: BaseHrefFn,
private readonly _translateService: TranslateService, private readonly _translateService: TranslateService,
private readonly _manualRedactionService: ManualRedactionService, private readonly _manualRedactionService: ManualRedactionService,
private readonly _annotationsActionsService: AnnotationActionsService,
private readonly _ngZone: NgZone, private readonly _ngZone: NgZone,
private readonly _userPreferenceService: UserPreferenceService, private readonly _userPreferenceService: UserPreferenceService,
private readonly _annotationDrawService: AnnotationDrawService, private readonly _annotationDrawService: AnnotationDrawService,
@ -119,6 +121,7 @@ export class PdfProxyService {
let nextAnnotations: Annotation[]; let nextAnnotations: Annotation[];
if (action === 'deselected') { if (action === 'deselected') {
this.#cancelResizeIfIsResizing(annotations);
// Remove deselected annotations from selected list // Remove deselected annotations from selected list
nextAnnotations = this._annotationManager.selected.filter(ann => !annotations.some(a => a.Id === ann.Id)); nextAnnotations = this._annotationManager.selected.filter(ann => !annotations.some(a => a.Id === ann.Id));
this._pdf.disable(TextPopups.ADD_RECTANGLE); this._pdf.disable(TextPopups.ADD_RECTANGLE);
@ -152,10 +155,20 @@ export class PdfProxyService {
return nextAnnotations.map(ann => ann.Id); return nextAnnotations.map(ann => ann.Id);
} }
#cancelResizeIfIsResizing(annotations: Annotation[]) {
if (annotations.length !== 1) {
return;
}
const annotation = this._fileDataService.find(annotations[0].Id);
if (annotation?.resizing) {
this._annotationsActionsService.cancelResize(null, annotation).then();
}
}
private _configureElements() { private _configureElements() {
const color = this._annotationDrawService.convertColor( const hexColor = this._dictionariesMapService.get(this._state.dossierTemplateId, 'manual').hexColor;
this._dictionariesMapService.get(this._state.dossierTemplateId, 'manual').hexColor, const color = this._annotationDrawService.convertColor(hexColor);
);
this._documentViewer.setRectangleToolStyles(color); this._documentViewer.setRectangleToolStyles(color);
} }