@etsoo/materialui 1.4.49 → 1.4.50

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/lib/DataGridEx.d.ts +2 -2
  2. package/lib/pages/DataGridPageProps.d.ts +2 -1
  3. package/package.json +2 -2
  4. package/src/DataGridEx.tsx +7 -2
  5. package/src/pages/DataGridPageProps.ts +4 -3
package/lib/DataGridEx.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { GridColumn, GridLoaderStates, ScrollerGridProps } from "@etsoo/react";
1
+ import { GridColumn, GridJsonData, GridLoadDataProps, GridLoaderStates, ScrollerGridProps } from "@etsoo/react";
2
2
  import React from "react";
3
3
  import { MouseEventWithDataHandler } from "./MUGlobal";
4
4
  /**
@@ -14,7 +14,7 @@ export type DataGridExFooterItemRendererProps<T extends object> = {
14
14
  /**
15
15
  * Extended DataGrid with VariableSizeGrid props
16
16
  */
17
- export type DataGridExProps<T extends object> = Omit<ScrollerGridProps<T>, "itemRenderer" | "columnCount" | "columnWidth" | "width"> & {
17
+ export type DataGridExProps<T extends object, P extends GridJsonData = GridLoadDataProps> = Omit<ScrollerGridProps<T, P>, "itemRenderer" | "columnCount" | "columnWidth" | "width"> & {
18
18
  /**
19
19
  * Alternating colors for odd/even rows
20
20
  */
package/lib/pages/DataGridPageProps.d.ts CHANGED
@@ -1,9 +1,10 @@
1
+ import { GridJsonData, GridTemplateType } from "@etsoo/react";
1
2
  import type { DataGridExProps } from "../DataGridEx";
2
3
  import type { SearchPageProps } from "./SearchPageProps";
3
4
  /**
4
5
  * DataGrid page props
5
6
  */
6
- export type DataGridPageProps<T extends object, F> = Omit<DataGridExProps<T>, "loadData" | "height"> & SearchPageProps<T, F> & {
7
+ export type DataGridPageProps<T extends object, F> = DataGridExProps<T, GridJsonData & GridTemplateType<F>> & SearchPageProps<T, F> & {
7
8
  /**
8
9
  * Height will be deducted
9
10
  * @param height Current calcuated height
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@etsoo/materialui",
3
- "version": "1.4.49",
3
+ "version": "1.4.50",
4
4
  "description": "TypeScript Material-UI Implementation",
5
5
  "main": "lib/index.js",
6
6
  "type": "module",
@@ -37,7 +37,7 @@
37
37
  "@emotion/styled": "^11.13.5",
38
38
  "@etsoo/appscript": "^1.5.78",
39
39
  "@etsoo/notificationbase": "^1.1.54",
40
- "@etsoo/react": "^1.8.13",
40
+ "@etsoo/react": "^1.8.14",
41
41
  "@etsoo/shared": "^1.2.55",
42
42
  "@mui/icons-material": "^6.1.10",
43
43
  "@mui/material": "^6.1.10",
package/src/DataGridEx.tsx CHANGED
@@ -5,6 +5,8 @@ import {
5
5
  GridCellRendererProps,
6
6
  GridColumn,
7
7
  GridHeaderCellRendererProps,
8
+ GridJsonData,
9
+ GridLoadDataProps,
8
10
  GridLoaderPartialStates,
9
11
  GridLoaderStates,
10
12
  ScrollerGrid,
@@ -40,8 +42,11 @@ export type DataGridExFooterItemRendererProps<T extends object> = {
40
42
  /**
41
43
  * Extended DataGrid with VariableSizeGrid props
42
44
  */
43
- export type DataGridExProps<T extends object> = Omit<
44
- ScrollerGridProps<T>,
45
+ export type DataGridExProps<
46
+ T extends object,
47
+ P extends GridJsonData = GridLoadDataProps
48
+ > = Omit<
49
+ ScrollerGridProps<T, P>,
45
50
  "itemRenderer" | "columnCount" | "columnWidth" | "width"
46
51
  > & {
47
52
  /**
package/src/pages/DataGridPageProps.ts CHANGED
@@ -1,12 +1,13 @@
1
+ import { GridJsonData, GridTemplateType } from "@etsoo/react";
1
2
  import type { DataGridExProps } from "../DataGridEx";
2
3
  import type { SearchPageProps } from "./SearchPageProps";
3
4
 
4
5
  /**
5
6
  * DataGrid page props
6
7
  */
7
- export type DataGridPageProps<T extends object, F> = Omit<
8
- DataGridExProps<T>,
9
- "loadData" | "height"
8
+ export type DataGridPageProps<T extends object, F> = DataGridExProps<
9
+ T,
10
+ GridJsonData & GridTemplateType<F>
10
11
  > &
11
12
  SearchPageProps<T, F> & {
12
13
  /**