@alfalab/core-components-amount - npm Package Compare versions

Comparing version 2.0.3 to 2.1.0

CHANGELOG.md

@@ -6,2 +6,13 @@ # Change Log
 
+# [2.1.0](https://github.com/alfa-laboratory/core-components/compare/@alfalab/core-components-amount@2.0.3...@alfalab/core-components-amount@2.1.0) (2022-02-02)
+
+
+### Features
+
+* **amount:** add rightAddons, add showPlus, make currency optional ([#955](https://github.com/alfa-laboratory/core-components/issues/955)) ([ac35b9a](https://github.com/alfa-laboratory/core-components/commit/ac35b9aaf842d88fd28caeb4f888cdf74facf644))
+
+
+
+
+
 ## [2.0.3](https://github.com/alfa-laboratory/core-components/compare/@alfalab/core-components-amount@2.0.2...@alfalab/core-components-amount@2.0.3) (2021-12-08)
@@ -8,0 +19,0 @@

dist/component.js

@@ -14,3 +14,3 @@ 'use strict';
 
-var styles = {"component":"amount__component_12578","minorPartAndCurrency":"amount__minorPartAndCurrency_12578"};
+var styles = {"component":"amount__component_hx72o","minorPartAndCurrency":"amount__minorPartAndCurrency_hx72o"};
 require('./index.css')
@@ -23,4 +23,4 @@
 var Amount = function (_a) {
-    var value = _a.value, minority = _a.minority, currency = _a.currency, _b = _a.view, view = _b === void 0 ? 'default' : _b, className = _a.className, dataTestId = _a.dataTestId;
-    var _c = utils.formatAmount({
+    var value = _a.value, minority = _a.minority, currency = _a.currency, _b = _a.view, view = _b === void 0 ? 'default' : _b, rightAddons = _a.rightAddons, _c = _a.showPlus, showPlus = _c === void 0 ? false : _c, className = _a.className, dataTestId = _a.dataTestId;
+    var _d = utils.formatAmount({
         value: value,
@@ -30,4 +30,5 @@ currency: currency,
         view: view,
-    }), majorPart = _c.majorPart, minorPart = _c.minorPart, currencySymbol = _c.currencySymbol;
+    }), majorPart = _d.majorPart, minorPart = _d.minorPart, currencySymbol = _d.currencySymbol;
     return (React__default['default'].createElement("span", { className: cn__default['default'](styles.component, className), "data-test-id": dataTestId },
+        showPlus && value > 0 ? '+' : '',
         majorPart,
@@ -37,6 +38,6 @@ React__default['default'].createElement("span", { className: styles.minorPartAndCurrency },
             minorPart,
-            utils.THINSP,
-            currencySymbol)));
+            currency ? "" + utils.THINSP + currencySymbol : null,
+            rightAddons)));
 };
 
 exports.Amount = Amount;

dist/cssm/component.js

@@ -21,4 +21,4 @@ 'use strict';
 var Amount = function (_a) {
-    var value = _a.value, minority = _a.minority, currency = _a.currency, _b = _a.view, view = _b === void 0 ? 'default' : _b, className = _a.className, dataTestId = _a.dataTestId;
-    var _c = utils.formatAmount({
+    var value = _a.value, minority = _a.minority, currency = _a.currency, _b = _a.view, view = _b === void 0 ? 'default' : _b, rightAddons = _a.rightAddons, _c = _a.showPlus, showPlus = _c === void 0 ? false : _c, className = _a.className, dataTestId = _a.dataTestId;
+    var _d = utils.formatAmount({
         value: value,
@@ -28,4 +28,5 @@ currency: currency,
         view: view,
-    }), majorPart = _c.majorPart, minorPart = _c.minorPart, currencySymbol = _c.currencySymbol;
+    }), majorPart = _d.majorPart, minorPart = _d.minorPart, currencySymbol = _d.currencySymbol;
     return (React__default['default'].createElement("span", { className: cn__default['default'](styles__default['default'].component, className), "data-test-id": dataTestId },
+        showPlus && value > 0 ? '+' : '',
         majorPart,
@@ -35,6 +36,6 @@ React__default['default'].createElement("span", { className: styles__default['default'].minorPartAndCurrency },
             minorPart,
-            utils.THINSP,
-            currencySymbol)));
+            currency ? "" + utils.THINSP + currencySymbol : null,
+            rightAddons)));
 };
 
 exports.Amount = Amount;

dist/cssm/pure/component.js

@@ -22,4 +22,4 @@ 'use strict';
 var PureAmount = function (_a) {
-    var value = _a.value, minority = _a.minority, currency = _a.currency, _b = _a.view, view = _b === void 0 ? 'default' : _b, className = _a.className, dataTestId = _a.dataTestId;
-    var formattedWithCurrency = utils.formatAmount({
+    var value = _a.value, minority = _a.minority, currency = _a.currency, rightAddons = _a.rightAddons, _b = _a.view, view = _b === void 0 ? 'default' : _b, _c = _a.showPlus, showPlus = _c === void 0 ? false : _c, className = _a.className, dataTestId = _a.dataTestId;
+    var _d = utils.formatAmount({
         value: value,
@@ -29,6 +29,10 @@ currency: currency,
         view: view,
-    }).formattedWithCurrency;
-    return (React__default['default'].createElement("span", { className: cn__default['default'](styles__default['default'].component, className), "data-test-id": dataTestId }, formattedWithCurrency));
+    }), formatted = _d.formatted, currencySymbol = _d.currencySymbol;
+    return (React__default['default'].createElement("span", { className: cn__default['default'](styles__default['default'].component, className), "data-test-id": dataTestId },
+        showPlus && value > 0 ? '+' : '',
+        formatted,
+        currency ? "" + utils.THINSP + currencySymbol : null,
+        rightAddons));
 };
 
 exports.PureAmount = PureAmount;

dist/cssm/types/amount-props.d.ts

 import { CurrencyCodes } from '@alfalab/data';
+import { ReactNode } from 'react';
 type AmountProps = {
@@ -10,4 +11,8 @@ /**
      */
-    currency: CurrencyCodes;
+    currency?: CurrencyCodes;
     /**
+     * Слот справа
+     */
+    rightAddons?: ReactNode;
+    /**
      * Количество минорных единиц в валюте
@@ -22,2 +27,6 @@ */
     /**
+     * Показывать значок + для положительных значений
+     */
+    showPlus?: boolean;
+    /**
      * Дополнительный класс
@@ -24,0 +33,0 @@ */

dist/esm/component.js

@@ -5,3 +5,3 @@ import React from 'react';
 
-var styles = {"component":"amount__component_12578","minorPartAndCurrency":"amount__minorPartAndCurrency_12578"};
+var styles = {"component":"amount__component_hx72o","minorPartAndCurrency":"amount__minorPartAndCurrency_hx72o"};
 require('./index.css')
@@ -14,4 +14,4 @@
 var Amount = function (_a) {
-    var value = _a.value, minority = _a.minority, currency = _a.currency, _b = _a.view, view = _b === void 0 ? 'default' : _b, className = _a.className, dataTestId = _a.dataTestId;
-    var _c = formatAmount({
+    var value = _a.value, minority = _a.minority, currency = _a.currency, _b = _a.view, view = _b === void 0 ? 'default' : _b, rightAddons = _a.rightAddons, _c = _a.showPlus, showPlus = _c === void 0 ? false : _c, className = _a.className, dataTestId = _a.dataTestId;
+    var _d = formatAmount({
         value: value,
@@ -21,4 +21,5 @@ currency: currency,
         view: view,
-    }), majorPart = _c.majorPart, minorPart = _c.minorPart, currencySymbol = _c.currencySymbol;
+    }), majorPart = _d.majorPart, minorPart = _d.minorPart, currencySymbol = _d.currencySymbol;
     return (React.createElement("span", { className: cn(styles.component, className), "data-test-id": dataTestId },
+        showPlus && value > 0 ? '+' : '',
         majorPart,
@@ -28,6 +29,6 @@ React.createElement("span", { className: styles.minorPartAndCurrency },
             minorPart,
-            THINSP,
-            currencySymbol)));
+            currency ? "" + THINSP + currencySymbol : null,
+            rightAddons)));
 };
 
 export { Amount };

dist/esm/pure/component.js

 import React from 'react';
 import cn from 'classnames';
-import { formatAmount } from '@alfalab/utils';
+import { formatAmount, THINSP } from '@alfalab/utils';
 
-var styles = {"component":"amount__component_gyqmw"};
+var styles = {"component":"amount__component_1t25f"};
 require('./index.css')
@@ -14,4 +14,4 @@
 var PureAmount = function (_a) {
-    var value = _a.value, minority = _a.minority, currency = _a.currency, _b = _a.view, view = _b === void 0 ? 'default' : _b, className = _a.className, dataTestId = _a.dataTestId;
-    var formattedWithCurrency = formatAmount({
+    var value = _a.value, minority = _a.minority, currency = _a.currency, rightAddons = _a.rightAddons, _b = _a.view, view = _b === void 0 ? 'default' : _b, _c = _a.showPlus, showPlus = _c === void 0 ? false : _c, className = _a.className, dataTestId = _a.dataTestId;
+    var _d = formatAmount({
         value: value,
@@ -21,6 +21,10 @@ currency: currency,
         view: view,
-    }).formattedWithCurrency;
-    return (React.createElement("span", { className: cn(styles.component, className), "data-test-id": dataTestId }, formattedWithCurrency));
+    }), formatted = _d.formatted, currencySymbol = _d.currencySymbol;
+    return (React.createElement("span", { className: cn(styles.component, className), "data-test-id": dataTestId },
+        showPlus && value > 0 ? '+' : '',
+        formatted,
+        currency ? "" + THINSP + currencySymbol : null,
+        rightAddons));
 };
 
 export { PureAmount };

dist/esm/types/amount-props.d.ts

 import { CurrencyCodes } from '@alfalab/data';
+import { ReactNode } from 'react';
 type AmountProps = {
@@ -10,4 +11,8 @@ /**
      */
-    currency: CurrencyCodes;
+    currency?: CurrencyCodes;
     /**
+     * Слот справа
+     */
+    rightAddons?: ReactNode;
+    /**
      * Количество минорных единиц в валюте
@@ -22,2 +27,6 @@ */
     /**
+     * Показывать значок + для положительных значений
+     */
+    showPlus?: boolean;
+    /**
      * Дополнительный класс
@@ -24,0 +33,0 @@ */

dist/modern/component.js

@@ -5,3 +5,3 @@ import React from 'react';
 
-var styles = {"component":"amount__component_12578","minorPartAndCurrency":"amount__minorPartAndCurrency_12578"};
+var styles = {"component":"amount__component_hx72o","minorPartAndCurrency":"amount__minorPartAndCurrency_hx72o"};
 require('./index.css')
@@ -13,3 +13,3 @@
  */
-const Amount = ({ value, minority, currency, view = 'default', className, dataTestId, }) => {
+const Amount = ({ value, minority, currency, view = 'default', rightAddons, showPlus = false, className, dataTestId, }) => {
     const { majorPart, minorPart, currencySymbol } = formatAmount({
@@ -22,2 +22,3 @@ value,
     return (React.createElement("span", { className: cn(styles.component, className), "data-test-id": dataTestId },
+        showPlus && value > 0 ? '+' : '',
         majorPart,
@@ -27,6 +28,6 @@ React.createElement("span", { className: styles.minorPartAndCurrency },
             minorPart,
-            THINSP,
-            currencySymbol)));
+            currency ? `${THINSP}${currencySymbol}` : null,
+            rightAddons)));
 };
 
 export { Amount };

dist/modern/pure/component.js

 import React from 'react';
 import cn from 'classnames';
-import { formatAmount } from '@alfalab/utils';
+import { formatAmount, THINSP } from '@alfalab/utils';
 
-var styles = {"component":"amount__component_gyqmw"};
+var styles = {"component":"amount__component_1t25f"};
 require('./index.css')
@@ -13,4 +13,4 @@
  */
-const PureAmount = ({ value, minority, currency, view = 'default', className, dataTestId, }) => {
-    const { formattedWithCurrency } = formatAmount({
+const PureAmount = ({ value, minority, currency, rightAddons, view = 'default', showPlus = false, className, dataTestId, }) => {
+    const { formatted, currencySymbol } = formatAmount({
         value,
@@ -21,5 +21,9 @@ currency,
     });
-    return (React.createElement("span", { className: cn(styles.component, className), "data-test-id": dataTestId }, formattedWithCurrency));
+    return (React.createElement("span", { className: cn(styles.component, className), "data-test-id": dataTestId },
+        showPlus && value > 0 ? '+' : '',
+        formatted,
+        currency ? `${THINSP}${currencySymbol}` : null,
+        rightAddons));
 };
 
 export { PureAmount };

dist/modern/types/amount-props.d.ts

 import { CurrencyCodes } from '@alfalab/data';
+import { ReactNode } from 'react';
 type AmountProps = {
@@ -10,4 +11,8 @@ /**
      */
-    currency: CurrencyCodes;
+    currency?: CurrencyCodes;
     /**
+     * Слот справа
+     */
+    rightAddons?: ReactNode;
+    /**
      * Количество минорных единиц в валюте
@@ -22,2 +27,6 @@ */
     /**
+     * Показывать значок + для положительных значений
+     */
+    showPlus?: boolean;
+    /**
      * Дополнительный класс
@@ -24,0 +33,0 @@ */

dist/pure/component.js

@@ -14,3 +14,3 @@ 'use strict';
 
-var styles = {"component":"amount__component_gyqmw"};
+var styles = {"component":"amount__component_1t25f"};
 require('./index.css')
@@ -24,4 +24,4 @@
 var PureAmount = function (_a) {
-    var value = _a.value, minority = _a.minority, currency = _a.currency, _b = _a.view, view = _b === void 0 ? 'default' : _b, className = _a.className, dataTestId = _a.dataTestId;
-    var formattedWithCurrency = utils.formatAmount({
+    var value = _a.value, minority = _a.minority, currency = _a.currency, rightAddons = _a.rightAddons, _b = _a.view, view = _b === void 0 ? 'default' : _b, _c = _a.showPlus, showPlus = _c === void 0 ? false : _c, className = _a.className, dataTestId = _a.dataTestId;
+    var _d = utils.formatAmount({
         value: value,
@@ -31,6 +31,10 @@ currency: currency,
         view: view,
-    }).formattedWithCurrency;
-    return (React__default['default'].createElement("span", { className: cn__default['default'](styles.component, className), "data-test-id": dataTestId }, formattedWithCurrency));
+    }), formatted = _d.formatted, currencySymbol = _d.currencySymbol;
+    return (React__default['default'].createElement("span", { className: cn__default['default'](styles.component, className), "data-test-id": dataTestId },
+        showPlus && value > 0 ? '+' : '',
+        formatted,
+        currency ? "" + utils.THINSP + currencySymbol : null,
+        rightAddons));
 };
 
 exports.PureAmount = PureAmount;

dist/types/amount-props.d.ts

 import { CurrencyCodes } from '@alfalab/data';
+import { ReactNode } from 'react';
 type AmountProps = {
@@ -10,4 +11,8 @@ /**
      */
-    currency: CurrencyCodes;
+    currency?: CurrencyCodes;
     /**
+     * Слот справа
+     */
+    rightAddons?: ReactNode;
+    /**
      * Количество минорных единиц в валюте
@@ -22,2 +27,6 @@ */
     /**
+     * Показывать значок + для положительных значений
+     */
+    showPlus?: boolean;
+    /**
      * Дополнительный класс
@@ -24,0 +33,0 @@ */

package.json

 {
     "name": "@alfalab/core-components-amount",
-    "version": "2.0.3",
+    "version": "2.1.0",
     "description": "",
@@ -20,3 +20,3 @@ "keywords": [],
         "@alfalab/data": "^1.0.1",
-        "@alfalab/utils": "^1.5.1",
+        "@alfalab/utils": "^1.8.0",
         "classnames": "^2.2.6"
@@ -27,3 +27,3 @@ },
     },
-    "gitHead": "19a2d088b6c18a127940199cfd6e6fc4e8639ec5"
+    "gitHead": "86f898b81b12d809e5e43e3dbb557a7e9629a2e5"
 }

No alert changes

Improved metrics

Total package byte prevSize

33799

9.26%

Lines of code

718

8.46%

Dependency changes

• Updated

  @alfalab/utils@^1.8.0