From 725c94c89423d7db86a9ae316c6a5ff345f44365 Mon Sep 17 00:00:00 2001
From: Anmol Singh Bhatia <anmolsinghbhatia@plane.so>
Date: Wed, 7 Aug 2024 17:06:34 +0530
Subject: [PATCH 1/2] fix: user favorties item icon type and alignment

---
 .../sidebar/favorites/favorite-folder.tsx     |  2 +-
 .../sidebar/favorites/favorite-item.tsx       | 26 +++++++++----------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/web/core/components/workspace/sidebar/favorites/favorite-folder.tsx b/web/core/components/workspace/sidebar/favorites/favorite-folder.tsx
index 55ed717e3c3..046bd4f81fc 100644
--- a/web/core/components/workspace/sidebar/favorites/favorite-folder.tsx
+++ b/web/core/components/workspace/sidebar/favorites/favorite-folder.tsx
@@ -240,7 +240,7 @@ export const FavoriteFolder: React.FC<Props> = (props) => {
                             <DragHandle className="bg-transparent" />
                           </button>
                         </Tooltip>
-                        <div className="size-4 grid place-items-center flex-shrink-0">
+                        <div className="size-5 grid place-items-center flex-shrink-0">
                           <FavoriteFolderIcon />
                         </div>
                         <p className="truncate text-sm font-medium text-custom-sidebar-text-200">{favorite.name}</p>
diff --git a/web/core/components/workspace/sidebar/favorites/favorite-item.tsx b/web/core/components/workspace/sidebar/favorites/favorite-item.tsx
index f824fc493f3..ffcffd9db31 100644
--- a/web/core/components/workspace/sidebar/favorites/favorite-item.tsx
+++ b/web/core/components/workspace/sidebar/favorites/favorite-item.tsx
@@ -9,17 +9,9 @@ import { useParams } from "next/navigation";
 import { Briefcase, FileText, Layers, MoreHorizontal, Star } from "lucide-react";
 // ui
 import { IFavorite } from "@plane/types";
-import {
-  ContrastIcon,
-  CustomMenu,
-  DiceIcon,
-  DragHandle,
-  FavoriteFolderIcon,
-  LayersIcon,
-  Logo,
-  Tooltip,
-} from "@plane/ui";
+import { ContrastIcon, CustomMenu, DiceIcon, DragHandle, FavoriteFolderIcon, LayersIcon, Tooltip } from "@plane/ui";
 // components
+import { Logo } from "@/components/common";
 import { SidebarNavItem } from "@/components/sidebar";
 
 // helpers
@@ -70,10 +62,16 @@ export const FavoriteItem = observer(
 
     const getIcon = () => (
       <>
-        <div className="hidden group-hover:block">{ICONS[favorite.entity_type] || <FileText />}</div>
-        <div className="block group-hover:hidden">
+        <div className="hidden group-hover:flex items-center justify-center size-5">
+          {ICONS[favorite.entity_type] || <FileText />}
+        </div>
+        <div className="flex items-center justify-center size-5 group-hover:hidden">
           {favorite.entity_data?.logo_props?.in_use ? (
-            <Logo logo={favorite.entity_data?.logo_props} size={16} type="lucide" />
+            <Logo
+              logo={favorite.entity_data?.logo_props}
+              size={16}
+              type={favorite.entity_type === "project" ? "material" : "lucide"}
+            />
           ) : (
             ICONS[favorite.entity_type] || <FileText />
           )}
@@ -176,7 +174,7 @@ export const FavoriteItem = observer(
             </Tooltip>
 
             <Link href={getLink()} className="flex items-center gap-1.5 truncate">
-              {getIcon()}
+              <div className="flex items-center justify-center size-5">{getIcon()}</div>
               {!sidebarCollapsed && (
                 <span className="text-sm leading-5 font-medium flex-1 truncate">
                   {favorite.entity_data ? favorite.entity_data.name : favorite.name}

From 49325d2c9f4ec8e9ae9c309c7b5a949e3b07f63c Mon Sep 17 00:00:00 2001
From: Anmol Singh Bhatia <anmolsinghbhatia@plane.so>
Date: Wed, 7 Aug 2024 17:42:46 +0530
Subject: [PATCH 2/2] chore: user favorite item clickable area improvement

---
 .../sidebar/favorites/favorite-item.tsx       | 100 +++++++++---------
 1 file changed, 51 insertions(+), 49 deletions(-)

diff --git a/web/core/components/workspace/sidebar/favorites/favorite-item.tsx b/web/core/components/workspace/sidebar/favorites/favorite-item.tsx
index ffcffd9db31..348b5c76e75 100644
--- a/web/core/components/workspace/sidebar/favorites/favorite-item.tsx
+++ b/web/core/components/workspace/sidebar/favorites/favorite-item.tsx
@@ -138,18 +138,27 @@ export const FavoriteItem = observer(
     useOutsideClickDetector(actionSectionRef, () => setIsMenuActive(false));
 
     return (
-      <div ref={elementRef} className="group/project-item">
-        <SidebarNavItem
-          key={favorite.id}
-          className={cn({
-            "bg-custom-sidebar-background-90": isMenuActive,
-            "p-0 size-8 aspect-square justify-center mx-auto": sidebarCollapsed,
-          })}
-        >
+      <>
+        {sidebarCollapsed ? (
+          <div ref={elementRef}>
+            <Link
+              href={getLink()}
+              className={cn(
+                "group/project-item cursor-pointer relative group w-full flex items-center justify-center gap-1.5 rounded px-2 py-1 outline-none text-custom-sidebar-text-200 hover:bg-custom-sidebar-background-90 active:bg-custom-sidebar-background-90 truncate p-0 size-8 aspect-square mx-auto"
+              )}
+            >
+              <span className="flex items-center justify-center size-5">{getIcon()}</span>
+            </Link>
+          </div>
+        ) : (
           <div
-            className={cn("flex justify-between items-center gap-1.5 py-[1px]", {
-              "w-full": !sidebarCollapsed,
-            })}
+            ref={elementRef}
+            className={cn(
+              "group/project-item cursor-pointer relative group flex items-center justify-between w-full gap-1.5 rounded px-2 py-1 outline-none text-custom-sidebar-text-200 hover:bg-custom-sidebar-background-90 active:bg-custom-sidebar-background-90",
+              {
+                "bg-custom-sidebar-background-90": isMenuActive,
+              }
+            )}
           >
             <Tooltip
               isMobile={isMobile}
@@ -164,7 +173,6 @@ export const FavoriteItem = observer(
                   {
                     "cursor-not-allowed opacity-60": favorite.sort_order === null,
                     "cursor-grabbing": isDragging,
-                    "!hidden": sidebarCollapsed,
                   }
                 )}
                 ref={dragHandleRef}
@@ -172,47 +180,41 @@ export const FavoriteItem = observer(
                 <DragHandle className="bg-transparent" />
               </button>
             </Tooltip>
-
-            <Link href={getLink()} className="flex items-center gap-1.5 truncate">
+            <Link href={getLink()} className="flex items-center gap-1.5 truncate w-full">
               <div className="flex items-center justify-center size-5">{getIcon()}</div>
-              {!sidebarCollapsed && (
-                <span className="text-sm leading-5 font-medium flex-1 truncate">
-                  {favorite.entity_data ? favorite.entity_data.name : favorite.name}
-                </span>
-              )}
+              <span className="text-sm leading-5 font-medium flex-1 truncate">
+                {favorite.entity_data ? favorite.entity_data.name : favorite.name}
+              </span>
             </Link>
-
-            {!sidebarCollapsed && (
-              <CustomMenu
-                customButton={
-                  <span
-                    ref={actionSectionRef}
-                    className="grid place-items-center p-0.5 text-custom-sidebar-text-400 hover:bg-custom-sidebar-background-80 rounded"
-                    onClick={() => setIsMenuActive(!isMenuActive)}
-                  >
-                    <MoreHorizontal className="size-4" />
-                  </span>
+            <CustomMenu
+              customButton={
+                <span
+                  ref={actionSectionRef}
+                  className="grid place-items-center p-0.5 text-custom-sidebar-text-400 hover:bg-custom-sidebar-background-80 rounded"
+                  onClick={() => setIsMenuActive(!isMenuActive)}
+                >
+                  <MoreHorizontal className="size-4" />
+                </span>
+              }
+              className={cn(
+                "opacity-0 pointer-events-none flex-shrink-0 group-hover/project-item:opacity-100 group-hover/project-item:pointer-events-auto",
+                {
+                  "opacity-100 pointer-events-auto": isMenuActive,
                 }
-                className={cn(
-                  "opacity-0 pointer-events-none flex-shrink-0 group-hover/project-item:opacity-100 group-hover/project-item:pointer-events-auto",
-                  {
-                    "opacity-100 pointer-events-auto": isMenuActive,
-                  }
-                )}
-                customButtonClassName="grid place-items-center"
-                placement="bottom-start"
-              >
-                <CustomMenu.MenuItem onClick={() => handleRemoveFromFavorites(favorite)}>
-                  <span className="flex items-center justify-start gap-2">
-                    <Star className="h-3.5 w-3.5 fill-yellow-500 stroke-yellow-500" />
-                    <span>Remove from favorites</span>
-                  </span>
-                </CustomMenu.MenuItem>
-              </CustomMenu>
-            )}
+              )}
+              customButtonClassName="grid place-items-center"
+              placement="bottom-start"
+            >
+              <CustomMenu.MenuItem onClick={() => handleRemoveFromFavorites(favorite)}>
+                <span className="flex items-center justify-start gap-2">
+                  <Star className="h-3.5 w-3.5 fill-yellow-500 stroke-yellow-500" />
+                  <span>Remove from favorites</span>
+                </span>
+              </CustomMenu.MenuItem>
+            </CustomMenu>
           </div>
-        </SidebarNavItem>
-      </div>
+        )}
+      </>
     );
   }
 );