Skip to content
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

feat:Inline view of selected options of Multiselect #7287

Merged
merged 8 commits into from
Mar 5, 2024
Merged

feat:Inline view of selected options of Multiselect #7287

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5b86002
feat:Inline view of selected options of Multiselect
creator79 Feb 27, 2024
5495a75
Merge branch 'develop' into ui-enhancement/inline-view
creator79 Feb 27, 2024
b791b91
fix: padding in input box
creator79 Feb 27, 2024
5a314d6
Merge branch 'ui-enhancement/inline-view' of https://github.com/creat…
creator79 Feb 27, 2024
42c9565
fix: padding
creator79 Feb 27, 2024
af784db
Merge branch 'develop' into ui-enhancement/inline-view
nihal467 Feb 28, 2024
f28cd6f
Merge branch 'develop' into ui-enhancement/inline-view
nihal467 Mar 5, 2024
44d3fa7
Merge branch 'develop' into ui-enhancement/inline-view
khavinshankar Mar 5, 2024
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
32 changes: 21 additions & 11 deletions src/Components/Form/MultiSelectMenuV2.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,6 @@ const MultiSelectMenuV2 = <T, V>(props: Props<T, V>) => {
if (selectedOptions.length === 0) return placeholder;
if (props.renderSelectedOptions)
return props.renderSelectedOptions(selectedOptions.map((o) => o.option));
return (
<span className="text-gray-800">{`${selectedOptions.length} item(s) selected`}</span>
);
};

return (
Expand All @@ -89,17 +86,30 @@ const MultiSelectMenuV2 = <T, V>(props: Props<T, V>) => {
<p className="ml-2.5 text-sm font-normal text-gray-600">
<Placeholder />
</p>

{selectedOptions.length !== 0 && (
<div className="flex flex-wrap gap-2">
{selectedOptions.map((option) => (
<MultiSelectOptionChip
key={option.value}
label={option.selectedLabel}
onRemove={() => {
const updatedOptions = selectedOptions.filter(
(selectedOption) =>
selectedOption.value !== option.value
);
props.onChange(
updatedOptions.map((o) => o.value) as any
);
}}
/>
))}
</div>
)}
</div>
<CareIcon className="care-l-angle-down -mb-0.5 text-lg text-gray-900" />
</div>
</Listbox.Button>
{selectedOptions.length !== 0 && (
<div className="flex flex-wrap gap-2 p-2">
{selectedOptions.map((option) => (
<MultiSelectOptionChip label={option.selectedLabel} />
))}
</div>
)}
</div>
<DropdownTransition show={open}>
<Listbox.Options className="cui-dropdown-base absolute top-12">
Expand Down Expand Up @@ -154,7 +164,7 @@ interface MultiSelectOptionChipProps {
export const MultiSelectOptionChip = (props: MultiSelectOptionChipProps) => {
return (
<span className="flex items-center gap-2 rounded-full border-gray-300 bg-gray-200 px-3 text-xs text-gray-700">
<p className="py-1.5">{props.label}</p>
<p className="py-1">{props.label}</p>
{props.onRemove && (
<p
className="cursor-pointer rounded-full hover:bg-white"
Expand Down
Loading