From d6287e5a6093244f97b697954d3256a971d44571 Mon Sep 17 00:00:00 2001 From: Vamsi krishna Date: Mon, 6 Jan 2025 12:37:48 +0530 Subject: [PATCH 1/2] * fix: added tooltips for favorites --- web/core/components/issues/issue-modal/base.tsx | 2 +- .../sidebar/favorites/favorite-folder.tsx | 15 ++++++++++----- .../favorite-items/common/favorite-item-title.tsx | 11 +++++++---- .../sidebar/favorites/favorite-items/root.tsx | 1 + 4 files changed, 19 insertions(+), 10 deletions(-) diff --git a/web/core/components/issues/issue-modal/base.tsx b/web/core/components/issues/issue-modal/base.tsx index a54bf81f6be..090cb41d399 100644 --- a/web/core/components/issues/issue-modal/base.tsx +++ b/web/core/components/issues/issue-modal/base.tsx @@ -3,9 +3,9 @@ import React, { useEffect, useRef, useState } from "react"; import { observer } from "mobx-react"; import { useParams, usePathname } from "next/navigation"; +import { EIssuesStoreType } from "@plane/constants"; import { useTranslation } from "@plane/i18n"; // types -import { EIssuesStoreType } from "@plane/constants"; import type { TBaseIssue, TIssue } from "@plane/types"; // ui import { EModalPosition, EModalWidth, ModalCore, TOAST_TYPE, setToast } from "@plane/ui"; diff --git a/web/core/components/workspace/sidebar/favorites/favorite-folder.tsx b/web/core/components/workspace/sidebar/favorites/favorite-folder.tsx index 8806b2d081e..9c0c4c54bba 100644 --- a/web/core/components/workspace/sidebar/favorites/favorite-folder.tsx +++ b/web/core/components/workspace/sidebar/favorites/favorite-folder.tsx @@ -175,11 +175,16 @@ export const FavoriteFolder: React.FC = (props) => { "justify-center": isSidebarCollapsed, })} > - -
- -
-
+ + +
+ +
+
+
) : ( <> diff --git a/web/core/components/workspace/sidebar/favorites/favorite-items/common/favorite-item-title.tsx b/web/core/components/workspace/sidebar/favorites/favorite-items/common/favorite-item-title.tsx index 98dcb033b58..0a0ed7c114f 100644 --- a/web/core/components/workspace/sidebar/favorites/favorite-items/common/favorite-item-title.tsx +++ b/web/core/components/workspace/sidebar/favorites/favorite-items/common/favorite-item-title.tsx @@ -2,6 +2,7 @@ import React, { FC } from "react"; import { observer } from "mobx-react"; import Link from "next/link"; +import { Tooltip } from "@plane/ui"; import { useAppTheme } from "@/hooks/store"; import { usePlatformOS } from "@/hooks/use-platform-os"; @@ -27,9 +28,11 @@ export const FavoriteItemTitle: FC = observer((props) => { }; return ( - - {icon} - {!isSidebarCollapsed && {title}} - + + + {icon} + {!isSidebarCollapsed && {title}} + + ); }); diff --git a/web/core/components/workspace/sidebar/favorites/favorite-items/root.tsx b/web/core/components/workspace/sidebar/favorites/favorite-items/root.tsx index 49931802e84..e7eef160afd 100644 --- a/web/core/components/workspace/sidebar/favorites/favorite-items/root.tsx +++ b/web/core/components/workspace/sidebar/favorites/favorite-items/root.tsx @@ -151,6 +151,7 @@ export const FavoriteRoot: FC = observer((props) => { /> )} + {isLastChild && } ); From 5da614dfe9c0bdfc5855e0fc3c504ffe7b464f50 Mon Sep 17 00:00:00 2001 From: Vamsi krishna Date: Mon, 6 Jan 2025 12:46:44 +0530 Subject: [PATCH 2/2] chore: code formatting --- .../workspace/sidebar/favorites/favorite-items/root.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/web/core/components/workspace/sidebar/favorites/favorite-items/root.tsx b/web/core/components/workspace/sidebar/favorites/favorite-items/root.tsx index e7eef160afd..49931802e84 100644 --- a/web/core/components/workspace/sidebar/favorites/favorite-items/root.tsx +++ b/web/core/components/workspace/sidebar/favorites/favorite-items/root.tsx @@ -151,7 +151,6 @@ export const FavoriteRoot: FC = observer((props) => { /> )} - {isLastChild && } );