Merge pull request #1668 from makeplane/sync/ce-ee

Sync: Community Changes

packages/ui/src/form-fields/textarea.tsx

@@ -5,7 +5,7 @@ import { cn } from "../../helpers";
 import { useAutoResizeTextArea } from "../hooks/use-auto-resize-textarea";
 
 export interface TextAreaProps extends React.TextareaHTMLAttributes<HTMLTextAreaElement> {
-  mode?: "primary" | "transparent";
+  mode?: "primary" | "transparent" | "true-transparent";
   textAreaSize?: "xs" | "sm" | "md";
   hasError?: boolean;
   className?: string;
@@ -39,6 +39,7 @@ const TextArea = React.forwardRef<HTMLTextAreaElement, TextAreaProps>((props, re
           "rounded-md border-[0.5px] border-custom-border-200": mode === "primary",
           "focus:ring-theme rounded border-none bg-transparent ring-0 transition-all focus:ring-1":
             mode === "transparent",
+          "rounded border-none bg-transparent ring-0": mode === "true-transparent",
           "px-1.5 py-1": textAreaSize === "xs",
           "px-3 py-2": textAreaSize === "sm",
           "p-3": textAreaSize === "md",

web/core/components/workspace/sidebar/favorites/favorite-items/common/favorite-item-title.tsx

@@ -6,7 +6,6 @@ import { useAppTheme } from "@/hooks/store";
 import { usePlatformOS } from "@/hooks/use-platform-os";
 
 type Props = {
-  projectId: string | null;
   href: string;
   title: string;
   icon: JSX.Element;
@@ -14,7 +13,7 @@ type Props = {
 };
 
 export const FavoriteItemTitle: FC<Props> = observer((props) => {
-  const { projectId, href, title, icon, isSidebarCollapsed } = props;
+  const { href, title, icon, isSidebarCollapsed } = props;
   // store hooks
   const { toggleSidebar } = useAppTheme();
   const { isMobile } = usePlatformOS();
@@ -24,10 +23,6 @@ export const FavoriteItemTitle: FC<Props> = observer((props) => {
     "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";
 
   const handleOnClick = () => {
-    if (projectId) {
-      const projectItem = document.getElementById(`${projectId}`);
-      projectItem?.scrollIntoView({ behavior: "smooth" });
-    }
     if (isMobile) toggleSidebar();
   };
 

web/core/components/workspace/sidebar/favorites/favorite-items/root.tsx

@@ -91,13 +91,7 @@ export const FavoriteRoot: FC<Props> = observer((props) => {
     <>
       <FavoriteItemWrapper elementRef={elementRef} isMenuActive={isMenuActive} sidebarCollapsed={sidebarCollapsed}>
         {!sidebarCollapsed && <FavoriteItemDragHandle isDragging={isDragging} sort_order={favorite.sort_order} />}
-        <FavoriteItemTitle
-          href={itemLink}
-          projectId={favorite.project_id}
-          icon={itemIcon}
-          title={itemTitle}
-          isSidebarCollapsed={!!sidebarCollapsed}
-        />
+        <FavoriteItemTitle href={itemLink} icon={itemIcon} title={itemTitle} isSidebarCollapsed={!!sidebarCollapsed} />
         {!sidebarCollapsed && (
           <FavoriteItemQuickAction
             favorite={favorite}

web/core/components/workspace/sidebar/projects-list-item.tsx

@@ -287,7 +287,6 @@ export const SidebarProjectsListItem: React.FC<Props> = observer((props) => {
 
   useEffect(() => {
     if (URLProjectId === project.id) setIsProjectListOpen(true);
-    else setIsProjectListOpen(false);
   }, [URLProjectId]);
 
   const handleItemClick = () => {