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

Merge branch 'RED-3800' into 'master'

Browse Source 
RED-3800: Redo HasScrollbar directive

Closes RED-3800

See merge request redactmanager/red-ui!105
This commit is contained in:
Dan Percic 2023-09-24 11:23:44 +02:00
commit 70066243e2
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/red-ui/src/app/modules/file-preview/components/annotations-list/annotations-list.component.ts
View File

@ -1,4 +1,4 @@
import { ChangeDetectorRef, Component, computed, ElementRef, EventEmitter, Input, OnChanges, Output } from '@angular/core'; import { ChangeDetectorRef, Component, computed, ElementRef, EventEmitter, Input, Output } from '@angular/core';
import { HasScrollbarDirective } from '@iqser/common-ui'; import { HasScrollbarDirective } from '@iqser/common-ui';
import { FilterService } from '@iqser/common-ui/lib/filtering'; import { FilterService } from '@iqser/common-ui/lib/filtering';
import { IqserEventTarget } from '@iqser/common-ui/lib/utils'; import { IqserEventTarget } from '@iqser/common-ui/lib/utils';
@ -17,15 +17,15 @@ import { ViewModeService } from '../../services/view-mode.service';
templateUrl: './annotations-list.component.html', templateUrl: './annotations-list.component.html',
styleUrls: ['./annotations-list.component.scss'], styleUrls: ['./annotations-list.component.scss'],
}) })
export class AnnotationsListComponent extends HasScrollbarDirective implements OnChanges { export class AnnotationsListComponent extends HasScrollbarDirective {
@Input({ required: true }) annotations: ListItem<AnnotationWrapper>[];
@Output() readonly pagesPanelActive = new EventEmitter<boolean>();
readonly #earmarkGroups = computed(() => { readonly #earmarkGroups = computed(() => {
if (this._viewModeService.isEarmarks()) { if (this._viewModeService.isEarmarks()) {
return this.#getEarmarksGroups(); return this.#getEarmarksGroups();
} }
return [] as EarmarkGroup[]; return [] as EarmarkGroup[];
}); });
@Input({ required: true }) annotations: ListItem<AnnotationWrapper>[];
@Output() readonly pagesPanelActive = new EventEmitter<boolean>();
constructor( constructor(
protected readonly _elementRef: ElementRef, protected readonly _elementRef: ElementRef,

2
libs/common-ui

@ -1 +1 @@
Subproject commit 890cf417a1900eb882c61d335276360a48c9a54c Subproject commit 1b76808917fcb3ff2ab6fe377599bb1583515499