From e239dede66f91b7767e743cc5aa26ae7c93ce4bd Mon Sep 17 00:00:00 2001
From: Wroud <wrouds@gmail.com>
Date: Wed, 2 Jun 2021 21:30:39 +0300
Subject: [PATCH] fix(core-app): CB-821 expand node after successful load

---
 .../src/NavigationTree/useElementsTree.ts      | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/webapp/packages/core-app/src/NavigationTree/useElementsTree.ts b/webapp/packages/core-app/src/NavigationTree/useElementsTree.ts
index 55376b5148..926f7f6399 100644
--- a/webapp/packages/core-app/src/NavigationTree/useElementsTree.ts
+++ b/webapp/packages/core-app/src/NavigationTree/useElementsTree.ts
@@ -202,13 +202,21 @@ export function useElementsTree(options: IOptions): IElementsTree {
     },
     async expand(node: NavNode, state: boolean) {
       const treeNodeState = this.state.get(node.id);
-      treeNodeState.expanded = state;
 
-      if (state) {
-        await loadTree(node.id);
+      try {
+        if (state) {
+          state = await navTreeService.loadNestedNodes(node.id);
+        }
+
+        await options.onExpand?.(node, state);
+        treeNodeState.expanded = state;
+
+        if (state) {
+          await loadTree(node.id);
+        }
+      } catch {
+        treeNodeState.expanded = false;
       }
-
-      await options.onExpand?.(node, state);
     },
     async select(node: NavNode, multiple: boolean, nested: boolean) {
       if (options.customSelect) {