chore(pagination): 🏷️ update types

adaptui · Sep 9, 2020 · 4bfbb21 · 4bfbb21
1 parent bd60cb2
commit 4bfbb21
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/src/pagination/Pagination.ts b/src/pagination/Pagination.ts
@@ -2,9 +2,8 @@ import { BoxHTMLProps, BoxOptions, useBox } from "reakit";
 import { createComponent, createHook } from "reakit-system";
 
 import { PAGINATION_KEYS } from "./__keys";
-import { PaginationStateReturn } from "./PaginationState";
 
-export type PaginationOptions = BoxOptions & PaginationStateReturn;
+export type PaginationOptions = BoxOptions;
 
 export type PaginationHTMLProps = BoxHTMLProps;
 

diff --git a/src/pagination/PaginationItem.ts b/src/pagination/PaginationItem.ts
@@ -7,7 +7,7 @@ import { PAGINATION_ITEM_KEYS } from "./__keys";
 import { PaginationStateReturn } from "./PaginationState";
 
 export type PaginationItemOptions = ButtonOptions &
-  PaginationStateReturn & {
+  Pick<PaginationStateReturn, "currentPage" | "goTo"> & {
     page: string | number;
     getAriaLabel?: (page: string | number, isCurrent: boolean) => string;
   };
@@ -26,7 +26,7 @@ export const usePaginationItem = createHook<
   keys: PAGINATION_ITEM_KEYS,
 
   useProps(
-    { currentPage, page, goTo, getAriaLabel },
+    { currentPage, goTo, page, getAriaLabel },
     { onClick: htmlOnClick, ...htmlProps },
   ) {
     const isCurrent = currentPage === page;

diff --git a/src/pagination/PaginationNext.ts b/src/pagination/PaginationNext.ts
@@ -6,7 +6,8 @@ import { ButtonHTMLProps, ButtonOptions, useButton } from "reakit";
 import { PAGINATION_KEYS } from "./__keys";
 import { PaginationStateReturn } from "./PaginationState";
 
-export type PaginationNextOptions = ButtonOptions & PaginationStateReturn;
+export type PaginationNextOptions = ButtonOptions &
+  Pick<PaginationStateReturn, "next" | "isAtMax">;
 
 export type PaginationNextHTMLProps = ButtonHTMLProps;
 

diff --git a/src/pagination/PaginationPrev.ts b/src/pagination/PaginationPrev.ts
@@ -6,7 +6,8 @@ import { ButtonHTMLProps, ButtonOptions, useButton } from "reakit";
 import { PAGINATION_KEYS } from "./__keys";
 import { PaginationStateReturn } from "./PaginationState";
 
-export type PaginationPrevOptions = ButtonOptions & PaginationStateReturn;
+export type PaginationPrevOptions = ButtonOptions &
+  Pick<PaginationStateReturn, "isAtMin" | "prev">;
 
 export type PaginationPrevHTMLProps = ButtonHTMLProps;