Merge pull request #288 from frappe/refactor-truncate-legends

frappe · Jun 3, 2020 · a35c765 · a35c765
2 parents 59416ec + ee38b15
commit a35c765
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 16 deletions.
diff --git a/dist/frappe-charts.esm.js b/dist/frappe-charts.esm.js
@@ -1492,7 +1492,7 @@ class BaseChart {
 			showLegend: 1, // calculate
 			isNavigable: options.isNavigable || 0,
 			animate: (typeof options.animate !== 'undefined') ? options.animate : 1,
-			truncateLegends: options.truncateLegends || 0
+			truncateLegends: options.truncateLegends || 1
 		};
 
 		this.measures = JSON.parse(JSON.stringify(BASE_MEASURES));
@@ -1830,7 +1830,7 @@ class AggregationChart extends BaseChart {
 		let count = 0;
 		let y = 0;
 		this.legendTotals.map((d, i) => {
-			let barWidth = 110;
+			let barWidth = 150;
 			let divisor = Math.floor(
 				(this.width - getExtraWidth(this.measures))/barWidth
 			);
@@ -1842,13 +1842,14 @@ class AggregationChart extends BaseChart {
 				y += 20;
 			}
 			let x = barWidth * count + 5;
+			let label = this.config.truncateLegends ? truncateString(s.labels[i], barWidth/10) : s.labels[i];
 			let dot = legendDot(
 				x,
 				y,
 				5,
 				this.colors[i],
-				`${s.labels[i]}: ${d}`,
-				this.config.truncateLegends
+				`${label}: ${d}`,
+				false
 			);
 			this.legendArea.appendChild(dot);
 			count++;

diff --git a/dist/frappe-charts.min.cjs.js b/dist/frappe-charts.min.cjs.js
diff --git a/dist/frappe-charts.min.cjs.js.map b/dist/frappe-charts.min.cjs.js.map
diff --git a/dist/frappe-charts.min.esm.js b/dist/frappe-charts.min.esm.js
diff --git a/dist/frappe-charts.min.esm.js.map b/dist/frappe-charts.min.esm.js.map
diff --git a/dist/frappe-charts.min.iife.js b/dist/frappe-charts.min.iife.js
diff --git a/dist/frappe-charts.min.iife.js.map b/dist/frappe-charts.min.iife.js.map
diff --git a/docs/assets/js/frappe-charts.min.js b/docs/assets/js/frappe-charts.min.js
diff --git a/docs/assets/js/frappe-charts.min.js.map b/docs/assets/js/frappe-charts.min.js.map
diff --git a/src/js/charts/AggregationChart.js b/src/js/charts/AggregationChart.js
@@ -1,4 +1,5 @@
 import BaseChart from './BaseChart';
+import { truncateString } from '../utils/draw-utils';
 import { legendDot } from '../utils/draw';
 import { getExtraWidth } from '../utils/constants';
 
@@ -63,7 +64,7 @@ export default class AggregationChart extends BaseChart {
 		let count = 0;
 		let y = 0;
 		this.legendTotals.map((d, i) => {
-			let barWidth = 110;
+			let barWidth = 150;
 			let divisor = Math.floor(
 				(this.width - getExtraWidth(this.measures))/barWidth
 			);
@@ -75,13 +76,14 @@ export default class AggregationChart extends BaseChart {
 				y += 20;
 			}
 			let x = barWidth * count + 5;
+			let label = this.config.truncateLegends ? truncateString(s.labels[i], barWidth/10) : s.labels[i];
 			let dot = legendDot(
 				x,
 				y,
 				5,
 				this.colors[i],
-				`${s.labels[i]}: ${d}`,
-				this.config.truncateLegends
+				`${label}: ${d}`,
+				false
 			);
 			this.legendArea.appendChild(dot);
 			count++;

diff --git a/src/js/charts/BaseChart.js b/src/js/charts/BaseChart.js
@@ -33,7 +33,7 @@ export default class BaseChart {
 			showLegend: 1, // calculate
 			isNavigable: options.isNavigable || 0,
 			animate: (typeof options.animate !== 'undefined') ? options.animate : 1,
-			truncateLegends: options.truncateLegends || 0
+			truncateLegends: options.truncateLegends || 1
 		};
 
 		this.measures = JSON.parse(JSON.stringify(BASE_MEASURES));