@etsoo/materialui 1.3.9 → 1.3.11

package/lib/DataGridEx.js

@@ -261,7 +261,7 @@ export function DataGridEx(props) {
             rowIndex,
             columnIndex,
             cellProps,
-            renderProps,
+            renderProps: typeof renderProps === "function" ? renderProps(data) : renderProps,
             setItems
         });
         return (React.createElement("div", { className: rowClass, style: style, "data-row": rowIndex, "data-column": columnIndex, onMouseDown: selectable && !checkable ? handleMouseDown : undefined, onMouseOver: selectable ? handleMouseOver : undefined, onMouseOut: selectable ? handleMouseOut : undefined, onClick: (event) => onClick && data != null && onClick(event, data), onDoubleClick: (event) => onDoubleClick && data != null && onDoubleClick(event, data) },

package/lib/MUUtils.d.ts

@@ -1,4 +1,5 @@
 import { ListType2 } from "@etsoo/shared";
+import { GridApiCommunity } from "@mui/x-data-grid/models/api/gridApiCommunity";
 /**
  * MU utilities
  */
@@ -9,4 +10,11 @@ export declare namespace MUUtils {
      * @returns Result
      */
     function getListItemLabel(item: ListType2): string;
+    /**
+     * Get grid data
+     * @param grid Grid
+     * @param checkField Check field or callback
+     * @returns Results
+     */
+    function getGridData<T>(grid: GridApiCommunity, checkField: keyof T | ((item: T) => boolean)): T[];
 }

package/lib/MUUtils.js

@@ -16,4 +16,27 @@ export var MUUtils;
                 : item.title;
     }
     MUUtils.getListItemLabel = getListItemLabel;
+    /**
+     * Get grid data
+     * @param grid Grid
+     * @param checkField Check field or callback
+     * @returns Results
+     */
+    function getGridData(grid, checkField) {
+        const check = typeof checkField === "function"
+            ? checkField
+            : (item) => {
+                const value = item[checkField];
+                return value == null || value === "" ? false : true;
+            };
+        const items = [];
+        for (const [_, value] of grid.getRowModels()) {
+            const item = value;
+            if (check(item)) {
+                items.push(item);
+            }
+        }
+        return items;
+    }
+    MUUtils.getGridData = getGridData;
 })(MUUtils || (MUUtils = {}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/materialui",
-  "version": "1.3.9",
+  "version": "1.3.11",
   "description": "TypeScript Material-UI Implementation",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -50,13 +50,13 @@
     "@emotion/css": "^11.11.2",
     "@emotion/react": "^11.11.1",
     "@emotion/styled": "^11.11.0",
-    "@etsoo/appscript": "^1.4.41",
+    "@etsoo/appscript": "^1.4.45",
     "@etsoo/notificationbase": "^1.1.28",
-    "@etsoo/react": "^1.7.7",
+    "@etsoo/react": "^1.7.8",
     "@etsoo/shared": "^1.2.12",
     "@mui/icons-material": "^5.14.8",
     "@mui/material": "^5.14.8",
-    "@mui/x-data-grid": "^6.12.1",
+    "@mui/x-data-grid": "^6.13.0",
     "@types/pica": "^9.0.1",
     "@types/pulltorefreshjs": "^0.1.5",
     "@types/react": "^18.2.21",
@@ -76,7 +76,7 @@
   },
   "devDependencies": {
     "@babel/cli": "^7.22.15",
-    "@babel/core": "^7.22.15",
+    "@babel/core": "^7.22.17",
     "@babel/plugin-transform-runtime": "^7.22.15",
     "@babel/preset-env": "^7.22.15",
     "@babel/preset-react": "^7.22.15",

package/src/DataGridEx.tsx

@@ -575,7 +575,8 @@ export function DataGridEx<
       rowIndex,
       columnIndex,
       cellProps,
-      renderProps,
+      renderProps:
+        typeof renderProps === "function" ? renderProps(data) : renderProps,
       setItems
     });
 

package/src/MUUtils.ts

@@ -1,4 +1,5 @@
 import { ListType2 } from "@etsoo/shared";
+import { GridApiCommunity } from "@mui/x-data-grid/models/api/gridApiCommunity";
 
 /**
  * MU utilities
@@ -16,4 +17,32 @@ export namespace MUUtils {
       ? item.name
       : item.title;
   }
+
+  /**
+   * Get grid data
+   * @param grid Grid
+   * @param checkField Check field or callback
+   * @returns Results
+   */
+  export function getGridData<T>(
+    grid: GridApiCommunity,
+    checkField: keyof T | ((item: T) => boolean)
+  ) {
+    const check =
+      typeof checkField === "function"
+        ? checkField
+        : (item: T) => {
+            const value = item[checkField];
+            return value == null || value === "" ? false : true;
+          };
+
+    const items: T[] = [];
+    for (const [_, value] of grid.getRowModels()) {
+      const item = value as T;
+      if (check(item)) {
+        items.push(item);
+      }
+    }
+    return items;
+  }
 }