Make sure colour-scale points still have semi-transparent fill (#75)

redbearsam · Mar 6, 2019 · 95d85c7 · 95d85c7
1 parent 386c93d
commit 95d85c7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/packages/perspective-viewer-d3fc/src/js/series/pointSeries.js b/packages/perspective-viewer-d3fc/src/js/series/pointSeries.js
@@ -10,7 +10,7 @@ import * as d3 from "d3";
 import * as fc from "d3fc";
 import {tooltip} from "../tooltip/tooltip";
 import {groupFromKey} from "./seriesKey";
-import {withoutOpacity} from "./seriesColours";
+import {withOpacity, withoutOpacity} from "./seriesColours";
 
 const symbols = [d3.symbolCircle, d3.symbolCross, d3.symbolDiamond, d3.symbolSquare, d3.symbolStar, d3.symbolTriangle, d3.symbolWye];
 
@@ -30,7 +30,7 @@ export function pointSeries(settings, seriesKey, size, colour, symbols) {
     series.decorate(selection => {
         tooltip()(selection, settings);
         if (colour) {
-            selection.style("stroke", d => withoutOpacity(colour(d.colorValue || seriesKey))).style("fill", d => colour(d.colorValue || seriesKey));
+            selection.style("stroke", d => withoutOpacity(colour(d.colorValue || seriesKey))).style("fill", d => withOpacity(colour(d.colorValue || seriesKey)));
         }
     });
 

diff --git a/packages/perspective-viewer-d3fc/src/js/series/seriesColours.js b/packages/perspective-viewer-d3fc/src/js/series/seriesColours.js
@@ -39,6 +39,8 @@ export function withoutOpacity(colour) {
 }
 
 export function withOpacity(colour) {
+    if (colour.includes("rgba")) return colour;
+
     const toInt = offset => parseInt(colour.substring(offset, offset + 2), 16);
     return `rgba(${toInt(1)},${toInt(3)},${toInt(5)},0.5)`;
 }