From 98d63daef68948fbd0fa8c83cd2781697327d263 Mon Sep 17 00:00:00 2001
From: Janne Savolainen <janne.savolainen@live.fi>
Date: Tue, 16 Nov 2021 13:51:44 +0200
Subject: [PATCH] Update version of injectable for disambiguous typing

Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com>
Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>
---
 ...ble.ts => kube-object-menu.injectable.tsx} | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)
 rename src/renderer/components/kube-object-menu/{kube-object-menu.injectable.ts => kube-object-menu.injectable.tsx} (78%)

diff --git a/src/renderer/components/kube-object-menu/kube-object-menu.injectable.ts b/src/renderer/components/kube-object-menu/kube-object-menu.injectable.tsx
similarity index 78%
rename from src/renderer/components/kube-object-menu/kube-object-menu.injectable.ts
rename to src/renderer/components/kube-object-menu/kube-object-menu.injectable.tsx
index 330e988932..5bca3e457c 100644
--- a/src/renderer/components/kube-object-menu/kube-object-menu.injectable.ts
+++ b/src/renderer/components/kube-object-menu/kube-object-menu.injectable.tsx
@@ -19,18 +19,26 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-import { KubeObjectMenu, KubeObjectMenuDependencies } from "./kube-object-menu";
+import React from "react";
+
+import {
+  KubeObjectMenu,
+  KubeObjectMenuDependencies,
+  KubeObjectMenuProps,
+} from "./kube-object-menu";
+
 import type { KubeObject } from "../../../common/k8s-api/kube-object";
-import type { IComponentInjectable } from "@ogre-tools/injectable";
+import type { IInjectable } from "@ogre-tools/injectable";
 import apiManagerInjectable from "./dependencies/apiManager.injectable";
-import clusterNameInjectable  from "./dependencies/clusterName.injectable";
+import clusterNameInjectable from "./dependencies/clusterName.injectable";
 import kubeObjectMenuRegistryInjectable from "./dependencies/kubeObjectMenuRegistry.injectable";
 import editResourceTabInjectable from "./dependencies/editResourceTab.injectable";
 import hideDetailsInjectable from "./dependencies/hideDetails.injectable";
 
-const KubeObjectMenuInjectable: IComponentInjectable<
-  typeof KubeObjectMenu,
-  KubeObjectMenuDependencies<KubeObject>
+const KubeObjectMenuInjectable: IInjectable<
+  JSX.Element,
+  KubeObjectMenuDependencies<KubeObject>,
+  KubeObjectMenuProps<KubeObject>
 > = {
   getDependencies: di => ({
     clusterName: di.inject(clusterNameInjectable),
@@ -40,7 +48,9 @@ const KubeObjectMenuInjectable: IComponentInjectable<
     hideDetails: di.inject(hideDetailsInjectable),
   }),
 
-  instantiate: KubeObjectMenu,
+  instantiate: (dependencies, props) => (
+    <KubeObjectMenu<KubeObject> {...dependencies} {...props} />
+  ),
 };
 
 export default KubeObjectMenuInjectable;