ciphera-net/pulse
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 15 Wiki Activity

fix: site picker opens outside sidebar when collapsed

Browse Source 
No longer expands sidebar first. When collapsed, dropdown appears
to the right of the button (like AppLauncher/UserMenu/Notifications).
When expanded, opens below the button.
This commit is contained in:
Usman Baig
2026-03-24 22:11:46 +01:00
parent 441fd9afda
commit b607a9a76e
1 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
components/dashboard/Sidebar.tsx
View File

@@ -136,14 +136,25 @@ function SitePicker({ sites, siteId, collapsed, onExpand, onCollapse, wasCollaps
const updatePosition = useCallback(() => { const updatePosition = useCallback(() => {
if (buttonRef.current) { if (buttonRef.current) {
const rect = buttonRef.current.getBoundingClientRect() const rect = buttonRef.current.getBoundingClientRect()
let top = rect.bottom + 4 if (collapsed) {
if (panelRef.current) { // Collapsed: open to the right, like AppLauncher/UserMenu/Notifications
const maxTop = window.innerHeight - panelRef.current.offsetHeight - 8 let top = rect.top
top = Math.min(top, Math.max(8, maxTop)) if (panelRef.current) {
const maxTop = window.innerHeight - panelRef.current.offsetHeight - 8
top = Math.min(top, Math.max(8, maxTop))
}
setFixedPos({ left: rect.right + 8, top })
} else {
// Expanded: open below the button
let top = rect.bottom + 4
if (panelRef.current) {
const maxTop = window.innerHeight - panelRef.current.offsetHeight - 8
top = Math.min(top, Math.max(8, maxTop))
}
setFixedPos({ left: rect.left, top })
} }
setFixedPos({ left: rect.left, top })
} }
}, []) }, [collapsed])
useEffect(() => { useEffect(() => {
const handler = (e: MouseEvent) => { const handler = (e: MouseEvent) => {
@@ -154,7 +165,6 @@ function SitePicker({ sites, siteId, collapsed, onExpand, onCollapse, wasCollaps
) { ) {
if (open) { if (open) {
setOpen(false); setSearch('') setOpen(false); setSearch('')
if (wasCollapsed.current) { onCollapse(); wasCollapsed.current = false }
} }
} }
} }
@@ -171,7 +181,6 @@ function SitePicker({ sites, siteId, collapsed, onExpand, onCollapse, wasCollaps
const closePicker = () => { const closePicker = () => {
setOpen(false); setSearch('') setOpen(false); setSearch('')
if (wasCollapsed.current) { onCollapse(); wasCollapsed.current = false }
} }
const switchSite = (id: string) => { const switchSite = (id: string) => {
@@ -247,15 +256,7 @@ function SitePicker({ sites, siteId, collapsed, onExpand, onCollapse, wasCollaps
<div className="relative mb-4 px-2" ref={ref}> <div className="relative mb-4 px-2" ref={ref}>
<button <button
ref={buttonRef} ref={buttonRef}
onClick={() => { onClick={() => setOpen(!open)}
if (collapsed) {
wasCollapsed.current = true
pickerOpenCallback.current = () => setOpen(true)
onExpand()
} else {
setOpen(!open)
}
}}
className="w-full flex items-center gap-2.5 rounded-lg px-2.5 py-2 text-sm font-medium text-neutral-200 hover:bg-white/[0.06] overflow-hidden" className="w-full flex items-center gap-2.5 rounded-lg px-2.5 py-2 text-sm font-medium text-neutral-200 hover:bg-white/[0.06] overflow-hidden"
> >
<span className="w-7 h-7 rounded-md bg-brand-orange/10 flex items-center justify-center shrink-0 overflow-hidden"> <span className="w-7 h-7 rounded-md bg-brand-orange/10 flex items-center justify-center shrink-0 overflow-hidden">