@@ -14,6 +14,7 @@ import {
1414 SelectTrigger ,
1515 SelectValue ,
1616} from "./ui/select" ;
17+ import { Tooltip , TooltipPopup , TooltipTrigger } from "./ui/tooltip" ;
1718
1819interface BranchToolbarEnvironmentSelectorProps {
1920 autoEnvironmentLabel ?: string | undefined ;
@@ -59,26 +60,30 @@ export const BranchToolbarEnvironmentSelector = memo(function BranchToolbarEnvir
5960 // only thing in the strip.
6061 if ( envLocked || onEnvironmentChange === undefined ) {
6162 return (
62- < span
63- className = "inline-flex h-7 min-w-0 max-w-full items-center gap-1 border border-transparent px-[calc(--spacing(2)-1px)] font-normal text-muted-foreground/70 text-xs sm:h-6"
64- data-composer-context-control
65- >
66- < EnvironmentMachineIcon
67- kind = { activeEnvironment ?. machine ?? "server" }
68- className = "size-3 shrink-0"
69- />
70- < span
71- data-composer-label
72- className = "min-w-0 max-w-[240px] group-data-[compact]/composer-context:max-w-0"
63+ < Tooltip >
64+ < TooltipTrigger
65+ render = { < span /> }
66+ className = "inline-flex h-7 min-w-0 max-w-full items-center gap-1 border border-transparent px-[calc(--spacing(2)-1px)] font-normal text-muted-foreground/70 text-xs sm:h-6"
67+ data-composer-context-control
7368 >
69+ < EnvironmentMachineIcon
70+ kind = { activeEnvironment ?. machine ?? "server" }
71+ className = "size-3 shrink-0"
72+ />
7473 < span
75- data-composer-label-motion
76- className = "block w-full min-w-0 max-w-[240px] truncate transition-opacity duration-180 ease-[cubic-bezier(0.32,0.72,0,1)] group-data-[compact]/composer-context:opacity-0 motion-reduce:transition-none "
74+ data-composer-label
75+ className = "min-w-0 max-w-[240px] group-data-[compact]/composer-context:max-w-0 "
7776 >
78- { activeEnvironment ?. label ?? "Run on" }
77+ < span
78+ data-composer-label-motion
79+ className = "block w-full min-w-0 max-w-[240px] truncate transition-opacity duration-180 ease-[cubic-bezier(0.32,0.72,0,1)] group-data-[compact]/composer-context:opacity-0 motion-reduce:transition-none"
80+ >
81+ { activeEnvironment ?. label ?? "Run on" }
82+ </ span >
7983 </ span >
80- </ span >
81- </ span >
84+ </ TooltipTrigger >
85+ < TooltipPopup > { activeEnvironment ?. label ?? "Run on" } </ TooltipPopup >
86+ </ Tooltip >
8287 ) ;
8388 }
8489
@@ -91,34 +96,41 @@ export const BranchToolbarEnvironmentSelector = memo(function BranchToolbarEnvir
9196 }
9297 items = { environmentItems }
9398 >
94- < SelectTrigger
95- variant = "ghost"
96- size = "xs"
97- className = "min-w-0 max-w-full font-normal text-xs!"
98- aria-label = "Run on"
99- data-composer-shortcut = "composer.host"
100- data-composer-context-control
101- >
102- { autoEnvironmentLabel ? (
103- < ScaleIcon className = "size-3 shrink-0" aria-hidden = "true" />
104- ) : (
105- < EnvironmentMachineIcon
106- kind = { activeEnvironment ?. machine ?? "server" }
107- className = "size-3 shrink-0"
108- />
109- ) }
110- < span
111- data-composer-label
112- className = "min-w-0 max-w-[240px] group-data-[compact]/composer-context:max-w-0"
99+ < Tooltip >
100+ < TooltipTrigger
101+ render = {
102+ < SelectTrigger
103+ variant = "ghost"
104+ size = "xs"
105+ className = "min-w-0 max-w-full font-normal text-xs!"
106+ aria-label = "Run on"
107+ data-composer-shortcut = "composer.host"
108+ data-composer-context-control
109+ />
110+ }
113111 >
112+ { autoEnvironmentLabel ? (
113+ < ScaleIcon className = "size-3 shrink-0" aria-hidden = "true" />
114+ ) : (
115+ < EnvironmentMachineIcon
116+ kind = { activeEnvironment ?. machine ?? "server" }
117+ className = "size-3 shrink-0"
118+ />
119+ ) }
114120 < span
115- data-composer-label-motion
116- className = "block w-full min-w-0 max-w-[240px] truncate transition-opacity duration-180 ease-[cubic-bezier(0.32,0.72,0,1)] group-data-[compact]/composer-context:opacity-0 motion-reduce:transition-none "
121+ data-composer-label
122+ className = "min-w-0 max-w-[240px] group-data-[compact]/composer-context:max-w-0 "
117123 >
118- < SelectValue />
124+ < span
125+ data-composer-label-motion
126+ className = "block w-full min-w-0 max-w-[240px] truncate transition-opacity duration-180 ease-[cubic-bezier(0.32,0.72,0,1)] group-data-[compact]/composer-context:opacity-0 motion-reduce:transition-none"
127+ >
128+ < SelectValue />
129+ </ span >
119130 </ span >
120- </ span >
121- </ SelectTrigger >
131+ </ TooltipTrigger >
132+ < TooltipPopup > { autoEnvironmentLabel ?? activeEnvironment ?. label ?? "Run on" } </ TooltipPopup >
133+ </ Tooltip >
122134 < SelectPopup alignItemWithTrigger = { false } { ...composerFloatingLayerProps } >
123135 < SelectGroup >
124136 < SelectGroupLabel > Run on</ SelectGroupLabel >
0 commit comments