Skip to content

refactor: adding nav changes #1031

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 3 commits into from
Jul 27, 2021
Merged

refactor: adding nav changes #1031

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7b195a0
refactor: adding nav changes
anandtiwary Jul 27, 2021
37f7c11
fix: lint
jake-bassett Jul 27, 2021
fd5c6c5
Merge branch 'main' into nav-changes
jake-bassett Jul 27, 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
4 changes: 2 additions & 2 deletions projects/components/src/navigation/nav-item/nav-item.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
@import 'color-palette';
@import 'font';
@import 'mixins';

.nav-item {
@include font-left-nav-label;
@include raised-shadow-hover();
color: $gray-7;
display: flex;
height: 36px;
Expand Down
11 changes: 10 additions & 1 deletion projects/components/src/navigation/nav-item/nav-item.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import { NavItemLinkConfig } from '../navigation-list.component';
<ht-icon
class="icon"
[icon]="this.config.icon"
size="${IconSize.Medium}"
size="{{ this.config.iconSize !== undefined ? this.config.iconSize : '${IconSize.Medium}' }}"
[label]="this.config.label"
[showTooltip]="this.collapsed"
>
Expand All @@ -30,6 +30,15 @@ import { NavItemLinkConfig } from '../navigation-list.component';
<span class="soon">SOON</span>
</span>
<ht-beta-tag *ngIf="config.isBeta" class="beta"></ht-beta-tag>
<ht-icon
class="trailing-icon"
*ngIf="this.config.trailingIcon"
[icon]="this.config.trailingIcon"
size="{{ this.config.iconSize !== undefined ? this.config.iconSize : '${IconSize.Medium}' }}"
[ngStyle]="{ color: this.config.trailingIconColor }"
[htTooltip]="this.config.trailingIconTooltip"
>
</ht-icon>
</div>
</div>
</ht-link>
Expand Down
6 changes: 5 additions & 1 deletion projects/components/src/navigation/navigation-list.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from '@angular/core';
import { ActivatedRoute } from '@angular/router';
import { IconType } from '@hypertrace/assets-library';
import { NavigationService } from '@hypertrace/common';
import { Color, NavigationService } from '@hypertrace/common';
import { Observable } from 'rxjs';
import { map, startWith } from 'rxjs/operators';
import { IconSize } from '../icon/icon-size';
Expand Down Expand Up @@ -103,11 +103,15 @@ export type NavItemConfig = NavItemLinkConfig | NavItemHeaderConfig | NavItemDiv
export interface NavItemLinkConfig {
type: NavItemType.Link;
icon: string;
iconSize?: IconSize;
label: string;
matchPaths: string[]; // For now, default path is index 0
features?: string[];
replaceCurrentHistory?: boolean;
isBeta?: boolean;
trailingIcon?: string;
trailingIconTooltip?: string;
trailingIconColor?: Color;
}

export type FooterItemConfig = FooterItemLinkConfig;
Expand Down
4 changes: 3 additions & 1 deletion projects/components/src/navigation/navigation-list.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { LabelModule } from '../label/label.module';
import { LayoutChangeModule } from '../layout/layout-change.module';
import { LetAsyncModule } from '../let-async/let-async.module';
import { LinkModule } from '../link/link.module';
import { TooltipModule } from './../tooltip/tooltip.module';
import { NavItemComponent } from './nav-item/nav-item.component';
import { NavigationListComponent } from './navigation-list.component';

Expand All @@ -26,7 +27,8 @@ import { NavigationListComponent } from './navigation-list.component';
LabelModule,
BetaTagModule,
MemoizeModule,
LinkModule
LinkModule,
TooltipModule
],
declarations: [NavigationListComponent, NavItemComponent],
exports: [NavigationListComponent]
Expand Down