-
Notifications
You must be signed in to change notification settings - Fork 57.1k
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.
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
Add desktop shortcut support #4194
Open
JasonEWNL
wants to merge
5
commits into
ChatGPTNextWeb:main
Choose a base branch
from
JasonEWNL:desktop-shortcut
base: main
Could not load branches
Branch not found: {{ refName }}
Could not load tags
Nothing to show
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
18d5ff8
Add desktop shortcut support
JasonEWNL 3b2bc86
Bypass eslint warning
JasonEWNL 96f7db1
Fix conditionally hook
JasonEWNL 75c5812
Move tauri env check inside effect
JasonEWNL 80ef6a7
Refactor: Add dependencies and ignore eslint warning
JasonEWNL File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -31,6 +31,8 @@ import { isIOS, useMobileScreen } from "../utils"; | |
import dynamic from "next/dynamic"; | ||
import { showConfirm, showToast } from "./ui-lib"; | ||
|
||
import { register } from "@tauri-apps/api/globalShortcut"; | ||
|
||
const ChatList = dynamic(async () => (await import("./chat-list")).ChatList, { | ||
loading: () => null, | ||
}); | ||
|
@@ -128,6 +130,52 @@ function useDragSideBar() { | |
}; | ||
} | ||
|
||
function useGlobalShortcut() { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @JasonEWNL there is another one function useGlobalShortcut() {
// Call hooks at the top level to comply with the rules of hooks.
const chatStore = useChatStore();
const navigate = useNavigate();
const config = useAppConfig();
useEffect(() => {
// Early return if not in a Tauri environment. This way, the hooks are called unconditionally,
// but the code inside useEffect only runs conditionally.
if (!window.__TAURI__) {
return;
}
const handleMasks = async () => {
await register("CommandOrControl+Shift+M", () => {
if (config.dontShowMaskSplashScreen !== true) {
navigate(Path.NewChat, { state: { fromHome: true } });
} else {
navigate(Path.Masks, { state: { fromHome: true } });
}
});
};
const handleSettings = async () => {
await register("CommandOrControl+,", () => {
navigate(Path.Settings);
});
};
const handleNewChat = async () => {
await register("CommandOrControl+N", () => {
if (config.dontShowMaskSplashScreen) {
chatStore.newSession();
navigate(Path.Chat);
} else {
navigate(Path.NewChat);
}
});
};
// Execute the registration functions.
handleMasks();
handleSettings();
handleNewChat();
// Remember to return a cleanup function if necessary, for example, to unregister the shortcuts.
}, [chatStore, navigate, config]); // Include all dependencies here.
} |
||
const chatStore = useChatStore(); | ||
const navigate = useNavigate(); | ||
const config = useAppConfig(); | ||
|
||
useEffect(() => { | ||
// Early return if not in a Tauri environment | ||
if (!window.__TAURI__) { | ||
return; | ||
} | ||
|
||
const handleMasks = async () => { | ||
await register("CommandOrControl+Shift+M", () => { | ||
if (config.dontShowMaskSplashScreen !== true) { | ||
navigate(Path.NewChat, { state: { fromHome: true } }); | ||
} else { | ||
navigate(Path.Masks, { state: { fromHome: true } }); | ||
} | ||
}); | ||
}; | ||
|
||
const handleSettings = async () => { | ||
await register("CommandOrControl+,", () => { | ||
navigate(Path.Settings); | ||
}); | ||
}; | ||
|
||
const handleNewChat = async () => { | ||
await register("CommandOrControl+N", () => { | ||
if (config.dontShowMaskSplashScreen) { | ||
chatStore.newSession(); | ||
navigate(Path.Chat); | ||
} else { | ||
navigate(Path.NewChat); | ||
} | ||
}); | ||
}; | ||
|
||
// Shortcut registration | ||
handleMasks(); | ||
handleSettings(); | ||
handleNewChat(); | ||
// eslint-disable-next-line react-hooks/exhaustive-deps | ||
}, [chatStore, navigate, config]); | ||
} | ||
|
||
export function SideBar(props: { className?: string }) { | ||
const chatStore = useChatStore(); | ||
|
||
|
@@ -143,6 +191,8 @@ export function SideBar(props: { className?: string }) { | |
|
||
useHotKey(); | ||
|
||
useGlobalShortcut(); | ||
|
||
return ( | ||
<div | ||
className={`${styles.sidebar} ${props.className} ${ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -50,6 +50,9 @@ | |
}, | ||
"notification": { | ||
"all": true | ||
}, | ||
"globalShortcut": { | ||
"all": true | ||
} | ||
}, | ||
"bundle": { | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this the correct