Merge branch 'RED-10515' into 'master'
RED-10515: fixed multi select for hidden annotations. See merge request redactmanager/red-ui!720
This commit is contained in:
commit
13e019b5e5
@ -440,6 +440,7 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni
|
||||
switch (viewMode) {
|
||||
case ViewModes.STANDARD: {
|
||||
const wrappers = this._fileDataService.annotations();
|
||||
const multiSelectActive = this._multiSelectService.active();
|
||||
// TODO: const wrappers = untracked(this._fileDataService.annotations);
|
||||
const ocrAnnotationIds = wrappers.filter(a => a.isOCR).map(a => a.id);
|
||||
const standardEntries = annotations
|
||||
@ -454,7 +455,7 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni
|
||||
this._readableRedactionsService.setAnnotationsColor(standardEntries, 'annotationColor');
|
||||
this._readableRedactionsService.setAnnotationsOpacity(standardEntries, true);
|
||||
this._annotationManager.show(standardEntries);
|
||||
this._annotationManager.hide(nonStandardEntries);
|
||||
this._annotationManager.hide(nonStandardEntries, multiSelectActive);
|
||||
break;
|
||||
}
|
||||
case ViewModes.DELTA: {
|
||||
|
||||
@ -106,7 +106,11 @@ export class REDAnnotationManager {
|
||||
this.deselect(this.selected.map(annotation => annotation.Id));
|
||||
}
|
||||
|
||||
hide(annotations: Annotation[]): void {
|
||||
hide(annotations: Annotation[], multiSelectActive = false): void {
|
||||
if (multiSelectActive) {
|
||||
annotations.forEach(a => (a['Opacity'] = 0));
|
||||
return;
|
||||
}
|
||||
this.#manager.hideAnnotations(annotations);
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user