@etsoo/materialui 1.0.74 → 1.0.77

package/lib/pages/ViewPage.d.ts

@@ -3,7 +3,10 @@ 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 row width type
+ */
+export declare type ViewPageRowType = boolean | 'default' | 'small' | object;
 /**
  * View page display field
  */
@@ -23,13 +26,13 @@ export interface ViewPageField<T extends object> extends GridProps {
     /**
      * Display as single row
      */
-    singleRow?: RowType;
+    singleRow?: ViewPageRowType;
     /**
      * Render props
      */
     renderProps?: GridColumnRenderProps;
 }
-declare type ViewPageFieldTypeNarrow<T extends object> = (string & keyof T) | [string & keyof T, GridDataType, GridColumnRenderProps?, RowType?] | ViewPageField<T>;
+declare type ViewPageFieldTypeNarrow<T extends object> = (string & keyof T) | [string & keyof T, GridDataType, GridColumnRenderProps?, ViewPageRowType?] | ViewPageField<T>;
 /**
  * View page field type
  */

package/lib/pages/ViewPage.js

@@ -17,17 +17,19 @@ function formatItemData(fieldData) {
     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
-            };
+    return typeof singleRow === 'object'
+        ? singleRow
+        : 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;

package/lib/texts/MoneyText.js

@@ -10,5 +10,7 @@ export function MoneyText(props) {
     // Destruct
     const { currency, isInteger = false, locale, options = {}, value, ...rest } = props;
     // Layout
-    return (React.createElement(Typography, { component: "span", fontSize: "inherit", ...rest }, NumberUtils.formatMoney(value, currency, locale, isInteger, options)));
+    return (React.createElement(Typography, { component: "span", fontSize: "inherit", ...rest }, value == null
+        ? ''
+        : NumberUtils.formatMoney(value, currency, locale, isInteger, options)));
 }

package/lib/texts/NumberText.d.ts

@@ -15,7 +15,7 @@ export interface NumberTextProps extends TypographyProps {
     /**
      * Value
      */
-    value?: number | bigint;
+    value?: number | bigint | null;
 }
 /**
  * Number text

package/lib/texts/NumberText.js

@@ -10,5 +10,5 @@ export function NumberText(props) {
     // Destruct
     const { locale, options = {}, value, ...rest } = props;
     // Layout
-    return (React.createElement(Typography, { component: "span", fontSize: "inherit", ...rest }, NumberUtils.format(value, locale, options)));
+    return (React.createElement(Typography, { component: "span", fontSize: "inherit", ...rest }, value == null ? '' : NumberUtils.format(value, locale, options)));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/materialui",
-    "version": "1.0.74",
+    "version": "1.0.77",
     "description": "TypeScript Material-UI Implementation",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
@@ -51,10 +51,10 @@
         "@emotion/css": "^11.10.5",
         "@emotion/react": "^11.10.5",
         "@emotion/styled": "^11.10.5",
-        "@etsoo/appscript": "^1.3.30",
-        "@etsoo/notificationbase": "^1.1.14",
-        "@etsoo/react": "^1.6.24",
-        "@etsoo/shared": "^1.1.75",
+        "@etsoo/appscript": "^1.3.33",
+        "@etsoo/notificationbase": "^1.1.16",
+        "@etsoo/react": "^1.6.26",
+        "@etsoo/shared": "^1.1.77",
         "@mui/icons-material": "^5.10.9",
         "@mui/material": "^5.10.13",
         "@types/pica": "^9.0.1",

package/src/pages/ViewPage.tsx

@@ -16,7 +16,10 @@ import { PullToRefreshUI } from '../PullToRefreshUI';
 import { CommonPage } from './CommonPage';
 import { CommonPageProps } from './CommonPageProps';
 
-type RowType = boolean | 'default' | 'small';
+/**
+ * View page row width type
+ */
+export type ViewPageRowType = boolean | 'default' | 'small' | object;
 
 /**
  * View page display field
@@ -40,7 +43,7 @@ export interface ViewPageField<T extends object> extends GridProps {
     /**
      * Display as single row
      */
-    singleRow?: RowType;
+    singleRow?: ViewPageRowType;
 
     /**
      * Render props
@@ -50,7 +53,7 @@ export interface ViewPageField<T extends object> extends GridProps {
 
 type ViewPageFieldTypeNarrow<T extends object> =
     | (string & keyof T)
-    | [string & keyof T, GridDataType, GridColumnRenderProps?, RowType?]
+    | [string & keyof T, GridDataType, GridColumnRenderProps?, ViewPageRowType?]
     | ViewPageField<T>;
 
 /**
@@ -107,8 +110,10 @@ function formatItemData(fieldData: unknown): string | undefined {
     return `${fieldData}`;
 }
 
-function getResp(singleRow: RowType) {
-    return singleRow === 'default'
+function getResp(singleRow: ViewPageRowType) {
+    return typeof singleRow === 'object'
+        ? singleRow
+        : singleRow === 'default'
         ? { xs: 12, sm: 12, md: 12, lg: 6, xl: 6 }
         : singleRow === true
         ? { xs: 12, sm: 12, md: 12, lg: 12, xl: 12 }

package/src/texts/MoneyText.tsx

@@ -37,13 +37,15 @@ export function MoneyText(props: MoneyTextProps) {
     // Layout
     return (
         <Typography component="span" fontSize="inherit" {...rest}>
-            {NumberUtils.formatMoney(
-                value,
-                currency,
-                locale,
-                isInteger,
-                options
-            )}
+            {value == null
+                ? ''
+                : NumberUtils.formatMoney(
+                      value,
+                      currency,
+                      locale,
+                      isInteger,
+                      options
+                  )}
         </Typography>
     );
 }

package/src/texts/NumberText.tsx

@@ -19,7 +19,7 @@ export interface NumberTextProps extends TypographyProps {
     /**
      * Value
      */
-    value?: number | bigint;
+    value?: number | bigint | null;
 }
 
 /**
@@ -34,7 +34,7 @@ export function NumberText(props: NumberTextProps) {
     // Layout
     return (
         <Typography component="span" fontSize="inherit" {...rest}>
-            {NumberUtils.format(value, locale, options)}
+            {value == null ? '' : NumberUtils.format(value, locale, options)}
         </Typography>
     );
 }