@bytebrand/fe-ui-core 4.8.1 → 4.8.2

package/__tests__/components/_common/MaterialDatePicker/MaterialDatePicker.test.tsx

@@ -47,7 +47,7 @@ describe('MaterialDatePicker', () => {
     fireEvent.click(okButton);
     fireEvent.focusOut(input);
 
-    expect(handleChange).toHaveBeenCalledTimes(3);
+    expect(handleChange).toHaveBeenCalledTimes(4);
     expect(handleOpen).toHaveBeenCalledTimes(1);
     expect(handleBlur).toHaveBeenCalledTimes(1);
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bytebrand/fe-ui-core",
-  "version": "4.8.1",
+  "version": "4.8.2",
   "description": "UI components for the auto.de project",
   "main": "index.ts",
   "module": "dist/common.js",
@@ -13,7 +13,6 @@
     "@babel/preset-react": "^7.18.6",
     "@babel/preset-typescript": "^7.21.0",
     "@bytebrand/car-schema-selectors": "^2.0.7",
-    "@bytebrand/fe-financing": "^5.10.6",
     "@bytebrand/fe-histoslider": "3.0.0",
     "@bytebrand/i18n-dictionaries": "^0.7.5",
     "@emotion/react": "^11.9.3",

package/source/framework/types/types.ts

@@ -355,4 +355,14 @@ export interface IWltpConsumption {
   wltpPowerCombined?: number;
   wltpWeightedCombined?: number;
   wltpWeightedPowerCombined?: number;
+}
+
+export interface IFinancingUtils {
+  co2DefaultCostsLow: number;
+  co2DefaultCostsMedium: number;
+  co2DefaultCostsHigh: number;
+  getVehicleTax: (fuelType: string, cubicCapacity: number, co2: number, firstRegistration: number) => number;
+  getFuelPrice: (fuelSelector: string, consumption: IWltpConsumption, hybridPlugin?: boolean) => number;
+  getBaseFuelPrice: (fuelSelector: string, hybridPlugin?: boolean) => { fuelPrice: number, powerPrice?: number };
+  getCo2Price: (wltpCo2: number) => { co2PriceLow: number, co2PriceMedium: number, co2PriceHigh: number };
 }

package/source/framework/vehiclesProps/decoratedProps.tsx

@@ -7,9 +7,8 @@ import { formatTimestamp } from '../utils/DateUtils';
 import { formatMileage } from '../utils/CommonUtils';
 import { EMISSION_STICKERS_ICONS, WP_EMISSION_STICKERS_ICONS } from '../constants/Search';
 import { DELIVERY_PERIODS_EXTRA } from '../constants';
-import { IDecoratedProp, ICar } from '../types/types';
+import { IDecoratedProp, ICar, IFinancingUtils } from '../types/types';
 import { getFormattedPrice } from '../utils/CommonUtils';
-import { getVehicleTax, getFuelPrice, co2DefaultCostsLow, co2DefaultCostsMedium, co2DefaultCostsHigh, getBaseFuelPrice, getCo2Price } from '@bytebrand/fe-financing';
 
 const formatDeliveryPeriod = (t: (key: string, options?: object) => string, deliveryPeriod: string) => {
   const count: number = +DELIVERY_PERIODS_EXTRA.find((period: any) => period.value === deliveryPeriod).label;
@@ -72,7 +71,8 @@ const getDecoratedProps = (
   car: ICar, // @TODO should have a proper interface
   t: (key: string, options?: object) => string,
   language: string = 'en',
-  simplifiedLabels: boolean = false // shortened labels for repsonsive layout (see 'power'),
+  simplifiedLabels: boolean = false, // shortened labels for repsonsive layout (see 'power'),
+  financingUtils?: IFinancingUtils
 ): IDecoratedProp => {
   const {
     offer = {},
@@ -1548,6 +1548,7 @@ const getDecoratedProps = (
         const consumption = {
           wltpCombined, wltpPowerCombined, wltpWeightedCombined, wltpWeightedPowerCombined
         }
+        const { getFuelPrice } = financingUtils;
         const fuelCost = getFuelPrice(fuel, consumption, hybridPlugin);
         return Number.isFinite(fuelCost)
           ? t('vehicleProps:value.pricePerYear', { price: getFormattedPrice(fuelCost, '$,.2f') })
@@ -1555,9 +1556,14 @@ const getDecoratedProps = (
       }
     },
     wltpCo2CostsLow: {
-      title: t('vehicleProps:title.wltpCo2LowPrice', { price: co2DefaultCostsLow }),
+      get title() {
+        const { co2DefaultCostsLow } = financingUtils;
+        return t('vehicleProps:title.wltpCo2LowPrice', { price: co2DefaultCostsLow })
+      },
       get value() {
         const wltpCo2 = car.environmentEmissions.wltpCo2;
+
+        const { getCo2Price } = financingUtils;
         const { co2PriceLow } = getCo2Price(wltpCo2);
         return Number.isFinite(co2PriceLow)
           ? t('vehicleProps:value.wltpCo2Price', { price: getFormattedPrice(co2PriceLow, '$,.2f') })
@@ -1565,9 +1571,14 @@ const getDecoratedProps = (
       }
     },
     wltpCo2CostsMiddle: {
-      title: t('vehicleProps:title.wltpCo2MidPrice', { price: co2DefaultCostsMedium }),
+      get title() {
+        const { co2DefaultCostsMedium } = financingUtils;
+        return t('vehicleProps:title.wltpCo2MidPrice', { price: co2DefaultCostsMedium })
+      },
       get value() {
         const wltpCo2 = car.environmentEmissions.wltpCo2;
+
+        const { getCo2Price } = financingUtils;
         const { co2PriceMedium } = getCo2Price(wltpCo2);
         return Number.isFinite(co2PriceMedium)
           ? t('vehicleProps:value.wltpCo2Price', { price: getFormattedPrice(co2PriceMedium, '$,.2f') })
@@ -1575,9 +1586,14 @@ const getDecoratedProps = (
       }
     },
     wltpCo2CostsHigh: {
-      title: t('vehicleProps:title.wltpCo2HighPrice', { price: co2DefaultCostsHigh }),
+      get title() {
+        const { co2DefaultCostsHigh } = financingUtils;
+        return t('vehicleProps:title.wltpCo2HighPrice', { price: co2DefaultCostsHigh })
+      },
       get value() {
         const wltpCo2 = car.environmentEmissions.wltpCo2;
+
+        const { getCo2Price } = financingUtils;
         const { co2PriceHigh } = getCo2Price(wltpCo2);
         return Number.isFinite(co2PriceHigh)
           ? t('vehicleProps:value.wltpCo2Price', { price: getFormattedPrice(co2PriceHigh, '$,.2f') })
@@ -1590,6 +1606,8 @@ const getDecoratedProps = (
         const fuel = car.consumption.fuel;
         const { hybridPlugin } = car.engineData;
 
+        const { getBaseFuelPrice } = financingUtils;
+
         const basePowerPrice = getBaseFuelPrice(fuel, hybridPlugin).powerPrice;
         const powerPrice = car.costModel.powerPrice ? car.costModel.powerPrice : basePowerPrice;
 
@@ -1604,6 +1622,8 @@ const getDecoratedProps = (
         const fuel = car.consumption.fuel;
         const { hybridPlugin } = car.engineData;
 
+        const { getBaseFuelPrice } = financingUtils;
+
         const baseFuelPrice = getBaseFuelPrice(fuel, hybridPlugin);
 
         const fuelPrice = car.costModel.fuelPrice ? car.costModel.fuelPrice : baseFuelPrice;
@@ -1627,6 +1647,7 @@ const getDecoratedProps = (
         const cubicCapacity = car.engineData.cubicCapacity;
         const fuel = car.consumption.fuel;
         const wltpCo2 = car.environmentEmissions.wltpCo2;
+        const { getVehicleTax } = financingUtils;
         const tax = car.costModel.tax ? car.costModel.tax : getVehicleTax(fuel, cubicCapacity, wltpCo2, firstRegistration);
         return Number.isFinite(tax)
           ? t('vehicleProps:value.price', { price: getFormattedPrice(tax, '$,.2f') })