Skip to content

Commit 5819213

Browse files
refactor: adding nav changes (#1031)
* refactor: adding nav changes * fix: lint Co-authored-by: Jake Bassett <[email protected]> Co-authored-by: Jake <[email protected]>
1 parent c90b652 commit 5819213

File tree

4 files changed

+20
-5
lines changed

4 files changed

+20
-5
lines changed

projects/components/src/navigation/nav-item/nav-item.component.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
@import 'color-palette';
2-
@import 'font';
1+
@import 'mixins';
32

43
.nav-item {
54
@include font-left-nav-label;
5+
@include raised-shadow-hover();
66
color: $gray-7;
77
display: flex;
88
height: 36px;

projects/components/src/navigation/nav-item/nav-item.component.ts

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import { NavItemLinkConfig } from '../navigation-list.component';
1818
<ht-icon
1919
class="icon"
2020
[icon]="this.config.icon"
21-
size="${IconSize.Medium}"
21+
size="{{ this.config.iconSize !== undefined ? this.config.iconSize : '${IconSize.Medium}' }}"
2222
[label]="this.config.label"
2323
[showTooltip]="this.collapsed"
2424
>
@@ -30,6 +30,15 @@ import { NavItemLinkConfig } from '../navigation-list.component';
3030
<span class="soon">SOON</span>
3131
</span>
3232
<ht-beta-tag *ngIf="config.isBeta" class="beta"></ht-beta-tag>
33+
<ht-icon
34+
class="trailing-icon"
35+
*ngIf="this.config.trailingIcon"
36+
[icon]="this.config.trailingIcon"
37+
size="{{ this.config.iconSize !== undefined ? this.config.iconSize : '${IconSize.Medium}' }}"
38+
[ngStyle]="{ color: this.config.trailingIconColor }"
39+
[htTooltip]="this.config.trailingIconTooltip"
40+
>
41+
</ht-icon>
3342
</div>
3443
</div>
3544
</ht-link>

projects/components/src/navigation/navigation-list.component.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from '@angular/core';
22
import { ActivatedRoute } from '@angular/router';
33
import { IconType } from '@hypertrace/assets-library';
4-
import { NavigationService } from '@hypertrace/common';
4+
import { Color, NavigationService } from '@hypertrace/common';
55
import { Observable } from 'rxjs';
66
import { map, startWith } from 'rxjs/operators';
77
import { IconSize } from '../icon/icon-size';
@@ -103,11 +103,15 @@ export type NavItemConfig = NavItemLinkConfig | NavItemHeaderConfig | NavItemDiv
103103
export interface NavItemLinkConfig {
104104
type: NavItemType.Link;
105105
icon: string;
106+
iconSize?: IconSize;
106107
label: string;
107108
matchPaths: string[]; // For now, default path is index 0
108109
features?: string[];
109110
replaceCurrentHistory?: boolean;
110111
isBeta?: boolean;
112+
trailingIcon?: string;
113+
trailingIconTooltip?: string;
114+
trailingIconColor?: Color;
111115
}
112116

113117
export type FooterItemConfig = FooterItemLinkConfig;

projects/components/src/navigation/navigation-list.module.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import { LabelModule } from '../label/label.module';
1010
import { LayoutChangeModule } from '../layout/layout-change.module';
1111
import { LetAsyncModule } from '../let-async/let-async.module';
1212
import { LinkModule } from '../link/link.module';
13+
import { TooltipModule } from './../tooltip/tooltip.module';
1314
import { NavItemComponent } from './nav-item/nav-item.component';
1415
import { NavigationListComponent } from './navigation-list.component';
1516

@@ -26,7 +27,8 @@ import { NavigationListComponent } from './navigation-list.component';
2627
LabelModule,
2728
BetaTagModule,
2829
MemoizeModule,
29-
LinkModule
30+
LinkModule,
31+
TooltipModule
3032
],
3133
declarations: [NavigationListComponent, NavItemComponent],
3234
exports: [NavigationListComponent]

0 commit comments

Comments
 (0)