Skip to content

Feat/select component clear option optional #1492

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 7 commits into from
Mar 21, 2022
Merged

Feat/select component clear option optional #1492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
08c9eea
Merge branch 'main' of github.com:hypertrace/hypertrace-ui
adisreyaj Mar 15, 2022
ecbcc89
Merge branch 'main' of github.com:hypertrace/hypertrace-ui
adisreyaj Mar 17, 2022
4d36a01
feat(select): configurable clear selected option
adisreyaj Mar 18, 2022
c641c69
Merge branch 'main' into feat/select-component-clear-option-optional
adisreyaj Mar 21, 2022
7635a57
feat(select): default show clear selected to false
adisreyaj Mar 21, 2022
7aa8cb2
Merge branch 'main' into feat/select-component-clear-option-optional
adisreyaj Mar 21, 2022
6c77a40
test(select): fix test cases
adisreyaj Mar 21, 2022
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
2 changes: 1 addition & 1 deletion projects/components/src/select/select.component.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ describe('Select Component', () => {
test('should show clear selected button', fakeAsync(() => {
spectator = hostFactory(
`
<ht-select [selected]="selected">
<ht-select [selected]="selected" [showClearSelected]="true">
<ht-select-option *ngFor="let option of options" [label]="option.label" [value]="option.value" [selectedLabel]="option.selectedLabel">
</ht-select-option>
</ht-select>`,
Expand Down
25 changes: 14 additions & 11 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 @@ -69,9 +69,9 @@ import { SelectSize } from './select-size';
<ng-container
[ngTemplateOutlet]="selected?.selectOptionRenderer?.getTemplateRef() ?? defaultMenuWithBorderTriggerTemplate"
></ng-container>
<ht-icon class="trigger-icon" icon="${IconType.ChevronDown}" size="${IconSize.ExtraSmall}"> </ht-icon>
<ng-template #defaultMenuWithBorderTriggerTemplate
><ht-icon
<ht-icon class="trigger-icon" icon="${IconType.ChevronDown}" size="${IconSize.ExtraSmall}"></ht-icon>
<ng-template #defaultMenuWithBorderTriggerTemplate>
<ht-icon
*ngIf="this.getPrefixIcon(selected)"
class="trigger-prefix-icon"
[icon]="this.getPrefixIcon(selected)"
Expand Down Expand Up @@ -111,14 +111,14 @@ import { SelectSize } from './select-size';
<ng-container
[ngTemplateOutlet]="selected?.selectOptionRenderer?.getTemplateRef() ?? defaultMenuWithBackgroundTriggerTemplate"
></ng-container>
<ng-template #defaultMenuWithBackgroundTriggerTemplate
><ht-label
<ng-template #defaultMenuWithBackgroundTriggerTemplate>
<ht-label
class="trigger-label"
[label]="selected?.selectedLabel || selected?.label || this.placeholder"
>
</ht-label
></ng-template>
<ht-icon class="trigger-icon" icon="${IconType.ChevronDown}" size="${IconSize.ExtraSmall}"> </ht-icon>
</ht-label>
</ng-template>
<ht-icon class="trigger-icon" icon="${IconType.ChevronDown}" size="${IconSize.ExtraSmall}"></ht-icon>
</div>
</div>
</ht-popover-trigger>
Expand All @@ -137,7 +137,7 @@ import { SelectSize } from './select-size';
</ng-container>
<ht-button
class="clear-selected"
*ngIf="this.selected !== undefined"
*ngIf="this.showClearSelected && this.selected !== undefined"
role="${ButtonRole.Primary}"
display="${ButtonStyle.Text}"
size="${ButtonSize.ExtraSmall}"
Expand Down Expand Up @@ -178,8 +178,8 @@ import { SelectSize } from './select-size';
</div>
</ng-template>

<ng-template #defaultSelectOptionTemplate let-item
><div class="select-option-info">
<ng-template #defaultSelectOptionTemplate let-item>
<div class="select-option-info">
<ht-icon
*ngIf="item.icon"
class="icon"
Expand Down Expand Up @@ -224,6 +224,9 @@ export class SelectComponent<V> implements ControlValueAccessor, AfterContentIni
@Input()
public showBorder: boolean = false;

@Input()
public showClearSelected: boolean = false;

@Input()
public justify?: SelectJustify;

Expand Down