From c041266b313a70b66b4c904942f69614a10ed286 Mon Sep 17 00:00:00 2001
From: Alex Andreev <alex.andreev.email@gmail.com>
Date: Wed, 16 Jun 2021 10:57:16 +0300
Subject: [PATCH] Set controlled selected prop

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>
---
 src/renderer/components/+catalog/catalog-menu.tsx | 3 ++-
 src/renderer/components/+catalog/catalog.tsx      | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/renderer/components/+catalog/catalog-menu.tsx b/src/renderer/components/+catalog/catalog-menu.tsx
index 9fe24a810c..78052cbd9d 100644
--- a/src/renderer/components/+catalog/catalog-menu.tsx
+++ b/src/renderer/components/+catalog/catalog-menu.tsx
@@ -31,6 +31,7 @@ import { cssNames } from "../../utils";
 import type { CatalogCategory } from "../../api/catalog-entity";
 
 type Props = {
+  activeItem: string;
   onItemClick: (id: string) => void;
 };
 
@@ -61,7 +62,7 @@ export function CatalogMenu(props: Props) {
           defaultExpanded={["catalog"]}
           defaultCollapseIcon={<Icon material="expand_more"/>}
           defaultExpandIcon={<Icon material="chevron_right" />}
-          defaultSelected="browse"
+          selected={props.activeItem || "browse"}
         >
           <Item nodeId="browse" label="Browse" data-testid="*-tab" onClick={() => props.onItemClick("*")}/>
           <Item
diff --git a/src/renderer/components/+catalog/catalog.tsx b/src/renderer/components/+catalog/catalog.tsx
index 9dcbca1a44..067dab9009 100644
--- a/src/renderer/components/+catalog/catalog.tsx
+++ b/src/renderer/components/+catalog/catalog.tsx
@@ -141,7 +141,7 @@ export class Catalog extends React.Component<Props> {
   };
 
   renderNavigation() {
-    return <CatalogMenu onItemClick={this.onTabChange}/>;
+    return <CatalogMenu activeItem={this.activeTab} onItemClick={this.onTabChange}/>;
   }
 
   renderItemMenu = (item: CatalogEntityItem) => {