fix(GroupedGoalList): Create Goal mirage

taskany-inc · Oct 18, 2023 · a85d69d · a85d69d
1 parent 2d5d147
commit a85d69d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/components/CollapsableItem.tsx b/src/components/CollapsableItem.tsx
@@ -195,7 +195,7 @@ export const CollapsableItem: FC<React.PropsWithChildren<CollapsableItemProps>>
             {nullable(children, (ch) => (
                 <StyledCollapsableItem>{ch}</StyledCollapsableItem>
             ))}
-            {!collapsed ? content : null}
+            {nullable(content, (c) => !collapsed && c)}
         </StyledCollapsableContainer>
     );
 };
diff --git a/src/components/ProjectListItemConnected.tsx b/src/components/ProjectListItemConnected.tsx
@@ -35,7 +35,7 @@ export const ProjectListItemConnected: FC<{
     const { on } = useGoalPreview();
     const utils = trpc.useContext();
 
-    const { data: projectDeepInfo } = trpc.project.getDeepInfo.useQuery(
+    const { data: projectDeepInfo, isLoading: isDeepInfoLoading } = trpc.project.getDeepInfo.useQuery(
         {
             id: project.id,
             goalsQuery: queryState,
@@ -120,9 +120,10 @@ export const ProjectListItemConnected: FC<{
             deep={deep}
             contentHidden={contentHidden}
         >
-            {nullable(!projectDeepInfo?.goals.length && status !== 'loading', () => (
-                <InlineCreateGoalControl projectId={project.id} />
-            ))}
+            {nullable(
+                !projectDeepInfo?.goals.length,
+                () => !isDeepInfoLoading && <InlineCreateGoalControl projectId={project.id} />,
+            )}
             {childrenProjects.map((p) => (
                 <ProjectListItemConnected
                     key={p.id}