Skip to content

fix: issue with async nav lists not updating correctly #1032

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 1 commit into from
Jul 28, 2021
Merged

fix: issue with async nav lists not updating correctly #1032

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 7 additions & 5 deletions projects/components/src/navigation/navigation-list.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from '@angular/core';
import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnChanges, Output } from '@angular/core';
import { ActivatedRoute } from '@angular/router';
import { IconType } from '@hypertrace/assets-library';
import { Color, NavigationService } from '@hypertrace/common';
Expand All @@ -25,7 +25,7 @@ import { IconSize } from '../icon/icon-size';
<hr *ngSwitchCase="'${NavItemType.Divider}'" class="nav-divider" />

<ng-container *ngSwitchCase="'${NavItemType.Link}'">
<ht-nav-item [config]="item" [active]="item === activeItem" [collapsed]="this.collapsed"> </ht-nav-item>
<ht-nav-item [config]="item" [active]="item === activeItem" [collapsed]="this.collapsed"></ht-nav-item>
</ng-container>
</ng-container>
</ng-container>
Expand All @@ -48,7 +48,7 @@ import { IconSize } from '../icon/icon-size';
</nav>
`
})
export class NavigationListComponent {
export class NavigationListComponent implements OnChanges {
@Input()
public navItems: NavItemConfig[] = [];

Expand All @@ -64,12 +64,14 @@ export class NavigationListComponent {
@Output()
public readonly collapsedChange: EventEmitter<boolean> = new EventEmitter();

public readonly activeItem$: Observable<NavItemLinkConfig | undefined>;
public activeItem$?: Observable<NavItemLinkConfig | undefined>;

public constructor(
private readonly navigationService: NavigationService,
private readonly activatedRoute: ActivatedRoute
) {
) {}

public ngOnChanges(): void {
this.activeItem$ = this.navigationService.navigation$.pipe(
startWith(this.navigationService.getCurrentActivatedRoute()),
map(() => this.findActiveItem(this.navItems))
Expand Down