From 451b7d7ee9a9bd1bf4d6f04ba8b09a55b2968f69 Mon Sep 17 00:00:00 2001
From: danangarbansa <danang@canva.com>
Date: Tue, 4 Apr 2023 13:30:14 +1000
Subject: [PATCH 1/2] Fix Select component

Signed-off-by: danangarbansa <danang@canva.com>
---
 .../src/components/Select/Select.test.tsx            | 12 ++++++++++++
 .../core-components/src/components/Select/Select.tsx |  6 ++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/packages/core-components/src/components/Select/Select.test.tsx b/packages/core-components/src/components/Select/Select.test.tsx
index df29983222..edc7058a07 100644
--- a/packages/core-components/src/components/Select/Select.test.tsx
+++ b/packages/core-components/src/components/Select/Select.test.tsx
@@ -54,4 +54,16 @@ describe('<Select />', () => {
     fireEvent.click(option);
     expect(input.textContent).toBe('test 1');
   });
+
+  it('display the placeholder value when selected props updated to undefined', async () => {
+    const { getByTestId, rerender } = render(
+      <Select {...minProps} selected="test 1" />,
+    );
+
+    expect(getByTestId('select').textContent).toBe('test 1');
+
+    rerender(<Select {...minProps} selected={undefined} />);
+
+    expect(getByTestId('select').textContent).toBe('All results');
+  });
 });
diff --git a/packages/core-components/src/components/Select/Select.tsx b/packages/core-components/src/components/Select/Select.tsx
index 9cb8822a05..1b57e0d4da 100644
--- a/packages/core-components/src/components/Select/Select.tsx
+++ b/packages/core-components/src/components/Select/Select.tsx
@@ -163,10 +163,8 @@ export function SelectComponent(props: SelectProps) {
   }, [triggerReset, multiple]);
 
   useEffect(() => {
-    if (selected !== undefined) {
-      setValue(selected);
-    }
-  }, [selected]);
+    setValue(selected || (multiple ? [] : ''));
+  }, [selected, multiple]);
 
   const handleChange = (event: React.ChangeEvent<{ value: unknown }>) => {
     setValue(event.target.value as SelectedItems);

From be52a585e08cbf419c14d8ef7ae894c22f9efd4d Mon Sep 17 00:00:00 2001
From: danangarbansa <danang@canva.com>
Date: Tue, 4 Apr 2023 14:00:13 +1000
Subject: [PATCH 2/2] Fix test

Signed-off-by: danangarbansa <danang@canva.com>
---
 packages/core-components/src/components/Select/Select.test.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core-components/src/components/Select/Select.test.tsx b/packages/core-components/src/components/Select/Select.test.tsx
index edc7058a07..e9828e70fd 100644
--- a/packages/core-components/src/components/Select/Select.test.tsx
+++ b/packages/core-components/src/components/Select/Select.test.tsx
@@ -57,7 +57,7 @@ describe('<Select />', () => {
 
   it('display the placeholder value when selected props updated to undefined', async () => {
     const { getByTestId, rerender } = render(
-      <Select {...minProps} selected="test 1" />,
+      <Select {...minProps} selected="test_1" />,
     );
 
     expect(getByTestId('select').textContent).toBe('test 1');