@etsoo/materialui 1.5.0 → 1.5.2

package/lib/cjs/GridDataFormat.js

@@ -40,6 +40,9 @@ function GridDataFormat(data, type, renderProps) {
         else
             return shared_1.NumberUtils.format(data, renderProps?.culture, renderProps?.numberFormatOptions);
     }
+    // Array
+    if (Array.isArray(data))
+        return data.join(", ");
     if (typeof data === "string")
         return data;
     return `${data}`;

package/lib/cjs/ViewContainer.js

@@ -21,6 +21,8 @@ function formatItemData(app, fieldData) {
         return fieldData;
     if (fieldData instanceof Date)
         return app.formatDate(fieldData, "d");
+    if (Array.isArray(fieldData))
+        return fieldData.join(", ");
     return `${fieldData}`;
 }
 function getResp(singleRow) {
@@ -162,7 +164,7 @@ function ViewContainer(props) {
     // Global app
     const app = (0, ReactApp_1.useRequiredAppContext)();
     // Destruct
-    const { data, fields, gridRef, leftContainer, leftContainerLines = 3, leftContainerProps = {}, refresh, spacing = MUGlobal_1.MUGlobal.half(MUGlobal_1.MUGlobal.pagePaddings), ...rest } = props;
+    const { data, fields, gridRef, leftContainer, leftContainerLines = 3, leftContainerProps = {}, refresh, spacing = MUGlobal_1.MUGlobal.half(MUGlobal_1.MUGlobal.pagePaddings) } = props;
     // Left container
     const { size = ViewPageSize.smallLine, ...leftContainerPropsRest } = leftContainerProps;
     // Current breakpoint
@@ -226,5 +228,5 @@ function ViewContainer(props) {
     }, [app, fields, data, bp]);
     let leftResult;
     // Layout
-    return ((0, jsx_runtime_1.jsxs)(material_1.Grid2, { container: true, justifyContent: "left", className: "ET-ViewPage", ref: gridRef, spacing: spacing, children: [leftContainer && (leftResult = leftContainer(data)) != null && ((0, jsx_runtime_1.jsxs)(react_2.default.Fragment, { children: [(0, jsx_runtime_1.jsx)(material_1.Grid2, { container: true, className: "ET-ViewPage-LeftContainer", spacing: spacing, size: size, ...leftContainerPropsRest, children: leftResult }), (0, jsx_runtime_1.jsx)(material_1.Grid2, { container: true, className: "ET-ViewPage-LeftOthers", spacing: spacing, size: ViewPageSize.matchSize(size), children: createFields(data, leftContainerLines * (12 - getItemSize(bp, size))) })] })), createFields(data)] }));
+    return ((0, jsx_runtime_1.jsxs)(material_1.Grid2, { container: true, justifyContent: "left", className: "ET-ViewContainer", ref: gridRef, spacing: spacing, children: [leftContainer && (leftResult = leftContainer(data)) != null && ((0, jsx_runtime_1.jsxs)(react_2.default.Fragment, { children: [(0, jsx_runtime_1.jsx)(material_1.Grid2, { container: true, className: "ET-ViewPage-LeftContainer", spacing: spacing, size: size, ...leftContainerPropsRest, children: leftResult }), (0, jsx_runtime_1.jsx)(material_1.Grid2, { container: true, className: "ET-ViewPage-LeftOthers", spacing: spacing, size: ViewPageSize.matchSize(size), children: createFields(data, leftContainerLines * (12 - getItemSize(bp, size))) })] })), createFields(data)] }));
 }

package/lib/cjs/pages/ViewPage.js

@@ -44,11 +44,7 @@ function ViewPage(props) {
             MessageUtils_1.MessageUtils.offRefresh(refreshHandler);
         };
     }, [refresh]);
-    return ((0, jsx_runtime_1.jsx)(CommonPage_1.CommonPage, { paddings: paddings, onRefresh: supportRefresh ? refresh : undefined, onUpdate: supportRefresh ? undefined : refresh, sx: {
-            ".MuiTypography-subtitle2": {
-                fontWeight: "bold"
-            }
-        }, ...rest, scrollContainer: globalThis, fabColumnDirection: fabColumnDirection, fabTop: fabTop, supportBack: supportBack, children: data == null ? ((0, jsx_runtime_1.jsx)(material_1.LinearProgress, {})) : ((0, jsx_runtime_1.jsxs)(react_2.default.Fragment, { children: [operationMessageHandler && ((0, jsx_runtime_1.jsx)(OperationMessageContainer_1.OperationMessageContainer, { handler: "id" in operationMessageHandler
+    return ((0, jsx_runtime_1.jsx)(CommonPage_1.CommonPage, { paddings: paddings, onRefresh: supportRefresh ? refresh : undefined, onUpdate: supportRefresh ? undefined : refresh, className: "ET-ViewPage", ...rest, scrollContainer: globalThis, fabColumnDirection: fabColumnDirection, fabTop: fabTop, supportBack: supportBack, children: data == null ? ((0, jsx_runtime_1.jsx)(material_1.LinearProgress, {})) : ((0, jsx_runtime_1.jsxs)(react_2.default.Fragment, { children: [operationMessageHandler && ((0, jsx_runtime_1.jsx)(OperationMessageContainer_1.OperationMessageContainer, { handler: "id" in operationMessageHandler
                         ? [
                             operationMessageHandler.types,
                             refresh,

package/lib/mjs/GridDataFormat.js

@@ -37,6 +37,9 @@ export function GridDataFormat(data, type, renderProps) {
         else
             return NumberUtils.format(data, renderProps?.culture, renderProps?.numberFormatOptions);
     }
+    // Array
+    if (Array.isArray(data))
+        return data.join(", ");
     if (typeof data === "string")
         return data;
     return `${data}`;

package/lib/mjs/ViewContainer.js

@@ -13,6 +13,8 @@ function formatItemData(app, fieldData) {
         return fieldData;
     if (fieldData instanceof Date)
         return app.formatDate(fieldData, "d");
+    if (Array.isArray(fieldData))
+        return fieldData.join(", ");
     return `${fieldData}`;
 }
 function getResp(singleRow) {
@@ -154,7 +156,7 @@ export function ViewContainer(props) {
     // Global app
     const app = useRequiredAppContext();
     // Destruct
-    const { data, fields, gridRef, leftContainer, leftContainerLines = 3, leftContainerProps = {}, refresh, spacing = MUGlobal.half(MUGlobal.pagePaddings), ...rest } = props;
+    const { data, fields, gridRef, leftContainer, leftContainerLines = 3, leftContainerProps = {}, refresh, spacing = MUGlobal.half(MUGlobal.pagePaddings) } = props;
     // Left container
     const { size = ViewPageSize.smallLine, ...leftContainerPropsRest } = leftContainerProps;
     // Current breakpoint
@@ -218,5 +220,5 @@ export function ViewContainer(props) {
     }, [app, fields, data, bp]);
     let leftResult;
     // Layout
-    return (_jsxs(Grid2, { container: true, justifyContent: "left", className: "ET-ViewPage", ref: gridRef, spacing: spacing, children: [leftContainer && (leftResult = leftContainer(data)) != null && (_jsxs(React.Fragment, { children: [_jsx(Grid2, { container: true, className: "ET-ViewPage-LeftContainer", spacing: spacing, size: size, ...leftContainerPropsRest, children: leftResult }), _jsx(Grid2, { container: true, className: "ET-ViewPage-LeftOthers", spacing: spacing, size: ViewPageSize.matchSize(size), children: createFields(data, leftContainerLines * (12 - getItemSize(bp, size))) })] })), createFields(data)] }));
+    return (_jsxs(Grid2, { container: true, justifyContent: "left", className: "ET-ViewContainer", ref: gridRef, spacing: spacing, children: [leftContainer && (leftResult = leftContainer(data)) != null && (_jsxs(React.Fragment, { children: [_jsx(Grid2, { container: true, className: "ET-ViewPage-LeftContainer", spacing: spacing, size: size, ...leftContainerPropsRest, children: leftResult }), _jsx(Grid2, { container: true, className: "ET-ViewPage-LeftOthers", spacing: spacing, size: ViewPageSize.matchSize(size), children: createFields(data, leftContainerLines * (12 - getItemSize(bp, size))) })] })), createFields(data)] }));
 }

package/lib/mjs/pages/ViewPage.js

@@ -38,11 +38,7 @@ export function ViewPage(props) {
             MessageUtils.offRefresh(refreshHandler);
         };
     }, [refresh]);
-    return (_jsx(CommonPage, { paddings: paddings, onRefresh: supportRefresh ? refresh : undefined, onUpdate: supportRefresh ? undefined : refresh, sx: {
-            ".MuiTypography-subtitle2": {
-                fontWeight: "bold"
-            }
-        }, ...rest, scrollContainer: globalThis, fabColumnDirection: fabColumnDirection, fabTop: fabTop, supportBack: supportBack, children: data == null ? (_jsx(LinearProgress, {})) : (_jsxs(React.Fragment, { children: [operationMessageHandler && (_jsx(OperationMessageContainer, { handler: "id" in operationMessageHandler
+    return (_jsx(CommonPage, { paddings: paddings, onRefresh: supportRefresh ? refresh : undefined, onUpdate: supportRefresh ? undefined : refresh, className: "ET-ViewPage", ...rest, scrollContainer: globalThis, fabColumnDirection: fabColumnDirection, fabTop: fabTop, supportBack: supportBack, children: data == null ? (_jsx(LinearProgress, {})) : (_jsxs(React.Fragment, { children: [operationMessageHandler && (_jsx(OperationMessageContainer, { handler: "id" in operationMessageHandler
                         ? [
                             operationMessageHandler.types,
                             refresh,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/materialui",
-  "version": "1.5.0",
+  "version": "1.5.2",
   "description": "TypeScript Material-UI Implementation",
   "main": "lib/cjs/index.js",
   "module": "lib/mjs/index.js",
@@ -46,7 +46,7 @@
     "@etsoo/shared": "^1.2.63",
     "@mui/icons-material": "^6.4.8",
     "@mui/material": "^6.4.8",
-    "@mui/x-data-grid": "^7.28.0",
+    "@mui/x-data-grid": "^7.28.1",
     "chart.js": "^4.4.8",
     "chartjs-plugin-datalabels": "^2.2.0",
     "eventemitter3": "^5.0.1",

package/src/GridDataFormat.tsx

@@ -71,6 +71,9 @@ export function GridDataFormat(
       );
   }
 
+  // Array
+  if (Array.isArray(data)) return data.join(", ");
+
   if (typeof data === "string") return data;
 
   return `${data}`;

package/src/ViewContainer.tsx

@@ -14,6 +14,7 @@ function formatItemData(
   if (fieldData == null) return undefined;
   if (typeof fieldData === "string") return fieldData;
   if (fieldData instanceof Date) return app.formatDate(fieldData, "d");
+  if (Array.isArray(fieldData)) return fieldData.join(", ");
   return `${fieldData}`;
 }
 
@@ -315,8 +316,7 @@ export function ViewContainer<T extends DataTypes.StringRecord>(
     leftContainerLines = 3,
     leftContainerProps = {},
     refresh,
-    spacing = MUGlobal.half(MUGlobal.pagePaddings),
-    ...rest
+    spacing = MUGlobal.half(MUGlobal.pagePaddings)
   } = props;
 
   // Left container
@@ -403,7 +403,7 @@ export function ViewContainer<T extends DataTypes.StringRecord>(
     <Grid2
       container
       justifyContent="left"
-      className="ET-ViewPage"
+      className="ET-ViewContainer"
       ref={gridRef}
       spacing={spacing}
     >

package/src/pages/ViewPage.tsx

@@ -129,11 +129,7 @@ export function ViewPage<T extends DataTypes.StringRecord>(
       paddings={paddings}
       onRefresh={supportRefresh ? refresh : undefined}
       onUpdate={supportRefresh ? undefined : refresh}
-      sx={{
-        ".MuiTypography-subtitle2": {
-          fontWeight: "bold"
-        }
-      }}
+      className="ET-ViewPage"
       {...rest}
       scrollContainer={globalThis}
       fabColumnDirection={fabColumnDirection}