diff --git a/web/app/[workspaceSlug]/(projects)/sidebar.tsx b/web/app/[workspaceSlug]/(projects)/sidebar.tsx index 35fbaff4b..3a7db3f36 100644 --- a/web/app/[workspaceSlug]/(projects)/sidebar.tsx +++ b/web/app/[workspaceSlug]/(projects)/sidebar.tsx @@ -1,4 +1,4 @@ -import { FC, useRef } from "react"; +import { FC, useEffect, useRef } from "react"; import { observer } from "mobx-react"; // components import { @@ -15,6 +15,7 @@ import { cn } from "@/helpers/common.helper"; import { useAppTheme } from "@/hooks/store"; import useOutsideClickDetector from "@/hooks/use-outside-click-detector"; // plane web components +import useSize from "@/hooks/use-window-size"; import { SidebarAppSwitcher } from "@/plane-web/components/sidebar"; export interface IAppSidebar {} @@ -22,6 +23,7 @@ export interface IAppSidebar {} export const AppSidebar: FC = observer(() => { // store hooks const { toggleSidebar, sidebarCollapsed } = useAppTheme(); + const windowSize = useSize(); // refs const ref = useRef(null); @@ -33,6 +35,14 @@ export const AppSidebar: FC = observer(() => { } }); + useEffect(() => { + if (windowSize[0] < 768) { + !sidebarCollapsed && toggleSidebar(); + } else { + sidebarCollapsed && toggleSidebar(); + } + }, [windowSize, sidebarCollapsed]); + return (
{ +export const useProjectColumns = () => { // states const [removeMemberModal, setRemoveMemberModal] = useState(null); @@ -71,5 +71,3 @@ const useProjectColumns = () => { ]; return { columns, workspaceSlug, projectId, removeMemberModal, setRemoveMemberModal }; }; - -export default useProjectColumns; diff --git a/web/ce/components/workspace/settings/useMemberColumns.tsx b/web/ce/components/workspace/settings/useMemberColumns.tsx index 8820cf331..3fc7cd4c2 100644 --- a/web/ce/components/workspace/settings/useMemberColumns.tsx +++ b/web/ce/components/workspace/settings/useMemberColumns.tsx @@ -4,7 +4,7 @@ import { AccountTypeColumn, NameColumn, RowData } from "@/components/workspace/s import { EUserWorkspaceRoles } from "@/constants/workspace"; import { useUser } from "@/hooks/store"; -const useMemberColumns = () => { +export const useMemberColumns = () => { // states const [removeMemberModal, setRemoveMemberModal] = useState(null); @@ -65,5 +65,3 @@ const useMemberColumns = () => { ]; return { columns, workspaceSlug, removeMemberModal, setRemoveMemberModal }; }; - -export default useMemberColumns; diff --git a/web/core/components/project/member-list-item.tsx b/web/core/components/project/member-list-item.tsx index 1e3259047..a3d19cd0d 100644 --- a/web/core/components/project/member-list-item.tsx +++ b/web/core/components/project/member-list-item.tsx @@ -11,7 +11,7 @@ import { PROJECT_MEMBER_LEAVE } from "@/constants/event-tracker"; // hooks import { useEventTracker, useMember, useProject, useUser } from "@/hooks/store"; import { useAppRouter } from "@/hooks/use-app-router"; -import useProjectColumns from "@/plane-web/components/projects/settings/useProjectColumns"; +import { useProjectColumns } from "@/plane-web/components/projects/settings/useProjectColumns"; import { IProjectMemberDetails } from "@/store/member/project-member.store"; type Props = { diff --git a/web/core/components/workspace/settings/members-list-item.tsx b/web/core/components/workspace/settings/members-list-item.tsx index 683b39606..2d9f0aad7 100644 --- a/web/core/components/workspace/settings/members-list-item.tsx +++ b/web/core/components/workspace/settings/members-list-item.tsx @@ -12,7 +12,7 @@ import { WORKSPACE_MEMBER_LEAVE } from "@/constants/event-tracker"; // hooks import { useEventTracker, useMember, useUser } from "@/hooks/store"; import { useAppRouter } from "@/hooks/use-app-router"; -import useMemberColumns from "@/plane-web/components/workspace/settings/useMemberColumns"; +import { useMemberColumns } from "@/plane-web/components/workspace/settings/useMemberColumns"; type Props = { memberDetails: (IWorkspaceMember | null)[];