From e24bea62060b401ba31b2506fa0c56dcabbcc4a0 Mon Sep 17 00:00:00 2001 From: onevcat Date: Tue, 23 Jun 2026 21:49:55 +0900 Subject: [PATCH] fix: worktree delete/archive shortcuts unresponsive when terminal has focus Use focusedSceneValue instead of focusedValue so the menu bar commands can read the actions regardless of which view holds keyboard focus. --- .../Repositories/Views/ArchivedWorktreesDetailView.swift | 2 +- supacode/Features/Repositories/Views/SidebarView.swift | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/supacode/Features/Repositories/Views/ArchivedWorktreesDetailView.swift b/supacode/Features/Repositories/Views/ArchivedWorktreesDetailView.swift index 8d4eec62..59f7c475 100644 --- a/supacode/Features/Repositories/Views/ArchivedWorktreesDetailView.swift +++ b/supacode/Features/Repositories/Views/ArchivedWorktreesDetailView.swift @@ -38,7 +38,7 @@ struct ArchivedWorktreesDetailView: View { selectedArchivedWorktreeIDs = selectedArchivedWorktreeIDs.intersection(newValue) } .animation(.easeOut(duration: 0.2), value: snapshot.archivedRowIDs) - .focusedValue(\.deleteWorktreeAction, snapshot.deleteWorktreeAction) + .focusedSceneValue(\.deleteWorktreeAction, snapshot.deleteWorktreeAction) .focusedSceneValue(\.confirmWorktreeAction, snapshot.confirmWorktreeAction) .toolbar { toolbarContent(deleteWorktreeAction: snapshot.deleteWorktreeAction) } } diff --git a/supacode/Features/Repositories/Views/SidebarView.swift b/supacode/Features/Repositories/Views/SidebarView.swift index c2b73fc2..7be01aff 100644 --- a/supacode/Features/Repositories/Views/SidebarView.swift +++ b/supacode/Features/Repositories/Views/SidebarView.swift @@ -30,8 +30,8 @@ struct SidebarView: View { terminalManager: terminalManager ) .focusedSceneValue(\.confirmWorktreeAction, confirmWorktreeAction) - .focusedValue(\.archiveWorktreeAction, archiveWorktreeAction) - .focusedValue(\.deleteWorktreeAction, deleteWorktreeAction) + .focusedSceneValue(\.archiveWorktreeAction, archiveWorktreeAction) + .focusedSceneValue(\.deleteWorktreeAction, deleteWorktreeAction) .focusedSceneValue(\.visibleHotkeyWorktreeRows, visibleHotkeyRows) // `visibleHotkeyWorktreeRows` stays a plain value: `WorktreeRowModel` is // Equatable, so SwiftUI already skips republishing it on no-op body runs. -- 2.51.2