Merge pull request #55 from redbearsam/feature/update-d3fc-grouped

Update d3fc with fixed seriesSvgGrouped
finos · Feb 19, 2019 · 8ea5383 · 8ea5383
2 parents ceda5f8 + dbdaea2
commit 8ea5383
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 137 deletions.
diff --git a/packages/perspective-viewer-d3fc/package.json b/packages/perspective-viewer-d3fc/package.json
@@ -45,7 +45,7 @@
         "chroma-js": "^1.3.4",
         "d3": "^5.7.0",
         "d3-svg-legend": "^2.25.6",
-        "d3fc": "^14.0.25",
+        "d3fc": "^14.0.26",
         "gradient-parser": "0.1.5"
     }
 }
diff --git a/packages/perspective-viewer-d3fc/src/js/d3fc/series/groupedBase.js b/packages/perspective-viewer-d3fc/src/js/d3fc/series/groupedBase.js
diff --git a/packages/perspective-viewer-d3fc/src/js/d3fc/series/svg/grouped.js b/packages/perspective-viewer-d3fc/src/js/d3fc/series/svg/grouped.js
diff --git a/packages/perspective-viewer-d3fc/src/js/series/barSeries.js b/packages/perspective-viewer-d3fc/src/js/series/barSeries.js
@@ -8,10 +8,9 @@
  */
 import * as fc from "d3fc";
 import {tooltip} from "../tooltip/tooltip";
-import seriesSvgGrouped from "../d3fc/series/svg/grouped";
 
 export function barSeries(settings, colour) {
-    let series = settings.mainValues.length > 1 ? seriesSvgGrouped(fc.seriesSvgBar()) : fc.seriesSvgBar();
+    let series = settings.mainValues.length > 1 ? fc.seriesSvgGrouped(fc.seriesSvgBar()) : fc.seriesSvgBar();
 
     series = series.decorate(selection => {
         tooltip(selection, settings);