π₯π₯π₯ 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
[WEB-2278] dev: scroll area enhancement (#6612)
Anmol Singh Bhatia075eefe1a5bf
diff --git a/packages/tailwind-config/tailwind.config.js b/packages/tailwind-config/tailwind.config.jsindex 0731894f06..3e34ca1f04 100644--- a/packages/tailwind-config/tailwind.config.js+++ b/packages/tailwind-config/tailwind.config.js@@ -203,6 +203,11 @@ module.exports = {},},backdrop: "rgba(0, 0, 0, 0.25)",+ scrollbar: {+ neutral: "rgba(96, 100, 108, 0.1)",+ hover: "rgba(96, 100, 108, 0.25)",+ active: "rgba(96, 100, 108, 0.7)",+ },},onboarding: {background: {diff --git a/packages/ui/package.json b/packages/ui/package.jsonindex 580225477f..fff80ee84b 100644--- a/packages/ui/package.json+++ b/packages/ui/package.json@@ -34,6 +34,7 @@"@plane/hooks": "*","@plane/utils": "*","@popperjs/core": "^2.11.8",+ "@radix-ui/react-scroll-area": "^1.2.3","clsx": "^2.0.0","emoji-picker-react": "^4.5.16","lodash": "^4.17.21",diff --git a/packages/ui/src/index.ts b/packages/ui/src/index.tsindex 279e19a3e3..f583178ddd 100644--- a/packages/ui/src/index.ts+++ b/packages/ui/src/index.ts@@ -25,6 +25,7 @@ export * from "./popovers";export * from "./tables";export * from "./header";export * from "./row";+export * from "./scroll-area";export * from "./content-wrapper";export * from "./card";export * from "./tag";diff --git a/packages/ui/src/scroll-area.tsx b/packages/ui/src/scroll-area.tsxnew file mode 100644index 0000000000..0f6cc33c63--- /dev/null+++ b/packages/ui/src/scroll-area.tsx@@ -0,0 +1,66 @@+"use client";+import * as RadixScrollArea from "@radix-ui/react-scroll-area";+import React, { FC } from "react";+import { cn } from "../helpers";++type TScrollAreaProps = {+ type?: "auto" | "always" | "scroll" | "hover";+ className?: string;+ scrollHideDelay?: number;+ size?: "sm" | "md" | "lg";+ children: React.ReactNode;+};++const sizeStyles = {+ sm: "p-[0.112rem] data-[orientation=vertical]:w-2.5 data-[orientation=horizontal]:h-2.5",+ md: "p-[0.152rem] data-[orientation=vertical]:w-3 data-[orientation=horizontal]:h-3",+ lg: "p-[0.225rem] data-[orientation=vertical]:w-4 data-[orientation=horizontal]:h-4",+};++const thumbSizeStyles = {+ sm: "before:absolute before:left-1/2 before:top-1/2 before:size-full before:min-h-11 before:min-w-11 before:-translate-x-1/2 before:-translate-y-1/2",+ md: "before:absolute before:left-1/2 before:top-1/2 before:size-full before:min-h-14 before:min-w-14 before:-translate-x-1/2 before:-translate-y-1/2",+ lg: "before:absolute before:left-1/2 before:top-1/2 before:size-full before:min-h-17 before:min-w-17 before:-translate-x-1/2 before:-translate-y-1/2",+};++export const ScrollArea: FC<TScrollAreaProps> = (props) => {+ const { type = "always", className = "", scrollHideDelay = 600, size = "md", children } = props;++ return (+ <RadixScrollArea.Root+ type={type}+ className={cn("group overflow-hidden", className)}+ scrollHideDelay={scrollHideDelay}+ >+ <RadixScrollArea.Viewport className="size-full">{children}</RadixScrollArea.Viewport>+ <RadixScrollArea.Scrollbar+ className={cn(+ "group/track flex touch-none select-none bg-transparent transition-colors duration-[160ms] ease-out",+ sizeStyles[size]+ )}+ orientation="vertical"+ >+ <RadixScrollArea.Thumb+ className={cn(+ "relative flex-1 rounded-[10px] bg-custom-scrollbar-neutral group-hover:bg-custom-scrollbar-hover group-active/track:bg-custom-scrollbar-active",+ thumbSizeStyles[size]+ )}+ />+ </RadixScrollArea.Scrollbar>+ <RadixScrollArea.Scrollbar+ className={cn(+ "group/track flex touch-none select-none bg-transparent transition-colors duration-[160ms] ease-out",+ sizeStyles[size]+ )}+ orientation="horizontal"+ >+ <RadixScrollArea.Thumb+ className={cn(+ "relative flex-1 rounded-[10px] bg-custom-scrollbar-neutral group-hover:bg-custom-scrollbar-hover group-active/track:bg-custom-scrollbar-active",+ thumbSizeStyles[size]+ )}+ />+ </RadixScrollArea.Scrollbar>+ </RadixScrollArea.Root>+ );+};diff --git a/web/core/components/workspace/sidebar/project-navigation.tsx b/web/core/components/workspace/sidebar/project-navigation.tsxindex a8a76ad608..0d500a8a09 100644--- a/web/core/components/workspace/sidebar/project-navigation.tsx+++ b/web/core/components/workspace/sidebar/project-navigation.tsx@@ -154,7 +154,7 @@ export const ProjectNavigation: FC<TProjectItemsProps> = observer((props) => {<SidebarNavItemclassName={`pl-[18px] ${isSidebarCollapsed ? "p-0 size-7 justify-center mx-auto" : ""}`}isActive={- item.key === "issues"+ item.i18n_key === "sidebar.work_items"? pathname.includes(item.href) || pathname.includes(`/${workspaceSlug}/browse/`): pathname.includes(item.href)}diff --git a/yarn.lock b/yarn.lockindex 8acfac5931..f82913e39a 100644--- a/yarn.lock+++ b/yarn.lock@@ -2224,6 +2224,11 @@dependencies:"@opentelemetry/instrumentation" "^0.52.0 || ^0.53.0 || ^0.54.0 || ^0.55.0 || ^0.56.0"+"@radix-ui/[email protected]":+ version "1.1.0"+ resolved "https://registry.yarnpkg.com/@radix-ui/number/-/number-1.1.0.tgz#1e95610461a09cdf8bb05c152e76ca1278d5da46"+ integrity sha512-V3gRzhVNU1ldS5XhAPTom1fOIo4ccrjjJgmE+LI2h/WaFpHmx0MQApT+KZHnx8abG6Avtfcz4WoEciMnpFT3HQ==+"@radix-ui/[email protected]":version "1.1.1"resolved "https://registry.npmjs.org/@radix-ui/primitive/-/primitive-1.1.1.tgz#fc169732d755c7fbad33ba8d0cd7fd10c90dc8e3"@@ -2259,6 +2264,11 @@aria-hidden "^1.2.4"react-remove-scroll "^2.6.3"+"@radix-ui/[email protected]":+ version "1.1.0"+ resolved "https://registry.yarnpkg.com/@radix-ui/react-direction/-/react-direction-1.1.0.tgz#a7d39855f4d077adc2a1922f9c353c5977a09cdc"+ integrity sha512-BUuBvgThEiAXh2DWu93XsT+a3aWrGqolGlqqw5VU1kG7p/ZH2cuDlM1sRLNnY3QcBS69UIz2mcKhMxDsdewhjg==+"@radix-ui/[email protected]":version "1.1.5"resolved "https://registry.npmjs.org/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.1.5.tgz#96dde2be078c694a621e55e047406c58cd5fe774"@@ -2314,6 +2324,21 @@dependencies:"@radix-ui/react-slot" "1.1.2"+"@radix-ui/react-scroll-area@^1.2.3":+ version "1.2.3"+ resolved "https://registry.yarnpkg.com/@radix-ui/react-scroll-area/-/react-scroll-area-1.2.3.tgz#6a9a7897add739ce84b517796ee345d495893d3f"+ integrity sha512-l7+NNBfBYYJa9tNqVcP2AGvxdE3lmE6kFTBXdvHgUaZuy+4wGCL1Cl2AfaR7RKyimj7lZURGLwFO59k4eBnDJQ==+ dependencies:+ "@radix-ui/number" "1.1.0"+ "@radix-ui/primitive" "1.1.1"+ "@radix-ui/react-compose-refs" "1.1.1"+ "@radix-ui/react-context" "1.1.1"+ "@radix-ui/react-direction" "1.1.0"+ "@radix-ui/react-presence" "1.1.2"+ "@radix-ui/react-primitive" "2.0.2"+ "@radix-ui/react-use-callback-ref" "1.1.0"+ "@radix-ui/react-use-layout-effect" "1.1.0"+"@radix-ui/[email protected]", "@radix-ui/react-slot@^1.1.1":version "1.1.2"resolved "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.1.2.tgz#daffff7b2bfe99ade63b5168407680b93c00e1c6"@@ -11387,16 +11412,7 @@ streamx@^2.15.0, streamx@^2.21.0:optionalDependencies:bare-events "^2.2.0"-"string-width-cjs@npm:string-width@^4.2.0":- version "4.2.3"- resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"- integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==- dependencies:- emoji-regex "^8.0.0"- is-fullwidth-code-point "^3.0.0"- strip-ansi "^6.0.1"--string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:+"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:version "4.2.3"resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==@@ -11489,14 +11505,7 @@ string_decoder@^1.1.1, string_decoder@^1.3.0:dependencies:safe-buffer "~5.2.0"-"strip-ansi-cjs@npm:strip-ansi@^6.0.1":- version "6.0.1"- resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"- integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==- dependencies:- ansi-regex "^5.0.1"--strip-ansi@^6.0.0, strip-ansi@^6.0.1:+"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:version "6.0.1"resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==@@ -12724,16 +12733,7 @@ word-wrap@^1.2.5:resolved "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34"integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":- version "7.0.0"- resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"- integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==- dependencies:- ansi-styles "^4.0.0"- string-width "^4.1.0"- strip-ansi "^6.0.0"--wrap-ansi@^7.0.0:+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:version "7.0.0"resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==