@etsoo/materialui 1.3.42 → 1.3.44

package/lib/TooltipClick.js

@@ -21,11 +21,11 @@ export function TooltipClick(props) {
         setOpen(true);
         if (newTitle)
             setTitle(newTitle);
-        delayed === null || delayed === void 0 ? void 0 : delayed.call();
+        delayed?.call();
     };
     React.useEffect(() => {
         return () => {
-            delayed === null || delayed === void 0 ? void 0 : delayed.clear();
+            delayed?.clear();
         };
     }, []);
     // Layout

package/lib/TwoFieldInput.js

@@ -11,7 +11,7 @@ import { InputField } from './InputField';
  */
 export function TwoFieldInput(props) {
     // Destruct
-    const { name, inputProps, type = inputProps === null || inputProps === void 0 ? void 0 : inputProps.inputMode, values, onValuesChange, onChange, onInput, ...rest } = props;
+    const { name, inputProps, type = inputProps?.inputMode, values, onValuesChange, onChange, onInput, ...rest } = props;
     // Local values
     const localValues = values == null
         ? [null, null]

package/lib/UserAvatar.js

@@ -10,8 +10,7 @@ import { globalApp } from "./app/ReactApp";
 export function UserAvatar(props) {
     // Destruct
     const { src, title, formatTitle = (title) => {
-        var _a;
-        return BusinessUtils.formatAvatarTitle(title, 3, (_a = globalApp === null || globalApp === void 0 ? void 0 : globalApp.get("me")) !== null && _a !== void 0 ? _a : "ME");
+        return BusinessUtils.formatAvatarTitle(title, 3, globalApp?.get("me") ?? "ME");
     } } = props;
     // Format
     const fTitle = formatTitle(title);

package/lib/UserAvatarEditor.js

@@ -73,7 +73,6 @@ export function UserAvatarEditor(props) {
     };
     // Handle file upload
     const handleFileUpload = (files) => {
-        var _a;
         // Reset all settings
         handleReset();
         // Set new preview image
@@ -83,7 +82,7 @@ export function UserAvatarEditor(props) {
         // Set ready state
         setReady(false);
         // Make the submit button visible
-        (_a = buttonRef.current) === null || _a === void 0 ? void 0 : _a.scrollIntoView(false);
+        buttonRef.current?.scrollIntoView(false);
     };
     // Handle reset
     const handleReset = () => {
@@ -99,11 +98,10 @@ export function UserAvatarEditor(props) {
     };
     // Handle done
     const handleDone = async () => {
-        var _a, _b;
         // Data
         var data = scaledResult
-            ? (_a = ref.current) === null || _a === void 0 ? void 0 : _a.getImageScaledToCanvas()
-            : (_b = ref.current) === null || _b === void 0 ? void 0 : _b.getImage();
+            ? ref.current?.getImageScaledToCanvas()
+            : ref.current?.getImage();
         if (data == null)
             return;
         // pica
@@ -141,7 +139,7 @@ export function UserAvatarEditor(props) {
         React.createElement(FileUploadButton, { variant: "outlined", size: "medium", startIcon: React.createElement(ComputerIcon, null), fullWidth: true, onUploadFiles: handleFileUpload, inputProps: { multiple: false, accept: "image/png, image/jpeg" } }, labels.upload),
         React.createElement(Stack, { direction: "row", spacing: 0.5 },
             React.createElement(React.Suspense, { fallback: React.createElement(Skeleton, { variant: "rounded", width: width, height: height }) },
-                React.createElement(AE, { ref: ref, border: border, width: width, height: height, onLoadSuccess: handleLoad, image: previewImage !== null && previewImage !== void 0 ? previewImage : "", scale: editorState.scale, rotate: editorState.rotate })),
+                React.createElement(AE, { ref: ref, border: border, width: width, height: height, onLoadSuccess: handleLoad, image: previewImage ?? "", scale: editorState.scale, rotate: editorState.rotate })),
             React.createElement(ButtonGroup, { size: "small", orientation: "vertical", disabled: !ready },
                 React.createElement(Button, { onClick: () => handleRotate(90), title: labels.rotateRight },
                     React.createElement(RotateRightIcon, null)),

package/lib/app/CommonApp.js

@@ -37,7 +37,7 @@ export class CommonApp extends ReactApp {
      */
     async refreshToken(props) {
         // Destruct
-        const { callback, data, relogin = false, showLoading = false } = props !== null && props !== void 0 ? props : {};
+        const { callback, data, relogin = false, showLoading = false } = props ?? {};
         // Token
         const token = this.getCacheToken();
         if (token == null || token === "") {

package/lib/app/ReactApp.js

@@ -38,7 +38,7 @@ export function ReactAppStateDetector(props) {
             matchedFields = [];
             targetFields.forEach((targetField) => {
                 if (changedFields.includes(targetField))
-                    matchedFields === null || matchedFields === void 0 ? void 0 : matchedFields.push(targetField);
+                    matchedFields?.push(targetField);
             });
         }
         // Callback
@@ -106,7 +106,6 @@ export class ReactApp extends CoreApp {
      * @param culture New culture definition
      */
     async changeCulture(culture) {
-        var _a, _b;
         // Super call to update cultrue
         const resources = await super.changeCulture(culture);
         // Update component labels
@@ -124,7 +123,7 @@ export class ReactApp extends CoreApp {
         });
         // Document title
         // Default is servier name's label or appName label
-        const title = (_b = (_a = this.get(this.name)) !== null && _a !== void 0 ? _a : this.get("appName")) !== null && _b !== void 0 ? _b : this.name;
+        const title = this.get(this.name) ?? this.get("appName") ?? this.name;
         const host = BridgeUtils.host;
         if (host) {
             // Notify host
@@ -164,7 +163,7 @@ export class ReactApp extends CoreApp {
      * @returns Props
      */
     getMoneyFormatProps(currency) {
-        return { culture: this.culture, currency: currency !== null && currency !== void 0 ? currency : this.currency };
+        return { culture: this.culture, currency: currency ?? this.currency };
     }
     /**
      * Fresh countdown UI
@@ -241,8 +240,7 @@ export class ReactApp extends CoreApp {
      * @param key Page title resource key
      */
     setPageKey(key) {
-        var _a;
-        this.setPageTitle((_a = this.get(key)) !== null && _a !== void 0 ? _a : "");
+        this.setPageTitle(this.get(key) ?? "");
     }
     /**
      * Show input dialog

package/lib/app/ServiceApp.js

@@ -88,7 +88,7 @@ export class ServiceApp extends ReactApp {
      */
     async refreshToken(props) {
         // Destruct
-        const { appApi, callback, data, relogin = false, showLoading = false } = props !== null && props !== void 0 ? props : {};
+        const { appApi, callback, data, relogin = false, showLoading = false } = props ?? {};
         // Token
         const token = this.getCacheToken();
         if (token == null || token === "") {
@@ -116,7 +116,6 @@ export class ServiceApp extends ReactApp {
         };
         // Success callback
         const success = async (result, failCallback) => {
-            var _a;
             // Token
             const refreshToken = this.getResponseToken(payload.response);
             if (refreshToken == null || result.data == null) {
@@ -129,7 +128,7 @@ export class ServiceApp extends ReactApp {
             // Use core system access token to service api to exchange service access token
             const api = appApi ? appApi.api : this.serviceApi;
             const serviceResult = await api.put("Auth/ExchangeToken", {
-                token: this.encryptEnhanced(userData.token, ((_a = appApi === null || appApi === void 0 ? void 0 : appApi.serviceId) !== null && _a !== void 0 ? _a : this.settings.serviceId).toString())
+                token: this.encryptEnhanced(userData.token, (appApi?.serviceId ?? this.settings.serviceId).toString())
             }, {
                 showLoading,
                 onError: (error) => {
@@ -218,7 +217,7 @@ export class ServiceApp extends ReactApp {
      * @returns Pure text
      */
     serviceDecrypt(messageEncrypted, passphrase) {
-        return this.decrypt(messageEncrypted, passphrase !== null && passphrase !== void 0 ? passphrase : this.servicePassphrase);
+        return this.decrypt(messageEncrypted, passphrase ?? this.servicePassphrase);
     }
     /**
      * Service encrypt message
@@ -228,7 +227,7 @@ export class ServiceApp extends ReactApp {
      * @returns Result
      */
     serviceEncrypt(message, passphrase, iterations) {
-        return this.encrypt(message, passphrase !== null && passphrase !== void 0 ? passphrase : this.servicePassphrase, iterations);
+        return this.encrypt(message, passphrase ?? this.servicePassphrase, iterations);
     }
     /**
      * Try login
@@ -256,10 +255,9 @@ export class ServiceApp extends ReactApp {
      * @param serviceUser Service user
      */
     userLoginEx(user, refreshToken, serviceUser) {
-        var _a;
         // Service user login
         this.servicePassphrase =
-            (_a = this.decrypt(serviceUser.servicePassphrase, this.settings.serviceId.toString())) !== null && _a !== void 0 ? _a : "";
+            this.decrypt(serviceUser.servicePassphrase, this.settings.serviceId.toString()) ?? "";
         // Service user
         this.serviceUser = serviceUser;
         // Service API token

package/lib/pages/DataGridPage.d.ts

@@ -1,4 +1,4 @@
-import { DataTypes, IdDefaultType } from "@etsoo/shared";
+import { DataTypes } from "@etsoo/shared";
 import React from "react";
 import { DataGridPageProps } from "./DataGridPageProps";
 /**
@@ -6,4 +6,4 @@ import { DataGridPageProps } from "./DataGridPageProps";
  * @param props Props
  * @returns Component
  */
-export declare function DataGridPage<T extends object, F extends DataTypes.BasicTemplate = DataTypes.BasicTemplate, D extends DataTypes.Keys<T> = IdDefaultType<T>>(props: DataGridPageProps<T, F, D>): React.JSX.Element;
+export declare function DataGridPage<T extends object, F extends DataTypes.BasicTemplate = DataTypes.BasicTemplate>(props: DataGridPageProps<T, F>): React.JSX.Element;

package/lib/pages/DataGridPage.js

@@ -12,10 +12,9 @@ import { GridUtils } from "../GridUtils";
  * @returns Component
  */
 export function DataGridPage(props) {
-    var _a;
     // Destruct
     const { adjustHeight, fields, fieldTemplate, height, loadData, mRef, sizeReadyMiliseconds = 100, pageProps = {}, cacheKey, cacheMinutes = 15, ...rest } = props;
-    (_a = pageProps.paddings) !== null && _a !== void 0 ? _a : (pageProps.paddings = MUGlobal.pagePaddings);
+    pageProps.paddings ?? (pageProps.paddings = MUGlobal.pagePaddings);
     // States
     const [states, setStates] = React.useReducer((currentState, newState) => {
         return { ...currentState, ...newState };
@@ -97,7 +96,7 @@ export function DataGridPage(props) {
             return;
         ref.reset({ data });
     }, [ref, data]);
-    const f = typeof fields == "function" ? fields(searchData !== null && searchData !== void 0 ? searchData : {}) : fields;
+    const f = typeof fields == "function" ? fields(searchData ?? {}) : fields;
     // Layout
     return (React.createElement(CommonPage, { ...pageProps, scrollContainer: states.element },
         React.createElement(Stack, null,

package/lib/pages/DataGridPageProps.d.ts

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

package/lib/pages/FixedListPage.d.ts

@@ -1,4 +1,4 @@
-import { DataTypes, IdDefaultType } from "@etsoo/shared";
+import { DataTypes } from "@etsoo/shared";
 import React from "react";
 import { ListPageProps } from "./ListPageProps";
 /**
@@ -6,7 +6,7 @@ import { ListPageProps } from "./ListPageProps";
  * @param props Props
  * @returns Component
  */
-export declare function FixedListPage<T extends object, F extends DataTypes.BasicTemplate = DataTypes.BasicTemplate, D extends DataTypes.Keys<T> = IdDefaultType<T>>(props: ListPageProps<T, F, D> & {
+export declare function FixedListPage<T extends object, F extends DataTypes.BasicTemplate = DataTypes.BasicTemplate>(props: ListPageProps<T, F> & {
     /**
      * Height will be deducted
      * @param height Current calcuated height

package/lib/pages/FixedListPage.js

@@ -12,10 +12,9 @@ import { GridUtils } from "../GridUtils";
  * @returns Component
  */
 export function FixedListPage(props) {
-    var _a;
     // Destruct
     const { adjustHeight, fields, fieldTemplate, loadData, mRef, sizeReadyMiliseconds = 0, pageProps = {}, cacheKey, cacheMinutes = 15, ...rest } = props;
-    (_a = pageProps.paddings) !== null && _a !== void 0 ? _a : (pageProps.paddings = MUGlobal.pagePaddings);
+    pageProps.paddings ?? (pageProps.paddings = MUGlobal.pagePaddings);
     // States
     const [states] = React.useState({});
     const initLoadedRef = React.useRef();
@@ -89,7 +88,7 @@ export function FixedListPage(props) {
                     }, ...rest })));
         }
     }, [rect]);
-    const f = typeof fields == "function" ? fields(searchData !== null && searchData !== void 0 ? searchData : {}) : fields;
+    const f = typeof fields == "function" ? fields(searchData ?? {}) : fields;
     const { paddings, ...pageRest } = pageProps;
     // Layout
     return (React.createElement(CommonPage, { ...pageRest, paddings: {}, scrollContainer: scrollContainer },

package/lib/pages/LeftDrawer.js

@@ -4,9 +4,8 @@ import ChevronLeftIcon from "@mui/icons-material/ChevronLeft";
 import { DrawerHeader } from "./DrawerHeader";
 import { globalApp } from "../app/ReactApp";
 export function LeftDrawer(props) {
-    var _a;
     // Destruct
-    const { mdUp, width, appName = globalApp === null || globalApp === void 0 ? void 0 : globalApp.get("appName"), onMinimize, open = mdUp, children } = props;
+    const { mdUp, width, appName = globalApp?.get("appName"), onMinimize, open = mdUp, children } = props;
     // Menu open/close state
     const [openLocal, setOpen] = React.useState();
     const handleDrawerClose = () => {
@@ -29,7 +28,7 @@ export function LeftDrawer(props) {
             keepMounted: true // Better open performance on mobile.
         } },
         React.createElement(DrawerHeader, null,
-            React.createElement("a", { href: "https://www.etsoo.com", title: (_a = globalApp === null || globalApp === void 0 ? void 0 : globalApp.get("etsoo")) !== null && _a !== void 0 ? _a : "ETSOO", target: "_blank", rel: "noreferrer" },
+            React.createElement("a", { href: "https://www.etsoo.com", title: globalApp?.get("etsoo") ?? "ETSOO", target: "_blank", rel: "noreferrer" },
                 React.createElement(Avatar, { src: process.env.PUBLIC_URL + "/logo192.png", variant: "square", sx: { marginLeft: -0.5, marginRight: 1.5, marginBottom: 1 } })),
             React.createElement(Typography, { noWrap: true, component: "div", title: appName, sx: { flexGrow: 2 } }, appName),
             React.createElement(IconButton, { size: "small", onClick: handleDrawerClose },

package/lib/pages/ListPage.d.ts

@@ -1,4 +1,4 @@
-import { DataTypes, IdDefaultType } from "@etsoo/shared";
+import { DataTypes } from "@etsoo/shared";
 import React from "react";
 import { ListPageProps } from "./ListPageProps";
 /**
@@ -6,4 +6,4 @@ import { ListPageProps } from "./ListPageProps";
  * @param props Props
  * @returns Component
  */
-export declare function ListPage<T extends object, F extends DataTypes.BasicTemplate = DataTypes.BasicTemplate, D extends DataTypes.Keys<T> = IdDefaultType<T>>(props: ListPageProps<T, F, D>): React.JSX.Element;
+export declare function ListPage<T extends object, F extends DataTypes.BasicTemplate = DataTypes.BasicTemplate>(props: ListPageProps<T, F>): React.JSX.Element;

package/lib/pages/ListPage.js

@@ -12,10 +12,9 @@ import { GridUtils } from "../GridUtils";
  * @returns Component
  */
 export function ListPage(props) {
-    var _a;
     // Destruct
     const { fields, fieldTemplate, loadData, mRef, pageProps = {}, cacheKey, cacheMinutes = 15, ...rest } = props;
-    (_a = pageProps.paddings) !== null && _a !== void 0 ? _a : (pageProps.paddings = MUGlobal.pagePaddings);
+    pageProps.paddings ?? (pageProps.paddings = MUGlobal.pagePaddings);
     // States
     const [states] = React.useState({});
     const refs = useCombinedRefs(mRef, (ref) => {
@@ -69,7 +68,7 @@ export function ListPage(props) {
             return;
         sessionStorage.setItem(`${cacheKey}-scroll`, JSON.stringify(props));
     };
-    const f = typeof fields == "function" ? fields(searchData !== null && searchData !== void 0 ? searchData : {}) : fields;
+    const f = typeof fields == "function" ? fields(searchData ?? {}) : fields;
     // Layout
     return (React.createElement(CommonPage, { ...pageProps, scrollContainer: globalThis },
         React.createElement(Stack, null,

package/lib/pages/ListPageProps.d.ts

@@ -4,4 +4,4 @@ import { SearchPageProps } from "./SearchPageProps";
 /**
  * List page props
  */
-export type ListPageProps<T extends object, F extends DataTypes.BasicTemplate, D extends DataTypes.Keys<T>> = SearchPageProps<T, F> & Omit<ScrollerListExProps<T, D>, "loadData">;
+export type ListPageProps<T extends object, F extends DataTypes.BasicTemplate> = SearchPageProps<T, F> & Omit<ScrollerListExProps<T>, "loadData">;

package/lib/pages/ResponsivePage.d.ts

@@ -1,4 +1,4 @@
-import { DataTypes, IdDefaultType } from "@etsoo/shared";
+import { DataTypes } from "@etsoo/shared";
 import React from "react";
 import { ResponsePageProps } from "./ResponsivePageProps";
 /**
@@ -6,4 +6,4 @@ import { ResponsePageProps } from "./ResponsivePageProps";
  * @param props Props
  * @returns Component
  */
-export declare function ResponsivePage<T extends object, F extends DataTypes.BasicTemplate = DataTypes.BasicTemplate, D extends DataTypes.Keys<T> = IdDefaultType<T>>(props: ResponsePageProps<T, F, D>): React.JSX.Element;
+export declare function ResponsivePage<T extends object, F extends DataTypes.BasicTemplate = DataTypes.BasicTemplate>(props: ResponsePageProps<T, F>): React.JSX.Element;

package/lib/pages/ResponsivePage.js

@@ -9,10 +9,9 @@ import { OperationMessageContainer } from "../messages/OperationMessageContainer
  * @returns Component
  */
 export function ResponsivePage(props) {
-    var _a;
     // Destruct
     const { pageProps = {}, operationMessageHandler, ...rest } = props;
-    (_a = pageProps.paddings) !== null && _a !== void 0 ? _a : (pageProps.paddings = MUGlobal.pagePaddings);
+    pageProps.paddings ?? (pageProps.paddings = MUGlobal.pagePaddings);
     const { paddings, fabColumnDirection, ...pageRest } = pageProps;
     // State
     const [scrollContainer, setScrollContainer] = React.useState();

package/lib/pages/ResponsivePageProps.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import { GridMethodRef } from "@etsoo/react";
-import { DataTypes, IdDefaultType } from "@etsoo/shared";
+import { DataTypes } from "@etsoo/shared";
 import { ListChildComponentProps } from "react-window";
 import { ScrollerListExInnerItemRendererProps, ScrollerListExItemSize } from "../ScrollerListEx";
 import { DataGridPageProps } from "./DataGridPageProps";
@@ -8,7 +8,7 @@ import { OperationMessageHandlerAll } from "../messages/OperationMessageHandler"
 /**
  * Response page props
  */
-export type ResponsePageProps<T extends object, F extends DataTypes.BasicTemplate, D extends DataTypes.Keys<T> = IdDefaultType<T>> = Omit<DataGridPageProps<T, F, D>, "mRef" | "itemKey" | "onScroll" | "onItemsRendered"> & {
+export type ResponsePageProps<T extends object, F extends DataTypes.BasicTemplate> = Omit<DataGridPageProps<T, F>, "mRef" | "itemKey" | "onScroll" | "onItemsRendered"> & {
     /**
      *
      * @param height Current height

package/lib/pages/TablePage.js

@@ -12,10 +12,9 @@ import { GridUtils } from "../GridUtils";
  * @returns Component
  */
 export function TablePage(props) {
-    var _a;
     // Destruct
     const { columns, fields, fieldTemplate, loadData, mRef, sizeReadyMiliseconds = 0, pageProps = {}, cacheKey, cacheMinutes = 15, ...rest } = props;
-    (_a = pageProps.paddings) !== null && _a !== void 0 ? _a : (pageProps.paddings = MUGlobal.pagePaddings);
+    pageProps.paddings ?? (pageProps.paddings = MUGlobal.pagePaddings);
     // States
     const [states] = React.useState({});
     const refs = useCombinedRefs(mRef, (ref) => {
@@ -43,8 +42,7 @@ export function TablePage(props) {
     const searchData = GridUtils.getSearchData(cacheKey);
     // Total width
     const totalWidth = React.useMemo(() => columns.reduce((previousValue, { width, minWidth }) => {
-        var _a;
-        return previousValue + ((_a = width !== null && width !== void 0 ? width : minWidth) !== null && _a !== void 0 ? _a : TableExMinWidth);
+        return previousValue + (width ?? minWidth ?? TableExMinWidth);
     }, 0), [columns]);
     // Watch container
     const { dimensions } = useDimensions(1, undefined, sizeReadyMiliseconds);
@@ -59,7 +57,7 @@ export function TablePage(props) {
             return (React.createElement(TableEx, { autoLoad: false, columns: columns, loadData: localLoadData, maxHeight: maxHeight, mRef: refs, ...rest }));
         }
     }, [rect]);
-    const f = typeof fields == "function" ? fields(searchData !== null && searchData !== void 0 ? searchData : {}) : fields;
+    const f = typeof fields == "function" ? fields(searchData ?? {}) : fields;
     // Layout
     return (React.createElement(CommonPage, { ...pageProps, scrollContainer: globalThis },
         React.createElement(Stack, null,

package/lib/pages/UserMenu.js

@@ -30,9 +30,8 @@ export function UserMenu(props) {
         setAnchorEl(undefined);
     };
     const handleClick = async (event) => {
-        var _a;
         handleMenuClose();
-        const item = (_a = event.target) === null || _a === void 0 ? void 0 : _a.closest("li[href]");
+        const item = event.target?.closest("li[href]");
         if (item != null) {
             const href = item.getAttribute("href");
             if (href) {

package/lib/pages/ViewPage.js

@@ -21,10 +21,10 @@ export function ViewPageGridItem(props) {
     // Default options
     let options = {};
     if (gridProps.xs == null && gridProps.md == null) {
-        options = getResp(singleRow !== null && singleRow !== void 0 ? singleRow : "small");
+        options = getResp(singleRow ?? "small");
     }
     else if (singleRow != null) {
-        options = getResp(singleRow !== null && singleRow !== void 0 ? singleRow : "small");
+        options = getResp(singleRow ?? "small");
     }
     // Layout
     return (React.createElement(Grid, { item: true, ...gridProps, ...options },
@@ -60,13 +60,12 @@ function getResp(singleRow) {
                 };
 }
 function getItemField(field, data) {
-    var _a, _b, _c;
     // Item data and label
     let itemData, itemLabel, gridProps = {};
     if (Array.isArray(field)) {
         const [fieldData, fieldType, renderProps, singleRow = "small"] = field;
         itemData = GridDataFormat(data[fieldData], fieldType, renderProps);
-        itemLabel = (_a = globalApp === null || globalApp === void 0 ? void 0 : globalApp.get(fieldData)) !== null && _a !== void 0 ? _a : fieldData;
+        itemLabel = globalApp?.get(fieldData) ?? fieldData;
         gridProps = { ...getResp(singleRow) };
     }
     else if (typeof field === "object") {
@@ -88,12 +87,12 @@ function getItemField(field, data) {
             typeof fieldLabel === "function"
                 ? fieldLabel(data)
                 : fieldLabel != null
-                    ? (_b = globalApp === null || globalApp === void 0 ? void 0 : globalApp.get(fieldLabel)) !== null && _b !== void 0 ? _b : fieldLabel
+                    ? globalApp?.get(fieldLabel) ?? fieldLabel
                     : fieldLabel;
     }
     else {
         itemData = formatItemData(data[field]);
-        itemLabel = (_c = globalApp === null || globalApp === void 0 ? void 0 : globalApp.get(field)) !== null && _c !== void 0 ? _c : field;
+        itemLabel = globalApp?.get(field) ?? field;
     }
     return [itemData, itemLabel, gridProps];
 }
@@ -155,7 +154,7 @@ export function ViewPage(props) {
         Utils.getResult(children, data, refresh),
         pullToRefresh && (React.createElement(PullToRefreshUI, { mainElement: pullContainer, triggerElement: pullContainer, instructionsPullToRefresh: labels.pullToRefresh, instructionsReleaseToRefresh: labels.releaseToRefresh, instructionsRefreshing: labels.refreshing, onRefresh: refresh, shouldPullToRefresh: () => {
                 const container = document.querySelector(pullContainer);
-                return !(container === null || container === void 0 ? void 0 : container.scrollTop);
+                return !container?.scrollTop;
             } })),
         React.createElement(ScrollRestoration, null)))));
 }

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "@etsoo/materialui",
-  "version": "1.3.42",
+  "version": "1.3.44",
   "description": "TypeScript Material-UI Implementation",
   "main": "lib/index.js",
+  "type": "module",
   "types": "lib/index.d.ts",
   "scripts": {
     "build": "tsc",
@@ -50,19 +51,13 @@
     "@emotion/css": "^11.11.2",
     "@emotion/react": "^11.11.4",
     "@emotion/styled": "^11.11.0",
-    "@etsoo/appscript": "^1.4.77",
-    "@etsoo/notificationbase": "^1.1.35",
-    "@etsoo/react": "^1.7.27",
-    "@etsoo/shared": "^1.2.26",
+    "@etsoo/appscript": "^1.4.79",
+    "@etsoo/notificationbase": "^1.1.40",
+    "@etsoo/react": "^1.7.31",
+    "@etsoo/shared": "^1.2.31",
     "@mui/icons-material": "^5.15.11",
     "@mui/material": "^5.15.11",
-    "@mui/x-data-grid": "^6.19.5",
-    "@types/pica": "^9.0.4",
-    "@types/pulltorefreshjs": "^0.1.7",
-    "@types/react": "^18.2.60",
-    "@types/react-avatar-editor": "^13.0.2",
-    "@types/react-dom": "^18.2.19",
-    "@types/react-input-mask": "^3.0.5",
+    "@mui/x-data-grid": "^6.19.6",
     "chart.js": "^4.4.2",
     "chartjs-plugin-datalabels": "^2.2.0",
     "eventemitter3": "^5.0.1",
@@ -86,6 +81,13 @@
     "@testing-library/jest-dom": "^6.4.2",
     "@testing-library/react": "^14.2.1",
     "@types/jest": "^29.5.12",
+    "@types/pica": "^9.0.4",
+    "@types/pulltorefreshjs": "^0.1.7",
+    "@types/react": "^18.2.61",
+    "@types/react-avatar-editor": "^13.0.2",
+    "@types/react-dom": "^18.2.19",
+    "@types/react-input-mask": "^3.0.5",
+    "@types/react-window": "^1.8.8",
     "@typescript-eslint/eslint-plugin": "^7.1.0",
     "@typescript-eslint/parser": "^7.1.0",
     "jest": "^29.7.0",

package/src/DataGridEx.tsx

@@ -12,7 +12,7 @@ import {
   ScrollerGridProps,
   useCombinedRefs
 } from "@etsoo/react";
-import { DataTypes, IdDefaultType, Utils } from "@etsoo/shared";
+import { DataTypes, Utils } from "@etsoo/shared";
 import {
   Box,
   BoxProps,
@@ -39,11 +39,8 @@ export type DataGridExFooterItemRendererProps<T extends object> = {
 /**
  * Extended DataGrid with VariableSizeGrid props
  */
-export type DataGridExProps<
-  T extends object,
-  D extends DataTypes.Keys<T>
-> = Omit<
-  ScrollerGridProps<T, D>,
+export type DataGridExProps<T extends object> = Omit<
+  ScrollerGridProps<T>,
   "itemRenderer" | "columnCount" | "columnWidth" | "width"
 > & {
   /**
@@ -216,10 +213,7 @@ export function DataGridExCalColumns<T>(columns: GridColumn<T>[]) {
  * @param props Props
  * @returns Component
  */
-export function DataGridEx<
-  T extends object,
-  D extends DataTypes.Keys<T> = IdDefaultType<T>
->(props: DataGridExProps<T, D>) {
+export function DataGridEx<T extends object>(props: DataGridExProps<T>) {
   // Theme
   const theme = useTheme();
 
@@ -367,7 +361,7 @@ export function DataGridEx<
     footerItemRenderer = DataGridRenderers.defaultFooterItemRenderer,
     hideFooter = false,
     hoverColor = "#f6f9fb",
-    idField = "id" as D,
+    idField = "id" as DataTypes.Keys<T>,
     mRef = React.createRef(),
     onClick,
     onDoubleClick,
@@ -636,7 +630,7 @@ export function DataGridEx<
       : undefined;
 
     return (
-      <ScrollerGrid<T, D>
+      <ScrollerGrid<T>
         className={Utils.mergeClasses(
           "DataGridEx-Body",
           "DataGridEx-CustomBar",

package/src/ResponsibleContainer.tsx

@@ -1,4 +1,4 @@
-import { DataTypes, IdDefaultType } from "@etsoo/shared";
+import { DataTypes } from "@etsoo/shared";
 import { Box, Stack, SxProps, Theme } from "@mui/material";
 import React from "react";
 import {
@@ -39,10 +39,9 @@ import { GridUtils } from "./GridUtils";
  */
 export type ResponsibleContainerProps<
   T extends object,
-  F extends DataTypes.BasicTemplate = DataTypes.BasicTemplate,
-  D extends DataTypes.Keys<T> = IdDefaultType<T>
+  F extends DataTypes.BasicTemplate = DataTypes.BasicTemplate
 > = Omit<
-  DataGridExProps<T, D>,
+  DataGridExProps<T>,
   | "height"
   | "itemKey"
   | "loadData"
@@ -190,9 +189,8 @@ function defaultContainerBoxSx(
  */
 export function ResponsibleContainer<
   T extends object,
-  F extends DataTypes.BasicTemplate = DataTypes.BasicTemplate,
-  D extends DataTypes.Keys<T> = IdDefaultType<T>
->(props: ResponsibleContainerProps<T, F, D>) {
+  F extends DataTypes.BasicTemplate = DataTypes.BasicTemplate
+>(props: ResponsibleContainerProps<T, F>) {
   // Destruct
   const {
     adjustHeight,
@@ -371,7 +369,7 @@ export function ResponsibleContainer<
 
       return [
         <Box className="DataGridBox">
-          <DataGridEx<T, D>
+          <DataGridEx<T>
             autoLoad={!hasFields}
             height={heightLocal}
             width={rect.width}
@@ -404,7 +402,7 @@ export function ResponsibleContainer<
 
     return [
       <Box className="ListBox" sx={{ height: heightLocal }}>
-        <ScrollerListEx<T, D>
+        <ScrollerListEx<T>
           autoLoad={!hasFields}
           height={heightLocal}
           loadData={localLoadData}