From dc3dffc2fcb9c7f89c305d100537f684ae85f896 Mon Sep 17 00:00:00 2001
From: Sebastian Malton <sebastian@malton.name>
Date: Thu, 7 Apr 2022 15:57:43 -0400
Subject: [PATCH] fix select.test.tsx

Signed-off-by: Sebastian Malton <sebastian@malton.name>
---
 src/renderer/components/select/select.test.tsx | 2 +-
 src/renderer/components/select/select.tsx      | 8 +++++---
 src/renderer/getDiForUnitTesting.tsx           | 2 ++
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/renderer/components/select/select.test.tsx b/src/renderer/components/select/select.test.tsx
index 5619ba77d7..bc1bf25467 100644
--- a/src/renderer/components/select/select.test.tsx
+++ b/src/renderer/components/select/select.test.tsx
@@ -122,7 +122,7 @@ describe("<Select />", () => {
     const { container, rerender } = render(<Select
       value={options[0]}
       onChange={onChange}
-      options={options} 
+      options={options}
     />);
     const selectedValueContainer = container.querySelector(".Select__single-value");
 
diff --git a/src/renderer/components/select/select.tsx b/src/renderer/components/select/select.tsx
index dcbb176e47..6fd9a6d124 100644
--- a/src/renderer/components/select/select.tsx
+++ b/src/renderer/components/select/select.tsx
@@ -14,7 +14,6 @@ import ReactSelect, { components } from "react-select";
 import type { Props as ReactSelectProps, GroupBase } from "react-select";
 import { ThemeStore } from "../../theme.store";
 import { autoBind, cssNames } from "../../utils";
-import { merge } from "lodash";
 
 const { Menu } = components;
 
@@ -65,6 +64,7 @@ export class Select<Option, IsMulti extends boolean = false, Group extends Group
       menuClass,
       components = {},
       styles,
+      value = null,
       ...props
     } = this.props;
     const WrappedMenu = components.Menu ?? Menu;
@@ -72,12 +72,14 @@ export class Select<Option, IsMulti extends boolean = false, Group extends Group
     return (
       <ReactSelect
         {...props}
-        styles={merge(styles, {
+        styles={{
           menuPortal: styles => ({
             ...styles,
             zIndex: "auto",
           }),
-        })}
+          ...styles,
+        }}
+        value={value}
         onKeyDown={this.onKeyDown}
         className={cssNames("Select", this.themeClass, className)}
         classNamePrefix="Select"
diff --git a/src/renderer/getDiForUnitTesting.tsx b/src/renderer/getDiForUnitTesting.tsx
index 2b74a4adc0..f82565516c 100644
--- a/src/renderer/getDiForUnitTesting.tsx
+++ b/src/renderer/getDiForUnitTesting.tsx
@@ -34,6 +34,7 @@ import joinPathsInjectable from "../common/path/join-paths.injectable";
 import { joinPathsFake } from "../common/test-utils/join-paths-fake";
 import hotbarStoreInjectable from "../common/hotbar-store.injectable";
 import terminalSpawningPoolInjectable from "./components/dock/terminal/terminal-spawning-pool.injectable";
+import hostedClusterIdInjectable from "../common/cluster-store/hosted-cluster-id.injectable";
 
 export const getDiForUnitTesting = (
   { doGeneralOverrides } = { doGeneralOverrides: false },
@@ -59,6 +60,7 @@ export const getDiForUnitTesting = (
     di.override(isLinuxInjectable, () => false);
 
     di.override(terminalSpawningPoolInjectable, () => new HTMLElement());
+    di.override(hostedClusterIdInjectable, () => undefined);
 
     di.override(getAbsolutePathInjectable, () => getAbsolutePathFake);
     di.override(joinPathsInjectable, () => joinPathsFake);