Skip to content

feat: adding icon properties #1063

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 5 commits into from
Aug 17, 2021
Merged

feat: adding icon properties #1063

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
67cbc26
feat: adding icon properties
Aug 13, 2021
7405086
feat: adding border settings
Aug 17, 2021
1ec8375
Merge branch 'main' of github.com:hypertrace/hypertrace-ui into Addin…
Aug 17, 2021
1534614
feat: adding border settings
Aug 17, 2021
70c0795
feat: fixing inputs
Aug 17, 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
5 changes: 5 additions & 0 deletions projects/components/src/icon/icon-border.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
export const enum IconBorder {
NoBorder = 'no-border',
InsetBorder = 'inset-border',
OutsetBorder = 'outset-border'
}
13 changes: 13 additions & 0 deletions projects/components/src/icon/icon.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,17 @@
height: inherit;
width: inherit;
}

&.no-border {
border-style: none;
}

&.inset-border {
box-sizing: border-box;
}

&.outset-border {
border-width: 2px;
border-style: solid;
}
}
19 changes: 17 additions & 2 deletions projects/components/src/icon/icon.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { ChangeDetectionStrategy, Component, Input, OnChanges } from '@angular/core';
import { IconRegistryService, IconType } from '@hypertrace/assets-library';
import { assertUnreachable } from '@hypertrace/common';
import { IconBorder } from './icon-border';
import { IconSize } from './icon-size';

@Component({
Expand All @@ -10,8 +11,13 @@ import { IconSize } from './icon-size';
template: `
<mat-icon
class="ht-icon"
[ngClass]="this.size"
[ngStyle]="{ color: this.color ? this.color : '' }"
[ngClass]="[this.size, this.borderType ? this.borderType : '']"
[ngStyle]="{
color: this.color ? this.color : '',
borderColor: this.borderType !== '${IconBorder.InsetBorder}' && this.borderColor ? this.borderColor : '',
background: this.borderType === '${IconBorder.InsetBorder}' && this.borderColor ? this.borderColor : '',
borderRadius: this.borderRadius ? this.borderRadius : ''
}"
[attr.aria-label]="this.labelToUse"
[htTooltip]="this.showTooltip ? this.labelToUse : undefined"
[fontSet]="this.fontSet"
Expand All @@ -27,6 +33,15 @@ export class IconComponent implements OnChanges {
@Input()
public size: IconSize = IconSize.Medium;

@Input()
public borderType: IconBorder = IconBorder.NoBorder;

@Input()
public borderColor?: string;

@Input()
public borderRadius?: string;

@Input()
public label?: string;

Expand Down
1 change: 1 addition & 0 deletions projects/components/src/public-api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ export * from './header/page/page-header.module';

// Icon
export * from './icon/icon-size';
export * from './icon/icon-border';
export * from './icon/icon.component';
export * from './icon/icon.module';

Expand Down
10 changes: 10 additions & 0 deletions projects/components/src/select/select-option.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { ChangeDetectionStrategy, Component, Input, OnChanges } from '@angular/core';
import { IconType } from '@hypertrace/assets-library';
import { Observable, Subject } from 'rxjs';
import { IconBorder } from '../icon/icon-border';
import { SelectOption } from './select-option';

@Component({
Expand All @@ -27,6 +28,15 @@ export class SelectOptionComponent<V> implements OnChanges, SelectOption<V> {
@Input()
public iconColor?: string;

@Input()
public iconBorderType?: IconBorder;

@Input()
public iconBorderColor?: string;

@Input()
public iconBorderRadius?: string;

@Input()
public disabled?: boolean;

Expand Down
3 changes: 3 additions & 0 deletions projects/components/src/select/select-option.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,8 @@ export interface SelectOption<V> {
selectedLabel?: string;
icon?: string;
iconColor?: string;
iconBorderType?: string;
iconBorderColor?: string;
iconBorderRadius?: string;
disabled?: boolean;
}
6 changes: 6 additions & 0 deletions projects/components/src/select/select.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,9 @@ import { SelectSize } from './select-size';
[icon]="this.getPrefixIcon(selected)"
[size]="this.iconSize"
[color]="selected?.iconColor"
[borderType]="selected?.iconBorderType"
[borderColor]="selected?.iconBorderColor"
[borderRadius]="selected?.iconBorderRadius"
>
</ht-icon>
<ht-label class="trigger-label" [label]="selected?.selectedLabel || selected?.label || this.placeholder">
Expand Down Expand Up @@ -123,6 +126,9 @@ import { SelectSize } from './select-size';
[icon]="item.icon"
size="${IconSize.Small}"
[color]="item.iconColor"
[borderType]="item?.iconBorderType"
[borderColor]="item?.iconBorderColor"
[borderRadius]="item?.iconBorderRadius"
>
</ht-icon>
<span class="label">{{ item.label }}</span>
Expand Down