[@mantine/core] Fix MultiSelect nothingFoundMessage

mantinedev · Oct 9, 2023 · e19e1d5 · e19e1d5
1 parent 9aef3f5
commit e19e1d5
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/mantine-core/src/components/MultiSelect/MultiSelect.tsx b/src/mantine-core/src/components/MultiSelect/MultiSelect.tsx
@@ -253,6 +253,9 @@ export const MultiSelect = factory<MultiSelectFactory>((_props, ref) => {
     />
   );
 
+  const filteredData = filterPickedValues({ data: parsedData, value: _value });
+  const optionsDropdownData = hidePickedOptions ? filteredData : parsedData;
+
   return (
     <>
       <Combobox
@@ -353,17 +356,15 @@ export const MultiSelect = factory<MultiSelectFactory>((_props, ref) => {
         </Combobox.DropdownTarget>
 
         <OptionsDropdown
-          data={
-            hidePickedOptions ? filterPickedValues({ data: parsedData, value: _value }) : parsedData
-          }
+          data={optionsDropdownData}
           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}