From 5bb38b3116590a6dd4a5d34c0e7e35fd471cec81 Mon Sep 17 00:00:00 2001
From: Roman Pominov <rpominov+github@gmail.com>
Date: Thu, 14 Jul 2022 10:34:58 +0300
Subject: [PATCH 1/2] Fix flicker on close of a node with children

---
 apps/designer/app/designer/shared/tree/tree.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/designer/app/designer/shared/tree/tree.tsx b/apps/designer/app/designer/shared/tree/tree.tsx
index cf464888fb..e210af4a64 100644
--- a/apps/designer/app/designer/shared/tree/tree.tsx
+++ b/apps/designer/app/designer/shared/tree/tree.tsx
@@ -64,7 +64,7 @@ export const Tree = ({
     instance.children.length > 1 || typeof instance.children[0] === "object";
 
   const children = useMemo(() => {
-    if (isOpen === false || showChildren === false) {
+    if ((isOpen === false && animate === false) || showChildren === false) {
       return null;
     }
     const children = [];

From 6733aa7b84714ae4376ae076eeb78effb54aa4e2 Mon Sep 17 00:00:00 2001
From: Roman Pominov <rpominov+github@gmail.com>
Date: Thu, 14 Jul 2022 10:36:36 +0300
Subject: [PATCH 2/2] Fix flicker on nodes without children

---
 apps/designer/app/designer/shared/tree/tree.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/designer/app/designer/shared/tree/tree.tsx b/apps/designer/app/designer/shared/tree/tree.tsx
index e210af4a64..dbe2cfaa06 100644
--- a/apps/designer/app/designer/shared/tree/tree.tsx
+++ b/apps/designer/app/designer/shared/tree/tree.tsx
@@ -127,7 +127,7 @@ export const Tree = ({
           <Text>{label}</Text>
         </Button>
       </Flex>
-      <CollapsibleContent>{children}</CollapsibleContent>
+      {children != null && <CollapsibleContent>{children}</CollapsibleContent>}
     </Collapsible.Root>
   );
 };