fix(web): clean up composer resize animation#5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rynfar merged 1 commit into from
Aug 11, 2026
Merged

fix(web): clean up composer resize animation #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
95 changes: 85 additions & 10 deletions apps/web/src/components/BranchToolbar.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ import {
HistoryIcon,
MonitorIcon,
} from "lucide-react";
import { memo, useCallback, useEffect, useMemo, useRef, useState } from "react";
import { memo, useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react";

import { useComposerDraftStore, type DraftId } from "../composerDraftStore";
import { useProject, useThread, useThreadShellsForProjectRefs } from "../state/entities";
Expand DownExpand Up@@ -226,16 +226,20 @@ const MobileRunContextSelector = memo(function MobileRunContextSelector({
/**
* Collapse the strip's labels to icons only when the text no longer fits.
*
* Hidden labels stay measurable (they collapse to invisible absolute boxes,
* which keep their natural width), so the required width can be recomputed in
* either state on every pass - no remembered widths that could go stale or
* latch the strip compact. A small hysteresis keeps the boundary from
* flapping between states.
* Hidden labels stay measurable because their inner text keeps its natural
* width while the outer layout box collapses. This lets every pass recompute
* the expanded width without remembered values that could go stale or latch
* the strip compact. A small hysteresis keeps the boundary from flapping.
*/
const COMPACT_EXPAND_HYSTERESIS_PX = 16;
const COMPOSER_CONTEXT_MOTION_DURATION_MS = 180;
const COMPOSER_CONTEXT_MOTION_EASING = "cubic-bezier(0.32, 0.72, 0, 1)";
const COMPOSER_CONTEXT_CONTROL_SELECTOR = "[data-composer-context-control]";

function useLabelsOverflow(element: HTMLDivElement | null): boolean {
const [overflows, setOverflows] = useState(false);
const pendingControlRectsRef = useRef<Map<HTMLElement, DOMRect> | null>(null);
const controlAnimationsRef = useRef(new Map<HTMLElement, Animation>());
// A render-synced mirror instead of useEffectEvent: the compiler memoizes
// the event callback, which left observers reading the first render's null
// element forever.
Expand All@@ -249,7 +253,7 @@ function useLabelsOverflow(element: HTMLDivElement | null): boolean {
if (available === 0) return;
// flex-1 stretches the groups to fill the strip, so their own boxes always
// measure "full". Sum the laid-out content instead, skipping hidden form
// artifacts and absolutely-positioned nodes (the compact-hidden labels).
// artifacts and other out-of-flow nodes.
const contentWidth = (parent: Element): number => {
const gap = Number.parseFloat(getComputedStyle(parent).columnGap) || 0;
let width = 0;
Expand DownExpand Up@@ -291,9 +295,71 @@ function useLabelsOverflow(element: HTMLDivElement | null): boolean {
needed += Math.max(0, textWidth - label.clientWidth);
}
}
setOverflows(compact ? needed > available - COMPACT_EXPAND_HYSTERESIS_PX : needed > available);
const nextOverflows = compact
? needed > available - COMPACT_EXPAND_HYSTERESIS_PX
: needed > available;
if (nextOverflows !== compact) {
pendingControlRectsRef.current = new Map(
Array.from(current.querySelectorAll<HTMLElement>(COMPOSER_CONTEXT_CONTROL_SELECTOR)).map(
(control) => [control, control.getBoundingClientRect()],
),
);
}
setOverflows(nextOverflows);
}, []);

useLayoutEffect(() => {
const previousRects = pendingControlRectsRef.current;
if (!previousRects) return;
pendingControlRectsRef.current = null;

for (const animation of controlAnimationsRef.current.values()) {
animation.cancel();
}
controlAnimationsRef.current.clear();

if (window.matchMedia("(prefers-reduced-motion: reduce)").matches) return;

for (const [control, previousRect] of previousRects) {
if (!control.isConnected) continue;
const nextRect = control.getBoundingClientRect();
const deltaX = previousRect.left - nextRect.left;
const deltaY = previousRect.top - nextRect.top;
if (Math.abs(deltaX) < 0.5 && Math.abs(deltaY) < 0.5) continue;

const animation = control.animate(
[
{ transform: `translate3d(${deltaX}px, ${deltaY}px, 0)` },
{ transform: "translate3d(0, 0, 0)" },
],
{
duration: COMPOSER_CONTEXT_MOTION_DURATION_MS,
easing: COMPOSER_CONTEXT_MOTION_EASING,
fill: "backwards",
},
);
controlAnimationsRef.current.set(control, animation);
animation.addEventListener(
"finish",
() => {
if (controlAnimationsRef.current.get(control) === animation) {
controlAnimationsRef.current.delete(control);
}
},
{ once: true },
);
}
}, [overflows]);

useEffect(
() => () => {
for (const animation of controlAnimationsRef.current.values()) {
animation.cancel();
}
},
[],
);

// Label widths can change without the strip box moving (font family or
// size preferences), so re-measure on every render as well as on resize
// and font loads.
Expand DownExpand Up@@ -414,7 +480,7 @@ export const BranchToolbar = memo(function BranchToolbar({
<div
ref={setStripElement}
data-compact={labelsOverflow ? "" : undefined}
className="chat-composer-context-strip group/composer-context -mt-4 mx-auto flex w-[calc(100%-2.75rem)] max-w-[calc(48rem-2.75rem)] items-center gap-2 ps-1 pe-2 pt-5 pb-1"
className="chat-composer-context-strip group/composer-context -mt-4 mx-auto flex w-[calc(100%-2.75rem)] max-w-[calc(48rem-2.75rem)] items-center gap-2 overflow-x-clip overflow-y-visible ps-1 pe-2 pt-5 pb-1"
>
{/*
Workspace controls and the branch share the left run: they describe the
Expand DownExpand Up@@ -450,7 +516,11 @@ export const BranchToolbar = memo(function BranchToolbar({
{...(showEnvironmentPicker && onEnvironmentChange ? { onEnvironmentChange } : {})}
/>
{showGitControls ? (
<Separator orientation="vertical" className="mx-0.5 h-3.5!" />
<Separator
orientation="vertical"
className="mx-0.5 h-3.5!"
data-composer-context-control
/>
) : null}
</>
)}
Expand All@@ -466,6 +536,11 @@ export const BranchToolbar = memo(function BranchToolbar({
) : null}
</>
)}
{/*
Pylon keeps the branch in the left run beside the workspace controls
rather than pushing it right as upstream does: they describe the same
thing, and Usage sits opposite them.
*/}
{showGitControls ? (
<BranchToolbarBranchSelector
className="min-w-0 justify-start"
Expand Down
14 changes: 11 additions & 3 deletions apps/web/src/components/BranchToolbarBranchSelector.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -714,7 +714,10 @@ export function BranchToolbarBranchSelector({
open={isBranchMenuOpen}
value={resolvedActiveBranch}
>
<div className={cn("flex min-w-0 items-center gap-1", className)}>
<div
className={cn("flex min-w-0 items-center gap-1", className)}
data-composer-context-control
>
{branchPr && branchPrStatus ? (
<Tooltip>
<TooltipTrigger
Expand DownExpand Up@@ -751,9 +754,14 @@ export function BranchToolbarBranchSelector({
<GitBranchIcon className="size-3 shrink-0 opacity-70" />
<span
data-composer-label
className="min-w-0 max-w-[240px] truncate transition-[max-width,opacity] duration-300 ease-out group-data-[compact]/composer-context:max-w-0 group-data-[compact]/composer-context:opacity-0"
className="min-w-0 max-w-[240px] group-data-[compact]/composer-context:max-w-0"
>
{triggerLabel}
<span
data-composer-label-motion
className="block w-full min-w-0 max-w-[240px] origin-left truncate transition-[opacity,transform] duration-180 ease-[cubic-bezier(0.32,0.72,0,1)] group-data-[compact]/composer-context:[transform:translateX(-0.25rem)_scaleX(0.95)] group-data-[compact]/composer-context:opacity-0 motion-reduce:transform-none motion-reduce:transition-opacity"
>
{triggerLabel}
</span>
</span>
<ChevronDownIcon className="size-3 shrink-0 opacity-50" />
</ComboboxTrigger>
Expand Down
15 changes: 12 additions & 3 deletions apps/web/src/components/BranchToolbarEnvModeSelector.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,10 @@ export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSe

if (envLocked) {
return (
<span className="inline-flex h-7 shrink-0 items-center gap-1 border border-transparent px-[calc(--spacing(3)-1px)] text-sm font-medium text-muted-foreground/70 sm:h-6 sm:text-xs">
<span
className="inline-flex h-7 shrink-0 items-center gap-1 border border-transparent px-[calc(--spacing(3)-1px)] text-sm font-medium text-muted-foreground/70 sm:h-6 sm:text-xs"
data-composer-context-control
>
{activeWorktreePath ? (
<>
<FolderGitIcon className="size-3" />
Expand DownExpand Up@@ -84,6 +87,7 @@ export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSe
size="xs"
className="min-w-0 shrink font-medium"
aria-label="Workspace"
data-composer-context-control
>
{effectiveEnvMode === "worktree" ? (
<FolderGit2Icon className="size-3" />
Expand All@@ -94,9 +98,14 @@ export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSe
)}
<span
data-composer-label
className="min-w-0 max-w-[240px] truncate transition-[max-width,opacity] duration-300 ease-out group-data-[compact]/composer-context:max-w-0 group-data-[compact]/composer-context:opacity-0"
className="min-w-0 max-w-[240px] group-data-[compact]/composer-context:max-w-0"
>
<SelectValue />
<span
data-composer-label-motion
className="block w-full min-w-0 max-w-[240px] origin-left truncate transition-[opacity,transform] duration-180 ease-[cubic-bezier(0.32,0.72,0,1)] group-data-[compact]/composer-context:[transform:translateX(-0.25rem)_scaleX(0.95)] group-data-[compact]/composer-context:opacity-0 motion-reduce:transform-none motion-reduce:transition-opacity"
>
<SelectValue />
</span>
</span>
</SelectTrigger>
<SelectPopup>
Expand Down
24 changes: 19 additions & 5 deletions apps/web/src/components/BranchToolbarEnvironmentSelector.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,17 +48,25 @@ export const BranchToolbarEnvironmentSelector = memo(function BranchToolbarEnvir
// only thing in the strip.
if (envLocked || onEnvironmentChange === undefined) {
return (
<span className="inline-flex h-7 min-w-0 max-w-full items-center gap-1 border border-transparent px-[calc(--spacing(3)-1px)] text-sm font-medium text-muted-foreground/70 sm:h-6 sm:text-xs">
<span
className="inline-flex h-7 min-w-0 max-w-full items-center gap-1 border border-transparent px-[calc(--spacing(3)-1px)] text-sm font-medium text-muted-foreground/70 sm:h-6 sm:text-xs"
data-composer-context-control
>
{activeEnvironment?.isPrimary ? (
<MonitorIcon className="size-3 shrink-0" />
) : (
<CloudIcon className="size-3 shrink-0" />
)}
<span
data-composer-label
className="min-w-0 max-w-[240px] truncate transition-[max-width,opacity] duration-300 ease-out group-data-[compact]/composer-context:max-w-0 group-data-[compact]/composer-context:opacity-0"
className="min-w-0 max-w-[240px] group-data-[compact]/composer-context:max-w-0"
>
{activeEnvironment?.label ?? "Run on"}
<span
data-composer-label-motion
className="block w-full min-w-0 max-w-[240px] origin-left truncate transition-[opacity,transform] duration-180 ease-[cubic-bezier(0.32,0.72,0,1)] group-data-[compact]/composer-context:[transform:translateX(-0.25rem)_scaleX(0.95)] group-data-[compact]/composer-context:opacity-0 motion-reduce:transform-none motion-reduce:transition-opacity"
>
{activeEnvironment?.label ?? "Run on"}
</span>
</span>
</span>
);
Expand All@@ -76,6 +84,7 @@ export const BranchToolbarEnvironmentSelector = memo(function BranchToolbarEnvir
size="xs"
className="min-w-0 max-w-full font-medium"
aria-label="Run on"
data-composer-context-control
>
{activeEnvironment?.isPrimary ? (
<MonitorIcon className="size-3 shrink-0" />
Expand All@@ -84,9 +93,14 @@ export const BranchToolbarEnvironmentSelector = memo(function BranchToolbarEnvir
)}
<span
data-composer-label
className="min-w-0 max-w-[240px] truncate transition-[max-width,opacity] duration-300 ease-out group-data-[compact]/composer-context:max-w-0 group-data-[compact]/composer-context:opacity-0"
className="min-w-0 max-w-[240px] group-data-[compact]/composer-context:max-w-0"
>
<SelectValue />
<span
data-composer-label-motion
className="block w-full min-w-0 max-w-[240px] origin-left truncate transition-[opacity,transform] duration-180 ease-[cubic-bezier(0.32,0.72,0,1)] group-data-[compact]/composer-context:[transform:translateX(-0.25rem)_scaleX(0.95)] group-data-[compact]/composer-context:opacity-0 motion-reduce:transform-none motion-reduce:transition-opacity"
>
<SelectValue />
</span>
</span>
</SelectTrigger>
<SelectPopup>
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
fix(web): clean up composer resize animation#5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

rynfar
merged 1 commit into

from

Aug 11, 2026
 Merged


fix(web): clean up composer resize animation
#5
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


95 changes: 85 additions & 10 deletions
apps/web/src/components/BranchToolbar.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ import {
 HistoryIcon,
 MonitorIcon,
} from "lucide-react";
import { memo, useCallback, useEffect, useMemo, useRef, useState } from "react";
import { memo, useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react";

import { useComposerDraftStore, type DraftId } from "../composerDraftStore";
import { useProject, useThread, useThreadShellsForProjectRefs } from "../state/entities";
Expand DownExpand Up@@ -226,16 +226,20 @@ const MobileRunContextSelector = memo(function MobileRunContextSelector({
/**
 * Collapse the strip's labels to icons only when the text no longer fits.
 *
 * Hidden labels stay measurable (they collapse to invisible absolute boxes,
 * which keep their natural width), so the required width can be recomputed in
 * either state on every pass - no remembered widths that could go stale or
 * latch the strip compact. A small hysteresis keeps the boundary from
 * flapping between states.
 * Hidden labels stay measurable because their inner text keeps its natural
 * width while the outer layout box collapses. This lets every pass recompute
 * the expanded width without remembered values that could go stale or latch
 * the strip compact. A small hysteresis keeps the boundary from flapping.
 */
const COMPACT_EXPAND_HYSTERESIS_PX = 16;
const COMPOSER_CONTEXT_MOTION_DURATION_MS = 180;
const COMPOSER_CONTEXT_MOTION_EASING = "cubic-bezier(0.32, 0.72, 0, 1)";
const COMPOSER_CONTEXT_CONTROL_SELECTOR = "[data-composer-context-control]";

function useLabelsOverflow(element: HTMLDivElement | null): boolean {
 const [overflows, setOverflows] = useState(false);
 const pendingControlRectsRef = useRef<Map<HTMLElement, DOMRect> | null>(null);
 const controlAnimationsRef = useRef(new Map<HTMLElement, Animation>());
 // A render-synced mirror instead of useEffectEvent: the compiler memoizes
 // the event callback, which left observers reading the first render's null
 // element forever.
Expand All@@ -249,7 +253,7 @@ function useLabelsOverflow(element: HTMLDivElement | null): boolean {
 if (available === 0) return;
 // flex-1 stretches the groups to fill the strip, so their own boxes always
 // measure "full". Sum the laid-out content instead, skipping hidden form
 // artifacts and absolutely-positioned nodes (the compact-hidden labels).
 // artifacts and other out-of-flow nodes.
 const contentWidth = (parent: Element): number => {
 const gap = Number.parseFloat(getComputedStyle(parent).columnGap) || 0;
 let width = 0;
Expand DownExpand Up@@ -291,9 +295,71 @@ function useLabelsOverflow(element: HTMLDivElement | null): boolean {
 needed += Math.max(0, textWidth - label.clientWidth);
 }
 }
 setOverflows(compact ? needed > available - COMPACT_EXPAND_HYSTERESIS_PX : needed > available);
 const nextOverflows = compact
 ? needed > available - COMPACT_EXPAND_HYSTERESIS_PX
 : needed > available;
 if (nextOverflows !== compact) {
 pendingControlRectsRef.current = new Map(
 Array.from(current.querySelectorAll<HTMLElement>(COMPOSER_CONTEXT_CONTROL_SELECTOR)).map(
 (control) => [control, control.getBoundingClientRect()],
 ),
 );
 }
 setOverflows(nextOverflows);
 }, []);

 useLayoutEffect(() => {
 const previousRects = pendingControlRectsRef.current;
 if (!previousRects) return;
 pendingControlRectsRef.current = null;

 for (const animation of controlAnimationsRef.current.values()) {
 animation.cancel();
 }
 controlAnimationsRef.current.clear();

 if (window.matchMedia("(prefers-reduced-motion: reduce)").matches) return;

 for (const [control, previousRect] of previousRects) {
 if (!control.isConnected) continue;
 const nextRect = control.getBoundingClientRect();
 const deltaX = previousRect.left - nextRect.left;
 const deltaY = previousRect.top - nextRect.top;
 if (Math.abs(deltaX) < 0.5 && Math.abs(deltaY) < 0.5) continue;

 const animation = control.animate(
 [
 { transform: `translate3d(${deltaX}px, ${deltaY}px, 0)` },
 { transform: "translate3d(0, 0, 0)" },
 ],
 {
 duration: COMPOSER_CONTEXT_MOTION_DURATION_MS,
 easing: COMPOSER_CONTEXT_MOTION_EASING,
 fill: "backwards",
 },
 );
 controlAnimationsRef.current.set(control, animation);
 animation.addEventListener(
 "finish",
 () => {
 if (controlAnimationsRef.current.get(control) === animation) {
 controlAnimationsRef.current.delete(control);
 }
 },
 { once: true },
 );
 }
 }, [overflows]);

 useEffect(
 () => () => {
 for (const animation of controlAnimationsRef.current.values()) {
 animation.cancel();
 }
 },
 [],
 );

 // Label widths can change without the strip box moving (font family or
 // size preferences), so re-measure on every render as well as on resize
 // and font loads.
Expand DownExpand Up@@ -414,7 +480,7 @@ export const BranchToolbar = memo(function BranchToolbar({
 <div
 ref={setStripElement}
 data-compact={labelsOverflow ? "" : undefined}
 className="chat-composer-context-strip group/composer-context -mt-4 mx-auto flex w-[calc(100%-2.75rem)] max-w-[calc(48rem-2.75rem)] items-center gap-2 ps-1 pe-2 pt-5 pb-1"
 className="chat-composer-context-strip group/composer-context -mt-4 mx-auto flex w-[calc(100%-2.75rem)] max-w-[calc(48rem-2.75rem)] items-center gap-2 overflow-x-clip overflow-y-visible ps-1 pe-2 pt-5 pb-1"
 >
 {/*
 Workspace controls and the branch share the left run: they describe the
Expand DownExpand Up@@ -450,7 +516,11 @@ export const BranchToolbar = memo(function BranchToolbar({
 {...(showEnvironmentPicker && onEnvironmentChange ? { onEnvironmentChange } : {})}
 />
 {showGitControls ? (
 <Separator orientation="vertical" className="mx-0.5 h-3.5!" />
 <Separator
 orientation="vertical"
 className="mx-0.5 h-3.5!"
 data-composer-context-control
 />
 ) : null}
 </>
 )}
Expand All@@ -466,6 +536,11 @@ export const BranchToolbar = memo(function BranchToolbar({
 ) : null}
 </>
 )}
 {/*
 Pylon keeps the branch in the left run beside the workspace controls
 rather than pushing it right as upstream does: they describe the same
 thing, and Usage sits opposite them.
 */}
 {showGitControls ? (
 <BranchToolbarBranchSelector
 className="min-w-0 justify-start"
Expand Down

14 changes: 11 additions & 3 deletions
apps/web/src/components/BranchToolbarBranchSelector.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -714,7 +714,10 @@ export function BranchToolbarBranchSelector({
 open={isBranchMenuOpen}
 value={resolvedActiveBranch}
 >
 <div className={cn("flex min-w-0 items-center gap-1", className)}>
 <div
 className={cn("flex min-w-0 items-center gap-1", className)}
 data-composer-context-control
 >
 {branchPr && branchPrStatus ? (
 <Tooltip>
 <TooltipTrigger
Expand DownExpand Up@@ -751,9 +754,14 @@ export function BranchToolbarBranchSelector({
 <GitBranchIcon className="size-3 shrink-0 opacity-70" />
 <span
 data-composer-label
 className="min-w-0 max-w-[240px] truncate transition-[max-width,opacity] duration-300 ease-out group-data-[compact]/composer-context:max-w-0 group-data-[compact]/composer-context:opacity-0"
 className="min-w-0 max-w-[240px] group-data-[compact]/composer-context:max-w-0"
 >
 {triggerLabel}
 <span
 data-composer-label-motion
 className="block w-full min-w-0 max-w-[240px] origin-left truncate transition-[opacity,transform] duration-180 ease-[cubic-bezier(0.32,0.72,0,1)] group-data-[compact]/composer-context:[transform:translateX(-0.25rem)_scaleX(0.95)] group-data-[compact]/composer-context:opacity-0 motion-reduce:transform-none motion-reduce:transition-opacity"
 >
 {triggerLabel}
 </span>
 </span>
 <ChevronDownIcon className="size-3 shrink-0 opacity-50" />
 </ComboboxTrigger>
Expand Down

15 changes: 12 additions & 3 deletions
apps/web/src/components/BranchToolbarEnvModeSelector.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,10 @@ export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSe

 if (envLocked) {
 return (
 <span className="inline-flex h-7 shrink-0 items-center gap-1 border border-transparent px-[calc(--spacing(3)-1px)] text-sm font-medium text-muted-foreground/70 sm:h-6 sm:text-xs">
 <span
 className="inline-flex h-7 shrink-0 items-center gap-1 border border-transparent px-[calc(--spacing(3)-1px)] text-sm font-medium text-muted-foreground/70 sm:h-6 sm:text-xs"
 data-composer-context-control
 >
 {activeWorktreePath ? (
 <>
 <FolderGitIcon className="size-3" />
Expand DownExpand Up@@ -84,6 +87,7 @@ export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSe
 size="xs"
 className="min-w-0 shrink font-medium"
 aria-label="Workspace"
 data-composer-context-control
 >
 {effectiveEnvMode === "worktree" ? (
 <FolderGit2Icon className="size-3" />
Expand All@@ -94,9 +98,14 @@ export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSe
 )}
 <span
 data-composer-label
 className="min-w-0 max-w-[240px] truncate transition-[max-width,opacity] duration-300 ease-out group-data-[compact]/composer-context:max-w-0 group-data-[compact]/composer-context:opacity-0"
 className="min-w-0 max-w-[240px] group-data-[compact]/composer-context:max-w-0"
 >
 <SelectValue />
 <span
 data-composer-label-motion
 className="block w-full min-w-0 max-w-[240px] origin-left truncate transition-[opacity,transform] duration-180 ease-[cubic-bezier(0.32,0.72,0,1)] group-data-[compact]/composer-context:[transform:translateX(-0.25rem)_scaleX(0.95)] group-data-[compact]/composer-context:opacity-0 motion-reduce:transform-none motion-reduce:transition-opacity"
 >
 <SelectValue />
 </span>
 </span>
 </SelectTrigger>
 <SelectPopup>
Expand Down

24 changes: 19 additions & 5 deletions
apps/web/src/components/BranchToolbarEnvironmentSelector.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,17 +48,25 @@ export const BranchToolbarEnvironmentSelector = memo(function BranchToolbarEnvir
 // only thing in the strip.
 if (envLocked || onEnvironmentChange === undefined) {
 return (
 <span className="inline-flex h-7 min-w-0 max-w-full items-center gap-1 border border-transparent px-[calc(--spacing(3)-1px)] text-sm font-medium text-muted-foreground/70 sm:h-6 sm:text-xs">
 <span
 className="inline-flex h-7 min-w-0 max-w-full items-center gap-1 border border-transparent px-[calc(--spacing(3)-1px)] text-sm font-medium text-muted-foreground/70 sm:h-6 sm:text-xs"
 data-composer-context-control
 >
 {activeEnvironment?.isPrimary ? (
 <MonitorIcon className="size-3 shrink-0" />
 ) : (
 <CloudIcon className="size-3 shrink-0" />
 )}
 <span
 data-composer-label
 className="min-w-0 max-w-[240px] truncate transition-[max-width,opacity] duration-300 ease-out group-data-[compact]/composer-context:max-w-0 group-data-[compact]/composer-context:opacity-0"
 className="min-w-0 max-w-[240px] group-data-[compact]/composer-context:max-w-0"
 >
 {activeEnvironment?.label ?? "Run on"}
 <span
 data-composer-label-motion
 className="block w-full min-w-0 max-w-[240px] origin-left truncate transition-[opacity,transform] duration-180 ease-[cubic-bezier(0.32,0.72,0,1)] group-data-[compact]/composer-context:[transform:translateX(-0.25rem)_scaleX(0.95)] group-data-[compact]/composer-context:opacity-0 motion-reduce:transform-none motion-reduce:transition-opacity"
 >
 {activeEnvironment?.label ?? "Run on"}
 </span>
 </span>
 </span>
 );
Expand All@@ -76,6 +84,7 @@ export const BranchToolbarEnvironmentSelector = memo(function BranchToolbarEnvir
 size="xs"
 className="min-w-0 max-w-full font-medium"
 aria-label="Run on"
 data-composer-context-control
 >
 {activeEnvironment?.isPrimary ? (
 <MonitorIcon className="size-3 shrink-0" />
Expand All@@ -84,9 +93,14 @@ export const BranchToolbarEnvironmentSelector = memo(function BranchToolbarEnvir
 )}
 <span
 data-composer-label
 className="min-w-0 max-w-[240px] truncate transition-[max-width,opacity] duration-300 ease-out group-data-[compact]/composer-context:max-w-0 group-data-[compact]/composer-context:opacity-0"
 className="min-w-0 max-w-[240px] group-data-[compact]/composer-context:max-w-0"
 >
 <SelectValue />
 <span
 data-composer-label-motion
 className="block w-full min-w-0 max-w-[240px] origin-left truncate transition-[opacity,transform] duration-180 ease-[cubic-bezier(0.32,0.72,0,1)] group-data-[compact]/composer-context:[transform:translateX(-0.25rem)_scaleX(0.95)] group-data-[compact]/composer-context:opacity-0 motion-reduce:transform-none motion-reduce:transition-opacity"
 >
 <SelectValue />
 </span>
 </span>
 </SelectTrigger>
 <SelectPopup>
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix(web): clean up composer resize animation#5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

rynfar
merged 1 commit into

from

Aug 11, 2026
 Merged


fix(web): clean up composer resize animation
#5
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


95 changes: 85 additions & 10 deletions
apps/web/src/components/BranchToolbar.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ import {
 HistoryIcon,
 MonitorIcon,
} from "lucide-react";
import { memo, useCallback, useEffect, useMemo, useRef, useState } from "react";
import { memo, useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react";

import { useComposerDraftStore, type DraftId } from "../composerDraftStore";
import { useProject, useThread, useThreadShellsForProjectRefs } from "../state/entities";
Expand DownExpand Up@@ -226,16 +226,20 @@ const MobileRunContextSelector = memo(function MobileRunContextSelector({
/**
 * Collapse the strip's labels to icons only when the text no longer fits.
 *
 * Hidden labels stay measurable (they collapse to invisible absolute boxes,
 * which keep their natural width), so the required width can be recomputed in
 * either state on every pass - no remembered widths that could go stale or
 * latch the strip compact. A small hysteresis keeps the boundary from
 * flapping between states.
 * Hidden labels stay measurable because their inner text keeps its natural
 * width while the outer layout box collapses. This lets every pass recompute
 * the expanded width without remembered values that could go stale or latch
 * the strip compact. A small hysteresis keeps the boundary from flapping.
 */
const COMPACT_EXPAND_HYSTERESIS_PX = 16;
const COMPOSER_CONTEXT_MOTION_DURATION_MS = 180;
const COMPOSER_CONTEXT_MOTION_EASING = "cubic-bezier(0.32, 0.72, 0, 1)";
const COMPOSER_CONTEXT_CONTROL_SELECTOR = "[data-composer-context-control]";

function useLabelsOverflow(element: HTMLDivElement | null): boolean {
 const [overflows, setOverflows] = useState(false);
 const pendingControlRectsRef = useRef<Map<HTMLElement, DOMRect> | null>(null);
 const controlAnimationsRef = useRef(new Map<HTMLElement, Animation>());
 // A render-synced mirror instead of useEffectEvent: the compiler memoizes
 // the event callback, which left observers reading the first render's null
 // element forever.
Expand All@@ -249,7 +253,7 @@ function useLabelsOverflow(element: HTMLDivElement | null): boolean {
 if (available === 0) return;
 // flex-1 stretches the groups to fill the strip, so their own boxes always
 // measure "full". Sum the laid-out content instead, skipping hidden form
 // artifacts and absolutely-positioned nodes (the compact-hidden labels).
 // artifacts and other out-of-flow nodes.
 const contentWidth = (parent: Element): number => {
 const gap = Number.parseFloat(getComputedStyle(parent).columnGap) || 0;
 let width = 0;
Expand DownExpand Up@@ -291,9 +295,71 @@ function useLabelsOverflow(element: HTMLDivElement | null): boolean {
 needed += Math.max(0, textWidth - label.clientWidth);
 }
 }
 setOverflows(compact ? needed > available - COMPACT_EXPAND_HYSTERESIS_PX : needed > available);
 const nextOverflows = compact
 ? needed > available - COMPACT_EXPAND_HYSTERESIS_PX
 : needed > available;
 if (nextOverflows !== compact) {
 pendingControlRectsRef.current = new Map(
 Array.from(current.querySelectorAll<HTMLElement>(COMPOSER_CONTEXT_CONTROL_SELECTOR)).map(
 (control) => [control, control.getBoundingClientRect()],
 ),
 );
 }
 setOverflows(nextOverflows);
 }, []);

 useLayoutEffect(() => {
 const previousRects = pendingControlRectsRef.current;
 if (!previousRects) return;
 pendingControlRectsRef.current = null;

 for (const animation of controlAnimationsRef.current.values()) {
 animation.cancel();
 }
 controlAnimationsRef.current.clear();

 if (window.matchMedia("(prefers-reduced-motion: reduce)").matches) return;

 for (const [control, previousRect] of previousRects) {
 if (!control.isConnected) continue;
 const nextRect = control.getBoundingClientRect();
 const deltaX = previousRect.left - nextRect.left;
 const deltaY = previousRect.top - nextRect.top;
 if (Math.abs(deltaX) < 0.5 && Math.abs(deltaY) < 0.5) continue;

 const animation = control.animate(
 [
 { transform: `translate3d(${deltaX}px, ${deltaY}px, 0)` },
 { transform: "translate3d(0, 0, 0)" },
 ],
 {
 duration: COMPOSER_CONTEXT_MOTION_DURATION_MS,
 easing: COMPOSER_CONTEXT_MOTION_EASING,
 fill: "backwards",
 },
 );
 controlAnimationsRef.current.set(control, animation);
 animation.addEventListener(
 "finish",
 () => {
 if (controlAnimationsRef.current.get(control) === animation) {
 controlAnimationsRef.current.delete(control);
 }
 },
 { once: true },
 );
 }
 }, [overflows]);

 useEffect(
 () => () => {
 for (const animation of controlAnimationsRef.current.values()) {
 animation.cancel();
 }
 },
 [],
 );

 // Label widths can change without the strip box moving (font family or
 // size preferences), so re-measure on every render as well as on resize
 // and font loads.
Expand DownExpand Up@@ -414,7 +480,7 @@ export const BranchToolbar = memo(function BranchToolbar({
 <div
 ref={setStripElement}
 data-compact={labelsOverflow ? "" : undefined}
 className="chat-composer-context-strip group/composer-context -mt-4 mx-auto flex w-[calc(100%-2.75rem)] max-w-[calc(48rem-2.75rem)] items-center gap-2 ps-1 pe-2 pt-5 pb-1"
 className="chat-composer-context-strip group/composer-context -mt-4 mx-auto flex w-[calc(100%-2.75rem)] max-w-[calc(48rem-2.75rem)] items-center gap-2 overflow-x-clip overflow-y-visible ps-1 pe-2 pt-5 pb-1"
 >
 {/*
 Workspace controls and the branch share the left run: they describe the
Expand DownExpand Up@@ -450,7 +516,11 @@ export const BranchToolbar = memo(function BranchToolbar({
 {...(showEnvironmentPicker && onEnvironmentChange ? { onEnvironmentChange } : {})}
 />
 {showGitControls ? (
 <Separator orientation="vertical" className="mx-0.5 h-3.5!" />
 <Separator
 orientation="vertical"
 className="mx-0.5 h-3.5!"
 data-composer-context-control
 />
 ) : null}
 </>
 )}
Expand All@@ -466,6 +536,11 @@ export const BranchToolbar = memo(function BranchToolbar({
 ) : null}
 </>
 )}
 {/*
 Pylon keeps the branch in the left run beside the workspace controls
 rather than pushing it right as upstream does: they describe the same
 thing, and Usage sits opposite them.
 */}
 {showGitControls ? (
 <BranchToolbarBranchSelector
 className="min-w-0 justify-start"
Expand Down

14 changes: 11 additions & 3 deletions
apps/web/src/components/BranchToolbarBranchSelector.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -714,7 +714,10 @@ export function BranchToolbarBranchSelector({
 open={isBranchMenuOpen}
 value={resolvedActiveBranch}
 >
 <div className={cn("flex min-w-0 items-center gap-1", className)}>
 <div
 className={cn("flex min-w-0 items-center gap-1", className)}
 data-composer-context-control
 >
 {branchPr && branchPrStatus ? (
 <Tooltip>
 <TooltipTrigger
Expand DownExpand Up@@ -751,9 +754,14 @@ export function BranchToolbarBranchSelector({
 <GitBranchIcon className="size-3 shrink-0 opacity-70" />
 <span
 data-composer-label
 className="min-w-0 max-w-[240px] truncate transition-[max-width,opacity] duration-300 ease-out group-data-[compact]/composer-context:max-w-0 group-data-[compact]/composer-context:opacity-0"
 className="min-w-0 max-w-[240px] group-data-[compact]/composer-context:max-w-0"
 >
 {triggerLabel}
 <span
 data-composer-label-motion
 className="block w-full min-w-0 max-w-[240px] origin-left truncate transition-[opacity,transform] duration-180 ease-[cubic-bezier(0.32,0.72,0,1)] group-data-[compact]/composer-context:[transform:translateX(-0.25rem)_scaleX(0.95)] group-data-[compact]/composer-context:opacity-0 motion-reduce:transform-none motion-reduce:transition-opacity"
 >
 {triggerLabel}
 </span>
 </span>
 <ChevronDownIcon className="size-3 shrink-0 opacity-50" />
 </ComboboxTrigger>
Expand Down

15 changes: 12 additions & 3 deletions
apps/web/src/components/BranchToolbarEnvModeSelector.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,10 @@ export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSe

 if (envLocked) {
 return (
 <span className="inline-flex h-7 shrink-0 items-center gap-1 border border-transparent px-[calc(--spacing(3)-1px)] text-sm font-medium text-muted-foreground/70 sm:h-6 sm:text-xs">
 <span
 className="inline-flex h-7 shrink-0 items-center gap-1 border border-transparent px-[calc(--spacing(3)-1px)] text-sm font-medium text-muted-foreground/70 sm:h-6 sm:text-xs"
 data-composer-context-control
 >
 {activeWorktreePath ? (
 <>
 <FolderGitIcon className="size-3" />
Expand DownExpand Up@@ -84,6 +87,7 @@ export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSe
 size="xs"
 className="min-w-0 shrink font-medium"
 aria-label="Workspace"
 data-composer-context-control
 >
 {effectiveEnvMode === "worktree" ? (
 <FolderGit2Icon className="size-3" />
Expand All@@ -94,9 +98,14 @@ export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSe
 )}
 <span
 data-composer-label
 className="min-w-0 max-w-[240px] truncate transition-[max-width,opacity] duration-300 ease-out group-data-[compact]/composer-context:max-w-0 group-data-[compact]/composer-context:opacity-0"
 className="min-w-0 max-w-[240px] group-data-[compact]/composer-context:max-w-0"
 >
 <SelectValue />
 <span
 data-composer-label-motion
 className="block w-full min-w-0 max-w-[240px] origin-left truncate transition-[opacity,transform] duration-180 ease-[cubic-bezier(0.32,0.72,0,1)] group-data-[compact]/composer-context:[transform:translateX(-0.25rem)_scaleX(0.95)] group-data-[compact]/composer-context:opacity-0 motion-reduce:transform-none motion-reduce:transition-opacity"
 >
 <SelectValue />
 </span>
 </span>
 </SelectTrigger>
 <SelectPopup>
Expand Down

24 changes: 19 additions & 5 deletions
apps/web/src/components/BranchToolbarEnvironmentSelector.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,17 +48,25 @@ export const BranchToolbarEnvironmentSelector = memo(function BranchToolbarEnvir
 // only thing in the strip.
 if (envLocked || onEnvironmentChange === undefined) {
 return (
 <span className="inline-flex h-7 min-w-0 max-w-full items-center gap-1 border border-transparent px-[calc(--spacing(3)-1px)] text-sm font-medium text-muted-foreground/70 sm:h-6 sm:text-xs">
 <span
 className="inline-flex h-7 min-w-0 max-w-full items-center gap-1 border border-transparent px-[calc(--spacing(3)-1px)] text-sm font-medium text-muted-foreground/70 sm:h-6 sm:text-xs"
 data-composer-context-control
 >
 {activeEnvironment?.isPrimary ? (
 <MonitorIcon className="size-3 shrink-0" />
 ) : (
 <CloudIcon className="size-3 shrink-0" />
 )}
 <span
 data-composer-label
 className="min-w-0 max-w-[240px] truncate transition-[max-width,opacity] duration-300 ease-out group-data-[compact]/composer-context:max-w-0 group-data-[compact]/composer-context:opacity-0"
 className="min-w-0 max-w-[240px] group-data-[compact]/composer-context:max-w-0"
 >
 {activeEnvironment?.label ?? "Run on"}
 <span
 data-composer-label-motion
 className="block w-full min-w-0 max-w-[240px] origin-left truncate transition-[opacity,transform] duration-180 ease-[cubic-bezier(0.32,0.72,0,1)] group-data-[compact]/composer-context:[transform:translateX(-0.25rem)_scaleX(0.95)] group-data-[compact]/composer-context:opacity-0 motion-reduce:transform-none motion-reduce:transition-opacity"
 >
 {activeEnvironment?.label ?? "Run on"}
 </span>
 </span>
 </span>
 );
Expand All@@ -76,6 +84,7 @@ export const BranchToolbarEnvironmentSelector = memo(function BranchToolbarEnvir
 size="xs"
 className="min-w-0 max-w-full font-medium"
 aria-label="Run on"
 data-composer-context-control
 >
 {activeEnvironment?.isPrimary ? (
 <MonitorIcon className="size-3 shrink-0" />
Expand All@@ -84,9 +93,14 @@ export const BranchToolbarEnvironmentSelector = memo(function BranchToolbarEnvir
 )}
 <span
 data-composer-label
 className="min-w-0 max-w-[240px] truncate transition-[max-width,opacity] duration-300 ease-out group-data-[compact]/composer-context:max-w-0 group-data-[compact]/composer-context:opacity-0"
 className="min-w-0 max-w-[240px] group-data-[compact]/composer-context:max-w-0"
 >
 <SelectValue />
 <span
 data-composer-label-motion
 className="block w-full min-w-0 max-w-[240px] origin-left truncate transition-[opacity,transform] duration-180 ease-[cubic-bezier(0.32,0.72,0,1)] group-data-[compact]/composer-context:[transform:translateX(-0.25rem)_scaleX(0.95)] group-data-[compact]/composer-context:opacity-0 motion-reduce:transform-none motion-reduce:transition-opacity"
 >
 <SelectValue />
 </span>
 </span>
 </SelectTrigger>
 <SelectPopup>
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix(web): clean up composer resize animation#5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

rynfar
merged 1 commit into

from

Aug 11, 2026
 Merged


fix(web): clean up composer resize animation
#5
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


95 changes: 85 additions & 10 deletions
apps/web/src/components/BranchToolbar.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ import {
 HistoryIcon,
 MonitorIcon,
} from "lucide-react";
import { memo, useCallback, useEffect, useMemo, useRef, useState } from "react";
import { memo, useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react";

import { useComposerDraftStore, type DraftId } from "../composerDraftStore";
import { useProject, useThread, useThreadShellsForProjectRefs } from "../state/entities";
Expand DownExpand Up@@ -226,16 +226,20 @@ const MobileRunContextSelector = memo(function MobileRunContextSelector({
/**
 * Collapse the strip's labels to icons only when the text no longer fits.
 *
 * Hidden labels stay measurable (they collapse to invisible absolute boxes,
 * which keep their natural width), so the required width can be recomputed in
 * either state on every pass - no remembered widths that could go stale or
 * latch the strip compact. A small hysteresis keeps the boundary from
 * flapping between states.
 * Hidden labels stay measurable because their inner text keeps its natural
 * width while the outer layout box collapses. This lets every pass recompute
 * the expanded width without remembered values that could go stale or latch
 * the strip compact. A small hysteresis keeps the boundary from flapping.
 */
const COMPACT_EXPAND_HYSTERESIS_PX = 16;
const COMPOSER_CONTEXT_MOTION_DURATION_MS = 180;
const COMPOSER_CONTEXT_MOTION_EASING = "cubic-bezier(0.32, 0.72, 0, 1)";
const COMPOSER_CONTEXT_CONTROL_SELECTOR = "[data-composer-context-control]";

function useLabelsOverflow(element: HTMLDivElement | null): boolean {
 const [overflows, setOverflows] = useState(false);
 const pendingControlRectsRef = useRef<Map<HTMLElement, DOMRect> | null>(null);
 const controlAnimationsRef = useRef(new Map<HTMLElement, Animation>());
 // A render-synced mirror instead of useEffectEvent: the compiler memoizes
 // the event callback, which left observers reading the first render's null
 // element forever.
Expand All@@ -249,7 +253,7 @@ function useLabelsOverflow(element: HTMLDivElement | null): boolean {
 if (available === 0) return;
 // flex-1 stretches the groups to fill the strip, so their own boxes always
 // measure "full". Sum the laid-out content instead, skipping hidden form
 // artifacts and absolutely-positioned nodes (the compact-hidden labels).
 // artifacts and other out-of-flow nodes.
 const contentWidth = (parent: Element): number => {
 const gap = Number.parseFloat(getComputedStyle(parent).columnGap) || 0;
 let width = 0;
Expand DownExpand Up@@ -291,9 +295,71 @@ function useLabelsOverflow(element: HTMLDivElement | null): boolean {
 needed += Math.max(0, textWidth - label.clientWidth);
 }
 }
 setOverflows(compact ? needed > available - COMPACT_EXPAND_HYSTERESIS_PX : needed > available);
 const nextOverflows = compact
 ? needed > available - COMPACT_EXPAND_HYSTERESIS_PX
 : needed > available;
 if (nextOverflows !== compact) {
 pendingControlRectsRef.current = new Map(
 Array.from(current.querySelectorAll<HTMLElement>(COMPOSER_CONTEXT_CONTROL_SELECTOR)).map(
 (control) => [control, control.getBoundingClientRect()],
 ),
 );
 }
 setOverflows(nextOverflows);
 }, []);

 useLayoutEffect(() => {
 const previousRects = pendingControlRectsRef.current;
 if (!previousRects) return;
 pendingControlRectsRef.current = null;

 for (const animation of controlAnimationsRef.current.values()) {
 animation.cancel();
 }
 controlAnimationsRef.current.clear();

 if (window.matchMedia("(prefers-reduced-motion: reduce)").matches) return;

 for (const [control, previousRect] of previousRects) {
 if (!control.isConnected) continue;
 const nextRect = control.getBoundingClientRect();
 const deltaX = previousRect.left - nextRect.left;
 const deltaY = previousRect.top - nextRect.top;
 if (Math.abs(deltaX) < 0.5 && Math.abs(deltaY) < 0.5) continue;

 const animation = control.animate(
 [
 { transform: `translate3d(${deltaX}px, ${deltaY}px, 0)` },
 { transform: "translate3d(0, 0, 0)" },
 ],
 {
 duration: COMPOSER_CONTEXT_MOTION_DURATION_MS,
 easing: COMPOSER_CONTEXT_MOTION_EASING,
 fill: "backwards",
 },
 );
 controlAnimationsRef.current.set(control, animation);
 animation.addEventListener(
 "finish",
 () => {
 if (controlAnimationsRef.current.get(control) === animation) {
 controlAnimationsRef.current.delete(control);
 }
 },
 { once: true },
 );
 }
 }, [overflows]);

 useEffect(
 () => () => {
 for (const animation of controlAnimationsRef.current.values()) {
 animation.cancel();
 }
 },
 [],
 );

 // Label widths can change without the strip box moving (font family or
 // size preferences), so re-measure on every render as well as on resize
 // and font loads.
Expand DownExpand Up@@ -414,7 +480,7 @@ export const BranchToolbar = memo(function BranchToolbar({
 <div
 ref={setStripElement}
 data-compact={labelsOverflow ? "" : undefined}
 className="chat-composer-context-strip group/composer-context -mt-4 mx-auto flex w-[calc(100%-2.75rem)] max-w-[calc(48rem-2.75rem)] items-center gap-2 ps-1 pe-2 pt-5 pb-1"
 className="chat-composer-context-strip group/composer-context -mt-4 mx-auto flex w-[calc(100%-2.75rem)] max-w-[calc(48rem-2.75rem)] items-center gap-2 overflow-x-clip overflow-y-visible ps-1 pe-2 pt-5 pb-1"
 >
 {/*
 Workspace controls and the branch share the left run: they describe the
Expand DownExpand Up@@ -450,7 +516,11 @@ export const BranchToolbar = memo(function BranchToolbar({
 {...(showEnvironmentPicker && onEnvironmentChange ? { onEnvironmentChange } : {})}
 />
 {showGitControls ? (
 <Separator orientation="vertical" className="mx-0.5 h-3.5!" />
 <Separator
 orientation="vertical"
 className="mx-0.5 h-3.5!"
 data-composer-context-control
 />
 ) : null}
 </>
 )}
Expand All@@ -466,6 +536,11 @@ export const BranchToolbar = memo(function BranchToolbar({
 ) : null}
 </>
 )}
 {/*
 Pylon keeps the branch in the left run beside the workspace controls
 rather than pushing it right as upstream does: they describe the same
 thing, and Usage sits opposite them.
 */}
 {showGitControls ? (
 <BranchToolbarBranchSelector
 className="min-w-0 justify-start"
Expand Down

14 changes: 11 additions & 3 deletions
apps/web/src/components/BranchToolbarBranchSelector.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -714,7 +714,10 @@ export function BranchToolbarBranchSelector({
 open={isBranchMenuOpen}
 value={resolvedActiveBranch}
 >
 <div className={cn("flex min-w-0 items-center gap-1", className)}>
 <div
 className={cn("flex min-w-0 items-center gap-1", className)}
 data-composer-context-control
 >
 {branchPr && branchPrStatus ? (
 <Tooltip>
 <TooltipTrigger
Expand DownExpand Up@@ -751,9 +754,14 @@ export function BranchToolbarBranchSelector({
 <GitBranchIcon className="size-3 shrink-0 opacity-70" />
 <span
 data-composer-label
 className="min-w-0 max-w-[240px] truncate transition-[max-width,opacity] duration-300 ease-out group-data-[compact]/composer-context:max-w-0 group-data-[compact]/composer-context:opacity-0"
 className="min-w-0 max-w-[240px] group-data-[compact]/composer-context:max-w-0"
 >
 {triggerLabel}
 <span
 data-composer-label-motion
 className="block w-full min-w-0 max-w-[240px] origin-left truncate transition-[opacity,transform] duration-180 ease-[cubic-bezier(0.32,0.72,0,1)] group-data-[compact]/composer-context:[transform:translateX(-0.25rem)_scaleX(0.95)] group-data-[compact]/composer-context:opacity-0 motion-reduce:transform-none motion-reduce:transition-opacity"
 >
 {triggerLabel}
 </span>
 </span>
 <ChevronDownIcon className="size-3 shrink-0 opacity-50" />
 </ComboboxTrigger>
Expand Down

15 changes: 12 additions & 3 deletions
apps/web/src/components/BranchToolbarEnvModeSelector.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,10 @@ export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSe

 if (envLocked) {
 return (
 <span className="inline-flex h-7 shrink-0 items-center gap-1 border border-transparent px-[calc(--spacing(3)-1px)] text-sm font-medium text-muted-foreground/70 sm:h-6 sm:text-xs">
 <span
 className="inline-flex h-7 shrink-0 items-center gap-1 border border-transparent px-[calc(--spacing(3)-1px)] text-sm font-medium text-muted-foreground/70 sm:h-6 sm:text-xs"
 data-composer-context-control
 >
 {activeWorktreePath ? (
 <>
 <FolderGitIcon className="size-3" />
Expand DownExpand Up@@ -84,6 +87,7 @@ export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSe
 size="xs"
 className="min-w-0 shrink font-medium"
 aria-label="Workspace"
 data-composer-context-control
 >
 {effectiveEnvMode === "worktree" ? (
 <FolderGit2Icon className="size-3" />
Expand All@@ -94,9 +98,14 @@ export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSe
 )}
 <span
 data-composer-label
 className="min-w-0 max-w-[240px] truncate transition-[max-width,opacity] duration-300 ease-out group-data-[compact]/composer-context:max-w-0 group-data-[compact]/composer-context:opacity-0"
 className="min-w-0 max-w-[240px] group-data-[compact]/composer-context:max-w-0"
 >
 <SelectValue />
 <span
 data-composer-label-motion
 className="block w-full min-w-0 max-w-[240px] origin-left truncate transition-[opacity,transform] duration-180 ease-[cubic-bezier(0.32,0.72,0,1)] group-data-[compact]/composer-context:[transform:translateX(-0.25rem)_scaleX(0.95)] group-data-[compact]/composer-context:opacity-0 motion-reduce:transform-none motion-reduce:transition-opacity"
 >
 <SelectValue />
 </span>
 </span>
 </SelectTrigger>
 <SelectPopup>
Expand Down

24 changes: 19 additions & 5 deletions
apps/web/src/components/BranchToolbarEnvironmentSelector.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,17 +48,25 @@ export const BranchToolbarEnvironmentSelector = memo(function BranchToolbarEnvir
 // only thing in the strip.
 if (envLocked || onEnvironmentChange === undefined) {
 return (
 <span className="inline-flex h-7 min-w-0 max-w-full items-center gap-1 border border-transparent px-[calc(--spacing(3)-1px)] text-sm font-medium text-muted-foreground/70 sm:h-6 sm:text-xs">
 <span
 className="inline-flex h-7 min-w-0 max-w-full items-center gap-1 border border-transparent px-[calc(--spacing(3)-1px)] text-sm font-medium text-muted-foreground/70 sm:h-6 sm:text-xs"
 data-composer-context-control
 >
 {activeEnvironment?.isPrimary ? (
 <MonitorIcon className="size-3 shrink-0" />
 ) : (
 <CloudIcon className="size-3 shrink-0" />
 )}
 <span
 data-composer-label
 className="min-w-0 max-w-[240px] truncate transition-[max-width,opacity] duration-300 ease-out group-data-[compact]/composer-context:max-w-0 group-data-[compact]/composer-context:opacity-0"
 className="min-w-0 max-w-[240px] group-data-[compact]/composer-context:max-w-0"
 >
 {activeEnvironment?.label ?? "Run on"}
 <span
 data-composer-label-motion
 className="block w-full min-w-0 max-w-[240px] origin-left truncate transition-[opacity,transform] duration-180 ease-[cubic-bezier(0.32,0.72,0,1)] group-data-[compact]/composer-context:[transform:translateX(-0.25rem)_scaleX(0.95)] group-data-[compact]/composer-context:opacity-0 motion-reduce:transform-none motion-reduce:transition-opacity"
 >
 {activeEnvironment?.label ?? "Run on"}
 </span>
 </span>
 </span>
 );
Expand All@@ -76,6 +84,7 @@ export const BranchToolbarEnvironmentSelector = memo(function BranchToolbarEnvir
 size="xs"
 className="min-w-0 max-w-full font-medium"
 aria-label="Run on"
 data-composer-context-control
 >
 {activeEnvironment?.isPrimary ? (
 <MonitorIcon className="size-3 shrink-0" />
Expand All@@ -84,9 +93,14 @@ export const BranchToolbarEnvironmentSelector = memo(function BranchToolbarEnvir
 )}
 <span
 data-composer-label
 className="min-w-0 max-w-[240px] truncate transition-[max-width,opacity] duration-300 ease-out group-data-[compact]/composer-context:max-w-0 group-data-[compact]/composer-context:opacity-0"
 className="min-w-0 max-w-[240px] group-data-[compact]/composer-context:max-w-0"
 >
 <SelectValue />
 <span
 data-composer-label-motion
 className="block w-full min-w-0 max-w-[240px] origin-left truncate transition-[opacity,transform] duration-180 ease-[cubic-bezier(0.32,0.72,0,1)] group-data-[compact]/composer-context:[transform:translateX(-0.25rem)_scaleX(0.95)] group-data-[compact]/composer-context:opacity-0 motion-reduce:transform-none motion-reduce:transition-opacity"
 >
 <SelectValue />
 </span>
 </span>
 </SelectTrigger>
 <SelectPopup>
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
fix(web): clean up composer resize animation#5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

rynfar
merged 1 commit into

from

Aug 11, 2026
 Merged


fix(web): clean up composer resize animation
#5
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


95 changes: 85 additions & 10 deletions
apps/web/src/components/BranchToolbar.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ import {
 HistoryIcon,
 MonitorIcon,
} from "lucide-react";
import { memo, useCallback, useEffect, useMemo, useRef, useState } from "react";
import { memo, useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react";

import { useComposerDraftStore, type DraftId } from "../composerDraftStore";
import { useProject, useThread, useThreadShellsForProjectRefs } from "../state/entities";
Expand DownExpand Up@@ -226,16 +226,20 @@ const MobileRunContextSelector = memo(function MobileRunContextSelector({
/**
 * Collapse the strip's labels to icons only when the text no longer fits.
 *
 * Hidden labels stay measurable (they collapse to invisible absolute boxes,
 * which keep their natural width), so the required width can be recomputed in
 * either state on every pass - no remembered widths that could go stale or
 * latch the strip compact. A small hysteresis keeps the boundary from
 * flapping between states.
 * Hidden labels stay measurable because their inner text keeps its natural
 * width while the outer layout box collapses. This lets every pass recompute
 * the expanded width without remembered values that could go stale or latch
 * the strip compact. A small hysteresis keeps the boundary from flapping.
 */
const COMPACT_EXPAND_HYSTERESIS_PX = 16;
const COMPOSER_CONTEXT_MOTION_DURATION_MS = 180;
const COMPOSER_CONTEXT_MOTION_EASING = "cubic-bezier(0.32, 0.72, 0, 1)";
const COMPOSER_CONTEXT_CONTROL_SELECTOR = "[data-composer-context-control]";

function useLabelsOverflow(element: HTMLDivElement | null): boolean {
 const [overflows, setOverflows] = useState(false);
 const pendingControlRectsRef = useRef<Map<HTMLElement, DOMRect> | null>(null);
 const controlAnimationsRef = useRef(new Map<HTMLElement, Animation>());
 // A render-synced mirror instead of useEffectEvent: the compiler memoizes
 // the event callback, which left observers reading the first render's null
 // element forever.
Expand All@@ -249,7 +253,7 @@ function useLabelsOverflow(element: HTMLDivElement | null): boolean {
 if (available === 0) return;
 // flex-1 stretches the groups to fill the strip, so their own boxes always
 // measure "full". Sum the laid-out content instead, skipping hidden form
 // artifacts and absolutely-positioned nodes (the compact-hidden labels).
 // artifacts and other out-of-flow nodes.
 const contentWidth = (parent: Element): number => {
 const gap = Number.parseFloat(getComputedStyle(parent).columnGap) || 0;
 let width = 0;
Expand DownExpand Up@@ -291,9 +295,71 @@ function useLabelsOverflow(element: HTMLDivElement | null): boolean {
 needed += Math.max(0, textWidth - label.clientWidth);
 }
 }
 setOverflows(compact ? needed > available - COMPACT_EXPAND_HYSTERESIS_PX : needed > available);
 const nextOverflows = compact
 ? needed > available - COMPACT_EXPAND_HYSTERESIS_PX
 : needed > available;
 if (nextOverflows !== compact) {
 pendingControlRectsRef.current = new Map(
 Array.from(current.querySelectorAll<HTMLElement>(COMPOSER_CONTEXT_CONTROL_SELECTOR)).map(
 (control) => [control, control.getBoundingClientRect()],
 ),
 );
 }
 setOverflows(nextOverflows);
 }, []);

 useLayoutEffect(() => {
 const previousRects = pendingControlRectsRef.current;
 if (!previousRects) return;
 pendingControlRectsRef.current = null;

 for (const animation of controlAnimationsRef.current.values()) {
 animation.cancel();
 }
 controlAnimationsRef.current.clear();

 if (window.matchMedia("(prefers-reduced-motion: reduce)").matches) return;

 for (const [control, previousRect] of previousRects) {
 if (!control.isConnected) continue;
 const nextRect = control.getBoundingClientRect();
 const deltaX = previousRect.left - nextRect.left;
 const deltaY = previousRect.top - nextRect.top;
 if (Math.abs(deltaX) < 0.5 && Math.abs(deltaY) < 0.5) continue;

 const animation = control.animate(
 [
 { transform: `translate3d(${deltaX}px, ${deltaY}px, 0)` },
 { transform: "translate3d(0, 0, 0)" },
 ],
 {
 duration: COMPOSER_CONTEXT_MOTION_DURATION_MS,
 easing: COMPOSER_CONTEXT_MOTION_EASING,
 fill: "backwards",
 },
 );
 controlAnimationsRef.current.set(control, animation);
 animation.addEventListener(
 "finish",
 () => {
 if (controlAnimationsRef.current.get(control) === animation) {
 controlAnimationsRef.current.delete(control);
 }
 },
 { once: true },
 );
 }
 }, [overflows]);

 useEffect(
 () => () => {
 for (const animation of controlAnimationsRef.current.values()) {
 animation.cancel();
 }
 },
 [],
 );

 // Label widths can change without the strip box moving (font family or
 // size preferences), so re-measure on every render as well as on resize
 // and font loads.
Expand DownExpand Up@@ -414,7 +480,7 @@ export const BranchToolbar = memo(function BranchToolbar({
 <div
 ref={setStripElement}
 data-compact={labelsOverflow ? "" : undefined}
 className="chat-composer-context-strip group/composer-context -mt-4 mx-auto flex w-[calc(100%-2.75rem)] max-w-[calc(48rem-2.75rem)] items-center gap-2 ps-1 pe-2 pt-5 pb-1"
 className="chat-composer-context-strip group/composer-context -mt-4 mx-auto flex w-[calc(100%-2.75rem)] max-w-[calc(48rem-2.75rem)] items-center gap-2 overflow-x-clip overflow-y-visible ps-1 pe-2 pt-5 pb-1"
 >
 {/*
 Workspace controls and the branch share the left run: they describe the
Expand DownExpand Up@@ -450,7 +516,11 @@ export const BranchToolbar = memo(function BranchToolbar({
 {...(showEnvironmentPicker && onEnvironmentChange ? { onEnvironmentChange } : {})}
 />
 {showGitControls ? (
 <Separator orientation="vertical" className="mx-0.5 h-3.5!" />
 <Separator
 orientation="vertical"
 className="mx-0.5 h-3.5!"
 data-composer-context-control
 />
 ) : null}
 </>
 )}
Expand All@@ -466,6 +536,11 @@ export const BranchToolbar = memo(function BranchToolbar({
 ) : null}
 </>
 )}
 {/*
 Pylon keeps the branch in the left run beside the workspace controls
 rather than pushing it right as upstream does: they describe the same
 thing, and Usage sits opposite them.
 */}
 {showGitControls ? (
 <BranchToolbarBranchSelector
 className="min-w-0 justify-start"
Expand Down

14 changes: 11 additions & 3 deletions
apps/web/src/components/BranchToolbarBranchSelector.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -714,7 +714,10 @@ export function BranchToolbarBranchSelector({
 open={isBranchMenuOpen}
 value={resolvedActiveBranch}
 >
 <div className={cn("flex min-w-0 items-center gap-1", className)}>
 <div
 className={cn("flex min-w-0 items-center gap-1", className)}
 data-composer-context-control
 >
 {branchPr && branchPrStatus ? (
 <Tooltip>
 <TooltipTrigger
Expand DownExpand Up@@ -751,9 +754,14 @@ export function BranchToolbarBranchSelector({
 <GitBranchIcon className="size-3 shrink-0 opacity-70" />
 <span
 data-composer-label
 className="min-w-0 max-w-[240px] truncate transition-[max-width,opacity] duration-300 ease-out group-data-[compact]/composer-context:max-w-0 group-data-[compact]/composer-context:opacity-0"
 className="min-w-0 max-w-[240px] group-data-[compact]/composer-context:max-w-0"
 >
 {triggerLabel}
 <span
 data-composer-label-motion
 className="block w-full min-w-0 max-w-[240px] origin-left truncate transition-[opacity,transform] duration-180 ease-[cubic-bezier(0.32,0.72,0,1)] group-data-[compact]/composer-context:[transform:translateX(-0.25rem)_scaleX(0.95)] group-data-[compact]/composer-context:opacity-0 motion-reduce:transform-none motion-reduce:transition-opacity"
 >
 {triggerLabel}
 </span>
 </span>
 <ChevronDownIcon className="size-3 shrink-0 opacity-50" />
 </ComboboxTrigger>
Expand Down

15 changes: 12 additions & 3 deletions
apps/web/src/components/BranchToolbarEnvModeSelector.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,10 @@ export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSe

 if (envLocked) {
 return (
 <span className="inline-flex h-7 shrink-0 items-center gap-1 border border-transparent px-[calc(--spacing(3)-1px)] text-sm font-medium text-muted-foreground/70 sm:h-6 sm:text-xs">
 <span
 className="inline-flex h-7 shrink-0 items-center gap-1 border border-transparent px-[calc(--spacing(3)-1px)] text-sm font-medium text-muted-foreground/70 sm:h-6 sm:text-xs"
 data-composer-context-control
 >
 {activeWorktreePath ? (
 <>
 <FolderGitIcon className="size-3" />
Expand DownExpand Up@@ -84,6 +87,7 @@ export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSe
 size="xs"
 className="min-w-0 shrink font-medium"
 aria-label="Workspace"
 data-composer-context-control
 >
 {effectiveEnvMode === "worktree" ? (
 <FolderGit2Icon className="size-3" />
Expand All@@ -94,9 +98,14 @@ export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSe
 )}
 <span
 data-composer-label
 className="min-w-0 max-w-[240px] truncate transition-[max-width,opacity] duration-300 ease-out group-data-[compact]/composer-context:max-w-0 group-data-[compact]/composer-context:opacity-0"
 className="min-w-0 max-w-[240px] group-data-[compact]/composer-context:max-w-0"
 >
 <SelectValue />
 <span
 data-composer-label-motion
 className="block w-full min-w-0 max-w-[240px] origin-left truncate transition-[opacity,transform] duration-180 ease-[cubic-bezier(0.32,0.72,0,1)] group-data-[compact]/composer-context:[transform:translateX(-0.25rem)_scaleX(0.95)] group-data-[compact]/composer-context:opacity-0 motion-reduce:transform-none motion-reduce:transition-opacity"
 >
 <SelectValue />
 </span>
 </span>
 </SelectTrigger>
 <SelectPopup>
Expand Down

24 changes: 19 additions & 5 deletions
apps/web/src/components/BranchToolbarEnvironmentSelector.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,17 +48,25 @@ export const BranchToolbarEnvironmentSelector = memo(function BranchToolbarEnvir
 // only thing in the strip.
 if (envLocked || onEnvironmentChange === undefined) {
 return (
 <span className="inline-flex h-7 min-w-0 max-w-full items-center gap-1 border border-transparent px-[calc(--spacing(3)-1px)] text-sm font-medium text-muted-foreground/70 sm:h-6 sm:text-xs">
 <span
 className="inline-flex h-7 min-w-0 max-w-full items-center gap-1 border border-transparent px-[calc(--spacing(3)-1px)] text-sm font-medium text-muted-foreground/70 sm:h-6 sm:text-xs"
 data-composer-context-control
 >
 {activeEnvironment?.isPrimary ? (
 <MonitorIcon className="size-3 shrink-0" />
 ) : (
 <CloudIcon className="size-3 shrink-0" />
 )}
 <span
 data-composer-label
 className="min-w-0 max-w-[240px] truncate transition-[max-width,opacity] duration-300 ease-out group-data-[compact]/composer-context:max-w-0 group-data-[compact]/composer-context:opacity-0"
 className="min-w-0 max-w-[240px] group-data-[compact]/composer-context:max-w-0"
 >
 {activeEnvironment?.label ?? "Run on"}
 <span
 data-composer-label-motion
 className="block w-full min-w-0 max-w-[240px] origin-left truncate transition-[opacity,transform] duration-180 ease-[cubic-bezier(0.32,0.72,0,1)] group-data-[compact]/composer-context:[transform:translateX(-0.25rem)_scaleX(0.95)] group-data-[compact]/composer-context:opacity-0 motion-reduce:transform-none motion-reduce:transition-opacity"
 >
 {activeEnvironment?.label ?? "Run on"}
 </span>
 </span>
 </span>
 );
Expand All@@ -76,6 +84,7 @@ export const BranchToolbarEnvironmentSelector = memo(function BranchToolbarEnvir
 size="xs"
 className="min-w-0 max-w-full font-medium"
 aria-label="Run on"
 data-composer-context-control
 >
 {activeEnvironment?.isPrimary ? (
 <MonitorIcon className="size-3 shrink-0" />
Expand All@@ -84,9 +93,14 @@ export const BranchToolbarEnvironmentSelector = memo(function BranchToolbarEnvir
 )}
 <span
 data-composer-label
 className="min-w-0 max-w-[240px] truncate transition-[max-width,opacity] duration-300 ease-out group-data-[compact]/composer-context:max-w-0 group-data-[compact]/composer-context:opacity-0"
 className="min-w-0 max-w-[240px] group-data-[compact]/composer-context:max-w-0"
 >
 <SelectValue />
 <span
 data-composer-label-motion
 className="block w-full min-w-0 max-w-[240px] origin-left truncate transition-[opacity,transform] duration-180 ease-[cubic-bezier(0.32,0.72,0,1)] group-data-[compact]/composer-context:[transform:translateX(-0.25rem)_scaleX(0.95)] group-data-[compact]/composer-context:opacity-0 motion-reduce:transform-none motion-reduce:transition-opacity"
 >
 <SelectValue />
 </span>
 </span>
 </SelectTrigger>
 <SelectPopup>
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix(web): clean up composer resize animation#5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

rynfar
merged 1 commit into

from

Aug 11, 2026
 Merged


fix(web): clean up composer resize animation
#5
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


95 changes: 85 additions & 10 deletions
apps/web/src/components/BranchToolbar.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ import {
 HistoryIcon,
 MonitorIcon,
} from "lucide-react";
import { memo, useCallback, useEffect, useMemo, useRef, useState } from "react";
import { memo, useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react";

import { useComposerDraftStore, type DraftId } from "../composerDraftStore";
import { useProject, useThread, useThreadShellsForProjectRefs } from "../state/entities";
Expand DownExpand Up@@ -226,16 +226,20 @@ const MobileRunContextSelector = memo(function MobileRunContextSelector({
/**
 * Collapse the strip's labels to icons only when the text no longer fits.
 *
 * Hidden labels stay measurable (they collapse to invisible absolute boxes,
 * which keep their natural width), so the required width can be recomputed in
 * either state on every pass - no remembered widths that could go stale or
 * latch the strip compact. A small hysteresis keeps the boundary from
 * flapping between states.
 * Hidden labels stay measurable because their inner text keeps its natural
 * width while the outer layout box collapses. This lets every pass recompute
 * the expanded width without remembered values that could go stale or latch
 * the strip compact. A small hysteresis keeps the boundary from flapping.
 */
const COMPACT_EXPAND_HYSTERESIS_PX = 16;
const COMPOSER_CONTEXT_MOTION_DURATION_MS = 180;
const COMPOSER_CONTEXT_MOTION_EASING = "cubic-bezier(0.32, 0.72, 0, 1)";
const COMPOSER_CONTEXT_CONTROL_SELECTOR = "[data-composer-context-control]";

function useLabelsOverflow(element: HTMLDivElement | null): boolean {
 const [overflows, setOverflows] = useState(false);
 const pendingControlRectsRef = useRef<Map<HTMLElement, DOMRect> | null>(null);
 const controlAnimationsRef = useRef(new Map<HTMLElement, Animation>());
 // A render-synced mirror instead of useEffectEvent: the compiler memoizes
 // the event callback, which left observers reading the first render's null
 // element forever.
Expand All@@ -249,7 +253,7 @@ function useLabelsOverflow(element: HTMLDivElement | null): boolean {
 if (available === 0) return;
 // flex-1 stretches the groups to fill the strip, so their own boxes always
 // measure "full". Sum the laid-out content instead, skipping hidden form
 // artifacts and absolutely-positioned nodes (the compact-hidden labels).
 // artifacts and other out-of-flow nodes.
 const contentWidth = (parent: Element): number => {
 const gap = Number.parseFloat(getComputedStyle(parent).columnGap) || 0;
 let width = 0;
Expand DownExpand Up@@ -291,9 +295,71 @@ function useLabelsOverflow(element: HTMLDivElement | null): boolean {
 needed += Math.max(0, textWidth - label.clientWidth);
 }
 }
 setOverflows(compact ? needed > available - COMPACT_EXPAND_HYSTERESIS_PX : needed > available);
 const nextOverflows = compact
 ? needed > available - COMPACT_EXPAND_HYSTERESIS_PX
 : needed > available;
 if (nextOverflows !== compact) {
 pendingControlRectsRef.current = new Map(
 Array.from(current.querySelectorAll<HTMLElement>(COMPOSER_CONTEXT_CONTROL_SELECTOR)).map(
 (control) => [control, control.getBoundingClientRect()],
 ),
 );
 }
 setOverflows(nextOverflows);
 }, []);

 useLayoutEffect(() => {
 const previousRects = pendingControlRectsRef.current;
 if (!previousRects) return;
 pendingControlRectsRef.current = null;

 for (const animation of controlAnimationsRef.current.values()) {
 animation.cancel();
 }
 controlAnimationsRef.current.clear();

 if (window.matchMedia("(prefers-reduced-motion: reduce)").matches) return;

 for (const [control, previousRect] of previousRects) {
 if (!control.isConnected) continue;
 const nextRect = control.getBoundingClientRect();
 const deltaX = previousRect.left - nextRect.left;
 const deltaY = previousRect.top - nextRect.top;
 if (Math.abs(deltaX) < 0.5 && Math.abs(deltaY) < 0.5) continue;

 const animation = control.animate(
 [
 { transform: `translate3d(${deltaX}px, ${deltaY}px, 0)` },
 { transform: "translate3d(0, 0, 0)" },
 ],
 {
 duration: COMPOSER_CONTEXT_MOTION_DURATION_MS,
 easing: COMPOSER_CONTEXT_MOTION_EASING,
 fill: "backwards",
 },
 );
 controlAnimationsRef.current.set(control, animation);
 animation.addEventListener(
 "finish",
 () => {
 if (controlAnimationsRef.current.get(control) === animation) {
 controlAnimationsRef.current.delete(control);
 }
 },
 { once: true },
 );
 }
 }, [overflows]);

 useEffect(
 () => () => {
 for (const animation of controlAnimationsRef.current.values()) {
 animation.cancel();
 }
 },
 [],
 );

 // Label widths can change without the strip box moving (font family or
 // size preferences), so re-measure on every render as well as on resize
 // and font loads.
Expand DownExpand Up@@ -414,7 +480,7 @@ export const BranchToolbar = memo(function BranchToolbar({
 <div
 ref={setStripElement}
 data-compact={labelsOverflow ? "" : undefined}
 className="chat-composer-context-strip group/composer-context -mt-4 mx-auto flex w-[calc(100%-2.75rem)] max-w-[calc(48rem-2.75rem)] items-center gap-2 ps-1 pe-2 pt-5 pb-1"
 className="chat-composer-context-strip group/composer-context -mt-4 mx-auto flex w-[calc(100%-2.75rem)] max-w-[calc(48rem-2.75rem)] items-center gap-2 overflow-x-clip overflow-y-visible ps-1 pe-2 pt-5 pb-1"
 >
 {/*
 Workspace controls and the branch share the left run: they describe the
Expand DownExpand Up@@ -450,7 +516,11 @@ export const BranchToolbar = memo(function BranchToolbar({
 {...(showEnvironmentPicker && onEnvironmentChange ? { onEnvironmentChange } : {})}
 />
 {showGitControls ? (
 <Separator orientation="vertical" className="mx-0.5 h-3.5!" />
 <Separator
 orientation="vertical"
 className="mx-0.5 h-3.5!"
 data-composer-context-control
 />
 ) : null}
 </>
 )}
Expand All@@ -466,6 +536,11 @@ export const BranchToolbar = memo(function BranchToolbar({
 ) : null}
 </>
 )}
 {/*
 Pylon keeps the branch in the left run beside the workspace controls
 rather than pushing it right as upstream does: they describe the same
 thing, and Usage sits opposite them.
 */}
 {showGitControls ? (
 <BranchToolbarBranchSelector
 className="min-w-0 justify-start"
Expand Down

14 changes: 11 additions & 3 deletions
apps/web/src/components/BranchToolbarBranchSelector.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -714,7 +714,10 @@ export function BranchToolbarBranchSelector({
 open={isBranchMenuOpen}
 value={resolvedActiveBranch}
 >
 <div className={cn("flex min-w-0 items-center gap-1", className)}>
 <div
 className={cn("flex min-w-0 items-center gap-1", className)}
 data-composer-context-control
 >
 {branchPr && branchPrStatus ? (
 <Tooltip>
 <TooltipTrigger
Expand DownExpand Up@@ -751,9 +754,14 @@ export function BranchToolbarBranchSelector({
 <GitBranchIcon className="size-3 shrink-0 opacity-70" />
 <span
 data-composer-label
 className="min-w-0 max-w-[240px] truncate transition-[max-width,opacity] duration-300 ease-out group-data-[compact]/composer-context:max-w-0 group-data-[compact]/composer-context:opacity-0"
 className="min-w-0 max-w-[240px] group-data-[compact]/composer-context:max-w-0"
 >
 {triggerLabel}
 <span
 data-composer-label-motion
 className="block w-full min-w-0 max-w-[240px] origin-left truncate transition-[opacity,transform] duration-180 ease-[cubic-bezier(0.32,0.72,0,1)] group-data-[compact]/composer-context:[transform:translateX(-0.25rem)_scaleX(0.95)] group-data-[compact]/composer-context:opacity-0 motion-reduce:transform-none motion-reduce:transition-opacity"
 >
 {triggerLabel}
 </span>
 </span>
 <ChevronDownIcon className="size-3 shrink-0 opacity-50" />
 </ComboboxTrigger>
Expand Down

15 changes: 12 additions & 3 deletions
apps/web/src/components/BranchToolbarEnvModeSelector.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,10 @@ export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSe

 if (envLocked) {
 return (
 <span className="inline-flex h-7 shrink-0 items-center gap-1 border border-transparent px-[calc(--spacing(3)-1px)] text-sm font-medium text-muted-foreground/70 sm:h-6 sm:text-xs">
 <span
 className="inline-flex h-7 shrink-0 items-center gap-1 border border-transparent px-[calc(--spacing(3)-1px)] text-sm font-medium text-muted-foreground/70 sm:h-6 sm:text-xs"
 data-composer-context-control
 >
 {activeWorktreePath ? (
 <>
 <FolderGitIcon className="size-3" />
Expand DownExpand Up@@ -84,6 +87,7 @@ export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSe
 size="xs"
 className="min-w-0 shrink font-medium"
 aria-label="Workspace"
 data-composer-context-control
 >
 {effectiveEnvMode === "worktree" ? (
 <FolderGit2Icon className="size-3" />
Expand All@@ -94,9 +98,14 @@ export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSe
 )}
 <span
 data-composer-label
 className="min-w-0 max-w-[240px] truncate transition-[max-width,opacity] duration-300 ease-out group-data-[compact]/composer-context:max-w-0 group-data-[compact]/composer-context:opacity-0"
 className="min-w-0 max-w-[240px] group-data-[compact]/composer-context:max-w-0"
 >
 <SelectValue />
 <span
 data-composer-label-motion
 className="block w-full min-w-0 max-w-[240px] origin-left truncate transition-[opacity,transform] duration-180 ease-[cubic-bezier(0.32,0.72,0,1)] group-data-[compact]/composer-context:[transform:translateX(-0.25rem)_scaleX(0.95)] group-data-[compact]/composer-context:opacity-0 motion-reduce:transform-none motion-reduce:transition-opacity"
 >
 <SelectValue />
 </span>
 </span>
 </SelectTrigger>
 <SelectPopup>
Expand Down

24 changes: 19 additions & 5 deletions
apps/web/src/components/BranchToolbarEnvironmentSelector.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,17 +48,25 @@ export const BranchToolbarEnvironmentSelector = memo(function BranchToolbarEnvir
 // only thing in the strip.
 if (envLocked || onEnvironmentChange === undefined) {
 return (
 <span className="inline-flex h-7 min-w-0 max-w-full items-center gap-1 border border-transparent px-[calc(--spacing(3)-1px)] text-sm font-medium text-muted-foreground/70 sm:h-6 sm:text-xs">
 <span
 className="inline-flex h-7 min-w-0 max-w-full items-center gap-1 border border-transparent px-[calc(--spacing(3)-1px)] text-sm font-medium text-muted-foreground/70 sm:h-6 sm:text-xs"
 data-composer-context-control
 >
 {activeEnvironment?.isPrimary ? (
 <MonitorIcon className="size-3 shrink-0" />
 ) : (
 <CloudIcon className="size-3 shrink-0" />
 )}
 <span
 data-composer-label
 className="min-w-0 max-w-[240px] truncate transition-[max-width,opacity] duration-300 ease-out group-data-[compact]/composer-context:max-w-0 group-data-[compact]/composer-context:opacity-0"
 className="min-w-0 max-w-[240px] group-data-[compact]/composer-context:max-w-0"
 >
 {activeEnvironment?.label ?? "Run on"}
 <span
 data-composer-label-motion
 className="block w-full min-w-0 max-w-[240px] origin-left truncate transition-[opacity,transform] duration-180 ease-[cubic-bezier(0.32,0.72,0,1)] group-data-[compact]/composer-context:[transform:translateX(-0.25rem)_scaleX(0.95)] group-data-[compact]/composer-context:opacity-0 motion-reduce:transform-none motion-reduce:transition-opacity"
 >
 {activeEnvironment?.label ?? "Run on"}
 </span>
 </span>
 </span>
 );
Expand All@@ -76,6 +84,7 @@ export const BranchToolbarEnvironmentSelector = memo(function BranchToolbarEnvir
 size="xs"
 className="min-w-0 max-w-full font-medium"
 aria-label="Run on"
 data-composer-context-control
 >
 {activeEnvironment?.isPrimary ? (
 <MonitorIcon className="size-3 shrink-0" />
Expand All@@ -84,9 +93,14 @@ export const BranchToolbarEnvironmentSelector = memo(function BranchToolbarEnvir
 )}
 <span
 data-composer-label
 className="min-w-0 max-w-[240px] truncate transition-[max-width,opacity] duration-300 ease-out group-data-[compact]/composer-context:max-w-0 group-data-[compact]/composer-context:opacity-0"
 className="min-w-0 max-w-[240px] group-data-[compact]/composer-context:max-w-0"
 >
 <SelectValue />
 <span
 data-composer-label-motion
 className="block w-full min-w-0 max-w-[240px] origin-left truncate transition-[opacity,transform] duration-180 ease-[cubic-bezier(0.32,0.72,0,1)] group-data-[compact]/composer-context:[transform:translateX(-0.25rem)_scaleX(0.95)] group-data-[compact]/composer-context:opacity-0 motion-reduce:transform-none motion-reduce:transition-opacity"
 >
 <SelectValue />
 </span>
 </span>
 </SelectTrigger>
 <SelectPopup>
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix(web): clean up composer resize animation#5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

rynfar
merged 1 commit into

from

Aug 11, 2026
 Merged


fix(web): clean up composer resize animation
#5
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


95 changes: 85 additions & 10 deletions
apps/web/src/components/BranchToolbar.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ import {
 HistoryIcon,
 MonitorIcon,
} from "lucide-react";
import { memo, useCallback, useEffect, useMemo, useRef, useState } from "react";
import { memo, useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react";

import { useComposerDraftStore, type DraftId } from "../composerDraftStore";
import { useProject, useThread, useThreadShellsForProjectRefs } from "../state/entities";
Expand DownExpand Up@@ -226,16 +226,20 @@ const MobileRunContextSelector = memo(function MobileRunContextSelector({
/**
 * Collapse the strip's labels to icons only when the text no longer fits.
 *
 * Hidden labels stay measurable (they collapse to invisible absolute boxes,
 * which keep their natural width), so the required width can be recomputed in
 * either state on every pass - no remembered widths that could go stale or
 * latch the strip compact. A small hysteresis keeps the boundary from
 * flapping between states.
 * Hidden labels stay measurable because their inner text keeps its natural
 * width while the outer layout box collapses. This lets every pass recompute
 * the expanded width without remembered values that could go stale or latch
 * the strip compact. A small hysteresis keeps the boundary from flapping.
 */
const COMPACT_EXPAND_HYSTERESIS_PX = 16;
const COMPOSER_CONTEXT_MOTION_DURATION_MS = 180;
const COMPOSER_CONTEXT_MOTION_EASING = "cubic-bezier(0.32, 0.72, 0, 1)";
const COMPOSER_CONTEXT_CONTROL_SELECTOR = "[data-composer-context-control]";

function useLabelsOverflow(element: HTMLDivElement | null): boolean {
 const [overflows, setOverflows] = useState(false);
 const pendingControlRectsRef = useRef<Map<HTMLElement, DOMRect> | null>(null);
 const controlAnimationsRef = useRef(new Map<HTMLElement, Animation>());
 // A render-synced mirror instead of useEffectEvent: the compiler memoizes
 // the event callback, which left observers reading the first render's null
 // element forever.
Expand All@@ -249,7 +253,7 @@ function useLabelsOverflow(element: HTMLDivElement | null): boolean {
 if (available === 0) return;
 // flex-1 stretches the groups to fill the strip, so their own boxes always
 // measure "full". Sum the laid-out content instead, skipping hidden form
 // artifacts and absolutely-positioned nodes (the compact-hidden labels).
 // artifacts and other out-of-flow nodes.
 const contentWidth = (parent: Element): number => {
 const gap = Number.parseFloat(getComputedStyle(parent).columnGap) || 0;
 let width = 0;
Expand DownExpand Up@@ -291,9 +295,71 @@ function useLabelsOverflow(element: HTMLDivElement | null): boolean {
 needed += Math.max(0, textWidth - label.clientWidth);
 }
 }
 setOverflows(compact ? needed > available - COMPACT_EXPAND_HYSTERESIS_PX : needed > available);
 const nextOverflows = compact
 ? needed > available - COMPACT_EXPAND_HYSTERESIS_PX
 : needed > available;
 if (nextOverflows !== compact) {
 pendingControlRectsRef.current = new Map(
 Array.from(current.querySelectorAll<HTMLElement>(COMPOSER_CONTEXT_CONTROL_SELECTOR)).map(
 (control) => [control, control.getBoundingClientRect()],
 ),
 );
 }
 setOverflows(nextOverflows);
 }, []);

 useLayoutEffect(() => {
 const previousRects = pendingControlRectsRef.current;
 if (!previousRects) return;
 pendingControlRectsRef.current = null;

 for (const animation of controlAnimationsRef.current.values()) {
 animation.cancel();
 }
 controlAnimationsRef.current.clear();

 if (window.matchMedia("(prefers-reduced-motion: reduce)").matches) return;

 for (const [control, previousRect] of previousRects) {
 if (!control.isConnected) continue;
 const nextRect = control.getBoundingClientRect();
 const deltaX = previousRect.left - nextRect.left;
 const deltaY = previousRect.top - nextRect.top;
 if (Math.abs(deltaX) < 0.5 && Math.abs(deltaY) < 0.5) continue;

 const animation = control.animate(
 [
 { transform: `translate3d(${deltaX}px, ${deltaY}px, 0)` },
 { transform: "translate3d(0, 0, 0)" },
 ],
 {
 duration: COMPOSER_CONTEXT_MOTION_DURATION_MS,
 easing: COMPOSER_CONTEXT_MOTION_EASING,
 fill: "backwards",
 },
 );
 controlAnimationsRef.current.set(control, animation);
 animation.addEventListener(
 "finish",
 () => {
 if (controlAnimationsRef.current.get(control) === animation) {
 controlAnimationsRef.current.delete(control);
 }
 },
 { once: true },
 );
 }
 }, [overflows]);

 useEffect(
 () => () => {
 for (const animation of controlAnimationsRef.current.values()) {
 animation.cancel();
 }
 },
 [],
 );

 // Label widths can change without the strip box moving (font family or
 // size preferences), so re-measure on every render as well as on resize
 // and font loads.
Expand DownExpand Up@@ -414,7 +480,7 @@ export const BranchToolbar = memo(function BranchToolbar({
 <div
 ref={setStripElement}
 data-compact={labelsOverflow ? "" : undefined}
 className="chat-composer-context-strip group/composer-context -mt-4 mx-auto flex w-[calc(100%-2.75rem)] max-w-[calc(48rem-2.75rem)] items-center gap-2 ps-1 pe-2 pt-5 pb-1"
 className="chat-composer-context-strip group/composer-context -mt-4 mx-auto flex w-[calc(100%-2.75rem)] max-w-[calc(48rem-2.75rem)] items-center gap-2 overflow-x-clip overflow-y-visible ps-1 pe-2 pt-5 pb-1"
 >
 {/*
 Workspace controls and the branch share the left run: they describe the
Expand DownExpand Up@@ -450,7 +516,11 @@ export const BranchToolbar = memo(function BranchToolbar({
 {...(showEnvironmentPicker && onEnvironmentChange ? { onEnvironmentChange } : {})}
 />
 {showGitControls ? (
 <Separator orientation="vertical" className="mx-0.5 h-3.5!" />
 <Separator
 orientation="vertical"
 className="mx-0.5 h-3.5!"
 data-composer-context-control
 />
 ) : null}
 </>
 )}
Expand All@@ -466,6 +536,11 @@ export const BranchToolbar = memo(function BranchToolbar({
 ) : null}
 </>
 )}
 {/*
 Pylon keeps the branch in the left run beside the workspace controls
 rather than pushing it right as upstream does: they describe the same
 thing, and Usage sits opposite them.
 */}
 {showGitControls ? (
 <BranchToolbarBranchSelector
 className="min-w-0 justify-start"
Expand Down

14 changes: 11 additions & 3 deletions
apps/web/src/components/BranchToolbarBranchSelector.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -714,7 +714,10 @@ export function BranchToolbarBranchSelector({
 open={isBranchMenuOpen}
 value={resolvedActiveBranch}
 >
 <div className={cn("flex min-w-0 items-center gap-1", className)}>
 <div
 className={cn("flex min-w-0 items-center gap-1", className)}
 data-composer-context-control
 >
 {branchPr && branchPrStatus ? (
 <Tooltip>
 <TooltipTrigger
Expand DownExpand Up@@ -751,9 +754,14 @@ export function BranchToolbarBranchSelector({
 <GitBranchIcon className="size-3 shrink-0 opacity-70" />
 <span
 data-composer-label
 className="min-w-0 max-w-[240px] truncate transition-[max-width,opacity] duration-300 ease-out group-data-[compact]/composer-context:max-w-0 group-data-[compact]/composer-context:opacity-0"
 className="min-w-0 max-w-[240px] group-data-[compact]/composer-context:max-w-0"
 >
 {triggerLabel}
 <span
 data-composer-label-motion
 className="block w-full min-w-0 max-w-[240px] origin-left truncate transition-[opacity,transform] duration-180 ease-[cubic-bezier(0.32,0.72,0,1)] group-data-[compact]/composer-context:[transform:translateX(-0.25rem)_scaleX(0.95)] group-data-[compact]/composer-context:opacity-0 motion-reduce:transform-none motion-reduce:transition-opacity"
 >
 {triggerLabel}
 </span>
 </span>
 <ChevronDownIcon className="size-3 shrink-0 opacity-50" />
 </ComboboxTrigger>
Expand Down

15 changes: 12 additions & 3 deletions
apps/web/src/components/BranchToolbarEnvModeSelector.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,10 @@ export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSe

 if (envLocked) {
 return (
 <span className="inline-flex h-7 shrink-0 items-center gap-1 border border-transparent px-[calc(--spacing(3)-1px)] text-sm font-medium text-muted-foreground/70 sm:h-6 sm:text-xs">
 <span
 className="inline-flex h-7 shrink-0 items-center gap-1 border border-transparent px-[calc(--spacing(3)-1px)] text-sm font-medium text-muted-foreground/70 sm:h-6 sm:text-xs"
 data-composer-context-control
 >
 {activeWorktreePath ? (
 <>
 <FolderGitIcon className="size-3" />
Expand DownExpand Up@@ -84,6 +87,7 @@ export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSe
 size="xs"
 className="min-w-0 shrink font-medium"
 aria-label="Workspace"
 data-composer-context-control
 >
 {effectiveEnvMode === "worktree" ? (
 <FolderGit2Icon className="size-3" />
Expand All@@ -94,9 +98,14 @@ export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSe
 )}
 <span
 data-composer-label
 className="min-w-0 max-w-[240px] truncate transition-[max-width,opacity] duration-300 ease-out group-data-[compact]/composer-context:max-w-0 group-data-[compact]/composer-context:opacity-0"
 className="min-w-0 max-w-[240px] group-data-[compact]/composer-context:max-w-0"
 >
 <SelectValue />
 <span
 data-composer-label-motion
 className="block w-full min-w-0 max-w-[240px] origin-left truncate transition-[opacity,transform] duration-180 ease-[cubic-bezier(0.32,0.72,0,1)] group-data-[compact]/composer-context:[transform:translateX(-0.25rem)_scaleX(0.95)] group-data-[compact]/composer-context:opacity-0 motion-reduce:transform-none motion-reduce:transition-opacity"
 >
 <SelectValue />
 </span>
 </span>
 </SelectTrigger>
 <SelectPopup>
Expand Down

24 changes: 19 additions & 5 deletions
apps/web/src/components/BranchToolbarEnvironmentSelector.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,17 +48,25 @@ export const BranchToolbarEnvironmentSelector = memo(function BranchToolbarEnvir
 // only thing in the strip.
 if (envLocked || onEnvironmentChange === undefined) {
 return (
 <span className="inline-flex h-7 min-w-0 max-w-full items-center gap-1 border border-transparent px-[calc(--spacing(3)-1px)] text-sm font-medium text-muted-foreground/70 sm:h-6 sm:text-xs">
 <span
 className="inline-flex h-7 min-w-0 max-w-full items-center gap-1 border border-transparent px-[calc(--spacing(3)-1px)] text-sm font-medium text-muted-foreground/70 sm:h-6 sm:text-xs"
 data-composer-context-control
 >
 {activeEnvironment?.isPrimary ? (
 <MonitorIcon className="size-3 shrink-0" />
 ) : (
 <CloudIcon className="size-3 shrink-0" />
 )}
 <span
 data-composer-label
 className="min-w-0 max-w-[240px] truncate transition-[max-width,opacity] duration-300 ease-out group-data-[compact]/composer-context:max-w-0 group-data-[compact]/composer-context:opacity-0"
 className="min-w-0 max-w-[240px] group-data-[compact]/composer-context:max-w-0"
 >
 {activeEnvironment?.label ?? "Run on"}
 <span
 data-composer-label-motion
 className="block w-full min-w-0 max-w-[240px] origin-left truncate transition-[opacity,transform] duration-180 ease-[cubic-bezier(0.32,0.72,0,1)] group-data-[compact]/composer-context:[transform:translateX(-0.25rem)_scaleX(0.95)] group-data-[compact]/composer-context:opacity-0 motion-reduce:transform-none motion-reduce:transition-opacity"
 >
 {activeEnvironment?.label ?? "Run on"}
 </span>
 </span>
 </span>
 );
Expand All@@ -76,6 +84,7 @@ export const BranchToolbarEnvironmentSelector = memo(function BranchToolbarEnvir
 size="xs"
 className="min-w-0 max-w-full font-medium"
 aria-label="Run on"
 data-composer-context-control
 >
 {activeEnvironment?.isPrimary ? (
 <MonitorIcon className="size-3 shrink-0" />
Expand All@@ -84,9 +93,14 @@ export const BranchToolbarEnvironmentSelector = memo(function BranchToolbarEnvir
 )}
 <span
 data-composer-label
 className="min-w-0 max-w-[240px] truncate transition-[max-width,opacity] duration-300 ease-out group-data-[compact]/composer-context:max-w-0 group-data-[compact]/composer-context:opacity-0"
 className="min-w-0 max-w-[240px] group-data-[compact]/composer-context:max-w-0"
 >
 <SelectValue />
 <span
 data-composer-label-motion
 className="block w-full min-w-0 max-w-[240px] origin-left truncate transition-[opacity,transform] duration-180 ease-[cubic-bezier(0.32,0.72,0,1)] group-data-[compact]/composer-context:[transform:translateX(-0.25rem)_scaleX(0.95)] group-data-[compact]/composer-context:opacity-0 motion-reduce:transform-none motion-reduce:transition-opacity"
 >
 <SelectValue />
 </span>
 </span>
 </SelectTrigger>
 <SelectPopup>
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
fix(web): clean up composer resize animation#5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

rynfar
merged 1 commit into

from

Aug 11, 2026
 Merged


fix(web): clean up composer resize animation
#5
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


95 changes: 85 additions & 10 deletions
apps/web/src/components/BranchToolbar.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ import {
 HistoryIcon,
 MonitorIcon,
} from "lucide-react";
import { memo, useCallback, useEffect, useMemo, useRef, useState } from "react";
import { memo, useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react";

import { useComposerDraftStore, type DraftId } from "../composerDraftStore";
import { useProject, useThread, useThreadShellsForProjectRefs } from "../state/entities";
Expand DownExpand Up@@ -226,16 +226,20 @@ const MobileRunContextSelector = memo(function MobileRunContextSelector({
/**
 * Collapse the strip's labels to icons only when the text no longer fits.
 *
 * Hidden labels stay measurable (they collapse to invisible absolute boxes,
 * which keep their natural width), so the required width can be recomputed in
 * either state on every pass - no remembered widths that could go stale or
 * latch the strip compact. A small hysteresis keeps the boundary from
 * flapping between states.
 * Hidden labels stay measurable because their inner text keeps its natural
 * width while the outer layout box collapses. This lets every pass recompute
 * the expanded width without remembered values that could go stale or latch
 * the strip compact. A small hysteresis keeps the boundary from flapping.
 */
const COMPACT_EXPAND_HYSTERESIS_PX = 16;
const COMPOSER_CONTEXT_MOTION_DURATION_MS = 180;
const COMPOSER_CONTEXT_MOTION_EASING = "cubic-bezier(0.32, 0.72, 0, 1)";
const COMPOSER_CONTEXT_CONTROL_SELECTOR = "[data-composer-context-control]";

function useLabelsOverflow(element: HTMLDivElement | null): boolean {
 const [overflows, setOverflows] = useState(false);
 const pendingControlRectsRef = useRef<Map<HTMLElement, DOMRect> | null>(null);
 const controlAnimationsRef = useRef(new Map<HTMLElement, Animation>());
 // A render-synced mirror instead of useEffectEvent: the compiler memoizes
 // the event callback, which left observers reading the first render's null
 // element forever.
Expand All@@ -249,7 +253,7 @@ function useLabelsOverflow(element: HTMLDivElement | null): boolean {
 if (available === 0) return;
 // flex-1 stretches the groups to fill the strip, so their own boxes always
 // measure "full". Sum the laid-out content instead, skipping hidden form
 // artifacts and absolutely-positioned nodes (the compact-hidden labels).
 // artifacts and other out-of-flow nodes.
 const contentWidth = (parent: Element): number => {
 const gap = Number.parseFloat(getComputedStyle(parent).columnGap) || 0;
 let width = 0;
Expand DownExpand Up@@ -291,9 +295,71 @@ function useLabelsOverflow(element: HTMLDivElement | null): boolean {
 needed += Math.max(0, textWidth - label.clientWidth);
 }
 }
 setOverflows(compact ? needed > available - COMPACT_EXPAND_HYSTERESIS_PX : needed > available);
 const nextOverflows = compact
 ? needed > available - COMPACT_EXPAND_HYSTERESIS_PX
 : needed > available;
 if (nextOverflows !== compact) {
 pendingControlRectsRef.current = new Map(
 Array.from(current.querySelectorAll<HTMLElement>(COMPOSER_CONTEXT_CONTROL_SELECTOR)).map(
 (control) => [control, control.getBoundingClientRect()],
 ),
 );
 }
 setOverflows(nextOverflows);
 }, []);

 useLayoutEffect(() => {
 const previousRects = pendingControlRectsRef.current;
 if (!previousRects) return;
 pendingControlRectsRef.current = null;

 for (const animation of controlAnimationsRef.current.values()) {
 animation.cancel();
 }
 controlAnimationsRef.current.clear();

 if (window.matchMedia("(prefers-reduced-motion: reduce)").matches) return;

 for (const [control, previousRect] of previousRects) {
 if (!control.isConnected) continue;
 const nextRect = control.getBoundingClientRect();
 const deltaX = previousRect.left - nextRect.left;
 const deltaY = previousRect.top - nextRect.top;
 if (Math.abs(deltaX) < 0.5 && Math.abs(deltaY) < 0.5) continue;

 const animation = control.animate(
 [
 { transform: `translate3d(${deltaX}px, ${deltaY}px, 0)` },
 { transform: "translate3d(0, 0, 0)" },
 ],
 {
 duration: COMPOSER_CONTEXT_MOTION_DURATION_MS,
 easing: COMPOSER_CONTEXT_MOTION_EASING,
 fill: "backwards",
 },
 );
 controlAnimationsRef.current.set(control, animation);
 animation.addEventListener(
 "finish",
 () => {
 if (controlAnimationsRef.current.get(control) === animation) {
 controlAnimationsRef.current.delete(control);
 }
 },
 { once: true },
 );
 }
 }, [overflows]);

 useEffect(
 () => () => {
 for (const animation of controlAnimationsRef.current.values()) {
 animation.cancel();
 }
 },
 [],
 );

 // Label widths can change without the strip box moving (font family or
 // size preferences), so re-measure on every render as well as on resize
 // and font loads.
Expand DownExpand Up@@ -414,7 +480,7 @@ export const BranchToolbar = memo(function BranchToolbar({
 <div
 ref={setStripElement}
 data-compact={labelsOverflow ? "" : undefined}
 className="chat-composer-context-strip group/composer-context -mt-4 mx-auto flex w-[calc(100%-2.75rem)] max-w-[calc(48rem-2.75rem)] items-center gap-2 ps-1 pe-2 pt-5 pb-1"
 className="chat-composer-context-strip group/composer-context -mt-4 mx-auto flex w-[calc(100%-2.75rem)] max-w-[calc(48rem-2.75rem)] items-center gap-2 overflow-x-clip overflow-y-visible ps-1 pe-2 pt-5 pb-1"
 >
 {/*
 Workspace controls and the branch share the left run: they describe the
Expand DownExpand Up@@ -450,7 +516,11 @@ export const BranchToolbar = memo(function BranchToolbar({
 {...(showEnvironmentPicker && onEnvironmentChange ? { onEnvironmentChange } : {})}
 />
 {showGitControls ? (
 <Separator orientation="vertical" className="mx-0.5 h-3.5!" />
 <Separator
 orientation="vertical"
 className="mx-0.5 h-3.5!"
 data-composer-context-control
 />
 ) : null}
 </>
 )}
Expand All@@ -466,6 +536,11 @@ export const BranchToolbar = memo(function BranchToolbar({
 ) : null}
 </>
 )}
 {/*
 Pylon keeps the branch in the left run beside the workspace controls
 rather than pushing it right as upstream does: they describe the same
 thing, and Usage sits opposite them.
 */}
 {showGitControls ? (
 <BranchToolbarBranchSelector
 className="min-w-0 justify-start"
Expand Down

14 changes: 11 additions & 3 deletions
apps/web/src/components/BranchToolbarBranchSelector.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -714,7 +714,10 @@ export function BranchToolbarBranchSelector({
 open={isBranchMenuOpen}
 value={resolvedActiveBranch}
 >
 <div className={cn("flex min-w-0 items-center gap-1", className)}>
 <div
 className={cn("flex min-w-0 items-center gap-1", className)}
 data-composer-context-control
 >
 {branchPr && branchPrStatus ? (
 <Tooltip>
 <TooltipTrigger
Expand DownExpand Up@@ -751,9 +754,14 @@ export function BranchToolbarBranchSelector({
 <GitBranchIcon className="size-3 shrink-0 opacity-70" />
 <span
 data-composer-label
 className="min-w-0 max-w-[240px] truncate transition-[max-width,opacity] duration-300 ease-out group-data-[compact]/composer-context:max-w-0 group-data-[compact]/composer-context:opacity-0"
 className="min-w-0 max-w-[240px] group-data-[compact]/composer-context:max-w-0"
 >
 {triggerLabel}
 <span
 data-composer-label-motion
 className="block w-full min-w-0 max-w-[240px] origin-left truncate transition-[opacity,transform] duration-180 ease-[cubic-bezier(0.32,0.72,0,1)] group-data-[compact]/composer-context:[transform:translateX(-0.25rem)_scaleX(0.95)] group-data-[compact]/composer-context:opacity-0 motion-reduce:transform-none motion-reduce:transition-opacity"
 >
 {triggerLabel}
 </span>
 </span>
 <ChevronDownIcon className="size-3 shrink-0 opacity-50" />
 </ComboboxTrigger>
Expand Down

15 changes: 12 additions & 3 deletions
apps/web/src/components/BranchToolbarEnvModeSelector.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,10 @@ export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSe

 if (envLocked) {
 return (
 <span className="inline-flex h-7 shrink-0 items-center gap-1 border border-transparent px-[calc(--spacing(3)-1px)] text-sm font-medium text-muted-foreground/70 sm:h-6 sm:text-xs">
 <span
 className="inline-flex h-7 shrink-0 items-center gap-1 border border-transparent px-[calc(--spacing(3)-1px)] text-sm font-medium text-muted-foreground/70 sm:h-6 sm:text-xs"
 data-composer-context-control
 >
 {activeWorktreePath ? (
 <>
 <FolderGitIcon className="size-3" />
Expand DownExpand Up@@ -84,6 +87,7 @@ export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSe
 size="xs"
 className="min-w-0 shrink font-medium"
 aria-label="Workspace"
 data-composer-context-control
 >
 {effectiveEnvMode === "worktree" ? (
 <FolderGit2Icon className="size-3" />
Expand All@@ -94,9 +98,14 @@ export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSe
 )}
 <span
 data-composer-label
 className="min-w-0 max-w-[240px] truncate transition-[max-width,opacity] duration-300 ease-out group-data-[compact]/composer-context:max-w-0 group-data-[compact]/composer-context:opacity-0"
 className="min-w-0 max-w-[240px] group-data-[compact]/composer-context:max-w-0"
 >
 <SelectValue />
 <span
 data-composer-label-motion
 className="block w-full min-w-0 max-w-[240px] origin-left truncate transition-[opacity,transform] duration-180 ease-[cubic-bezier(0.32,0.72,0,1)] group-data-[compact]/composer-context:[transform:translateX(-0.25rem)_scaleX(0.95)] group-data-[compact]/composer-context:opacity-0 motion-reduce:transform-none motion-reduce:transition-opacity"
 >
 <SelectValue />
 </span>
 </span>
 </SelectTrigger>
 <SelectPopup>
Expand Down

24 changes: 19 additions & 5 deletions
apps/web/src/components/BranchToolbarEnvironmentSelector.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,17 +48,25 @@ export const BranchToolbarEnvironmentSelector = memo(function BranchToolbarEnvir
 // only thing in the strip.
 if (envLocked || onEnvironmentChange === undefined) {
 return (
 <span className="inline-flex h-7 min-w-0 max-w-full items-center gap-1 border border-transparent px-[calc(--spacing(3)-1px)] text-sm font-medium text-muted-foreground/70 sm:h-6 sm:text-xs">
 <span
 className="inline-flex h-7 min-w-0 max-w-full items-center gap-1 border border-transparent px-[calc(--spacing(3)-1px)] text-sm font-medium text-muted-foreground/70 sm:h-6 sm:text-xs"
 data-composer-context-control
 >
 {activeEnvironment?.isPrimary ? (
 <MonitorIcon className="size-3 shrink-0" />
 ) : (
 <CloudIcon className="size-3 shrink-0" />
 )}
 <span
 data-composer-label
 className="min-w-0 max-w-[240px] truncate transition-[max-width,opacity] duration-300 ease-out group-data-[compact]/composer-context:max-w-0 group-data-[compact]/composer-context:opacity-0"
 className="min-w-0 max-w-[240px] group-data-[compact]/composer-context:max-w-0"
 >
 {activeEnvironment?.label ?? "Run on"}
 <span
 data-composer-label-motion
 className="block w-full min-w-0 max-w-[240px] origin-left truncate transition-[opacity,transform] duration-180 ease-[cubic-bezier(0.32,0.72,0,1)] group-data-[compact]/composer-context:[transform:translateX(-0.25rem)_scaleX(0.95)] group-data-[compact]/composer-context:opacity-0 motion-reduce:transform-none motion-reduce:transition-opacity"
 >
 {activeEnvironment?.label ?? "Run on"}
 </span>
 </span>
 </span>
 );
Expand All@@ -76,6 +84,7 @@ export const BranchToolbarEnvironmentSelector = memo(function BranchToolbarEnvir
 size="xs"
 className="min-w-0 max-w-full font-medium"
 aria-label="Run on"
 data-composer-context-control
 >
 {activeEnvironment?.isPrimary ? (
 <MonitorIcon className="size-3 shrink-0" />
Expand All@@ -84,9 +93,14 @@ export const BranchToolbarEnvironmentSelector = memo(function BranchToolbarEnvir
 )}
 <span
 data-composer-label
 className="min-w-0 max-w-[240px] truncate transition-[max-width,opacity] duration-300 ease-out group-data-[compact]/composer-context:max-w-0 group-data-[compact]/composer-context:opacity-0"
 className="min-w-0 max-w-[240px] group-data-[compact]/composer-context:max-w-0"
 >
 <SelectValue />
 <span
 data-composer-label-motion
 className="block w-full min-w-0 max-w-[240px] origin-left truncate transition-[opacity,transform] duration-180 ease-[cubic-bezier(0.32,0.72,0,1)] group-data-[compact]/composer-context:[transform:translateX(-0.25rem)_scaleX(0.95)] group-data-[compact]/composer-context:opacity-0 motion-reduce:transform-none motion-reduce:transition-opacity"
 >
 <SelectValue />
 </span>
 </span>
 </SelectTrigger>
 <SelectPopup>
Expand Down
Loading