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

fix(Multiselect): optimize handling of grouped options by flattening structure #7357

Merged
merged 2 commits into from
Oct 19, 2024
Merged

fix(Multiselect): optimize handling of grouped options by flattening structure #7357

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
2351ee7
remove: delete createGroupChildren function
KumJungMin Oct 19, 2024
d63e8c2
refactor: optimize handling of grouped options by flattening structure
KumJungMin Oct 19, 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
65 changes: 24 additions & 41 deletions components/lib/multiselect/MultiSelect.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,28 +386,11 @@ export const MultiSelect = React.memo(

if (event.checked) {
value = [];
} else {
const validOptions = visibleOptions.filter((option) => isValidOption(option) && !isOptionDisabled(option));

if (visibleOptions) {
const selectedOptions = visibleOptions.filter((option) => isOptionDisabled(option) && isSelected(option));

value = selectedOptions.map((option) => getOptionValue(option));
}
} else if (visibleOptions) {
const options = visibleOptions.filter((option) => !isOptionDisabled(option) || isSelected(option));

if (props.optionGroupLabel) {
value = [];
options.forEach(
(optionGroup) =>
(value = [
...value,
...getOptionGroupChildren(optionGroup)
.filter((option) => !isOptionDisabled(option))
.map((option) => getOptionValue(option))
])
);
} else {
value = options.map((option) => getOptionValue(option));
if (validOptions) {
value = validOptions.map((option) => getOptionValue(option));
}
}

Expand Down Expand Up @@ -622,21 +605,7 @@ export const MultiSelect = React.memo(
return false;
}

const options = visibleOptions.filter((option) => !isOptionDisabled(option));

if (props.optionGroupLabel) {
let areAllSelected = true;

for (let optionGroup of options) {
const visibleOptionsGroupChildren = getOptionGroupChildren(optionGroup).filter((option) => !isOptionDisabled(option));

if (visibleOptionsGroupChildren.some((option) => !isSelected(option)) === true) {
areAllSelected = false;
}
}

return areAllSelected;
}
const options = visibleOptions.filter((option) => !isOptionDisabled(option) && isValidOption(option));

return !options.some((option) => !isSelected(option));
};
Expand Down Expand Up @@ -697,7 +666,7 @@ export const MultiSelect = React.memo(
};

const isOptionGroup = (option) => {
return props.optionGroupLabel && option.optionGroup && option.group;
return props.optionGroupLabel && option.group;
};

const hasSelectedOption = () => {
Expand Down Expand Up @@ -937,12 +906,14 @@ export const MultiSelect = React.memo(
};

const getVisibleOptions = () => {
const options = props.optionGroupLabel ? flatOptions(props.options) : props.options;

if (hasFilter) {
const filterValue = filterState.trim().toLocaleLowerCase(props.filterLocale);
const searchFields = props.filterBy ? props.filterBy.split(',') : [props.optionLabel || 'label'];

if (props.optionGroupLabel) {
let filteredGroups = [];
const filteredGroups = [];

for (let optgroup of props.options) {
let filteredSubOptions = FilterService.filter(getOptionGroupChildren(optgroup), searchFields, filterValue, props.filterMatchMode, props.filterLocale);
Expand All @@ -952,13 +923,25 @@ export const MultiSelect = React.memo(
}
}

return filteredGroups;
return flatOptions(filteredGroups);
}

return FilterService.filter(props.options, searchFields, filterValue, props.filterMatchMode, props.filterLocale);
return FilterService.filter(options, searchFields, filterValue, props.filterMatchMode, props.filterLocale);
}

return props.options;
return options;
};

const flatOptions = (options) => {
return (options || []).reduce((result, option, index) => {
result.push({ ...option, group: true, index });

const optionGroupChildren = getOptionGroupChildren(option);

optionGroupChildren && optionGroupChildren.forEach((o) => result.push(o));

return result;
}, []);
};

React.useImperativeHandle(ref, () => ({
Expand Down
45 changes: 4 additions & 41 deletions components/lib/multiselect/MultiSelectPanel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,39 +104,6 @@ export const MultiSelectPanel = React.memo(
}
};

const createGroupChildren = (optionGroup, style) => {
const groupChildren = props.getOptionGroupChildren(optionGroup);

return groupChildren.map((option, j) => {
const optionLabel = props.getOptionLabel(option);
const optionKey = j + '_' + props.getOptionRenderKey(option);
const disabled = props.isOptionDisabled(option);
const selected = props.isSelected(option);

return (
<MultiSelectItem
hostName={props.hostName}
index={j}
key={optionKey}
focusedOptionIndex={props.focusedOptionIndex}
label={optionLabel}
option={option}
style={style}
template={props.itemTemplate}
selected={selected}
onClick={props.onOptionSelect}
onMouseMove={changeFocusedItemOnHover}
disabled={disabled}
className={props.itemClassName}
checkboxIcon={props.checkboxIcon}
isUnstyled={isUnstyled}
ptm={ptm}
cx={cx}
/>
);
});
};

const createEmptyFilter = () => {
const emptyFilterMessage = ObjectUtils.getJSXElement(props.emptyFilterMessage, props) || localeOption('emptyFilterMessage');

Expand Down Expand Up @@ -174,9 +141,8 @@ export const MultiSelectPanel = React.memo(
const createItem = (option, index, scrollerOptions = {}) => {
const style = { height: scrollerOptions.props ? scrollerOptions.props.itemSize : undefined };

if (props.optionGroupLabel) {
if (option.group && props.optionGroupLabel) {
const groupContent = props.optionGroupTemplate ? ObjectUtils.getJSXElement(props.optionGroupTemplate, option, index) : props.getOptionGroupLabel(option);
const groupChildrenContent = createGroupChildren(option, style);
const key = index + '_' + props.getOptionGroupRenderKey(option);
const itemGroupProps = mergeProps(
{
Expand All @@ -187,12 +153,9 @@ export const MultiSelectPanel = React.memo(
);

return (
<React.Fragment key={key}>
<li {...itemGroupProps} key={key}>
{groupContent}
</li>
{groupChildrenContent}
</React.Fragment>
<li key={key} {...itemGroupProps}>
{groupContent}
</li>
);
}

Expand Down
Loading