Refactor loadData of GridLoader

ETSOO · Dec 6, 2024 · b22c3bb · b22c3bb
1 parent 3830b88
commit b22c3bb
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/react",
-  "version": "1.8.12",
+  "version": "1.8.13",
   "description": "TypeScript ReactJs UI Independent Framework",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

diff --git a/src/components/GridLoader.ts b/src/components/GridLoader.ts
@@ -81,17 +81,17 @@ export function GridDataGetData<const T>(
 /**
  * Grid Json data
  */
-export type GridJsonData = Omit<GridLoadDataProps, "data">;
-
-/**
- * Grid data load props
- */
-export type GridLoadDataProps = {
+export type GridJsonData = {
   /**
    * Query paging data
    */
   queryPaging: QueryPagingData;
+};
 
+/**
+ * Grid data load props
+ */
+export type GridLoadDataProps = GridJsonData & {
   /**
    * Data related
    */
@@ -116,7 +116,10 @@ export type GridLoadDataPartialProps = {
 /**
  * Grid data loader
  */
-export type GridLoader<T extends object> = {
+export type GridLoader<
+  T extends object,
+  P extends GridJsonData = GridLoadDataProps
+> = {
   /**
    * Auto load data, otherwise call reset
    * @default true
@@ -136,10 +139,7 @@ export type GridLoader<T extends object> = {
   /**
    * Load data
    */
-  loadData: (
-    props: GridLoadDataProps,
-    lastItem?: T
-  ) => PromiseLike<T[] | null | undefined>;
+  loadData: (props: P, lastItem?: T) => PromiseLike<T[] | null | undefined>;
 
   /**
    * Handler for init load