Merge branch 'RED-3800' into 'master'
RED-3800: Redo HasScrollbar directive Closes RED-3800 See merge request redactmanager/red-ui!105
This commit is contained in:
commit
70066243e2
@ -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 { FilterService } from '@iqser/common-ui/lib/filtering';
|
||||
import { IqserEventTarget } from '@iqser/common-ui/lib/utils';
|
||||
@ -17,15 +17,15 @@ import { ViewModeService } from '../../services/view-mode.service';
|
||||
templateUrl: './annotations-list.component.html',
|
||||
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(() => {
|
||||
if (this._viewModeService.isEarmarks()) {
|
||||
return this.#getEarmarksGroups();
|
||||
}
|
||||
return [] as EarmarkGroup[];
|
||||
});
|
||||
@Input({ required: true }) annotations: ListItem<AnnotationWrapper>[];
|
||||
@Output() readonly pagesPanelActive = new EventEmitter<boolean>();
|
||||
|
||||
constructor(
|
||||
protected readonly _elementRef: ElementRef,
|
||||
|
||||
@ -1 +1 @@
|
||||
Subproject commit 890cf417a1900eb882c61d335276360a48c9a54c
|
||||
Subproject commit 1b76808917fcb3ff2ab6fe377599bb1583515499
|
||||
Loading…
x
Reference in New Issue
Block a user