From ae9598689c8ad1ee694ab27dd46d7a21adf48412 Mon Sep 17 00:00:00 2001 From: melloware Date: Wed, 4 Oct 2023 08:29:22 -0400 Subject: [PATCH] Fix #5028: Multiselect filterTemplate --- components/lib/multiselect/MultiSelect.js | 6 +++++- components/lib/multiselect/MultiSelectHeader.js | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/components/lib/multiselect/MultiSelect.js b/components/lib/multiselect/MultiSelect.js index dbe968f20c..d91211783c 100644 --- a/components/lib/multiselect/MultiSelect.js +++ b/components/lib/multiselect/MultiSelect.js @@ -501,7 +501,11 @@ export const MultiSelect = React.memo( if (ObjectUtils.isNotEmpty(props.maxSelectedLabels) && props.value.length > props.maxSelectedLabels) { return getSelectedItemsLabel(); } else { - return props.value.reduce((acc, value, index) => acc + (index !== 0 ? ',' : '') + getLabelByValue(value), ''); + if (ObjectUtils.isArray(props.value)) { + return props.value.reduce((acc, value, index) => acc + (index !== 0 ? ',' : '') + getLabelByValue(value), ''); + } else { + return ''; + } } } diff --git a/components/lib/multiselect/MultiSelectHeader.js b/components/lib/multiselect/MultiSelectHeader.js index e0f8b64e75..c3aabfe502 100644 --- a/components/lib/multiselect/MultiSelectHeader.js +++ b/components/lib/multiselect/MultiSelectHeader.js @@ -80,11 +80,11 @@ export const MultiSelectHeader = React.memo((props) => { if (props.filterTemplate) { const defaultContentOptions = { - className: containerClassName, + className: filterContainerProps.className, element: content, filterOptions: filterOptions, onFilter: onFilter, - filterIconClassName, + filterIconClassName: props.filterIconClassName, props };