diff --git a/projects/components/src/multi-select/multi-select.component.scss b/projects/components/src/multi-select/multi-select.component.scss index 694d3af32..a3ccc2032 100644 --- a/projects/components/src/multi-select/multi-select.component.scss +++ b/projects/components/src/multi-select/multi-select.component.scss @@ -30,6 +30,10 @@ height: 34px; border-radius: 6px; + &.disabled { + cursor: not-allowed; + } + &.extra-small { height: 30px; } diff --git a/projects/components/src/multi-select/multi-select.component.test.ts b/projects/components/src/multi-select/multi-select.component.test.ts index 54f7a1526..b293743c5 100644 --- a/projects/components/src/multi-select/multi-select.component.test.ts +++ b/projects/components/src/multi-select/multi-select.component.test.ts @@ -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 } }); }); @@ -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' } }); }); @@ -159,7 +161,8 @@ describe('Multi Select Component', () => { expectObservable(spectator.component.triggerValues$).toBe('x', { x: { label: 'second', - selectedItemsCount: 2 + overflowItemsCount: 1, + overflowLabel: 'third' } }); }); @@ -232,7 +235,8 @@ describe('Multi Select Component', () => { expectObservable(spectator.component.triggerValues$).toBe('x', { x: { label: 'second', - selectedItemsCount: 2 + overflowItemsCount: 1, + overflowLabel: 'third' } }); }); @@ -368,7 +372,7 @@ describe('Multi Select Component', () => { expectObservable(spectator.component.triggerValues$).toBe('(x|)', { x: { label: 'Placeholder', - selectedItemsCount: 0 + overflowItemsCount: 0 } }); }); @@ -398,7 +402,7 @@ describe('Multi Select Component', () => { expectObservable(spectator.component.triggerValues$).toBe('x', { x: { label: selectionOptions[1].label, - selectedItemsCount: 1 + overflowItemsCount: 0 } }); }); diff --git a/projects/components/src/multi-select/multi-select.component.ts b/projects/components/src/multi-select/multi-select.component.ts index c0ab74510..93b578604 100644 --- a/projects/components/src/multi-select/multi-select.component.ts +++ b/projects/components/src/multi-select/multi-select.component.ts @@ -53,15 +53,23 @@ import { MultiSelectJustify } from './multi-select-justify';