Skip to content

armgit / plane

Public Imported from GitHub
0

πŸ”₯πŸ”₯πŸ”₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.

fix: merge conflicts resolved

sriram veeraghanta9cf5348019d6
diff --cc web/components/issues/issue-detail/root.tsx
index 92badf4b25,902ba7c252..1fab25d96c
--- a/web/components/issues/issue-detail/root.tsx
+++ b/web/components/issues/issue-detail/root.tsx
@@@ -16,7 -16,7 +16,8 @@@ import { TIssue } from "@plane/types"
// constants
import { EUserProjectRoles } from "constants/project";
import { EIssuesStoreType } from "constants/issue";
+import { ISSUE_UPDATED, ISSUE_DELETED } from "constants/event-tracker";
+ import { observer } from "mobx-react";
export type TIssueOperations = {
fetch: (workspaceSlug: string, projectId: string, issueId: string) => Promise<void>;
@@@ -357,7 -358,9 +359,10 @@@ export const IssueDetailRoot: FC<TIssue
is_editable={!is_archived && is_editable}
/>
</div>
- <div className="h-full w-1/3 space-y-5 overflow-hidden border-l border-custom-border-300 py-5">
- <div className="h-full w-full sm:w-1/2 md:w-1/3 space-y-5 overflow-hidden border-l border-custom-border-300 py-5 fixed md:relative bg-custom-sidebar-background-100 right-0 z-[5]"
++ <div
++ className="h-full w-full sm:w-1/2 md:w-1/3 space-y-5 overflow-hidden border-l border-custom-border-300 py-5 fixed md:relative bg-custom-sidebar-background-100 right-0 z-[5]"
+ style={themeStore.issueDetailSidebarCollapsed ? { right: `-${window?.innerWidth || 0}px` } : {}}
+ >
<IssueDetailsSidebar
workspaceSlug={workspaceSlug}
projectId={projectId}
diff --cc web/components/issues/issue-layouts/spreadsheet/columns/header-column.tsx
index 73478c6ac8,95982ab25a..b7f432385e
--- a/web/components/issues/issue-layouts/spreadsheet/columns/header-column.tsx
+++ b/web/components/issues/issue-layouts/spreadsheet/columns/header-column.tsx
@@@ -64,8 -62,8 +64,9 @@@ export const HeaderColumn = (props: Pro
</div>
</div>
}
+ onMenuClose={onClose}
placement="bottom-end"
+ closeOnSelect
>
<CustomMenu.MenuItem onClick={() => handleOrderBy(propertyDetails.ascendingOrderKey, property)}>
<div