From cd83245ba965ede2e9f300ef7ccbef8d882dedcf Mon Sep 17 00:00:00 2001 From: Wroud Date: Fri, 1 Apr 2022 10:06:07 +0300 Subject: [PATCH] fix(core-ui): CB-1826 default tab selection --- webapp/packages/core-ui/src/Tabs/TabsState.tsx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/webapp/packages/core-ui/src/Tabs/TabsState.tsx b/webapp/packages/core-ui/src/Tabs/TabsState.tsx index 38e4fb0ebf..ce835e76ef 100644 --- a/webapp/packages/core-ui/src/Tabs/TabsState.tsx +++ b/webapp/packages/core-ui/src/Tabs/TabsState.tsx @@ -98,7 +98,11 @@ export const TabsState = observer(function TabsState>({ const tabExists = displayed.some(tabInfo => tabInfo.key === dynamic.selectedId); if (displayed.length && !tabExists) { - state.selectedId = selectedId; + if (displayed.some(tabInfo => tabInfo.key === selectedId)) { + state.selectedId = selectedId; + } else { + state.selectedId = displayed[0].key; + } } }