[@mantine/core] Fix MultiSelect nothingFoundMessage

mantinedev · Oct 9, 2023 · 5c318e1 · 5c318e1
1 parent 9aef3f5
commit 5c318e1
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/mantine-core/src/components/MultiSelect/MultiSelect.tsx b/src/mantine-core/src/components/MultiSelect/MultiSelect.tsx
@@ -253,6 +253,8 @@ export const MultiSelect = factory<MultiSelectFactory>((_props, ref) => {
     />
   );
 
+  const filteredData = filterPickedValues({ data: parsedData, value: _value });
+
   return (
     <>
       <Combobox
@@ -354,16 +356,16 @@ export const MultiSelect = factory<MultiSelectFactory>((_props, ref) => {
 
         <OptionsDropdown
           data={
-            hidePickedOptions ? filterPickedValues({ data: parsedData, value: _value }) : parsedData
+            hidePickedOptions ? filteredData : parsedData
           }
           hidden={readOnly || disabled}
           filter={filter}
           search={_searchValue}
           limit={limit}
           hiddenWhenEmpty={
-            hidePickedOptions ||
+            !searchable ||
             !nothingFoundMessage ||
-            (!searchable && _searchValue.trim().length !== 0)
+            (hidePickedOptions && filteredData.length === 0 && _searchValue.trim().length === 0)
           }
           withScrollArea={withScrollArea}
           maxDropdownHeight={maxDropdownHeight}