π₯π₯π₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.
TypeScript boardsbug-trackerdjangodockerganttissue-trackerjirajira-alternativekanbanlinearpostgresqlproduct-managementproject-managementproject-planningpythonreactredistypesciptvitework-management
regression: sidebar toggle button position (#8186)
Aaryan Khandelwal39749106a2a4
diff --git a/apps/web/app/(all)/[workspaceSlug]/(projects)/browse/[workItem]/header.tsx b/apps/web/app/(all)/[workspaceSlug]/(projects)/browse/[workItem]/header.tsxindex e4c68d0642..7d99ed0e22 100644--- a/apps/web/app/(all)/[workspaceSlug]/(projects)/browse/[workItem]/header.tsx+++ b/apps/web/app/(all)/[workspaceSlug]/(projects)/browse/[workItem]/header.tsx@@ -2,9 +2,13 @@ import { observer } from "mobx-react";import { useParams } from "next/navigation";// plane importsimport { Header, Row } from "@plane/ui";+import { cn } from "@plane/utils";// componentsimport { AppHeader } from "@/components/core/app-header";import { TabNavigationRoot } from "@/components/navigation";+import { AppSidebarToggleButton } from "@/components/sidebar/sidebar-toggle-button";+// hooks+import { useAppTheme } from "@/hooks/store/use-app-theme";import { useIssueDetail } from "@/hooks/store/use-issue-detail";import { useProjectNavigationPreferences } from "@/hooks/use-navigation-preferences";// local components@@ -14,6 +18,7 @@ export const ProjectWorkItemDetailsHeader = observer(function ProjectWorkItemDet// routerconst { workspaceSlug, workItem } = useParams();// store hooks+ const { sidebarCollapsed } = useAppTheme();const {issue: { getIssueById, getIssueIdByIdentifier },} = useIssueDetail();@@ -29,8 +34,13 @@ export const ProjectWorkItemDetailsHeader = observer(function ProjectWorkItemDet<div className="z-20"><Row className="h-header flex gap-2 w-full items-center border-b border-custom-border-200 bg-custom-sidebar-background-100"><div className="flex items-center gap-2 divide-x divide-custom-border-100 h-full w-full">- <div className="flex items-center h-full w-full flex-1">- <Header className="h-full">+ <div className="flex items-center gap-2 size-full flex-1">+ {sidebarCollapsed && (+ <div className="shrink-0">+ <AppSidebarToggleButton />+ </div>+ )}+ <Header className={cn("h-full", { "pl-1.5": !sidebarCollapsed })}><Header.LeftItem className="h-full max-w-full"><TabNavigationRootworkspaceSlug={workspaceSlug}diff --git a/apps/web/app/(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/layout.tsx b/apps/web/app/(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/layout.tsxindex fb5098568f..c2c7e22241 100644--- a/apps/web/app/(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/layout.tsx+++ b/apps/web/app/(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/layout.tsx@@ -1,14 +1,24 @@"use client";+import { observer } from "mobx-react";import { Outlet } from "react-router";+// plane importsimport { Header, Row } from "@plane/ui";+import { cn } from "@plane/utils";+// componentsimport { TabNavigationRoot } from "@/components/navigation/tab-navigation-root";+import { AppSidebarToggleButton } from "@/components/sidebar/sidebar-toggle-button";+// hooks+import { useAppTheme } from "@/hooks/store/use-app-theme";import { useProjectNavigationPreferences } from "@/hooks/use-navigation-preferences";+// local importsimport type { Route } from "./+types/layout";-export default function ProjectLayout({ params }: Route.ComponentProps) {+function ProjectLayout({ params }: Route.ComponentProps) {// routerconst { workspaceSlug, projectId } = params;+ // store hooks+ const { sidebarCollapsed } = useAppTheme();// preferencesconst { preferences: projectPreferences } = useProjectNavigationPreferences();@@ -18,9 +28,14 @@ export default function ProjectLayout({ params }: Route.ComponentProps) {<div className="z-20"><Row className="h-header flex gap-2 w-full items-center border-b border-custom-border-200 bg-custom-sidebar-background-100"><div className="flex items-center gap-2 divide-x divide-custom-border-100 h-full w-full">- <div className="flex items-center h-full w-full flex-1">- <Header className="h-full">- <Header.LeftItem className="h-full max-w-full">+ <div className="flex items-center gap-2 size-full flex-1">+ {sidebarCollapsed && (+ <div className="shrink-0">+ <AppSidebarToggleButton />+ </div>+ )}+ <Header className={cn("h-full", { "pl-1.5": !sidebarCollapsed })}>+ <Header.LeftItem className="h-full max-w-full flex items-center gap-2"><TabNavigationRoot workspaceSlug={workspaceSlug} projectId={projectId} /></Header.LeftItem></Header>@@ -33,3 +48,5 @@ export default function ProjectLayout({ params }: Route.ComponentProps) {</>);}++export default observer(ProjectLayout);diff --git a/apps/web/ce/components/common/extended-app-header.tsx b/apps/web/ce/components/common/extended-app-header.tsxindex c72eac175f..f8661d5c20 100644--- a/apps/web/ce/components/common/extended-app-header.tsx+++ b/apps/web/ce/components/common/extended-app-header.tsx@@ -1,16 +1,26 @@import type { ReactNode } from "react";import { observer } from "mobx-react";+import { useParams } from "react-router";+// componentsimport { AppSidebarToggleButton } from "@/components/sidebar/sidebar-toggle-button";+// hooksimport { useAppTheme } from "@/hooks/store/use-app-theme";+import { useProjectNavigationPreferences } from "@/hooks/use-navigation-preferences";export const ExtendedAppHeader = observer(function ExtendedAppHeader(props: { header: ReactNode }) {const { header } = props;+ // params+ const { projectId, workItem } = useParams();+ // preferences+ const { preferences: projectPreferences } = useProjectNavigationPreferences();// store hooksconst { sidebarCollapsed } = useAppTheme();+ // derived values+ const shouldShowSidebarToggleButton = projectPreferences.navigationMode === "accordion" || (!projectId && !workItem);return (<>- {sidebarCollapsed && <AppSidebarToggleButton />}+ {sidebarCollapsed && shouldShowSidebarToggleButton && <AppSidebarToggleButton />}<div className="w-full">{header}</div></>);diff --git a/apps/web/ce/components/workspace/content-wrapper.tsx b/apps/web/ce/components/workspace/content-wrapper.tsxindex c795875f49..462fcd584a 100644--- a/apps/web/ce/components/workspace/content-wrapper.tsx+++ b/apps/web/ce/components/workspace/content-wrapper.tsx@@ -12,7 +12,7 @@ export const WorkspaceContentWrapper = observer(function WorkspaceContentWrapperchildren: React.ReactNode;}) {return (- <div className="flex flex-col relative size-full overflow-hidden bg-custom-background-90 rounded-lg transition-all ease-in-out duration-300">+ <div className="flex flex-col relative size-full overflow-hidden bg-custom-background-90 transition-all ease-in-out duration-300"><TopNavigationRoot /><div className="relative flex size-full overflow-hidden"><AppRailRoot />diff --git a/apps/web/core/components/navigation/tab-navigation-root.tsx b/apps/web/core/components/navigation/tab-navigation-root.tsxindex c18d45128f..a3285fd82b 100644--- a/apps/web/core/components/navigation/tab-navigation-root.tsx+++ b/apps/web/core/components/navigation/tab-navigation-root.tsx@@ -167,7 +167,7 @@ export const TabNavigationRoot: FC<TTabNavigationRootProps> = observer((props) =/>{/* container for the tab navigation */}- <div className="flex items-center gap-3 overflow-hidden pl-1.5 size-full">+ <div className="flex items-center gap-3 overflow-hidden size-full"><div className="flex items-center gap-2 shrink-0"><ProjectHeader project={project} /><div className="shrink-0">