@etsoo/materialui 1.3.42 → 1.3.43

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.43",
   "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}