minimize diff

Author: mbostock

src/marks/link.js

@@ -38,8 +38,6 @@ export class Link extends Mark {
           .data(index)
           .join("path")
             .call(applyDirectStyles, this)
-            .call(applyChannelStyles, this, channels)
-            .call(applyMarkers, this, channels)
             .attr("d", i => {
               const p = path();
               const c = curve(p);
@@ -48,7 +46,9 @@ export class Link extends Mark {
               c.point(X2[i], Y2[i]);
               c.lineEnd();
               return p;
-            }))
+            })
+            .call(applyChannelStyles, this, channels)
+            .call(applyMarkers, this, channels))
       .node();
   }
 }

src/marks/rule.js

@@ -45,11 +45,11 @@ export class RuleX extends Mark {
           .data(index)
           .join("line")
             .call(applyDirectStyles, this)
-            .call(applyChannelStyles, this, channels)
             .attr("x1", X ? i => X[i] : (marginLeft + width - marginRight) / 2)
             .attr("x2", X ? i => X[i] : (marginLeft + width - marginRight) / 2)
             .attr("y1", Y1 && !isCollapsed(y) ? i => Y1[i] + insetTop : marginTop + insetTop)
-            .attr("y2", Y2 && !isCollapsed(y) ? (y.bandwidth ? i => Y2[i] + y.bandwidth() - insetBottom : i => Y2[i] - insetBottom) : height - marginBottom - insetBottom))
+            .attr("y2", Y2 && !isCollapsed(y) ? (y.bandwidth ? i => Y2[i] + y.bandwidth() - insetBottom : i => Y2[i] - insetBottom) : height - marginBottom - insetBottom)
+            .call(applyChannelStyles, this, channels))
       .node();
   }
 }
@@ -88,11 +88,11 @@ export class RuleY extends Mark {
           .data(index)
           .join("line")
             .call(applyDirectStyles, this)
-            .call(applyChannelStyles, this, channels)
             .attr("x1", X1 && !isCollapsed(x) ? i => X1[i] + insetLeft : marginLeft + insetLeft)
             .attr("x2", X2 && !isCollapsed(x) ? (x.bandwidth ? i => X2[i] + x.bandwidth() - insetRight : i => X2[i] - insetRight) : width - marginRight - insetRight)
             .attr("y1", Y ? i => Y[i] : (marginTop + height - marginBottom) / 2)
-            .attr("y2", Y ? i => Y[i] : (marginTop + height - marginBottom) / 2))
+            .attr("y2", Y ? i => Y[i] : (marginTop + height - marginBottom) / 2)
+            .call(applyChannelStyles, this, channels))
       .node();
   }
 }

test/output/aaplCandlestick.svg

@@ -65,7 +65,6 @@ function reindexStyle(root) {
   }
 }
 
-// TODO replace iris url(#plot-1)
 function reindexMarker(root) {
   let index = 0;
   const map = new Map();