YourSelfHosted/memos
1
0
Fork 0
mirror of https://github.com/usememos/memos.git synced 2025-06-05 22:09:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: shortcutId in filter

Browse Source
This commit is contained in:
boojack
2022-05-20 23:10:47 +08:00
parent 3fc907d446
commit 9a3afc56e7
9 changed files with 40 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
web/src/components/ShortcutList.tsx
View File

@ -1,9 +1,10 @@
import { useContext, useEffect } from "react";
import { locationService, shortcutService } from "../services";
import appContext from "../stores/appContext";
import { UNKNOWN_ID } from "../helpers/consts";
import utils from "../helpers/utils";
import useToggle from "../hooks/useToggle";
import useLoading from "../hooks/useLoading";
import utils from "../helpers/utils";
import toastHelper from "./Toast";
import showCreateShortcutDialog from "./CreateShortcutDialog";
import "../less/shortcut-list.less";
@ -47,7 +48,7 @@ const ShortcutList: React.FC<Props> = () => {
</p>
<div className="shortcuts-container">
{sortedShortcuts.map((s) => {
return <ShortcutContainer key={s.id} shortcut={s} isActive={s.id === shortcutId} />;
return <ShortcutContainer key={s.id} shortcut={s} isActive={s.id === Number(shortcutId)} />;
})}
</div>
</div>
@ -65,7 +66,7 @@ const ShortcutContainer: React.FC<ShortcutContainerProps> = (props: ShortcutCont
const handleShortcutClick = () => {
if (isActive) {
locationService.setMemoShortcut("");
locationService.setMemoShortcut(UNKNOWN_ID);
} else {
if (!["/"].includes(locationService.getState().pathname)) {
locationService.setPathname("/");