@aclymatepackages/modules 2.1.4 → 2.1.6

package/dist/components/AccountingChart.js

@@ -124,6 +124,7 @@ const AccountingChart = _ref2 => {
       if (baseline) {
         return {
           baseline: 100,
+          isPledgeYear: pledgeYear === (0, _dayjs.default)(baselineDate).year(),
           year,
           tonsCo2e
         };

package/dist/components/EmissionsPieChart.js

@@ -61,7 +61,8 @@ const EmissionsPieChart = _ref2 => {
     viewMode = "subcategories",
     pieChartRef,
     branding,
-    showTooltip = true
+    showTooltip = true,
+    CustomTooltip
   } = _ref2;
   const subcategoriesArray = (0, _subcategories.buildSubcategoriesArray)(emissions);
   const scopesArray = (0, _subcategories.buildScopesWithColors)(branding);
@@ -88,6 +89,7 @@ const EmissionsPieChart = _ref2 => {
     });
   };
   const pieSlicesWithPercentages = formatChartPieSlices();
+  const TooltipComponent = CustomTooltip || PieChartCustomTooltip;
   return /*#__PURE__*/_react.default.createElement(_recharts.ResponsiveContainer, {
     height: "100%",
     aspect: 1.5
@@ -115,7 +117,7 @@ const EmissionsPieChart = _ref2 => {
     wrapperStyle: {
       zIndex: 99
     },
-    content: /*#__PURE__*/_react.default.createElement(PieChartCustomTooltip, null)
+    content: /*#__PURE__*/_react.default.createElement(TooltipComponent, null)
   })));
 };
 var _default = exports.default = EmissionsPieChart;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aclymatepackages/modules",
-  "version": "2.1.4",
+  "version": "2.1.6",
   "description": "Aclymate modules",
   "author": "William Loopesko",
   "main": "dist/index.js",

package/src/components/AccountingChart.js

@@ -56,6 +56,7 @@ const AccountingChartTooltip = ({
     if (isPledgeYear) {
       return { title, subtitle: "Pledge Year" };
     }
+
     if (future) {
       return {
         title,
@@ -123,7 +124,12 @@ const AccountingChart = ({
       tonsCo2e,
     }) => {
       if (baseline) {
-        return { baseline: 100, year, tonsCo2e };
+        return {
+          baseline: 100,
+          isPledgeYear: pledgeYear === dayjs(baselineDate).year(),
+          year,
+          tonsCo2e,
+        };
       }
 
       if (!pledgeYear || pledgeYear > year) {

package/src/components/EmissionsPieChart.js

@@ -54,6 +54,7 @@ const EmissionsPieChart = ({
   pieChartRef,
   branding,
   showTooltip = true,
+  CustomTooltip,
 }) => {
   const subcategoriesArray = buildSubcategoriesArray(emissions);
   const scopesArray = buildScopesWithColors(branding);
@@ -91,6 +92,8 @@ const EmissionsPieChart = ({
 
   const pieSlicesWithPercentages = formatChartPieSlices();
 
+  const TooltipComponent = CustomTooltip || PieChartCustomTooltip;
+
   return (
     <ResponsiveContainer height="100%" aspect={1.5}>
       <PieChart ref={pieChartRef}>
@@ -113,7 +116,7 @@ const EmissionsPieChart = ({
         {showTooltip && (
           <ChartTooltip
             wrapperStyle={{ zIndex: 99 }}
-            content={<PieChartCustomTooltip />}
+            content={<TooltipComponent />}
           />
         )}
       </PieChart>