Skip to content

fix: defer completion card collapse when mouse is inside panel #69

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
wxtsky merged 1 commit into from
Apr 13, 2026
Merged

fix: defer completion card collapse when mouse is inside panel #69

Show file tree
Hide file tree
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
9 changes: 9 additions & 0 deletions Sources/CodeIsland/AppState.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ final class AppState {
private var completionQueue: [String] = []
/// Mouse must enter the panel before auto-collapse is allowed (prevents instant dismiss)
var completionHasBeenEntered = false
/// Auto-collapse timer fired but mouse is inside panel — defer collapse until mouse leaves
var deferCollapseOnMouseLeave = false
private var processMonitors: [String: (source: DispatchSourceProcess, process: ProcessIdentity)] = [:]
private var exitingSessions: [String: ProcessIdentity] = [:]
private var saveTimer: Timer?
Expand Down Expand Up @@ -621,6 +623,7 @@ final class AppState {
activeSessionId = sessionId
surface = .completionCard(sessionId: sessionId)
completionHasBeenEntered = false
deferCollapseOnMouseLeave = false

autoCollapseTask?.cancel()
autoCollapseTask = Task { @MainActor in
Expand All @@ -633,9 +636,15 @@ final class AppState {
func cancelCompletionQueue() {
autoCollapseTask?.cancel()
completionQueue.removeAll()
deferCollapseOnMouseLeave = false
}

private func showNextCompletionOrCollapse() {
// Once the mouse has entered the completion card, defer collapse until it leaves
if completionHasBeenEntered {
deferCollapseOnMouseLeave = true
return
}
// showNextPending handles: interactive items first, then completionQueue, then collapse
if showNextPending() { return }
withAnimation(NotchAnimation.close) {
Expand Down
7 changes: 4 additions & 3 deletions Sources/CodeIsland/NotchPanelView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,13 +219,14 @@ struct NotchPanelView: View {
// Completion card: mark entered on hover-in, block collapse until entered
if hovering {
appState.completionHasBeenEntered = true
} else if appState.completionHasBeenEntered {
// Mouse entered then left — allow collapse
} else if appState.completionHasBeenEntered || appState.deferCollapseOnMouseLeave {
// Mouse entered then left — allow collapse (immediate or deferred)
hoverTimer?.invalidate()
hoverTimer = nil
appState.deferCollapseOnMouseLeave = false
appState.cancelCompletionQueue()
withAnimation(NotchAnimation.close) {
appState.surface = .collapsed
appState.cancelCompletionQueue()
}
}
return
Expand Down