File tree Expand file tree Collapse file tree 1 file changed +20
-15
lines changed
npm-packages/dashboard-common/src/elements Expand file tree Collapse file tree 1 file changed +20
-15
lines changed Original file line number Diff line number Diff line change 7
7
DoubleArrowLeftIcon ,
8
8
DoubleArrowRightIcon ,
9
9
} from "@radix-ui/react-icons" ;
10
- import { Tooltip } from "@ui/Tooltip" ;
10
+ import { TooltipSide } from "@ui/Tooltip" ;
11
11
import { Button } from "@ui/Button" ;
12
12
13
13
export type SidebarItem = {
@@ -62,21 +62,23 @@ export function Sidebar({
62
62
< div key = { group . key } className = "flex gap-1 sm:flex-col sm:py-2" >
63
63
{ group . items . map ( ( item ) => (
64
64
< div className = "relative h-[1.875rem]" key = { item . key } >
65
- < Tooltip
66
- tip = { item . tooltip ? item . tooltip : collapsed && item . label }
67
- side = { width > 640 ? "right" : "bottom" }
68
- className = "text-left"
65
+ < SidebarLink
66
+ { ...omit ( item , "key" ) }
67
+ collapsed = { collapsed }
68
+ isActive = { currentPage === item . key }
69
+ disabled = { item . disabled }
70
+ small
71
+ tip = {
72
+ item . tooltip
73
+ ? item . tooltip
74
+ : collapsed
75
+ ? item . label
76
+ : undefined
77
+ }
78
+ tipSide = { width > 640 ? "right" : "bottom" }
69
79
>
70
- < SidebarLink
71
- { ...omit ( item , "key" ) }
72
- collapsed = { collapsed }
73
- isActive = { currentPage === item . key }
74
- disabled = { item . disabled }
75
- small
76
- >
77
- { item . label }
78
- </ SidebarLink >
79
- </ Tooltip >
80
+ { item . label }
81
+ </ SidebarLink >
80
82
</ div >
81
83
) ) }
82
84
</ div >
@@ -114,6 +116,7 @@ export function SidebarLink({
114
116
proBadge,
115
117
small,
116
118
tip,
119
+ tipSide,
117
120
target,
118
121
} : {
119
122
collapsed ?: boolean ;
@@ -126,12 +129,14 @@ export function SidebarLink({
126
129
proBadge ?: boolean ;
127
130
small ?: boolean ;
128
131
tip ?: string ;
132
+ tipSide ?: TooltipSide ;
129
133
target ?: "_blank" ;
130
134
} ) {
131
135
const { query : currentQuery } = useRouter ( ) ;
132
136
return (
133
137
< Button
134
138
tip = { tip }
139
+ tipSide = { tipSide }
135
140
variant = "unstyled"
136
141
href = {
137
142
disabled
You can’t perform that action at this time.
0 commit comments