Skip to content
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.

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

MARP-1738 fix overlay index of version & artifact dropdown #270

Merged
merged 7 commits into from
Jan 2, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@

@if (isDropDownDisplayed()) {
<div #artifactDownloadDialog id="download-dropdown-menu" class="show maven-artifact-version__action border__dropdown">
<div class="up-arrow border__dropdown position-absolute"></div>
<form>
<div class="form-group">
<label for="artifacts-selector" [lang]="languageService.selectedLanguage()"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
height: 204px;
margin-top: 6.4rem;
background-color: var(--bs-body-bg);
z-index: 999;
z-index: 1000;
padding: 10px;
border-radius: 5px;
box-shadow: 0px 4px 30px 0px rgba(0, 0, 0, 0.1);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -339,4 +339,16 @@ describe('ProductDetailVersionActionComponent', () => {
const result = component.getTrackingEnvironmentBasedOnActionType();
expect(result).toBe('');
});

it('should close the dropdown when clicking outside', () => {
component.isDropDownDisplayed.set(true);
component.actionType = ProductDetailActionType.STANDARD;
fixture.detectChanges();

const event = new MouseEvent('click');
document.dispatchEvent(event);
fixture.detectChanges();

expect(component.isDropDownDisplayed()).toBeFalse();
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import {
computed,
ElementRef,
EventEmitter,
HostListener,
inject,
Input,
model,
Expand Down Expand Up @@ -279,4 +280,18 @@ export class ProductDetailVersionActionComponent implements AfterViewInit {
return '';
}
}

@HostListener('document:click', ['$event'])
handleClickOutside(event: MouseEvent): void {
const downloadDialog = this.elementRef.nativeElement.querySelector(
'#download-dropdown-menu'
);
if (
this.isDropDownDisplayed() &&
downloadDialog &&
!downloadDialog.contains(event.target)
) {
this.isDropDownDisplayed.set(!this.isDropDownDisplayed());
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ <h4 class="analysis-title text-primary text-capitalize mb-0">
class="bg-transparent border-0"
(click)="onShowInfoContent()">
<i
id="info-content-dropdown__icon"
class="info-icon bi bi-info-circle"
[ngClass]="{
'text-primary': themeService.isDarkMode(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -198,15 +198,6 @@ describe('ProductDetailComponent', () => {
});
});

it('should toggle isDropdownOpen on onShowDropdown', () => {
component.isDropdownOpen.set(false);
component.onShowInfoContent();
expect(component.isDropdownOpen()).toBe(true);

component.onShowInfoContent();
expect(component.isTabDropdownShown()).toBe(false);
});

it('should reset state before fetching new product details', () => {
component.productDetail.set(MOCK_PRODUCT_DETAIL);
component.productModuleContent.set(
Expand Down Expand Up @@ -861,4 +852,15 @@ describe('ProductDetailComponent', () => {

expect(result).toBe(mockedRenderedHtml);
});

it('should close the dropdown when clicking outside', () => {
component.isDropdownOpen.set(true);
fixture.detectChanges();

const event = new MouseEvent('click');
document.dispatchEvent(event);
fixture.detectChanges();

expect(component.isDropdownOpen()).toBeFalse();
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,6 @@ export class ProductDetailComponent {
return this.getDisplayedTabsSignal();
});
isDropdownOpen: WritableSignal<boolean> = signal(false);
isTabDropdownShown: WritableSignal<boolean> = signal(false);
selectedVersion = '';
metaProductJsonUrl: string | undefined = '';
showPopup!: boolean;
Expand Down Expand Up @@ -323,8 +322,6 @@ export class ProductDetailComponent {

onTabChange(event: string): void {
this.setActiveTab(event);
this.isTabDropdownShown.update(value => !value);
this.onTabDropdownShown();
}

getSelectedTabLabel(): string {
Expand Down Expand Up @@ -363,21 +360,15 @@ export class ProductDetailComponent {
this.isDropdownOpen.update(value => !value);
}

onTabDropdownShown(): void {
this.isTabDropdownShown.set(!this.isTabDropdownShown());
}

@HostListener('document:click', ['$event'])
handleClickOutside(event: MouseEvent): void {
const formSelect =
this.elementRef.nativeElement.querySelector('.form-select');

if (
formSelect &&
!formSelect.contains(event.target) &&
this.isTabDropdownShown()
const nativeElement = this.elementRef.nativeElement;
if (!(
nativeElement.querySelector('.info-dropdown').contains(event.target) ||
nativeElement.querySelector('#info-content-dropdown__icon').contains(event.target)
) && this.isDropdownOpen()
) {
this.onTabDropdownShown();
this.onShowInfoContent();
}
}

Expand Down
Loading