From 5c318e189e6389eed1d09d3e01e980acb7a1516d Mon Sep 17 00:00:00 2001
From: Jaden Gregory <jaden.gregory@imcontrol.com.au>
Date: Mon, 9 Oct 2023 20:56:16 +1100
Subject: [PATCH] [@mantine/core] Fix MultiSelect nothingFoundMessage

---
 .../src/components/MultiSelect/MultiSelect.tsx            | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/mantine-core/src/components/MultiSelect/MultiSelect.tsx b/src/mantine-core/src/components/MultiSelect/MultiSelect.tsx
index 14376737f03..e832c024be7 100644
--- 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}