Skip to content

upstream取り込み: Cmd+O 二重発火修正 (#3511) #302

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
MocA-Love merged 3 commits into from
Apr 17, 2026
Merged

upstream取り込み: Cmd+O 二重発火修正 (#3511) #302

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9273ad9
fix(desktop): Cmd+O firing open-in twice on v1 workspace route (#3511)
Kitenite Apr 16, 2026
72b1944
fix(desktop): keep v1 OPEN_IN_APP hotkey alive in tearoff windows
MocA-Love Apr 17, 2026
ab4ba8f
style(desktop): organize imports for tearoff hotkey fork adaptation
MocA-Love Apr 17, 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
9 changes: 8 additions & 1 deletion apps/desktop/src/renderer/routes/_authenticated/_dashboard/workspace/$workspaceId/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { useCallback, useEffect, useMemo } from "react";
import { useCopyToClipboard } from "renderer/hooks/useCopyToClipboard";
import { useFileOpenMode } from "renderer/hooks/useFileOpenMode";
import { useRightSidebarOpenViewWidth } from "renderer/hooks/useRightSidebarOpenViewWidth";
import { isTearoffWindow } from "renderer/hooks/useTearoffInit";
import { useHotkey } from "renderer/hotkeys";
import {
addBrowserShortcutListener,
Expand Down Expand Up @@ -540,7 +541,13 @@ export function WorkspacePage({
});
}
}, [workspace?.worktreePath, resolvedDefaultApp, mutateOpenInApp, projectId]);
useHotkey("OPEN_IN_APP", handleOpenInApp, { enabled: isActive });
// FORK NOTE: upstream #3511 removed this page-level hotkey to avoid double
// firing with OpenInMenuButton. Fork tearoff windows do not render TopBar
// (layout.tsx gates it on !isTearoff), so OpenInMenuButton is absent there
// — keep the page-level registration alive only in tearoff windows.
useHotkey("OPEN_IN_APP", handleOpenInApp, {
enabled: isActive && isTearoffWindow(),
});

// Copy path shortcut
const { copyToClipboard } = useCopyToClipboard();
Expand Down
Loading