diff --git a/src/components/CollapsableItem.tsx b/src/components/CollapsableItem.tsx index 647f55a32..356ac91d8 100644 --- a/src/components/CollapsableItem.tsx +++ b/src/components/CollapsableItem.tsx @@ -56,7 +56,7 @@ const StyledHeaderContent = styled.div<{ highlighted?: boolean }>` `} `; -const StyledCollapsableContainer = styled.div<{ collapsed: boolean; deep: number; showLine: boolean }>` +const StyledCollapsableContainer = styled.div<{ collapsed: boolean; deep: number }>` position: relative; border-radius: ${radiusM}; @@ -156,19 +156,16 @@ export const CollapsableItem: FC<{ content: ReactNode; deep?: number; collapsed: boolean; - showLine?: boolean; -}> = ({ onClick, children, header, collapsed, deep = 0, showLine = true, content }) => { - return ( - - - - - {header} - - {nullable(children, (ch) => ( - {ch} - ))} - {!collapsed ? content : null} - - ); -}; +}> = ({ onClick, children, header, collapsed, deep = 0, content }) => ( + + + + + {header} + + {nullable(children, (ch) => ( + {ch} + ))} + {!collapsed ? content : null} + +); diff --git a/src/components/ProjectListItemCollapsable/ProjectListItemCollapsable.tsx b/src/components/ProjectListItemCollapsable/ProjectListItemCollapsable.tsx index f8d10c855..b457cd3cb 100644 --- a/src/components/ProjectListItemCollapsable/ProjectListItemCollapsable.tsx +++ b/src/components/ProjectListItemCollapsable/ProjectListItemCollapsable.tsx @@ -38,12 +38,12 @@ export const ProjectListItemCollapsable: React.FC { - const contentHidden = collapsed || loading; - - const offset = collapseOffset * (contentHidden ? deep - 1 : deep); const childs = useMemo(() => project.children.map(({ id }) => id), [project]); const onClickEnabled = childs.length; + const contentHidden = !childs.length || collapsed || loading; + + const offset = collapseOffset * (contentHidden ? deep - 1 : deep); const onGoalsButtonClick = useCallback( (e: MouseEvent) => {