@etsoo/react 1.8.11 → 1.8.13

package/lib/components/GridLoader.d.ts

@@ -39,15 +39,16 @@ export declare function GridDataGetData<const T>(data?: GridData, template?: 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
      */
@@ -69,7 +70,7 @@ export type GridLoadDataPartialProps = {
 /**
  * Grid data loader
  */
-export interface GridLoader<T extends object> {
+export type GridLoader<T extends object, P extends GridJsonData = GridLoadDataProps> = {
     /**
      * Auto load data, otherwise call reset
      * @default true
@@ -86,7 +87,7 @@ export interface 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
      * @param ref Ref
@@ -103,7 +104,7 @@ export interface GridLoader<T extends object> {
      * Threshold at which to pre-fetch data; default is half of loadBatchSize
      */
     threshold?: number | undefined;
-}
+};
 type GridLoaderProps<T> = {
     /**
      * Auto load data, otherwise call reset

package/lib/components/ScrollerGrid.d.ts

@@ -21,7 +21,7 @@ export type ScrollerGridItemRendererProps<T> = Omit<GridChildComponentProps<T>,
 /**
  * Scroller vertical grid props
  */
-export interface ScrollerGridProps<T extends object> extends GridLoader<T>, Omit<VariableSizeGridProps<T>, "children" | "rowCount" | "rowHeight"> {
+export type ScrollerGridProps<T extends object> = GridLoader<T> & Omit<VariableSizeGridProps<T>, "children" | "rowCount" | "rowHeight"> & {
     /**
      * Footer renderer
      */
@@ -50,7 +50,7 @@ export interface ScrollerGridProps<T extends object> extends GridLoader<T>, Omit
      * Returns the height of the specified row.
      */
     rowHeight?: ((index: number) => number) | number;
-}
+};
 /**
  * Scroller grid forward ref
  */

package/lib/components/ScrollerList.d.ts

@@ -6,7 +6,7 @@ import { GridMethodRef } from "./GridMethodRef";
 /**
  * Scroller vertical list props
  */
-export interface ScrollerListProps<T extends object> extends GridLoader<T>, Omit<ListProps<T>, "outerRef" | "height" | "width" | "children" | "itemCount"> {
+export type ScrollerListProps<T extends object> = GridLoader<T> & Omit<ListProps<T>, "outerRef" | "height" | "width" | "children" | "itemCount"> & {
     /**
      * Methods ref
      */
@@ -35,7 +35,7 @@ export interface ScrollerListProps<T extends object> extends GridLoader<T>, Omit
      * Item size, a function indicates its a variable size list
      */
     itemSize: ((index: number) => number) | number;
-}
+};
 /**
  * Scroller list ref
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/react",
-  "version": "1.8.11",
+  "version": "1.8.13",
   "description": "TypeScript ReactJs UI Independent Framework",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

package/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 interface 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 interface 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
@@ -161,7 +161,7 @@ export interface GridLoader<T extends object> {
    * Threshold at which to pre-fetch data; default is half of loadBatchSize
    */
   threshold?: number | undefined;
-}
+};
 
 type GridLoaderProps<T> = {
   /**

package/src/components/ScrollerGrid.tsx

@@ -44,44 +44,48 @@ export type ScrollerGridItemRendererProps<T> = Omit<
 /**
  * Scroller vertical grid props
  */
-export interface ScrollerGridProps<T extends object>
-  extends GridLoader<T>,
-    Omit<VariableSizeGridProps<T>, "children" | "rowCount" | "rowHeight"> {
-  /**
-   * Footer renderer
-   */
-  footerRenderer?: (rows: T[], states: GridLoaderStates<T>) => React.ReactNode;
-
-  /**
-   * Header renderer
-   */
-  headerRenderer?: (states: GridLoaderStates<T>) => React.ReactNode;
-
-  /**
-   * Id field
-   */
-  idField?: DataTypes.Keys<T>;
-
-  /**
-   * Item renderer
-   */
-  itemRenderer: (props: ScrollerGridItemRendererProps<T>) => React.ReactElement;
-
-  /**
-   * Methods
-   */
-  mRef?: React.Ref<ScrollerGridForwardRef<T>>;
-
-  /**
-   * On items select change
-   */
-  onSelectChange?: (selectedItems: T[]) => void;
-
-  /**
-   * Returns the height of the specified row.
-   */
-  rowHeight?: ((index: number) => number) | number;
-}
+export type ScrollerGridProps<T extends object> = GridLoader<T> &
+  Omit<VariableSizeGridProps<T>, "children" | "rowCount" | "rowHeight"> & {
+    /**
+     * Footer renderer
+     */
+    footerRenderer?: (
+      rows: T[],
+      states: GridLoaderStates<T>
+    ) => React.ReactNode;
+
+    /**
+     * Header renderer
+     */
+    headerRenderer?: (states: GridLoaderStates<T>) => React.ReactNode;
+
+    /**
+     * Id field
+     */
+    idField?: DataTypes.Keys<T>;
+
+    /**
+     * Item renderer
+     */
+    itemRenderer: (
+      props: ScrollerGridItemRendererProps<T>
+    ) => React.ReactElement;
+
+    /**
+     * Methods
+     */
+    mRef?: React.Ref<ScrollerGridForwardRef<T>>;
+
+    /**
+     * On items select change
+     */
+    onSelectChange?: (selectedItems: T[]) => void;
+
+    /**
+     * Returns the height of the specified row.
+     */
+    rowHeight?: ((index: number) => number) | number;
+  };
 
 /**
  * Scroller grid forward ref

package/src/components/ScrollerList.tsx

@@ -21,47 +21,46 @@ import { GridMethodRef } from "./GridMethodRef";
 /**
  * Scroller vertical list props
  */
-export interface ScrollerListProps<T extends object>
-  extends GridLoader<T>,
-    Omit<
-      ListProps<T>,
-      "outerRef" | "height" | "width" | "children" | "itemCount" // Exclude these props, shoud be exisited otherwise will be failed
-    > {
-  /**
-   * Methods ref
-   */
-  mRef?: React.Ref<ScrollerListForwardRef<T>>;
-
-  /**
-   * Outer div ref
-   */
-  oRef?: React.Ref<HTMLDivElement>;
-
-  /**
-   * Height of the list
-   */
-  height?: number;
-
-  /**
-   * Width of the list
-   */
-  width?: number | string;
-
-  /**
-   * Id field
-   */
-  idField?: DataTypes.Keys<T>;
-
-  /**
-   * Item renderer
-   */
-  itemRenderer: (props: ListChildComponentProps<T>) => React.ReactElement;
-
-  /**
-   * Item size, a function indicates its a variable size list
-   */
-  itemSize: ((index: number) => number) | number;
-}
+export type ScrollerListProps<T extends object> = GridLoader<T> &
+  Omit<
+    ListProps<T>,
+    "outerRef" | "height" | "width" | "children" | "itemCount" // Exclude these props, shoud be exisited otherwise will be failed
+  > & {
+    /**
+     * Methods ref
+     */
+    mRef?: React.Ref<ScrollerListForwardRef<T>>;
+
+    /**
+     * Outer div ref
+     */
+    oRef?: React.Ref<HTMLDivElement>;
+
+    /**
+     * Height of the list
+     */
+    height?: number;
+
+    /**
+     * Width of the list
+     */
+    width?: number | string;
+
+    /**
+     * Id field
+     */
+    idField?: DataTypes.Keys<T>;
+
+    /**
+     * Item renderer
+     */
+    itemRenderer: (props: ListChildComponentProps<T>) => React.ReactElement;
+
+    /**
+     * Item size, a function indicates its a variable size list
+     */
+    itemSize: ((index: number) => number) | number;
+  };
 
 /**
  * Scroller list ref