Skip to content

feat: add minor multiselect improvements #1412

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 2 commits into from
Feb 4, 2022
Merged

feat: add minor multiselect improvements #1412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c06de8
feat: add minor multiselect improvements
aaron-steinfeld Feb 4, 2022
e845a2c
test: fix tests
aaron-steinfeld Feb 4, 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
4 changes: 4 additions & 0 deletions projects/components/src/multi-select/multi-select.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@
height: 34px;
border-radius: 6px;

&.disabled {
cursor: not-allowed;
}

&.extra-small {
height: 30px;
}
Expand Down
16 changes: 10 additions & 6 deletions projects/components/src/multi-select/multi-select.component.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,8 @@ describe('Multi Select Component', () => {
expectObservable(spectator.component.triggerValues$).toBe('x', {
x: {
label: selectionOptions[1].label,
selectedItemsCount: 1 // Selected element is 1 as set in hostProps
overflowItemsCount: 0,
overflowLabel: undefined
}
});
});
Expand Down Expand Up @@ -116,7 +117,8 @@ describe('Multi Select Component', () => {
expectObservable(spectator.component.triggerValues$).toBe('x', {
x: {
label: selectionOptions[1].label,
selectedItemsCount: 2
overflowItemsCount: 1,
overflowLabel: 'third'
}
});
});
Expand Down Expand Up @@ -159,7 +161,8 @@ describe('Multi Select Component', () => {
expectObservable(spectator.component.triggerValues$).toBe('x', {
x: {
label: 'second',
selectedItemsCount: 2
overflowItemsCount: 1,
overflowLabel: 'third'
}
});
});
Expand Down Expand Up @@ -232,7 +235,8 @@ describe('Multi Select Component', () => {
expectObservable(spectator.component.triggerValues$).toBe('x', {
x: {
label: 'second',
selectedItemsCount: 2
overflowItemsCount: 1,
overflowLabel: 'third'
}
});
});
Expand Down Expand Up @@ -368,7 +372,7 @@ describe('Multi Select Component', () => {
expectObservable(spectator.component.triggerValues$).toBe('(x|)', {
x: {
label: 'Placeholder',
selectedItemsCount: 0
overflowItemsCount: 0
}
});
});
Expand Down Expand Up @@ -398,7 +402,7 @@ describe('Multi Select Component', () => {
expectObservable(spectator.component.triggerValues$).toBe('x', {
x: {
label: selectionOptions[1].label,
selectedItemsCount: 1
overflowItemsCount: 0
}
});
});
Expand Down
32 changes: 26 additions & 6 deletions projects/components/src/multi-select/multi-select.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,23 @@ import { MultiSelectJustify } from './multi-select-justify';
<div
class="trigger-content"
[style.justify-content]="this.justify"
[ngClass]="[this.triggerLabelDisplayMode, this.popoverOpen ? 'open' : '', this.size]"
[ngClass]="[
this.triggerLabelDisplayMode,
this.popoverOpen ? 'open' : '',
this.size,
this.disabled ? 'disabled' : ''
]"
#triggerContainer
>
<ht-icon *ngIf="this.icon" [icon]="this.icon" [size]="this.iconSize"></ht-icon>
<ng-container *ngIf="!this.isIconOnlyMode()">
<div class="trigger-label-container" *ngIf="this.triggerValues$ | async as triggerValues">
<ht-label class="trigger-label" [label]="triggerValues.label"></ht-label>
<span *ngIf="triggerValues.selectedItemsCount > 1" class="trigger-more-items"
>+{{ triggerValues.selectedItemsCount - 1 }}</span
<span
*ngIf="triggerValues.overflowItemsCount"
class="trigger-more-items"
[htTooltip]="triggerValues.overflowLabel"
>+{{ triggerValues.overflowItemsCount }}</span
>
<ht-icon class="trigger-icon" icon="${IconType.ChevronDown}" [size]="this.iconSize"></ht-icon>
</div>
Expand Down Expand Up @@ -262,6 +270,10 @@ export class MultiSelectComponent<V> implements ControlValueAccessor, AfterConte
this.propagateControlValueChangeOnTouch = onTouch;
}

public setDisabledState(isDisabled?: boolean): void {
this.disabled = isDisabled ?? false;
}

private setSelection(selected: V[]): void {
this.selected = selected;
this.setTriggerLabel();
Expand All @@ -273,7 +285,7 @@ export class MultiSelectComponent<V> implements ControlValueAccessor, AfterConte
if (this.triggerLabelDisplayMode === TriggerLabelDisplayMode.Placeholder) {
this.triggerValues$ = of({
label: this.placeholder,
selectedItemsCount: 0
overflowItemsCount: 0
});

return;
Expand All @@ -282,10 +294,17 @@ export class MultiSelectComponent<V> implements ControlValueAccessor, AfterConte
this.triggerValues$ = this.allOptions$?.pipe(
map(options => {
const selectedItems: SelectOptionComponent<V>[] = options.filter(item => this.isSelectedItem(item));
const isMultiSelection = selectedItems.length > 1;

return {
label: this.getLabel(selectedItems),
selectedItemsCount: selectedItems.length
overflowItemsCount: isMultiSelection ? selectedItems.length - 1 : 0,
overflowLabel: isMultiSelection
? selectedItems
.slice(1)
.map(item => item.label)
.join(', ')
: undefined
};
})
);
Expand All @@ -307,7 +326,8 @@ export class MultiSelectComponent<V> implements ControlValueAccessor, AfterConte

interface TriggerValues {
label: string | undefined;
selectedItemsCount: number;
overflowItemsCount: number;
overflowLabel?: string;
}

export const enum TriggerLabelDisplayMode {
Expand Down
4 changes: 3 additions & 1 deletion projects/components/src/multi-select/multi-select.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { LabelModule } from '../label/label.module';
import { LoadAsyncModule } from '../load-async/load-async.module';
import { PopoverModule } from '../popover/popover.module';
import { TraceSearchBoxModule } from '../search-box/search-box.module';
import { TooltipModule } from '../tooltip/tooltip.module';
import { MultiSelectComponent } from './multi-select.component';

@NgModule({
Expand All @@ -20,7 +21,8 @@ import { MultiSelectComponent } from './multi-select.component';
TraceSearchBoxModule,
ButtonModule,
LoadAsyncModule,
TraceCheckboxModule
TraceCheckboxModule,
TooltipModule
],
declarations: [MultiSelectComponent],
exports: [MultiSelectComponent]
Expand Down