Skip to content

Update multiselect.component.tsx #1

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
wwagner4719 merged 1 commit into from
Dec 7, 2022
Merged

Update multiselect.component.tsx #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
46 changes: 41 additions & 5 deletions src/multiselect/multiselect.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ export class Multiselect extends React.Component<IMultiselectProps, any> {
toggleOptionsList: false,
highlightOption: props.avoidHighlightFirstOption ? -1 : 0,
showCheckbox: props.showCheckbox,
showGroupByCheckbox: props.showGroupByCheckbox,
keepSearchTerm: props.keepSearchTerm,
groupedObject: [],
closeIconType: closeIconTypes[props.closeIcon] || closeIconTypes['circle']
Expand Down Expand Up @@ -356,6 +357,26 @@ export class Multiselect extends React.Component<IMultiselectProps, any> {
this.setState({ selectedValues: [item], toggleOptionsList: false });
}

onGroupSelectItem(item) {
let { options, filteredOptions, inputValue } = this.state;
const { selectedValues } = this.state;
const { showGroupByCheckbox } = this.props;
const groupedSelectedItems = filteredOptions.filter(i => this.matchValues(i[displayValue], item));

selectedValues.push(groupedSelectedItems);
this.setState({ selectedValues }, () => {
if (!showGroupByCheckbox) {
this.removeSelectedValuesFromOptions(true);
} else {
this.filterOptionsByInput();
}
});
if (!this.props.closeOnSelect) {
// @ts-ignore
this.searchBox.current.focus();
}
}

isSelectedValue(item) {
const { isObject, displayValue } = this.props;
const { selectedValues } = this.state;
Expand Down Expand Up @@ -388,19 +409,30 @@ export class Multiselect extends React.Component<IMultiselectProps, any> {
}

renderGroupByOptions() {
const { isObject = false, displayValue, showCheckbox, style, singleSelect } = this.props;
const { isObject = false, displayValue, showCheckbox, style, singleSelect, showGroupCheckbox } = this.props;
const { groupedObject } = this.state;
return Object.keys(groupedObject).map(obj => {
return (
<React.Fragment key={obj}>
<li className="groupHeading" style={style['groupHeading']}>{obj}</li>
<li className="groupHeading" style={style['groupHeading']}
onClick={() => this.onGroupSelectItem(obj)}>
{showGroupCheckbox && (
<input
type="checkbox"
className={'checkbox'}
readOnly
checked={isGroupSelected}
/>
)}{obj}</li>
{groupedObject[obj].map((option, i) => {
const isSelected = this.isSelectedValue(option);
return (
<li
key={`option${i}`}
style={style['option']}
className={`groupChildEle option ${isSelected ? 'selected' : ''} ${this.fadeOutSelection(option) ? 'disableSelection' : ''} ${this.isDisablePreSelectedValues(option) ? 'disableSelection' : ''}`}
className={`groupChildEle option ${isSelected ? 'selected' : ''}
${this.fadeOutSelection(option) ? 'disableSelection' : ''}
${this.isDisablePreSelectedValues(option) ? 'disableSelection' : ''}`}
onClick={() => this.onSelectItem(option)}
>
{showCheckbox && !singleSelect && (
Expand Down Expand Up @@ -429,7 +461,10 @@ export class Multiselect extends React.Component<IMultiselectProps, any> {
<li
key={`option${i}`}
style={style['option']}
className={`option ${isSelected ? 'selected' : ''} ${highlightOption === i ? `highlightOption highlight` : ""} ${this.fadeOutSelection(option) ? 'disableSelection' : ''} ${this.isDisablePreSelectedValues(option) ? 'disableSelection' : ''}`}
className={`option ${isSelected ? 'selected' : ''}
${highlightOption === i ? `highlightOption highlight` : ""}
${this.fadeOutSelection(option) ? 'disableSelection' : ''}
${this.isDisablePreSelectedValues(option) ? 'disableSelection' : ''}`}
onClick={() => this.onSelectItem(option)}
>
{showCheckbox && !singleSelect && (
Expand All @@ -450,7 +485,8 @@ export class Multiselect extends React.Component<IMultiselectProps, any> {
const { isObject = false, displayValue, style, singleSelect, customCloseIcon } = this.props;
const { selectedValues, closeIconType } = this.state;
return selectedValues.map((value, index) => (
<span className={`chip ${singleSelect && 'singleChip'} ${this.isDisablePreSelectedValues(value) && 'disableSelection'}`} key={index} style={style['chips']}>
<span className={`chip ${singleSelect && 'singleChip'}
${this.isDisablePreSelectedValues(value) && 'disableSelection'}`} key={index} style={style['chips']}>
{this.props.selectedValueDecorator(!isObject ? (value || '').toString() : value[displayValue], value)}
{!this.isDisablePreSelectedValues(value) && (!customCloseIcon ? <img
className="icon_cancel closeIcon"
Expand Down