feat(core-components-amount): allow withZeroMinorPart formatting

core-ds · Jun 26, 2020 · e86529d · e86529d
1 parent f946776
commit e86529d
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 7 deletions.
diff --git a/packages/amount/src/__snapshots__/component.test.tsx.snap b/packages/amount/src/__snapshots__/component.test.tsx.snap
@@ -9,8 +9,6 @@ exports[`Amount should match snapshot 1`] = `
   <span
     class="minorPartAndCurrency"
   >
-    ,
-    00
      
     ₽
   </span>

diff --git a/packages/amount/src/pure/__snapshots__/component.test.tsx.snap b/packages/amount/src/pure/__snapshots__/component.test.tsx.snap
@@ -6,8 +6,6 @@ exports[`PureAmount should match snapshot 1`] = `
   data-test-id="test-id"
 >
   1
-  ,
-  00
    
   ₽
 </span>

diff --git a/packages/amount/src/utils/formatAmount.test.ts b/packages/amount/src/utils/formatAmount.test.ts
@@ -1,4 +1,4 @@
-import { splitAmount } from './formatAmount';
+import { splitAmount, formatAmount } from './formatAmount';
 
 test('splitAmount', () => {
     expect(splitAmount('100', 3, ' ')).toBe('100');
@@ -8,3 +8,33 @@ test('splitAmount', () => {
     expect(splitAmount('1000000', 3, ' ')).toBe('1 000 000');
     expect(splitAmount('10000000', 3, ' ')).toBe('10 000 000');
 });
+
+test('formatAmount', () => {
+    const { minorPart } = formatAmount({
+        withZeroMinorPart: true,
+        value: 1234500,
+        currency: { code: 'RUR', minority: 100 },
+    });
+
+    expect(minorPart).toBe('00');
+});
+
+test('formatAmount', () => {
+    const { minorPart } = formatAmount({
+        withZeroMinorPart: true,
+        value: 1234500,
+        currency: { code: 'RUR', minority: 100 },
+    });
+
+    expect(minorPart).toBe('00');
+});
+
+test('should return null minorPart if passed withZeroMinorPart = false and value has zero minor part', () => {
+    const { minorPart } = formatAmount({
+        withZeroMinorPart: false,
+        value: 1234500,
+        currency: { code: 'RUR', minority: 100 },
+    });
+
+    expect(minorPart).toBeNull();
+});
diff --git a/packages/amount/src/utils/formatAmount.ts b/packages/amount/src/utils/formatAmount.ts
@@ -65,7 +65,11 @@ type AmountType = {
     withZeroMinorPart?: boolean;
 };
 
-export const formatAmount = ({ value, currency: { code, minority } }: AmountType) => {
+export const formatAmount = ({
+    value,
+    currency: { code, minority },
+    withZeroMinorPart,
+}: AmountType) => {
     if (value === null) {
         return {
             majorPart: '',
@@ -80,6 +84,7 @@ export const formatAmount = ({ value, currency: { code, minority } }: AmountType
 
     const fractionDigits = Math.log(minority) * Math.LOG10E;
     const valueAbsStr = (Math.abs(value) / minority).toFixed(fractionDigits);
+    // TODO: проверить что toFixed возврает всегда точку.
 
     const [majorPart, minorPart] = valueAbsStr.split('.');
 
@@ -99,7 +104,7 @@ export const formatAmount = ({ value, currency: { code, minority } }: AmountType
 
     return {
         majorPart: majorPartFormatted,
-        minorPart,
+        minorPart: !withZeroMinorPart && value % minority === 0 ? null : minorPart,
         value: formattedValueStr,
         currencySymbol: getCurrencySymbol(code),
     };