fix: paginator not resetting after searching another keywords (close a…

…list-org/alist#4979)
alist-org · Aug 10, 2023 · 4447dd1 · 4447dd1
1 parent 810ed67
commit 4447dd1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/components/Paginator.tsx b/src/components/Paginator.tsx
@@ -19,6 +19,7 @@ export interface PaginatorProps {
   total: number
   defaultPageSize?: number
   maxShowPage?: number
+  setResetCallback?: (callback: () => void) => void
 }
 export const Paginator = (props: PaginatorProps) => {
   const merged = mergeProps(
@@ -34,6 +35,9 @@ export const Paginator = (props: PaginatorProps) => {
     pageSize: merged.defaultPageSize,
     current: merged.defaultCurrent,
   })
+  merged.setResetCallback?.(() => {
+    setStore("current", merged.defaultCurrent)
+  })
   const pages = createMemo(() => {
     return Math.ceil(merged.total / store.pageSize)
   })

diff --git a/src/pages/home/folder/Search.tsx b/src/pages/home/folder/Search.tsx
@@ -207,8 +207,9 @@ const Search = () => {
   })
   const [scope, setScope] = createSignal(0)
   const scopes = ["all", "folder", "file"]
-
+  let resetPaginator: () => void
   const search = async (page = 1) => {
+    page === 1 && resetPaginator?.()
     if (loading()) return
     setData({
       content: [],
@@ -312,6 +313,7 @@ const Search = () => {
               onChange={(page) => {
                 search(page)
               }}
+              setResetCallback={(reset) => (resetPaginator = reset)}
             />
           </VStack>
         </ModalBody>