resolve merge

susielu · Jan 5, 2018 · 68cdb11 · 68cdb11
2 parents 98bd21c + 7e0eb71
commit 68cdb11
Show file tree

Hide file tree

Showing 10 changed files with 126 additions and 105 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/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
@@ -62,7 +62,9 @@ export default function color() {
     cellEnter.append(shape).attr("class", classPrefix + "swatch")
 
     let shapes = svg
-      .selectAll("g." + classPrefix + "cell " + shape)
+      .selectAll(
+        "g." + classPrefix + "cell " + shape + "." + classPrefix + "swatch"
+      )
       .data(type.data)
 
     //add event handlers

diff --git a/src/size.js b/src/size.js
@@ -56,7 +56,9 @@ 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)
@@ -114,7 +116,7 @@ export default function size() {
         }
         return bbox
       })
-    //console.log('SHAPESIZE')
+
     const maxH = max(shapeSize, d => d.height + d.y),
       maxW = max(shapeSize, d => d.width + d.x)
 

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)