@etsoo/materialui 1.3.34 → 1.3.35

package/lib/DataGridEx.js

@@ -84,7 +84,7 @@ export function DataGridEx(props) {
                 sortLabel = headerCellRenderer({
                     cellProps,
                     column,
-                    columnIndex: checkable ? index - 1 : index,
+                    columnIndex: checkable ? index - 1 : index, // Ignore the checkbox case,
                     states
                 });
             }
@@ -113,7 +113,7 @@ export function DataGridEx(props) {
             const cell = footerItemRenderer
                 ? footerItemRenderer(rows, {
                     column,
-                    index: checkable ? index - 1 : index,
+                    index: checkable ? index - 1 : index, // Ignore the checkbox case
                     states,
                     cellProps,
                     checkable
@@ -127,7 +127,7 @@ export function DataGridEx(props) {
     const { alternatingColors = [theme.palette.grey[100], undefined], borderRowsCount, bottomHeight = 53, checkable = false, className, columns, defaultOrderBy, height, headerHeight = 56, headerRenderer = defaultHeaderRenderer, footerRenderer = defaultFooterRenderer, footerItemRenderer = DataGridRenderers.defaultFooterItemRenderer, hideFooter = false, hoverColor = "#f6f9fb", idField = "id", mRef = React.createRef(), onClick, onDoubleClick, selectable = true, selectedColor = "#edf4fb", width, ...rest } = props;
     if (checkable) {
         const cbColumn = {
-            field: "selected",
+            field: "selected", // Avoid validation from data model
             header: "",
             sortable: false,
             width: 50,

package/lib/pages/ViewPage.d.ts

@@ -37,7 +37,7 @@ export interface ViewPageField<T extends object> extends GridProps {
     /**
      * Label field
      */
-    label?: string | (() => React.ReactNode);
+    label?: string | ((item: T) => React.ReactNode);
     /**
      * Display as single row
      */

package/lib/pages/ViewPage.js

@@ -86,7 +86,7 @@ function getItemField(field, data) {
         // Field label
         itemLabel =
             typeof fieldLabel === "function"
-                ? fieldLabel()
+                ? fieldLabel(data)
                 : fieldLabel != null
                     ? (_b = globalApp === null || globalApp === void 0 ? void 0 : globalApp.get(fieldLabel)) !== null && _b !== void 0 ? _b : fieldLabel
                     : fieldLabel;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/materialui",
-  "version": "1.3.34",
+  "version": "1.3.35",
   "description": "TypeScript Material-UI Implementation",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -54,14 +54,14 @@
     "@etsoo/notificationbase": "^1.1.32",
     "@etsoo/react": "^1.7.24",
     "@etsoo/shared": "^1.2.22",
-    "@mui/icons-material": "^5.14.18",
-    "@mui/material": "^5.14.18",
-    "@mui/x-data-grid": "^6.18.1",
+    "@mui/icons-material": "^5.14.19",
+    "@mui/material": "^5.14.19",
+    "@mui/x-data-grid": "^6.18.2",
     "@types/pica": "^9.0.4",
     "@types/pulltorefreshjs": "^0.1.7",
-    "@types/react": "^18.2.37",
+    "@types/react": "^18.2.40",
     "@types/react-avatar-editor": "^13.0.2",
-    "@types/react-dom": "^18.2.15",
+    "@types/react-dom": "^18.2.17",
     "@types/react-input-mask": "^3.0.5",
     "chart.js": "^4.4.0",
     "chartjs-plugin-datalabels": "^2.2.0",
@@ -75,20 +75,20 @@
     "react-imask": "6.6.3"
   },
   "devDependencies": {
-    "@babel/cli": "^7.23.0",
-    "@babel/core": "^7.23.3",
-    "@babel/plugin-transform-runtime": "^7.23.3",
-    "@babel/preset-env": "^7.23.3",
+    "@babel/cli": "^7.23.4",
+    "@babel/core": "^7.23.5",
+    "@babel/plugin-transform-runtime": "^7.23.4",
+    "@babel/preset-env": "^7.23.5",
     "@babel/preset-react": "^7.23.3",
     "@babel/preset-typescript": "^7.23.3",
-    "@babel/runtime-corejs3": "^7.23.2",
-    "@testing-library/jest-dom": "^6.1.4",
-    "@testing-library/react": "^14.1.0",
-    "@types/jest": "^29.5.8",
-    "@typescript-eslint/eslint-plugin": "^6.11.0",
-    "@typescript-eslint/parser": "^6.11.0",
+    "@babel/runtime-corejs3": "^7.23.5",
+    "@testing-library/jest-dom": "^6.1.5",
+    "@testing-library/react": "^14.1.2",
+    "@types/jest": "^29.5.10",
+    "@typescript-eslint/eslint-plugin": "^6.13.1",
+    "@typescript-eslint/parser": "^6.13.1",
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
-    "typescript": "^5.2.2"
+    "typescript": "^5.3.2"
   }
 }

package/src/pages/ViewPage.tsx

@@ -89,7 +89,7 @@ export interface ViewPageField<T extends object> extends GridProps {
   /**
    * Label field
    */
-  label?: string | (() => React.ReactNode);
+  label?: string | ((item: T) => React.ReactNode);
 
   /**
    * Display as single row
@@ -235,7 +235,7 @@ function getItemField<T extends object>(
     // Field label
     itemLabel =
       typeof fieldLabel === "function"
-        ? fieldLabel()
+        ? fieldLabel(data)
         : fieldLabel != null
         ? globalApp?.get<string>(fieldLabel) ?? fieldLabel
         : fieldLabel;