From 45d8be7ef1134b9a3664d7959e5d8ea47c693ad1 Mon Sep 17 00:00:00 2001
From: Raphael Krut-Landau <raphael.kl@gmail.com>
Date: Mon, 26 Aug 2024 15:33:33 -0400
Subject: [PATCH] fix(dashboard): In dashboard value source modal, after
 closing question picker modal, don't also close the first modal (#47242)

---
 .../src/metabase/core/components/SelectButton/SelectButton.tsx  | 1 +
 .../components/ValuesSourceModal/ValuesSourceModal.tsx          | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/src/metabase/core/components/SelectButton/SelectButton.tsx b/frontend/src/metabase/core/components/SelectButton/SelectButton.tsx
index e4cb69064f6..a589aaebce3 100644
--- a/frontend/src/metabase/core/components/SelectButton/SelectButton.tsx
+++ b/frontend/src/metabase/core/components/SelectButton/SelectButton.tsx
@@ -82,6 +82,7 @@ const SelectButton = forwardRef(function SelectButton(
         hasValue={hasValue}
         highlighted={highlighted}
         onClick={rightIcon === "close" ? handleClear : undefined}
+        style={{ flexShrink: 0 }}
       />
     </SelectButtonRoot>
   );
diff --git a/frontend/src/metabase/parameters/components/ValuesSourceModal/ValuesSourceModal.tsx b/frontend/src/metabase/parameters/components/ValuesSourceModal/ValuesSourceModal.tsx
index 5d1be4ba2aa..78ea86ee682 100644
--- a/frontend/src/metabase/parameters/components/ValuesSourceModal/ValuesSourceModal.tsx
+++ b/frontend/src/metabase/parameters/components/ValuesSourceModal/ValuesSourceModal.tsx
@@ -63,7 +63,7 @@ const ValuesSourceModal = ({
       sourceConfig={sourceConfig}
       onChangeSourceConfig={setSourceConfig}
       onSubmit={handlePickerClose}
-      onClose={onClose}
+      onClose={handlePickerClose}
     />
   );
 };
-- 
GitLab