From 568701881eb157cf8149cfe898bbdffd59025079 Mon Sep 17 00:00:00 2001 From: Lakhan Baheti <94619783+1akhanBaheti@users.noreply.github.com> Date: Mon, 18 Mar 2024 19:35:17 +0530 Subject: [PATCH] fix: calendar-layout draggable wrapper condition (#3984) --- .../issues/issue-layouts/calendar/calendar.tsx | 1 + .../issues/issue-layouts/calendar/issue-blocks.tsx | 9 ++++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/web/components/issues/issue-layouts/calendar/calendar.tsx b/web/components/issues/issue-layouts/calendar/calendar.tsx index 96d915149..1aa01e9a1 100644 --- a/web/components/issues/issue-layouts/calendar/calendar.tsx +++ b/web/components/issues/issue-layouts/calendar/calendar.tsx @@ -174,6 +174,7 @@ export const CalendarChart: React.FC = observer((props) => { viewId={viewId} readOnly={readOnly} isDragDisabled + isMobileView /> diff --git a/web/components/issues/issue-layouts/calendar/issue-blocks.tsx b/web/components/issues/issue-layouts/calendar/issue-blocks.tsx index 0cb4e572c..6465a00bf 100644 --- a/web/components/issues/issue-layouts/calendar/issue-blocks.tsx +++ b/web/components/issues/issue-layouts/calendar/issue-blocks.tsx @@ -7,7 +7,6 @@ import { CalendarQuickAddIssueForm, CalendarIssueBlockRoot } from "components/is import { renderFormattedPayloadDate } from "helpers/date-time.helper"; // types import { TIssue, TIssueMap } from "@plane/types"; -import useSize from "hooks/use-window-size"; type Props = { date: Date; @@ -26,6 +25,7 @@ type Props = { addIssuesToView?: (issueIds: string[]) => Promise; viewId?: string; readOnly?: boolean; + isMobileView?: boolean; }; export const CalendarIssueBlocks: React.FC = observer((props) => { @@ -41,11 +41,10 @@ export const CalendarIssueBlocks: React.FC = observer((props) => { addIssuesToView, viewId, readOnly, + isMobileView = false, } = props; // states const [showAllIssues, setShowAllIssues] = useState(false); - // hooks - const [windowWidth] = useSize(); const formattedDatePayload = renderFormattedPayloadDate(date); const totalIssues = issueIdList?.length ?? 0; @@ -54,8 +53,8 @@ export const CalendarIssueBlocks: React.FC = observer((props) => { return ( <> - {issueIdList?.slice(0, showAllIssues || windowWidth <= 768 ? issueIdList.length : 4).map((issueId, index) => - windowWidth > 768 ? ( + {issueIdList?.slice(0, showAllIssues || isMobileView ? issueIdList.length : 4).map((issueId, index) => + !isMobileView ? ( {(provided, snapshot) => (