npm - @etsoo/materialui - Versions diffs - 1.0.10 → 1.0.13 - Mend

@etsoo/materialui 1.0.10 → 1.0.13

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

package/lib/pages/ViewPage.d.ts CHANGED Viewed

@@ -3,6 +3,7 @@ import { DataTypes } from '@etsoo/shared';
 import { GridProps } from '@mui/material';
 import React from 'react';
 import { CommonPageProps } from './CommonPageProps';
+declare type RowType = boolean | 'default' | 'small';
 /**
  * View page display field
  */
@@ -22,13 +23,13 @@ export interface ViewPageField<T extends object> extends GridProps {
     /**
      * Display as single row
      */
-    singleRow?: boolean;
+    singleRow?: RowType;
     /**
      * Render props
      */
     renderProps?: GridColumnRenderProps;
 }
-declare type ViewPageFieldType<T extends object> = (string & keyof T) | [string & keyof T, GridDataType, GridColumnRenderProps?] | ViewPageField<T>;
+declare type ViewPageFieldType<T extends object> = (string & keyof T) | [string & keyof T, GridDataType, GridColumnRenderProps?, RowType?] | ViewPageField<T>;
 /**
  * View page props
  */

package/lib/pages/ViewPage.js CHANGED Viewed

@@ -16,25 +16,36 @@ function formatItemData(fieldData) {
         return globalApp.formatDate(fieldData, 'd');
     return `${fieldData}`;
 }
+function getResp(singleRow) {
+    return singleRow === 'default'
+        ? { xs: 12, sm: 12, md: 12, lg: 6, xl: 6 }
+        : singleRow === true
+            ? { xs: 12, sm: 12, md: 12, lg: 12, xl: 12 }
+            : {
+                xs: singleRow === false ? 12 : 6,
+                sm: 6,
+                md: 6,
+                lg: 4,
+                xl: 3
+            };
+}
 function getItemField(field, data) {
     var _a, _b, _c;
     // Item data and label
     let itemData, itemLabel, gridProps = {};
-    let xs = 6;
     if (Array.isArray(field)) {
-        const [fieldData, fieldType, renderProps] = field;
+        const [fieldData, fieldType, renderProps, singleRow = 'small'] = field;
         itemData = GridDataFormat(data[fieldData], fieldType, renderProps);
         itemLabel = (_a = globalApp.get(fieldData)) !== null && _a !== void 0 ? _a : fieldData;
+        gridProps = { ...getResp(singleRow) };
     }
     else if (typeof field === 'object') {
         // Destruct
-        const { data: fieldData, dataType, label: fieldLabel, renderProps, singleRow, ...rest } = field;
+        const { data: fieldData, dataType, label: fieldLabel, renderProps, singleRow = 'default', ...rest } = field;
         gridProps = {
             ...rest,
-            ...(singleRow && { xs: 12, sm: 12, md: 12, lg: 12, xl: 12 })
+            ...getResp(singleRow)
         };
-        if (singleRow === false)
-            xs = 12;
         // Field data
         if (typeof fieldData === 'function')
             itemData = fieldData(data);
@@ -52,11 +63,7 @@ function getItemField(field, data) {
         itemData = formatItemData(data[field]);
         itemLabel = (_c = globalApp.get(field)) !== null && _c !== void 0 ? _c : field;
     }
-    return [
-        itemData,
-        itemLabel,
-        { xs, sm: 6, md: 6, lg: 4, xl: 3, ...gridProps }
-    ];
+    return [itemData, itemLabel, gridProps];
 }
 /**
  * View page
@@ -94,7 +101,7 @@ export function ViewPage(props) {
                 React.createElement(Typography, { variant: "caption", component: "div" },
                     itemLabel,
                     ":"),
-                React.createElement(Typography, { variant: "subtitle2" }, itemData)));
+                typeof itemData === 'object' ? (itemData) : (React.createElement(Typography, { variant: "subtitle2" }, itemData))));
         })),
         actions != null && (React.createElement(Stack, { className: "ET-ViewPage-Actions", direction: "row", width: "100%", flexWrap: "wrap", justifyContent: "flex-end", paddingTop: paddings, paddingBottom: paddings, gap: paddings }, Utils.getResult(actions, data, refresh))),
         Utils.getResult(children, data, refresh),

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/materialui",
-    "version": "1.0.10",
+    "version": "1.0.13",
     "description": "TypeScript Material-UI Implementation",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
@@ -54,7 +54,7 @@
         "@etsoo/appscript": "^1.2.90",
         "@etsoo/notificationbase": "^1.1.7",
         "@etsoo/react": "^1.5.89",
-        "@etsoo/shared": "^1.1.53",
+        "@etsoo/shared": "^1.1.54",
         "@mui/icons-material": "^5.10.3",
         "@mui/material": "^5.10.4",
         "@types/pica": "^9.0.1",
@@ -82,10 +82,10 @@
         "@babel/runtime-corejs3": "^7.19.0",
         "@testing-library/jest-dom": "^5.16.5",
         "@testing-library/react": "^13.4.0",
-        "@types/jest": "^29.0.0",
+        "@types/jest": "^29.0.1",
         "@typescript-eslint/eslint-plugin": "^5.36.2",
         "@typescript-eslint/parser": "^5.36.2",
-        "eslint": "^8.23.0",
+        "eslint": "^8.23.1",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.26.0",
         "eslint-plugin-react": "^7.31.8",

package/src/pages/ViewPage.tsx CHANGED Viewed

@@ -16,6 +16,8 @@ import { PullToRefreshUI } from '../PullToRefreshUI';
 import { CommonPage } from './CommonPage';
 import { CommonPageProps } from './CommonPageProps';
+type RowType = boolean | 'default' | 'small';
 /**
  * View page display field
  */
@@ -38,7 +40,7 @@ export interface ViewPageField<T extends object> extends GridProps {
     /**
      * Display as single row
      */
-    singleRow?: boolean;
+    singleRow?: RowType;
     /**
      * Render props
@@ -48,7 +50,7 @@ export interface ViewPageField<T extends object> extends GridProps {
 type ViewPageFieldType<T extends object> =
     | (string & keyof T)
-    | [string & keyof T, GridDataType, GridColumnRenderProps?]
+    | [string & keyof T, GridDataType, GridColumnRenderProps?, RowType?]
     | ViewPageField<T>;
 /**
@@ -98,6 +100,20 @@ function formatItemData(fieldData: unknown): string | undefined {
     return `${fieldData}`;
 }
+function getResp(singleRow: RowType) {
+    return singleRow === 'default'
+        ? { xs: 12, sm: 12, md: 12, lg: 6, xl: 6 }
+        : singleRow === true
+        ? { xs: 12, sm: 12, md: 12, lg: 12, xl: 12 }
+        : {
+              xs: singleRow === false ? 12 : 6,
+              sm: 6,
+              md: 6,
+              lg: 4,
+              xl: 3
+          };
+}
 function getItemField<T extends object>(
     field: ViewPageFieldType<T>,
     data: T
@@ -107,12 +123,11 @@ function getItemField<T extends object>(
         itemLabel: React.ReactNode,
         gridProps: GridProps = {};
-    let xs = 6;
     if (Array.isArray(field)) {
-        const [fieldData, fieldType, renderProps] = field;
+        const [fieldData, fieldType, renderProps, singleRow = 'small'] = field;
         itemData = GridDataFormat(data[fieldData], fieldType, renderProps);
         itemLabel = globalApp.get<string>(fieldData) ?? fieldData;
+        gridProps = { ...getResp(singleRow) };
     } else if (typeof field === 'object') {
         // Destruct
         const {
@@ -120,17 +135,15 @@ function getItemField<T extends object>(
             dataType,
             label: fieldLabel,
             renderProps,
-            singleRow,
+            singleRow = 'default',
             ...rest
         } = field;
         gridProps = {
             ...rest,
-            ...(singleRow && { xs: 12, sm: 12, md: 12, lg: 12, xl: 12 })
+            ...getResp(singleRow)
         };
-        if (singleRow === false) xs = 12;
         // Field data
         if (typeof fieldData === 'function') itemData = fieldData(data);
         else if (dataType == null) itemData = formatItemData(data[fieldData]);
@@ -149,11 +162,7 @@ function getItemField<T extends object>(
         itemLabel = globalApp.get<string>(field) ?? field;
     }
-    return [
-        itemData,
-        itemLabel,
-        { xs, sm: 6, md: 6, lg: 4, xl: 3, ...gridProps }
-    ];
+    return [itemData, itemLabel, gridProps];
 }
 /**
@@ -236,9 +245,13 @@ export function ViewPage<T extends DataTypes.StringRecord>(
                                     >
                                         {itemLabel}:
                                     </Typography>
-                                    <Typography variant="subtitle2">
-                                        {itemData}
-                                    </Typography>
+                                    {typeof itemData === 'object' ? (
+                                        itemData
+                                    ) : (
+                                        <Typography variant="subtitle2">
+                                            {itemData}
+                                        </Typography>
+                                    )}
                                 </Grid>
                             );
                         })}