Skip to content

fix(app): lift up project hover state to layout #18732

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
Brendonovich merged 4 commits into from
Mar 23, 2026
Merged

fix(app): lift up project hover state to layout #18732

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2083393
fix(app): lift up project hover state to layout
Brendonovich Mar 23, 2026
484bd56
use ctx more
Brendonovich Mar 23, 2026
9068ca9
cleanup
Brendonovich Mar 23, 2026
8f57d6a
Merge branch 'dev' into brendan/overlapping-project-popovers
Brendonovich Mar 23, 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
12 changes: 11 additions & 1 deletion packages/app/src/pages/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import {
createEffect,
createMemo,
createResource,
createSignal,
For,
on,
onCleanup,
Expand Down Expand Up @@ -2312,7 +2313,16 @@ export default function Layout(props: ParentProps) {
aimMove={aim.move}
projects={projects}
renderProject={(project) => (
<SortableProject ctx={projectSidebarCtx} project={project} sortNow={sortNow} mobile={mobile} />
<SortableProject
onHoverOpenChanged={(hoverOpen) => {
if (!hoverOpen && state.hoverProject && state.hoverProject !== project.worktree) return
setState("hoverProject", hoverOpen ? project.worktree : undefined)
}}
ctx={projectSidebarCtx}
project={project}
sortNow={sortNow}
mobile={mobile}
/>
)}
handleDragStart={handleDragStart}
handleDragEnd={handleDragEnd}
Expand Down
26 changes: 9 additions & 17 deletions packages/app/src/pages/layout/sidebar-project.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,7 @@ export const SortableProject = (props: {
mobile?: boolean
ctx: ProjectSidebarContext
sortNow: Accessor<number>
onHoverOpenChanged: (hovered: boolean) => void
}): JSX.Element => {
const globalSync = useGlobalSync()
const language = useLanguage()
Expand All @@ -289,28 +290,19 @@ export const SortableProject = (props: {
const workspaceEnabled = createMemo(() => props.ctx.workspacesEnabled(props.project))
const dirs = createMemo(() => props.ctx.workspaceIds(props.project))
const [state, setState] = createStore({
open: false,
menu: false,
suppressHover: false,
})

const isHoverProject = () => props.ctx.hoverProject() === props.project.worktree
const preview = createMemo(() => !props.mobile && props.ctx.sidebarOpened())
const overlay = createMemo(() => !props.mobile && !props.ctx.sidebarOpened())
const active = createMemo(
() => state.menu || (preview() ? state.open : overlay() && props.ctx.hoverProject() === props.project.worktree),
() =>
state.menu || (preview() ? isHoverProject() : overlay() && props.ctx.hoverProject() === props.project.worktree),
)

createEffect(() => {
if (preview()) return
if (!state.open) return
setState("open", false)
})

createEffect(() => {
if (!selected()) return
if (!state.open) return
setState("open", false)
})
const hoverOpen = () => isHoverProject() && preview() && !selected() && !state.menu

const label = (directory: string) => {
const [data] = globalSync.child(directory, { bootstrap: false })
Expand Down Expand Up @@ -351,7 +343,7 @@ export const SortableProject = (props: {
workspacesEnabled={props.ctx.workspacesEnabled}
closeProject={props.ctx.closeProject}
setMenu={(value) => setState("menu", value)}
setOpen={(value) => setState("open", value)}
setOpen={(value) => props.onHoverOpenChanged(value)}
setSuppressHover={(value) => setState("suppressHover", value)}
language={language}
/>
Expand All @@ -362,7 +354,7 @@ export const SortableProject = (props: {
<div use:sortable classList={{ "opacity-30": sortable.isActiveDraggable }}>
<Show when={preview() && !selected()} fallback={tile()}>
<HoverCard
open={!state.suppressHover && state.open && !state.menu}
open={!state.suppressHover && hoverOpen() && !state.menu}
openDelay={0}
closeDelay={0}
placement="right-start"
Expand All @@ -371,7 +363,7 @@ export const SortableProject = (props: {
onOpenChange={(value) => {
if (state.menu) return
if (value && state.suppressHover) return
setState("open", value)
props.onHoverOpenChanged(value)
if (value) props.ctx.setHoverSession(undefined)
}}
>
Expand All @@ -386,7 +378,7 @@ export const SortableProject = (props: {
projectChildren={projectChildren}
workspaceSessions={workspaceSessions}
workspaceChildren={workspaceChildren}
setOpen={(value) => setState("open", value)}
setOpen={(value) => props.onHoverOpenChanged(value)}
ctx={props.ctx}
language={language}
/>
Expand Down
Loading