@etsoo/materialui 1.4.49 → 1.4.51

package/lib/ComboBox.js

@@ -17,7 +17,7 @@ export function ComboBox(props) {
     // Labels
     const labels = globalApp?.getLabels("noOptions", "loading", "open", "add");
     // Destruct
-    const { search = false, autoAddBlankItem = search, idField = "id", idValue, inputError, inputHelperText, inputMargin, inputOnChange, inputRequired, inputReset, inputVariant, defaultValue, label, labelField = "label", loadData, onLoadData, name, inputAutoComplete = "off", options, dataReadonly = true, readOnly, onChange, onValueChange, openOnFocus = true, value, disableCloseOnSelect = false, getOptionLabel = (option) => `${option[labelField]}`, sx = { minWidth: "150px", flexGrow: 2 }, noOptionsText = labels?.noOptions, loadingText = labels?.loading, openText = labels?.open, addLabel = labels?.add, onAdd, ...rest } = props;
+    const { search = false, autoAddBlankItem = search, idField = "id", idValue, inputError, inputHelperText, inputMargin, inputOnChange, inputRequired, inputReset, inputVariant, defaultValue, label, labelField = "label", loadData, onLoadData, name, inputAutoComplete = "off", options, dataReadonly = true, readOnly, onChange, onValueChange, openOnFocus = true, value, disableCloseOnSelect = false, getOptionLabel = (option) => `${option[labelField]}`, sx = { minWidth: "150px", flexGrow: 2 }, noOptionsText = labels?.noOptions, loadingText = labels?.loading, openText = labels?.open, addLabel = labels?.add, onAdd, getOptionKey = (option) => `${option[idField]}`, ...rest } = props;
     // Value input ref
     const inputRef = React.createRef();
     // Options state
@@ -122,7 +122,7 @@ export function ComboBox(props) {
                                 onChange(event, value, reason, details);
                             if (onValueChange)
                                 onValueChange(value);
-                        }, openOnFocus: openOnFocus, sx: sx, renderInput: (params) => search ? (_jsx(SearchField, { ...addReadOnly(params), label: label, name: name + "Input", margin: inputMargin, variant: inputVariant, required: inputRequired, error: inputError, helperText: inputHelperText })) : (_jsx(InputField, { ...addReadOnly(params), label: label, name: name + "Input", margin: inputMargin, variant: inputVariant, required: inputRequired, error: inputError, helperText: inputHelperText })), options: localOptions, noOptionsText: noOptionsText, loadingText: loadingText, openText: openText, ...rest }), onAdd && (_jsx(IconButton, { size: "small", onClick: () => {
+                        }, openOnFocus: openOnFocus, sx: sx, renderInput: (params) => search ? (_jsx(SearchField, { ...addReadOnly(params), label: label, name: name + "Input", margin: inputMargin, variant: inputVariant, required: inputRequired, error: inputError, helperText: inputHelperText })) : (_jsx(InputField, { ...addReadOnly(params), label: label, name: name + "Input", margin: inputMargin, variant: inputVariant, required: inputRequired, error: inputError, helperText: inputHelperText })), options: localOptions, noOptionsText: noOptionsText, loadingText: loadingText, openText: openText, getOptionKey: getOptionKey, ...rest }), onAdd && (_jsx(IconButton, { size: "small", onClick: () => {
                             onAdd(doLoadData);
                         }, title: addLabel, children: _jsx(AddIcon, {}) }))] })] }));
 }

package/lib/DataGridEx.d.ts

@@ -1,4 +1,4 @@
-import { GridColumn, GridLoaderStates, ScrollerGridProps } from "@etsoo/react";
+import { GridColumn, GridJsonData, GridLoadDataProps, GridLoaderStates, ScrollerGridProps } from "@etsoo/react";
 import React from "react";
 import { MouseEventWithDataHandler } from "./MUGlobal";
 /**
@@ -14,7 +14,7 @@ export type DataGridExFooterItemRendererProps<T extends object> = {
 /**
  * Extended DataGrid with VariableSizeGrid props
  */
-export type DataGridExProps<T extends object> = Omit<ScrollerGridProps<T>, "itemRenderer" | "columnCount" | "columnWidth" | "width"> & {
+export type DataGridExProps<T extends object, P extends GridJsonData = GridLoadDataProps> = Omit<ScrollerGridProps<T, P>, "itemRenderer" | "columnCount" | "columnWidth" | "width"> & {
     /**
      * Alternating colors for odd/even rows
      */

package/lib/pages/DataGridPageProps.d.ts

@@ -1,9 +1,10 @@
+import { GridJsonData, GridTemplateType } from "@etsoo/react";
 import type { DataGridExProps } from "../DataGridEx";
 import type { SearchPageProps } from "./SearchPageProps";
 /**
  * DataGrid page props
  */
-export type DataGridPageProps<T extends object, F> = Omit<DataGridExProps<T>, "loadData" | "height"> & SearchPageProps<T, F> & {
+export type DataGridPageProps<T extends object, F> = DataGridExProps<T, GridJsonData & GridTemplateType<F>> & SearchPageProps<T, F> & {
     /**
      * Height will be deducted
      * @param height Current calcuated height

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/materialui",
-  "version": "1.4.49",
+  "version": "1.4.51",
   "description": "TypeScript Material-UI Implementation",
   "main": "lib/index.js",
   "type": "module",
@@ -33,15 +33,15 @@
     "@dnd-kit/core": "^6.3.1",
     "@dnd-kit/sortable": "^10.0.0",
     "@emotion/css": "^11.13.5",
-    "@emotion/react": "^11.13.5",
-    "@emotion/styled": "^11.13.5",
-    "@etsoo/appscript": "^1.5.78",
+    "@emotion/react": "^11.14.0",
+    "@emotion/styled": "^11.14.0",
+    "@etsoo/appscript": "^1.5.79",
     "@etsoo/notificationbase": "^1.1.54",
-    "@etsoo/react": "^1.8.13",
+    "@etsoo/react": "^1.8.14",
     "@etsoo/shared": "^1.2.55",
-    "@mui/icons-material": "^6.1.10",
-    "@mui/material": "^6.1.10",
-    "@mui/x-data-grid": "^7.23.1",
+    "@mui/icons-material": "^6.2.0",
+    "@mui/material": "^6.2.0",
+    "@mui/x-data-grid": "^7.23.2",
     "chart.js": "^4.4.7",
     "chartjs-plugin-datalabels": "^2.2.0",
     "eventemitter3": "^5.0.1",

package/src/ComboBox.tsx

@@ -117,6 +117,7 @@ export function ComboBox<
     openText = labels?.open,
     addLabel = labels?.add,
     onAdd,
+    getOptionKey = (option: T) => `${option[idField]}`,
     ...rest
   } = props;
 
@@ -292,6 +293,7 @@ export function ComboBox<
           noOptionsText={noOptionsText}
           loadingText={loadingText}
           openText={openText}
+          getOptionKey={getOptionKey}
           {...rest}
         />
         {onAdd && (

package/src/DataGridEx.tsx

@@ -5,6 +5,8 @@ import {
   GridCellRendererProps,
   GridColumn,
   GridHeaderCellRendererProps,
+  GridJsonData,
+  GridLoadDataProps,
   GridLoaderPartialStates,
   GridLoaderStates,
   ScrollerGrid,
@@ -40,8 +42,11 @@ export type DataGridExFooterItemRendererProps<T extends object> = {
 /**
  * Extended DataGrid with VariableSizeGrid props
  */
-export type DataGridExProps<T extends object> = Omit<
-  ScrollerGridProps<T>,
+export type DataGridExProps<
+  T extends object,
+  P extends GridJsonData = GridLoadDataProps
+> = Omit<
+  ScrollerGridProps<T, P>,
   "itemRenderer" | "columnCount" | "columnWidth" | "width"
 > & {
   /**

package/src/pages/DataGridPageProps.ts

@@ -1,12 +1,13 @@
+import { GridJsonData, GridTemplateType } from "@etsoo/react";
 import type { DataGridExProps } from "../DataGridEx";
 import type { SearchPageProps } from "./SearchPageProps";
 
 /**
  * DataGrid page props
  */
-export type DataGridPageProps<T extends object, F> = Omit<
-  DataGridExProps<T>,
-  "loadData" | "height"
+export type DataGridPageProps<T extends object, F> = DataGridExProps<
+  T,
+  GridJsonData & GridTemplateType<F>
 > &
   SearchPageProps<T, F> & {
     /**