in percentage mode tooltip should also show percentages (#13217)

elastic · Aug 1, 2017 · 5703ffc · 5703ffc
1 parent baabbdf
commit 5703ffc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/ui/public/vislib/lib/dispatch.js b/src/ui/public/vislib/lib/dispatch.js
@@ -40,7 +40,6 @@ export function VislibLibDispatchProvider(Private, config) {
       const slices = isSlices ? data.slices : undefined;
       const handler = this.handler;
       const color = _.get(handler, 'data.color');
-      const isPercentage = (handler && handler.visConfig.get('mode', 'normal') === 'percentage');
 
       const eventData = {
         value: d.y,
@@ -59,11 +58,13 @@ export function VislibLibDispatchProvider(Private, config) {
 
       if (isSeries) {
         // Find object with the actual d value and add it to the point object
+        const aggId = d3.event.target.parentElement.__data__.aggId;
+        const percentageMode = handler.charts[0].getSeries(aggId).getValueAxis().axisConfig.isPercentage();
         const object = _.find(series, { 'label': label });
         if (object) {
           eventData.value = +object.values[i].y;
 
-          if (isPercentage) {
+          if (percentageMode) {
             // Add the formatted percentage to the point object
             eventData.percent = (100 * d.y).toFixed(1) + '%';
           }

diff --git a/src/ui/public/vislib/visualizations/point_series.js b/src/ui/public/vislib/visualizations/point_series.js
@@ -40,6 +40,10 @@ export function VislibVisualizationsPointSeriesProvider(Private) {
       return charts[chartIndex];
     }
 
+    getSeries(seriesId) {
+      return this.series.find(series => series.chartData.aggId === seriesId);
+    }
+
     addBackground(svg, width, height) {
       const startX = 0;
       const startY = 0;