From 0d073a6fa8d7996c33ffec4b7cc239dc2618908c Mon Sep 17 00:00:00 2001
From: Neil <4138956+nwparker@users.noreply.github.com>
Date: Thu, 2 Jul 2026 16:55:40 -0700
Subject: [PATCH] fix(sidebar): preserve hover title wrapping

---
 .../sidebar/WorktreeTitleFieldRename.tsx          | 15 ++++++++++++---
 .../WorktreeTitleInlineRename.lifecycle.test.tsx  |  7 +++++++
 .../sidebar/WorktreeTitleInlineRename.tsx         |  1 +
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/renderer/src/components/sidebar/WorktreeTitleFieldRename.tsx b/src/renderer/src/components/sidebar/WorktreeTitleFieldRename.tsx
index b1a68eb5ef6..05839e5febd 100644
--- a/src/renderer/src/components/sidebar/WorktreeTitleFieldRename.tsx
+++ b/src/renderer/src/components/sidebar/WorktreeTitleFieldRename.tsx
@@ -15,6 +15,7 @@ type WorktreeTitleFieldRenameProps = {
   className?: string
   editingClassName?: string
   inputClassName?: string
+  wrapTitle: boolean
   suppressMouseSelection: boolean
   rootRef: React.RefCallback<HTMLSpanElement>
   inputRef: React.RefCallback<HTMLInputElement>
@@ -32,7 +33,7 @@ type WorktreeTitleFieldRenameProps = {
 const fieldEditingInputClassName =
   'h-6 rounded-sm border border-input bg-input/40 px-0 py-0 shadow-xs selection:bg-[Highlight] selection:text-[HighlightText] focus-visible:border-ring focus-visible:ring-[1px] focus-visible:ring-ring/50 dark:bg-input/30'
 const fieldReadInputClassName =
-  'h-[1lh] rounded-none border-0 !border-transparent !bg-transparent p-0 !shadow-none focus-visible:border-transparent focus-visible:ring-0 focus-visible:outline-none dark:!bg-transparent'
+  'absolute inset-0 h-full min-h-[1lh] rounded-none border-0 !border-transparent !bg-transparent p-0 !text-transparent !shadow-none caret-transparent selection:bg-transparent selection:text-transparent focus-visible:border-transparent focus-visible:ring-0 focus-visible:outline-none dark:!bg-transparent'
 
 export function WorktreeTitleFieldRename({
   titleElementKey,
@@ -45,6 +46,7 @@ export function WorktreeTitleFieldRename({
   className,
   editingClassName,
   inputClassName,
+  wrapTitle,
   suppressMouseSelection,
   rootRef,
   inputRef,
@@ -65,7 +67,7 @@ export function WorktreeTitleFieldRename({
       key={`field:${titleElementKey}`}
       ref={rootRef}
       className={cn(
-        'relative grid min-w-0 truncate leading-tight text-foreground',
+        'relative grid min-w-0 leading-tight text-foreground',
         showUnreadEmphasis ? 'font-semibold' : 'font-normal',
         className,
         editing && editingClassName
@@ -74,7 +76,14 @@ export function WorktreeTitleFieldRename({
       onDoubleClick={editing ? undefined : onStartRename}
     >
       <span
-        className="pointer-events-none invisible col-start-1 row-start-1 min-w-0 truncate whitespace-pre"
+        className={cn(
+          'pointer-events-none col-start-1 row-start-1 min-w-0',
+          editing
+            ? 'invisible truncate whitespace-pre'
+            : wrapTitle
+              ? 'break-words whitespace-normal'
+              : 'truncate whitespace-nowrap'
+        )}
         aria-hidden="true"
       >
         {displayName}
diff --git a/src/renderer/src/components/sidebar/WorktreeTitleInlineRename.lifecycle.test.tsx b/src/renderer/src/components/sidebar/WorktreeTitleInlineRename.lifecycle.test.tsx
index f5692439c64..96ce797fdf6 100644
--- a/src/renderer/src/components/sidebar/WorktreeTitleInlineRename.lifecycle.test.tsx
+++ b/src/renderer/src/components/sidebar/WorktreeTitleInlineRename.lifecycle.test.tsx
@@ -153,13 +153,20 @@ describe('WorktreeTitleInlineRename lifecycle', () => {
           displayName="Feature workspace"
           editingPresentation="field"
           selectOnFocus={false}
+          wrapTitle
           onRename={vi.fn()}
         />
       )
     })
 
     const readInput = nextContainer.querySelector('input')
+    const readSizingTitle = nextContainer.querySelector(
+      '[data-worktree-title-inline-rename] [aria-hidden="true"]'
+    )
     expect(readInput?.readOnly).toBe(true)
+    expect(readInput?.className).toContain('!text-transparent')
+    expect(readSizingTitle?.className).toContain('break-words')
+    expect(readSizingTitle?.className).toContain('whitespace-normal')
     expect(readInput?.getAttribute('data-worktree-title-rename-input')).toBeNull()
 
     act(() => {
diff --git a/src/renderer/src/components/sidebar/WorktreeTitleInlineRename.tsx b/src/renderer/src/components/sidebar/WorktreeTitleInlineRename.tsx
index c4717551716..071458cf7f0 100644
--- a/src/renderer/src/components/sidebar/WorktreeTitleInlineRename.tsx
+++ b/src/renderer/src/components/sidebar/WorktreeTitleInlineRename.tsx
@@ -333,6 +333,7 @@ export function WorktreeTitleInlineRename({
         className={className}
         editingClassName={editingClassName}
         inputClassName={inputClassName}
+        wrapTitle={wrapTitle}
         suppressMouseSelection={suppressMouseSelection}
         rootRef={handleRootRef}
         inputRef={handleInputRef}