Skip to content

The callout/banner is shown improperly #772

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sofyakurilova merged 2 commits into from
Sep 13, 2024
Merged

The callout/banner is shown improperly #772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be42d92
Move bottom callouts to top when callout is destroyed; fix css selector
sofyakurilova Sep 13, 2024
1e5d675
Merge branch 'dev' into bug/multiple_callouts
sofyakurilova Sep 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 26 additions & 2 deletions modules/ui/src/app/components/callout/dynamic-top.directive.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
import { AfterViewInit, Directive, Renderer2, ElementRef } from '@angular/core';
import {
AfterViewInit,
Directive,
Renderer2,
ElementRef,
OnDestroy,
} from '@angular/core';

@Directive({
selector: '[appDynamicTop]',
standalone: true,
})
export class DynamicTopDirective implements AfterViewInit {
export class DynamicTopDirective implements AfterViewInit, OnDestroy {
constructor(
private renderer: Renderer2,
private element: ElementRef
Expand All @@ -20,6 +26,10 @@ export class DynamicTopDirective implements AfterViewInit {
this.setTop();
}

ngOnDestroy() {
this.moveBottomCalloutsToTop();
}

private setTop() {
const firstCallout =
this.element.nativeElement.parentNode?.firstElementChild;
Expand All @@ -39,4 +49,18 @@ export class DynamicTopDirective implements AfterViewInit {
}
}
}

private moveBottomCalloutsToTop() {
let top = 0; // next callout should be moved to top
const next = this.element.nativeElement.nextElementSibling;
let el = next.nodeName === 'APP-CALLOUT' ? next : null;
while (el) {
this.renderer.setStyle(el, 'top', `${top}px`);
top = el.offsetHeight - 36;
el =
el.nextElementSibling.nodeName === 'APP-CALLOUT'
? el.nextElementSibling
: null;
}
}
}
39 changes: 16 additions & 23 deletions modules/ui/src/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,29 +260,22 @@ body:has(.filter-dialog-content)
opacity: 0;
}

body
#main:has(app-callout)
app-device-repository:not(:has(.device-repository-content-empty)),
body #main:has(app-callout) app-history:not(:has(.results-content-empty)),
body #main:has(app-callout) app-progress:not(:has(.progress-content-empty)),
body #main:has(app-callout) app-risk-assessment .risk-assessment-container {
margin-top: 96px;
}

body
#main:has(app-callout + app-callout)
app-device-repository:not(:has(.device-repository-content-empty)),
body
#main:has(app-callout + app-callout)
app-history:not(:has(.results-content-empty)),
body
#main:has(app-callout + app-callout)
app-progress:not(:has(.progress-content-empty)),
body
#main:has(app-callout + app-callout)
app-risk-assessment
.risk-assessment-container {
margin-top: 156px;
body #main:has(> app-callout) {
& app-device-repository:not(:has(.device-repository-content-empty)),
& app-history:not(:has(.results-content-empty)),
& app-progress:not(:has(.progress-content-empty)),
& app-risk-assessment .risk-assessment-container {
margin-top: 96px;
}
}

body #main:has(> app-callout + app-callout) {
& app-device-repository:not(:has(.device-repository-content-empty)),
& app-history:not(:has(.results-content-empty)),
& app-progress:not(:has(.progress-content-empty)),
& app-risk-assessment .risk-assessment-container {
margin-top: 156px;
}
}

body:has(app-risk-assessment .profiles-drawer) #main app-callout {
Expand Down