Skip to content

fix: menu dropdown should not be shown if no items in the list #967

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
merged 8 commits into from
Jul 6, 2021
Merged

fix: menu dropdown should not be shown if no items in the list #967

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0e404c0
fix: menu dropdown should not be shown if no items in the list
arjunlalb Jul 3, 2021
0670e27
Merge branch 'main' into no-menu-if-no-items
arjunlalb Jul 3, 2021
bf55e3e
fix: fix lint issue
arjunlalb Jul 3, 2021
d33dc3b
Merge branch 'no-menu-if-no-items' of github.com:hypertrace/hypertrac…
arjunlalb Jul 3, 2021
ea000fa
fix: update check
arjunlalb Jul 3, 2021
ec53209
fix: update test
arjunlalb Jul 4, 2021
4a6d835
Merge branch 'main' into no-menu-if-no-items
arjunlalb Jul 6, 2021
8647f50
Merge branch 'main' into no-menu-if-no-items
arjunlalb Jul 6, 2021
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
10 changes: 7 additions & 3 deletions projects/components/src/menu-dropdown/menu-dropdown.component.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,7 @@ describe('Menu dropdown Component', () => {

test('should display trigger content as expected', () => {
spectator = createHost(
`
<ht-menu-dropdown label="Settings" icon="${IconType.MoreHorizontal}">
</ht-menu-dropdown>`
`<ht-menu-dropdown label="Settings" icon="${IconType.MoreHorizontal}"><ht-menu-item label="Option 1"></ht-menu-item></ht-menu-dropdown>`
);

expect(spectator.query('.trigger-content')).toExist();
Expand Down Expand Up @@ -78,4 +76,10 @@ describe('Menu dropdown Component', () => {

expect(onClickSpy).not.toHaveBeenCalled();
});

test('should not show the dropdown if no items to show.', () => {
spectator = createHost(`<ht-menu-dropdown label="Settings" icon="${IconType.MoreHorizontal}"></ht-menu-dropdown>`);

expect(spectator.query('ht-popover-trigger')).not.toExist();
});
});
2 changes: 1 addition & 1 deletion projects/components/src/menu-dropdown/menu-dropdown.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { MenuItemComponent } from './menu-item/menu-item.component';
changeDetection: ChangeDetectionStrategy.OnPush,
template: `
<ht-event-blocker event="click" [enabled]="true">
<ht-popover [closeOnClick]="true" [disabled]="this.disabled">
<ht-popover [closeOnClick]="true" [disabled]="this.disabled" *ngIf="this.items?.length > 0">
<ht-popover-trigger>
<div class="trigger-content" [ngClass]="{ disabled: this.disabled, labeled: !!this.label }">
<ht-label *ngIf="this.label" class="trigger-label" [label]="this.label"> </ht-label>
Expand Down