From 0bab4584767b868f9d72a4de7ae23d0dd19daad3 Mon Sep 17 00:00:00 2001 From: Valentin Mihai Date: Wed, 9 Feb 2022 14:59:47 +0200 Subject: [PATCH] removed help mode for elements that overlap other elements --- src/assets/styles/common-help-mode.scss | 8 -------- src/lib/help-mode/help-mode.directive.ts | 3 +-- src/lib/help-mode/help-mode.service.ts | 11 ++++------- .../listing/page-header/page-header.component.html | 2 +- .../table-content/table-content.component.html | 2 +- .../listing/table-content/table-content.component.ts | 3 +-- src/lib/listing/table/table.component.html | 1 - src/lib/listing/table/table.component.ts | 1 - 8 files changed, 8 insertions(+), 23 deletions(-) diff --git a/src/assets/styles/common-help-mode.scss b/src/assets/styles/common-help-mode.scss index b2f54bb..9b1bb72 100644 --- a/src/assets/styles/common-help-mode.scss +++ b/src/assets/styles/common-help-mode.scss @@ -59,7 +59,6 @@ } .help-mode-on-mouse-over-reset-filters { - z-index: 20; padding-left: 4px; } @@ -69,19 +68,13 @@ height: calc(100% - 70px); } -.help-mode-on-mouse-over-edit-dossier-attributes { - z-index: 20; -} - .help-mode-on-mouse-over-dossier-features { - z-index: 20; height: 50px; margin-top: 17px; width: 95%; } .help-mode-on-mouse-over-edit-dossier-from-list { - z-index: 30; padding-left: 5px ; } @@ -90,7 +83,6 @@ .help-mode-on-mouse-over-redaction-remove-from-dictionary, .help-mode-on-mouse-over-redaction-false-positive, .help-mode-on-mouse-over-recommendation-accept-or-reject { - z-index: 20; width: 20px; height: 20px; margin-left: 9px; diff --git a/src/lib/help-mode/help-mode.directive.ts b/src/lib/help-mode/help-mode.directive.ts index f433b3e..d8e7e7d 100644 --- a/src/lib/help-mode/help-mode.directive.ts +++ b/src/lib/help-mode/help-mode.directive.ts @@ -8,7 +8,6 @@ import { Router } from '@angular/router'; }) export class HelpModeDirective implements OnInit { @Input('iqserHelpMode') elementName!: string; - @Input() updateElementPosition = true; private _path: string; constructor( @@ -33,7 +32,7 @@ export class HelpModeDirective implements OnInit { this._renderer.addClass(helperElement, 'help-mode-on-mouse-over'); this._renderer.addClass(helperElement, `help-mode-on-mouse-over-${this.elementName}`); - this._helpModeService.addElement(elementNameWithId, element, helperElement, this.updateElementPosition); + this._helpModeService.addElement(elementNameWithId, element, helperElement); } } diff --git a/src/lib/help-mode/help-mode.service.ts b/src/lib/help-mode/help-mode.service.ts index 275e62f..8f22d07 100644 --- a/src/lib/help-mode/help-mode.service.ts +++ b/src/lib/help-mode/help-mode.service.ts @@ -8,7 +8,6 @@ import { HELP_DOCS, MANUAL_BASE_URL } from './tokens'; interface Helper { readonly element: HTMLElement; readonly helperElement: HTMLElement; - readonly updateElementPosition: boolean; } @Injectable({ @@ -84,15 +83,13 @@ export class HelpModeService { }); } - addElement(elementName: string, element: HTMLElement, helperElement: HTMLElement, updateElementPosition: boolean): void { - this._elements[elementName] = { element, helperElement, updateElementPosition }; + addElement(elementName: string, element: HTMLElement, helperElement: HTMLElement): void { + this._elements[elementName] = { element, helperElement }; } private _enableHelperElements() { - Object.values(this._elements).forEach(({ element, helperElement, updateElementPosition }) => { - if (updateElementPosition) { - this._renderer.setStyle(element, 'position', 'relative'); - } + Object.values(this._elements).forEach(({ element, helperElement }) => { + this._renderer.setStyle(element, 'position', 'relative'); this._renderer.appendChild(element, helperElement); }); } diff --git a/src/lib/listing/page-header/page-header.component.html b/src/lib/listing/page-header/page-header.component.html index b239483..ccdbc72 100644 --- a/src/lib/listing/page-header/page-header.component.html +++ b/src/lib/listing/page-header/page-header.component.html @@ -36,7 +36,7 @@ > -
+
+
extends AutoUnsubscribe @Input() itemMouseLeaveFn?: (entity: T) => void; @Input() tableItemClasses?: Record boolean>; @Input() selectionEnabled!: boolean; - @Input() helpModeKey?: 'dossier-list' | 'document-list'; readonly trackBy = trackByFactory(); @ViewChild(CdkVirtualScrollViewport, { static: true }) readonly scrollViewport!: CdkVirtualScrollViewport; diff --git a/src/lib/listing/table/table.component.html b/src/lib/listing/table/table.component.html index 920483d..cb6baed 100644 --- a/src/lib/listing/table/table.component.html +++ b/src/lib/listing/table/table.component.html @@ -29,7 +29,6 @@ [itemSize]="itemSize" [selectionEnabled]="selectionEnabled" [tableItemClasses]="tableItemClasses" - [helpModeKey]="helpModeKey" > extends AutoUnsubscribe impleme @Input() tableItemClasses?: Record boolean>; @Input() itemMouseEnterFn?: (entity: T) => void; @Input() itemMouseLeaveFn?: (entity: T) => void; - @Input() helpModeKey?: 'dossier-list' | 'document-list'; @Output() readonly noDataAction = new EventEmitter(); @ViewChild(TableContentComponent, { static: true }) private readonly _tableContent!: TableContentComponent;