Skip to content

armgit / memos

Public Imported from GitHub
0

Memos is an open-source, self-hosted note-taking app that brings your everyday thoughts together in a personal timeline. Your data stays yours, and you choose what to keep private or share.

chore: simplify memo filters

Johnny3401def4423a
diff --git a/web/src/components/MemoEditor/index.tsx b/web/src/components/MemoEditor/index.tsx
index 42321181f..b7cb3d17d 100644
--- a/web/src/components/MemoEditor/index.tsx
+++ b/web/src/components/MemoEditor/index.tsx
@@ -151,7 +151,7 @@ const MemoEditor = observer((props: Props) => {
const isMetaKey = event.ctrlKey || event.metaKey;
if (isMetaKey) {
if (event.key === "Enter") {
- void handleSaveBtnClick();
+ handleSaveBtnClick();
return;
}
if (!workspaceMemoRelatedSetting.disableMarkdownShortcuts) {
diff --git a/web/src/components/MemoFilters.tsx b/web/src/components/MemoFilters.tsx
index 8f90b7a8d..784433c3c 100644
--- a/web/src/components/MemoFilters.tsx
+++ b/web/src/components/MemoFilters.tsx
@@ -5,29 +5,17 @@ import { useSearchParams } from "react-router-dom";
import { FilterFactor, getMemoFilterKey, MemoFilter, stringifyFilters, useMemoFilterStore } from "@/store/v1";
const MemoFilters = () => {
- const [searchParams, setSearchParams] = useSearchParams();
+ const [, setSearchParams] = useSearchParams();
const memoFilterStore = useMemoFilterStore();
const filters = memoFilterStore.filters;
- const checkAndSync = () => {
- const filtersInURL = searchParams.get("filter") || "";
- const storeMatchesURL = filtersInURL === stringifyFilters(filters);
-
- if (!storeMatchesURL) {
- // Sync Store -> URL
- const newSearchParams = new URLSearchParams(searchParams);
-
- if (filters.length > 0) {
- newSearchParams.set("filter", stringifyFilters(filters));
- } else {
- newSearchParams.delete("filter");
- }
-
- setSearchParams(newSearchParams);
+ useEffect(() => {
+ const searchParams = new URLSearchParams();
+ if (filters.length > 0) {
+ searchParams.set("filter", stringifyFilters(filters));
}
- };
-
- useEffect(checkAndSync, [searchParams, filters]);
+ setSearchParams(searchParams);
+ }, [filters]);
const getFilterDisplayText = (filter: MemoFilter) => {
if (filter.value) {