Unverified Commit cb2e1ae3 authored by boojack's avatar boojack Committed by GitHub

fix: fetch memo with filter (#346)

parent 9705406b
...@@ -103,6 +103,15 @@ const MemoList = () => { ...@@ -103,6 +103,15 @@ const MemoList = () => {
} }
}, [query]); }, [query]);
useEffect(() => {
if (isFetching || isComplete) {
return;
}
if (sortedMemos.length < DEFAULT_MEMO_LIMIT) {
handleFetchMoreClick();
}
}, [isFetching, isComplete, query, sortedMemos.length]);
const handleFetchMoreClick = async () => { const handleFetchMoreClick = async () => {
try { try {
const fetchedMemos = await memoService.fetchMemos(DEFAULT_MEMO_LIMIT, memos.length); const fetchedMemos = await memoService.fetchMemos(DEFAULT_MEMO_LIMIT, memos.length);
......
...@@ -42,7 +42,8 @@ const getStateFromLocation = () => { ...@@ -42,7 +42,8 @@ const getStateFromLocation = () => {
state.query.tag = urlParams.get("tag") ?? undefined; state.query.tag = urlParams.get("tag") ?? undefined;
state.query.type = (urlParams.get("type") as MemoSpecType) ?? undefined; state.query.type = (urlParams.get("type") as MemoSpecType) ?? undefined;
state.query.text = urlParams.get("text") ?? undefined; state.query.text = urlParams.get("text") ?? undefined;
state.query.shortcutId = Number(urlParams.get("shortcutId")) ?? undefined; const shortcutIdStr = urlParams.get("shortcutId");
state.query.shortcutId = shortcutIdStr ? Number(shortcutIdStr) : undefined;
const from = parseInt(urlParams.get("from") ?? "0"); const from = parseInt(urlParams.get("from") ?? "0");
const to = parseInt(urlParams.get("to") ?? "0"); const to = parseInt(urlParams.get("to") ?? "0");
if (to > from && to !== 0) { if (to > from && to !== 0) {
......
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