datastake-daf 0.6.310 → 0.6.312

package/dist/components/index.js

@@ -45822,7 +45822,7 @@ const Chart = _ref => {
     if (typeof legend === 'object') {
       return legend;
     }
-    if (legend === true || legend === undefined || isPdf) {
+    if (legend === true || isPdf) {
       return {};
     }
     return null;
@@ -49691,7 +49691,7 @@ function LineChart(_ref) {
   });
 }
 
-const _excluded$5 = ["data", "xFieldKey", "yFieldKey", "renderTooltipContent", "tooltipConfig", "animated", "isStack", "isGroup", "seriesField", "isPercentage", "showBackground", "formattedYAxis", "formattedXAxis", "color", "height", "groupField", "t", "isPdf", "extraLegendConfig"];
+const _excluded$5 = ["data", "xFieldKey", "yFieldKey", "renderTooltipContent", "tooltipConfig", "animated", "isStack", "isGroup", "seriesField", "isPercentage", "showBackground", "formattedYAxis", "formattedXAxis", "color", "height", "groupField", "t", "isPdf", "extraLegendConfig", "shouldSeperateLegendName"];
 const {
   useToken: useToken$c
 } = antd.theme;
@@ -49778,7 +49778,8 @@ function ColumnChart(_ref) {
       groupField,
       t = s => s,
       isPdf = false,
-      extraLegendConfig = {}
+      extraLegendConfig = {},
+      shouldSeperateLegendName = false
     } = _ref;
     _objectWithoutProperties(_ref, _excluded$5);
   const containerRef = React__default["default"].useRef(null);
@@ -49823,7 +49824,10 @@ function ColumnChart(_ref) {
       }),
       legend: isPdf ? _objectSpread2({
         itemName: {
-          formatter: text => t(text)
+          formatter: text => {
+            const textToTranslate = shouldSeperateLegendName ? text.split("-")[1].toLowerCase() : text;
+            return t(textToTranslate);
+          }
         },
         position: 'bottom'
       }, extraLegendConfig) : hasLegendConfig || false

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "datastake-daf",
-	"version": "0.6.310",
+	"version": "0.6.312",
 	"dependencies": {
 		"@ant-design/icons": "^5.2.5",
 		"@antv/g2": "^5.1.1",

package/src/@daf/core/components/Charts/ColumnChart/ColumnChart.stories.jsx

@@ -456,6 +456,7 @@ export const Pdf = {
 		renderTooltipContent: renderTooltipContent,
 		showBackground: true,
 		isPercentage: true,
+		shouldSeperateLegendName: true,
 	},
 	render: (args) => {
 		return <ColumnChart {...args} />;

package/src/@daf/core/components/Charts/ColumnChart/index.jsx

@@ -89,6 +89,7 @@ export default function ColumnChart({
 	t = (s) => s,
 	isPdf = false,
 	extraLegendConfig = {},
+	shouldSeperateLegendName = false,
 	...rest
 }) {
 	const containerRef = React.useRef(null);
@@ -145,7 +146,10 @@ export default function ColumnChart({
 			legend: isPdf
 			? {
 				itemName: {
-				  formatter: (text) => t(text),
+				  formatter: (text) => {
+					const textToTranslate = shouldSeperateLegendName ? text.split("-")[1].toLowerCase() : text
+					return t(textToTranslate)
+				  },
 				},
 				position: 'bottom',
 				...extraLegendConfig,

package/src/@daf/core/components/Charts/PieChart/PieChart.stories.js

@@ -39,8 +39,8 @@ export const Primary = {
 				"color": "#C04B19"
 			}
 		],
-		legend: false,
-		isPdf: true,
+		// legend: false,
+		// isPdf: true,
 		isPercentage: true,
 	},
 };

package/src/@daf/core/components/Charts/PieChart/chart.jsx

@@ -66,7 +66,7 @@ const Chart = ({
       return legend;
     }
   
-    if (legend === true || legend === undefined || isPdf) {
+    if (legend === true || isPdf) {
       return {};
     }