From a7a404f990b9833bcafed3e93b159dc4611d08e3 Mon Sep 17 00:00:00 2001 From: Akshita Goyal <36129505+gakshita@users.noreply.github.com> Date: Mon, 19 Aug 2024 19:30:37 +0530 Subject: [PATCH] fix: card gradient + kanban collapse issue (#870) --- .../layouts/board/group-item-header/root.tsx | 12 ++++++++---- .../components/projects/layouts/board/group-item.tsx | 12 ++++++++---- web/ee/components/projects/layouts/board/group.tsx | 4 ++-- .../components/projects/layouts/gallery/details.tsx | 3 ++- 4 files changed, 20 insertions(+), 11 deletions(-) diff --git a/web/ee/components/projects/layouts/board/group-item-header/root.tsx b/web/ee/components/projects/layouts/board/group-item-header/root.tsx index c0afcfed0b..9104054381 100644 --- a/web/ee/components/projects/layouts/board/group-item-header/root.tsx +++ b/web/ee/components/projects/layouts/board/group-item-header/root.tsx @@ -18,12 +18,16 @@ type TProjectBoardGroupItemHeader = { groupByKey: string; projectIds: string[]; verticalAlign: boolean; - setVerticalAlign: (value: boolean) => void; + setVerticalAlign: ( + value: (state: { [key: string]: boolean }) => { + [key: string]: boolean; + } + ) => void; }; // Todo: Vertical Align export const ProjectBoardGroupItemHeader: FC = observer((props) => { - const { groupByKey, projectIds, verticalAlign } = props; + const { groupByKey, projectIds, verticalAlign, setVerticalAlign } = props; //states const [open, setOpen] = useState(false); // hooks @@ -71,7 +75,7 @@ export const ProjectBoardGroupItemHeader: FC = obs >
{details?.title} @@ -83,7 +87,7 @@ export const ProjectBoardGroupItemHeader: FC = obs
setVerticalAlign(!verticalAlign)} + onClick={() => setVerticalAlign((state) => ({ ...state, [groupByKey]: !verticalAlign }))} > {verticalAlign ? : }
diff --git a/web/ee/components/projects/layouts/board/group-item.tsx b/web/ee/components/projects/layouts/board/group-item.tsx index 9bb360b297..c4449b8e49 100644 --- a/web/ee/components/projects/layouts/board/group-item.tsx +++ b/web/ee/components/projects/layouts/board/group-item.tsx @@ -17,8 +17,12 @@ import { groupDetails, highlightProjectOnDrop } from "./utils"; type ProjectBoardGroupItem = { groupByKey: string; projectIds: string[]; - verticalAlign: boolean; - setVerticalAlign: (value: boolean) => void; + verticalAlign: { [key: string]: boolean }; + setVerticalAlign: ( + value: (state: { [key: string]: boolean }) => { + [key: string]: boolean; + } + ) => void; dropErrorMessage?: string; }; @@ -98,11 +102,11 @@ export const ProjectBoardGroupItem: FC = observer((props) {/* projects placeholder */} - {!verticalAlign && projectIds.length > 0 && ( + {!verticalAlign[groupByKey] && projectIds.length > 0 && ( )}
diff --git a/web/ee/components/projects/layouts/board/group.tsx b/web/ee/components/projects/layouts/board/group.tsx index 039dff257c..55f8150541 100644 --- a/web/ee/components/projects/layouts/board/group.tsx +++ b/web/ee/components/projects/layouts/board/group.tsx @@ -14,7 +14,7 @@ type ProjectBoardGroup = { export const ProjectBoardGroup: FC = observer((props) => { const { groupByProjectIds } = props; - const [verticalAlign, setVerticalAlign] = useState(false); + const [verticalAlign, setVerticalAlign] = useState<{ [key: string]: boolean }>({}); return (
@@ -22,7 +22,7 @@ export const ProjectBoardGroup: FC = observer((props) => {
= observer((props) => { e.stopPropagation(); }} /> +
{(isOwner || !isArchived) && ( @@ -186,7 +187,7 @@ const Details: React.FC = observer((props) => { {" "}