@akinon/next 1.64.0 → 1.65.0

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @akinon/next
 
+## 1.65.0
+
+### Minor Changes
+
+- d13fd36: ZERO-2614: Refactor Price component to remove unnecessary code and improve readability also fix the decimal scale
+- 86d2531: ZERO-2693: resolve dependency collision warning for eslint-config-next
+
 ## 1.64.0
 
 ### Minor Changes

package/components/price.tsx

@@ -1,13 +1,11 @@
 import { useMemo } from 'react';
-// @ts-ignore
-import { NumericFormat, NumericFormatProps } from 'react-number-format';
+import NumberFormat, { NumberFormatProps } from 'react-number-format';
 import { getCurrency } from '@akinon/next/utils';
-
 import { useLocalization } from '@akinon/next/hooks';
 import { PriceProps } from '../types';
 import Settings from 'settings';
 
-export const Price = (props: NumericFormatProps & PriceProps) => {
+export const Price = (props: NumberFormatProps & PriceProps) => {
   const {
     value,
     currencyCode,
@@ -23,16 +21,10 @@ export const Price = (props: NumericFormatProps & PriceProps) => {
     fixedDecimalScale = true,
     ...rest
   } = props;
+
   const { currency: selectedCurrencyCode } = useLocalization();
   const currencyCode_ = currencyCode || selectedCurrencyCode;
 
-  // TODO: This is very bad practice. It broke decimalScale.
-  const _value = value?.toString().replace('.', ',');
-
-  const currentCurrencyDecimalScale = Settings.localization.currencies.find(
-    (currency) => currency.code === currencyCode_
-  ).decimalScale;
-
   const currency = useMemo(
     () =>
       getCurrency({
@@ -44,17 +36,39 @@ export const Price = (props: NumericFormatProps & PriceProps) => {
     [currencyCode_, useCurrencySymbol, useCurrencyAfterPrice, useCurrencySpace]
   );
 
+  const numericValue =
+    typeof value === 'string'
+      ? parseFloat(value)
+      : typeof value === 'number'
+      ? value
+      : 0;
+
+  const formattedValue = Number.isFinite(numericValue)
+    ? numericValue.toFixed(decimalScale)
+    : '0';
+
+  const displayValue =
+    useNegative && numericValue < 0
+      ? `-${useNegativeSpace ? ' ' : ''}${Math.abs(numericValue).toFixed(
+          decimalScale
+        )}`
+      : formattedValue;
+
+  const currentCurrencyDecimalScale = Settings.localization.currencies.find(
+    (currency) => currency.code === currencyCode_
+  ).decimalScale;
+
   return (
-    <NumericFormat
-      value={useNegative ? `-${useNegativeSpace}${_value}` : _value}
-      {...{
-        [useCurrencyAfterPrice ? 'suffix' : 'prefix']: currency
-      }}
+    <NumberFormat
+      value={displayValue}
       displayType={displayType}
       thousandSeparator={thousandSeparator}
       decimalScale={currentCurrencyDecimalScale ?? decimalScale}
       decimalSeparator={decimalSeparator}
       fixedDecimalScale={fixedDecimalScale}
+      prefix={!useCurrencyAfterPrice ? currency : undefined}
+      suffix={useCurrencyAfterPrice ? currency : undefined}
+      isNumericString={true}
       {...rest}
     />
   );

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@akinon/next",
   "description": "Core package for Project Zero Next",
-  "version": "1.64.0",
+  "version": "1.65.0",
   "private": false,
   "license": "MIT",
   "bin": {
@@ -30,12 +30,13 @@
     "set-cookie-parser": "2.6.0"
   },
   "devDependencies": {
-    "@akinon/eslint-plugin-projectzero": "1.64.0",
+    "@akinon/eslint-plugin-projectzero": "1.65.0",
     "@types/react-redux": "7.1.30",
     "@types/set-cookie-parser": "2.4.7",
     "@typescript-eslint/eslint-plugin": "6.7.4",
     "@typescript-eslint/parser": "6.7.4",
-    "eslint": "^8.14.0",
+    "eslint": "8.56.0",
+    "eslint-config-next": "14.2.3",
     "eslint-config-prettier": "8.5.0"
   }
 }