Commit 3401def4 authored by Johnny's avatar Johnny

chore: simplify memo filters

parent 16a08729
......@@ -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) {
......
......@@ -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);
useEffect(() => {
const searchParams = new URLSearchParams();
if (filters.length > 0) {
newSearchParams.set("filter", stringifyFilters(filters));
} else {
newSearchParams.delete("filter");
}
setSearchParams(newSearchParams);
searchParams.set("filter", stringifyFilters(filters));
}
};
useEffect(checkAndSync, [searchParams, filters]);
setSearchParams(searchParams);
}, [filters]);
const getFilterDisplayText = (filter: MemoFilter) => {
if (filter.value) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment