@etsoo/react 1.2.5 → 1.2.6

package/lib/components/GridColumn.js

@@ -12,6 +12,7 @@ export { GridDataType };
 export const GridAlignGet = (align, type) => {
     if (align == null && type != null) {
         if (type === GridDataType.Money ||
+            type === GridDataType.IntMoney ||
             type === GridDataType.Int ||
             type === GridDataType.Number)
             return 'right';

package/lib/mu/DataGridRenderers.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import { CircularProgress } from '@mui/material';
 import { GridDataType } from '../components/GridColumn';
-import { DateUtils } from '@etsoo/shared';
+import { DateUtils, NumberUtils } from '@etsoo/shared';
 import CheckIcon from '@mui/icons-material/Check';
 import ClearIcon from '@mui/icons-material/Clear';
 /**
@@ -32,16 +32,14 @@ export var DataGridRenderers;
             return undefined;
         // For date time
         if (value instanceof Date) {
-            return DateUtils.format(navigator.language, value, type === GridDataType.DateTime ? 'ds' : 'd');
+            return DateUtils.format(value, navigator.language, type === GridDataType.DateTime ? 'ds' : 'd');
         }
         // For numbers
         if (typeof value === 'number') {
-            if (type === GridDataType.Money)
-                return new Intl.NumberFormat('lookup', {
-                    minimumFractionDigits: 2
-                }).format(value);
+            if (type === GridDataType.Money || type === GridDataType.IntMoney)
+                return NumberUtils.formatMoney(value, undefined, undefined, type === GridDataType.IntMoney);
             else
-                return new Intl.NumberFormat().format(value);
+                return NumberUtils.format(value);
         }
         // For boolean
         if (typeof value === 'boolean') {

package/lib/mu/texts/DateText.js

@@ -12,7 +12,7 @@ export function DateText(props) {
     // Formatted value
     const localValue = value == null
         ? undefined
-        : DateUtils.format(locale, value, options, timeZone);
+        : DateUtils.format(value, locale, options, timeZone);
     // Layout
     return (React.createElement(Typography, { noWrap: true, ...rest }, localValue));
 }

package/lib/mu/texts/MoneyText.d.ts

@@ -8,6 +8,10 @@ export interface MoneyTextProps extends NumberTextProps {
      * Currency, USD for US dollar
      */
     currency?: string;
+    /**
+     * Is integer number
+     */
+    isInteger?: boolean;
 }
 /**
  * Money text

package/lib/mu/texts/MoneyText.js

@@ -1,3 +1,4 @@
+import { NumberUtils } from '@etsoo/shared';
 import { Typography } from '@mui/material';
 import React from 'react';
 /**
@@ -6,19 +7,8 @@ import React from 'react';
  * @returns Component
  */
 export function MoneyText(props) {
-    var _a, _b;
     // Destruct
-    const { currency, locale = 'lookup', options = {}, value, ...rest } = props;
-    // Default
-    if (currency) {
-        (_a = options.style) !== null && _a !== void 0 ? _a : (options.style = 'currency');
-        options.currency = currency;
-    }
-    (_b = options.minimumFractionDigits) !== null && _b !== void 0 ? _b : (options.minimumFractionDigits = 2);
-    // Formatter
-    const intl = new Intl.NumberFormat(locale, options);
-    // Formatted value
-    const localValue = value == null ? undefined : intl.format(value);
+    const { currency, isInteger = false, locale, options = {}, value, ...rest } = props;
     // Layout
-    return (React.createElement(Typography, { noWrap: true, ...rest }, localValue));
+    return (React.createElement(Typography, { noWrap: true, ...rest }, NumberUtils.formatMoney(value, currency, locale, isInteger, options)));
 }

package/lib/mu/texts/NumberText.d.ts

@@ -7,7 +7,7 @@ export interface NumberTextProps extends TypographyProps {
     /**
      * Locale
      */
-    locale?: string;
+    locale?: string | string[];
     /**
      * Options
      */

package/lib/mu/texts/NumberText.js

@@ -1,3 +1,4 @@
+import { NumberUtils } from '@etsoo/shared';
 import { Typography } from '@mui/material';
 import React from 'react';
 /**
@@ -7,11 +8,7 @@ import React from 'react';
  */
 export function NumberText(props) {
     // Destruct
-    const { locale = 'lookup', options = {}, value, ...rest } = props;
-    // Formatter
-    const intl = new Intl.NumberFormat(locale, options);
-    // Formatted value
-    const localValue = value == null ? undefined : intl.format(value);
+    const { locale, options = {}, value, ...rest } = props;
     // Layout
-    return (React.createElement(Typography, { noWrap: true, ...rest }, localValue));
+    return (React.createElement(Typography, { noWrap: true, ...rest }, NumberUtils.format(value, locale, options)));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/react",
-    "version": "1.2.5",
+    "version": "1.2.6",
     "description": "TypeScript ReactJs framework",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
@@ -44,9 +44,9 @@
         "@emotion/react": "^11.4.1",
         "@emotion/style": "^0.8.0",
         "@emotion/styled": "^11.3.0",
-        "@etsoo/appscript": "^1.0.94",
+        "@etsoo/appscript": "^1.0.96",
         "@etsoo/notificationbase": "^1.0.78",
-        "@etsoo/shared": "^1.0.43",
+        "@etsoo/shared": "^1.0.44",
         "@mui/icons-material": "^5.0.1",
         "@mui/material": "^5.0.2",
         "@reach/router": "^1.3.4",

package/src/components/GridColumn.ts

@@ -22,6 +22,7 @@ export const GridAlignGet = (align?: GridAlign, type?: GridDataType) => {
     if (align == null && type != null) {
         if (
             type === GridDataType.Money ||
+            type === GridDataType.IntMoney ||
             type === GridDataType.Int ||
             type === GridDataType.Number
         )

package/src/mu/DataGridRenderers.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { CircularProgress } from '@mui/material';
 import { GridCellRendererProps, GridDataType } from '../components/GridColumn';
-import { DateUtils } from '@etsoo/shared';
+import { DateUtils, NumberUtils } from '@etsoo/shared';
 import CheckIcon from '@mui/icons-material/Check';
 import ClearIcon from '@mui/icons-material/Clear';
 import { DataGridExFooterItemRendererProps } from './DataGridEx';
@@ -42,19 +42,22 @@ export namespace DataGridRenderers {
         // For date time
         if (value instanceof Date) {
             return DateUtils.format(
-                navigator.language,
                 value,
+                navigator.language,
                 type === GridDataType.DateTime ? 'ds' : 'd'
             );
         }
 
         // For numbers
         if (typeof value === 'number') {
-            if (type === GridDataType.Money)
-                return new Intl.NumberFormat('lookup', {
-                    minimumFractionDigits: 2
-                }).format(value);
-            else return new Intl.NumberFormat().format(value);
+            if (type === GridDataType.Money || type === GridDataType.IntMoney)
+                return NumberUtils.formatMoney(
+                    value,
+                    undefined,
+                    undefined,
+                    type === GridDataType.IntMoney
+                );
+            else return NumberUtils.format(value);
         }
 
         // For boolean

package/src/mu/texts/DateText.tsx

@@ -40,7 +40,7 @@ export function DateText(props: DateTextProps) {
     const localValue =
         value == null
             ? undefined
-            : DateUtils.format(locale, value, options, timeZone);
+            : DateUtils.format(value, locale, options, timeZone);
 
     // Layout
     return (

package/src/mu/texts/MoneyText.tsx

@@ -1,3 +1,4 @@
+import { NumberUtils } from '@etsoo/shared';
 import { Typography } from '@mui/material';
 import React from 'react';
 import { NumberTextProps } from './NumberText';
@@ -10,6 +11,11 @@ export interface MoneyTextProps extends NumberTextProps {
      * Currency, USD for US dollar
      */
     currency?: string;
+
+    /**
+     * Is integer number
+     */
+    isInteger?: boolean;
 }
 
 /**
@@ -19,26 +25,25 @@ export interface MoneyTextProps extends NumberTextProps {
  */
 export function MoneyText(props: MoneyTextProps) {
     // Destruct
-    const { currency, locale = 'lookup', options = {}, value, ...rest } = props;
-
-    // Default
-    if (currency) {
-        options.style ??= 'currency';
-        options.currency = currency;
-    }
-
-    options.minimumFractionDigits ??= 2;
-
-    // Formatter
-    const intl = new Intl.NumberFormat(locale, options);
-
-    // Formatted value
-    const localValue = value == null ? undefined : intl.format(value);
+    const {
+        currency,
+        isInteger = false,
+        locale,
+        options = {},
+        value,
+        ...rest
+    } = props;
 
     // Layout
     return (
         <Typography noWrap {...rest}>
-            {localValue}
+            {NumberUtils.formatMoney(
+                value,
+                currency,
+                locale,
+                isInteger,
+                options
+            )}
         </Typography>
     );
 }

package/src/mu/texts/NumberText.tsx

@@ -1,3 +1,4 @@
+import { NumberUtils } from '@etsoo/shared';
 import { Typography, TypographyProps } from '@mui/material';
 import React from 'react';
 
@@ -8,7 +9,7 @@ export interface NumberTextProps extends TypographyProps {
     /**
      * Locale
      */
-    locale?: string;
+    locale?: string | string[];
 
     /**
      * Options
@@ -28,18 +29,12 @@ export interface NumberTextProps extends TypographyProps {
  */
 export function NumberText(props: NumberTextProps) {
     // Destruct
-    const { locale = 'lookup', options = {}, value, ...rest } = props;
-
-    // Formatter
-    const intl = new Intl.NumberFormat(locale, options);
-
-    // Formatted value
-    const localValue = value == null ? undefined : intl.format(value);
+    const { locale, options = {}, value, ...rest } = props;
 
     // Layout
     return (
         <Typography noWrap {...rest}>
-            {localValue}
+            {NumberUtils.format(value, locale, options)}
         </Typography>
     );
 }