Skip to content

fix: branch selector dropdown clipping and scroll reset on tab switch #336

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
AbhiVarde wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: branch selector dropdown clipping and scroll reset on tab switch #336

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
40 changes: 34 additions & 6 deletions apps/web/src/components/repo/branch-selector.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"use client";

import { useState } from "react";
import { useRef, useState } from "react";
import { useRouter } from "next/navigation";
import { GitBranch, Tag, ChevronDown, Search, Check } from "lucide-react";
import { cn } from "@/lib/utils";
Expand Down Expand Up @@ -29,6 +29,8 @@ export function BranchSelector({
const [open, setOpen] = useState(false);
const [search, setSearch] = useState("");
const [tab, setTab] = useState<"branches" | "tags">("branches");
const listRef = useRef<HTMLDivElement>(null);
const triggerRef = useRef<HTMLButtonElement>(null);
const router = useRouter();

const items = tab === "branches" ? branches : tags;
Expand Down Expand Up @@ -61,11 +63,12 @@ export function BranchSelector({
return (
<div className="relative">
<button
ref={triggerRef}
onClick={() => setOpen(!open)}
className="flex items-center gap-1.5 px-3 py-1.5 text-[11px] font-mono border border-border hover:bg-muted/60 dark:hover:bg-white/3 transition-colors rounded-sm cursor-pointer"
>
<GitBranch className="w-3 h-3 text-muted-foreground/70" />
<span className="max-w-[120px] truncate">{currentRef}</span>
<span className="max-w-30 truncate">{currentRef}</span>
<ChevronDown className="w-3 h-3 text-muted-foreground/50" />
</button>

Expand All @@ -78,7 +81,17 @@ export function BranchSelector({
setSearch("");
}}
/>
<div className="absolute top-full left-0 mt-1 z-50 w-72 border border-border bg-card shadow-lg rounded-md">
<div
className="fixed z-50 w-72 border border-border bg-card shadow-lg rounded-md"
style={{
top:
(triggerRef.current?.getBoundingClientRect()
.bottom ?? 0) + 4,
left:
triggerRef.current?.getBoundingClientRect()
.left ?? 0,
}}
>
<div className="p-2 border-b border-border">
<div className="relative">
<Search className="absolute left-2.5 top-1/2 -translate-y-1/2 w-3 h-3 text-muted-foreground/50" />
Expand All @@ -99,7 +112,13 @@ export function BranchSelector({
</div>
<div className="flex border-b border-border">
<button
onClick={() => setTab("branches")}
onClick={() => {
setTab("branches");
listRef.current?.scrollTo(
0,
0,
);
}}
className={cn(
"flex-1 flex items-center justify-center gap-1.5 px-3 py-2 text-[10px] font-mono uppercase tracking-wider cursor-pointer -mb-px",
tab === "branches"
Expand All @@ -114,7 +133,13 @@ export function BranchSelector({
</span>
</button>
<button
onClick={() => setTab("tags")}
onClick={() => {
setTab("tags");
listRef.current?.scrollTo(
0,
0,
);
}}
className={cn(
"flex-1 flex items-center justify-center gap-1.5 px-3 py-2 text-[10px] font-mono uppercase tracking-wider cursor-pointer -mb-px",
tab === "tags"
Expand All @@ -129,7 +154,10 @@ export function BranchSelector({
</span>
</button>
</div>
<div className="max-h-60 overflow-y-auto">
<div
ref={listRef}
className="max-h-60 overflow-y-auto"
>
{filtered.map((item) => {
const isActive =
item.name === currentRef;
Expand Down
Loading