homeflowjs 1.1.3 → 1.1.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homeflowjs",
-  "version": "1.1.3",
+  "version": "1.1.5",
   "sideEffects": [
     "modal/**/*",
     "user/default-profile/**/*",

package/properties/properties-map/draggable-map.js

@@ -242,8 +242,11 @@ export default class DraggableMap {
         minimumFractionDigits: 0,
         maximumFractionDigits: 0,
       });
-      const value = rates && rates[currency] * numericPrice || propertyPrice;
+      const value = rates?.[currency] != null ? rates[currency] * numericPrice : propertyPrice;
       const convertedValue = formatter.format(Math.round(value));
+      if (!rates) {
+        return value;
+      };
 
       /*
         Properties which have different currencies set in admin
@@ -255,7 +258,7 @@ export default class DraggableMap {
        * Converting the property price to the selected currency
        * this could either be from GBP to EUR, GBP to USD, EUR to USD, etc
       */
-      if ( selectedCurrency === 'GBP' && localCurrencyCode !== null && localCurrencyPrice !== null && localCurrencyCode !== 'GBP' ) {
+      if ( rates && selectedCurrency === 'GBP' && localCurrencyCode !== null && localCurrencyPrice !== null && localCurrencyCode !== 'GBP' ) {
         const value = localCurrencyPrice / rates[localCurrencyCode];
         return formatter.format(Math.round(value));
       }

package/rent-yield-calculator/rent-yield-calculator.jsx

@@ -72,6 +72,7 @@ const RentYieldCalculator = ({
   currency,
   grossYieldTitle,
   netYieldTitle,
+  showThousandSeparator,
 }) => {
   const customFieldsConfigsList = useMemo(() => initialFieldsConfigsList
     .map((fieldConfig) => {
@@ -134,6 +135,7 @@ const RentYieldCalculator = ({
             rangeStylesConfigs={rangeStylesConfigs}
             inputPrefixString={currency}
             onRangeInputUpdate={onFormDataUpdate}
+            showThousandSeparator={showThousandSeparator}
           />
         </div>
       ))}
@@ -163,6 +165,7 @@ RentYieldCalculator.defaultProps = {
   currency: '£',
   grossYieldTitle: 'Gross Yield',
   netYieldTitle: 'Net Yield',
+  showThousandSeparator: true,
 };
 
 const FieldConfigType = PropTypes.shape({
@@ -182,6 +185,7 @@ RentYieldCalculator.propTypes = {
   currency: PropTypes.string,
   grossYieldTitle: PropTypes.string,
   netYieldTitle: PropTypes.string,
+  showThousandSeparator: PropTypes.bool,
 };
 
 export default memo(RentYieldCalculator);

package/search/range-input/index.jsx

@@ -18,9 +18,21 @@ const RangeInput = ({
   rangeStylesConfigs,
   inputPrefixString,
   onRangeInputUpdate,
+  showThousandSeparator,
 }) => {
+
+  const withThousandSeparator = (number) => {
+    if (!showThousandSeparator) {
+      return inputPrefixString ? `${inputPrefixString} ${number}` : `${number}`;
+    }
+
+    const separatedNumber = new Intl.NumberFormat().format(number);
+
+    return inputPrefixString ? `${inputPrefixString} ${separatedNumber}` : `${separatedNumber}`;
+  };
+
   const [valueConfig, setValueConfig] = useState({
-    inputValue: inputPrefixString ? `${inputPrefixString} 0` : '0',
+    inputValue: withThousandSeparator(0),
     rangeValue: 0,
   });
 
@@ -35,9 +47,7 @@ const RangeInput = ({
   useEffect(() => {
     const validatedValue = onValidateValue(Number(inititalValue));
     setValueConfig({
-      inputValue: inputPrefixString
-        ? `${inputPrefixString} ${validatedValue}`
-        : `${validatedValue}`,
+      inputValue: withThousandSeparator(validatedValue),
       rangeValue: validatedValue,
     });
   }, []);
@@ -47,15 +57,12 @@ const RangeInput = ({
     const currentValue = isRangeValue ? value[0] : value;
     const digitValue = isRangeValue
       ? currentValue
-      : currentValue.substring(currentValue.indexOf(inputPrefixString) + 1).trim();
+      : currentValue.replace(`${inputPrefixString} `, '').replaceAll(',', '');
+
+    if (isNaN(digitValue)) return;
 
-    if (isNaN(digitValue)) {
-      return;
-    }
     const validatedValue = onValidateValue(Number(digitValue));
-    const inputValue = inputPrefixString
-      ? `${inputPrefixString} ${validatedValue}`
-      : `${validatedValue}`;
+    const inputValue = withThousandSeparator(validatedValue);
     const rangeValue = Number(validatedValue);
 
     setValueConfig((prevState) => ({
@@ -116,6 +123,7 @@ RangeInput.propTypes = {
   inititalValue: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
   inputPrefixString: PropTypes.string,
   onRangeInputUpdate: PropTypes.func,
+  showThousandSeparator: PropTypes.bool.isRequired,
   ...RANGE_CONTROLLER_PROP_TYPES,
 };