Select shapes using swatch class

susielu · Dec 14, 2017 · 7e0eb71 · 7e0eb71
1 parent d9ab9f5
commit 7e0eb71
Show file tree

Hide file tree

Showing 11 changed files with 310 additions and 227 deletions.
diff --git a/d3-legend.js b/d3-legend.js
diff --git a/d3-legend.min.js b/d3-legend.min.js
diff --git a/docs/d3-legend.min.js b/docs/d3-legend.min.js
diff --git a/docs/docs.min.js b/docs/docs.min.js
diff --git a/indexRollup.js b/indexRollup.js
diff --git a/indexRollup.js.map b/indexRollup.js.map
diff --git a/indexRollupNext.js b/indexRollupNext.js
diff --git a/indexRollupNext.js.map b/indexRollupNext.js.map
diff --git a/src/color.js b/src/color.js
@@ -49,7 +49,7 @@ export default function color(){
           .attr("class", classPrefix + "cell")
       cellEnter.append(shape).attr("class", classPrefix + "swatch")
 
-      let shapes = svg.selectAll("g." + classPrefix + "cell " + shape).data(type.data);
+      let shapes = svg.selectAll("g." + classPrefix + "cell " + shape + "." + classPrefix + "swatch").data(type.data);
 
       //add event handlers
       helper.d3_addEvents(cellEnter, legendDispatcher);

diff --git a/src/size.js b/src/size.js
@@ -56,7 +56,7 @@ export default function size() {
       .attr("class", classPrefix + "cell")
     cellEnter.append(shape).attr("class", classPrefix + "swatch")
 
-    let shapes = svg.selectAll("g." + classPrefix + "cell " + shape)
+    let shapes = svg.selectAll("g." + classPrefix + "cell " + shape + "." + classPrefix + "swatch")
 
     //add event handlers
     helper.d3_addEvents(cellEnter, legendDispatcher)

diff --git a/src/symbol.js b/src/symbol.js
@@ -57,7 +57,7 @@ export default function symbol() {
       .attr("class", classPrefix + "cell")
     cellEnter.append(shape).attr("class", classPrefix + "swatch")
 
-    let shapes = svg.selectAll("g." + classPrefix + "cell " + shape)
+    let shapes = svg.selectAll("g." + classPrefix + "cell " + shape + "." + classPrefix + "swatch")
 
     //add event handlers
     helper.d3_addEvents(cellEnter, legendDispatcher)