Skip to content

fix(windows): windows branch switch ui broken #1038

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

Open
EwanJordaan wants to merge 10 commits into
base: main
Choose a base branch
from
+7 −3
Open

fix(windows): windows branch switch ui broken #1038

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7236690
fix(windows): windows branch switch ui broken
Mar 13, 2026
7fb763f
Unify branch selector item highlight styling
Mar 13, 2026
d3f6d4f
Merge branch 'main' into fix(windows)/branch-selection-ui
EwanJordaan Mar 13, 2026
8d81f85
Merge branch 'main' into fix(windows)/branch-selection-ui
EwanJordaan Mar 20, 2026
facdae5
Merge branch 'main' into fix(windows)/branch-selection-ui
EwanJordaan Mar 27, 2026
364a61f
fix(web): restore themed branch selector states
Mar 27, 2026
377f62c
fix(web): tune selected branch row surface
Mar 27, 2026
a449e61
fix(web): align branch selector hover surface
Mar 27, 2026
ef1bdc7
fix(web): use consistent branch selector highlight tone
Mar 27, 2026
8b03884
fix(web): use hover tone for selected branch rows
Mar 27, 2026
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
6 changes: 5 additions & 1 deletion apps/web/src/components/BranchToolbarBranchSelector.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,11 +336,14 @@ export function BranchToolbarBranchSelector({
effectiveEnvMode,
resolvedActiveBranch,
});
const branchSelectorHighlightClassName =
"hover:bg-accent hover:text-accent-foreground data-selected:bg-accent data-selected:text-accent-foreground data-highlighted:bg-accent data-highlighted:text-accent-foreground";

function renderPickerItem(itemValue: string, index: number, style?: CSSProperties) {
if (checkoutPullRequestItemValue && itemValue === checkoutPullRequestItemValue) {
return (
<ComboboxItem
className={branchSelectorHighlightClassName}
hideIndicator
key={itemValue}
index={index}
Expand All @@ -366,6 +369,7 @@ export function BranchToolbarBranchSelector({
if (createBranchItemValue && itemValue === createBranchItemValue) {
return (
<ComboboxItem
className={branchSelectorHighlightClassName}
hideIndicator
key={itemValue}
index={index}
Expand Down Expand Up @@ -393,11 +397,11 @@ export function BranchToolbarBranchSelector({
: null;
return (
<ComboboxItem
className={branchSelectorHighlightClassName}
hideIndicator
key={itemValue}
index={index}
value={itemValue}
className={itemValue === resolvedActiveBranch ? "bg-accent text-foreground" : undefined}
style={style}
onClick={() => selectBranch(branch)}
>
Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/components/ui/autocomplete.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ function AutocompleteItem({ className, children, ...props }: AutocompletePrimiti
return (
<AutocompletePrimitive.Item
className={cn(
"flex min-h-8 cursor-default select-none items-center rounded-sm px-2 py-1 text-base outline-none data-disabled:pointer-events-none data-highlighted:bg-accent data-highlighted:text-accent-foreground data-disabled:opacity-64 sm:min-h-7 sm:text-sm",
"flex min-h-8 cursor-default select-none items-center rounded-sm px-2 py-1 text-base outline-none hover:bg-accent data-disabled:pointer-events-none data-selected:bg-accent/50 data-selected:text-foreground data-highlighted:bg-accent data-highlighted:text-accent-foreground data-disabled:opacity-64 sm:min-h-7 sm:text-sm",
className,
)}
data-slot="autocomplete-item"
Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/components/ui/combobox.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ function ComboboxItem({
return (
<ComboboxPrimitive.Item
className={cn(
"grid min-h-8 in-data-[side=none]:min-w-[calc(var(--anchor-width)+1.25rem)] cursor-default grid-cols-[1rem_1fr] items-center gap-2 rounded-sm py-1 ps-2 pe-4 text-base outline-none data-disabled:pointer-events-none data-highlighted:bg-accent data-highlighted:text-accent-foreground data-disabled:opacity-64 sm:min-h-7 sm:text-sm [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
"grid min-h-8 in-data-[side=none]:min-w-[calc(var(--anchor-width)+1.25rem)] cursor-default grid-cols-[1rem_1fr] items-center gap-2 rounded-sm py-1 ps-2 pe-4 text-base outline-none hover:bg-accent data-disabled:pointer-events-none data-selected:bg-accent/50 data-selected:text-foreground data-highlighted:bg-accent data-highlighted:text-accent-foreground data-disabled:opacity-64 sm:min-h-7 sm:text-sm [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
Copy link
Copy Markdown
Contributor

@cursor cursor bot Mar 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shared primitives missing hover:text-accent-foreground class

Medium Severity

The shared ComboboxItem and AutocompleteItem base styles add hover:bg-accent but omit hover:text-accent-foreground. The branch selector works around this by adding hover:text-accent-foreground via branchSelectorHighlightClassName, but other combobox consumers won't get the text color change on hover. This is inconsistent with the data-highlighted state which pairs bg-accent with text-accent-foreground. On Windows where data-highlighted may not activate on hover, these consumers will see a background change without the corresponding text color update.

Additional Locations (1)
Fix in Cursor Fix in Web

className,
)}
data-slot="combobox-item"
Expand Down