filter common styles

Author: Fil

src/marks/bar.js

@@ -19,8 +19,7 @@ export class AbstractBar extends Mark {
   }
   render(I, scales, channels, dimensions) {
     const {rx, ry} = this;
-    const {fill: F, fillOpacity: FO, stroke: S, strokeOpacity: SO} = channels;
-    const index = filter(I, ...this._positions(channels), F, FO, S, SO); // TODO filter standard channels
+    const index = filter(I, ...this._positions(channels));
     return create("svg:g")
         .call(applyIndirectStyles, this)
         .call(this._transform, scales)

src/marks/dot.js

@@ -31,8 +31,8 @@ export class Dot extends Mark {
     channels,
     {width, height, marginTop, marginRight, marginBottom, marginLeft}
   ) {
-    const {x: X, y: Y, r: R, fill: F, fillOpacity: FO, stroke: S, strokeOpacity: SO} = channels;
-    let index = filter(I, X, Y, F, FO, S, SO); // TODO filter standard channels
+    const {x: X, y: Y, r: R} = channels;
+    let index = filter(I, X, Y);
     if (R) index = index.filter(i => positive(R[i]));
     return create("svg:g")
         .call(applyIndirectStyles, this)

src/marks/link.js

@@ -30,8 +30,8 @@ export class Link extends Mark {
     {x, y},
     channels
   ) {
-    const {x1: X1, y1: Y1, x2: X2 = X1, y2: Y2 = Y1, stroke: S, strokeOpacity: SO} = channels;
-    const index = filter(I, X1, Y1, X2, Y2, S, SO); // TODO filter standard channels
+    const {x1: X1, y1: Y1, x2: X2 = X1, y2: Y2 = Y1} = channels;
+    const index = filter(I, X1, Y1, X2, Y2);
     return create("svg:g")
         .call(applyIndirectStyles, this)
         .call(applyTransform, x, y, 0.5, 0.5)

src/marks/rect.js

@@ -40,9 +40,9 @@ export class Rect extends Mark {
     this.ry = impliedString(ry, "auto");
   }
   render(I, {x, y}, channels) {
-    const {x1: X1, y1: Y1, x2: X2, y2: Y2, fill: F, fillOpacity: FO, stroke: S, strokeOpacity: SO} = channels;
+    const {x1: X1, y1: Y1, x2: X2, y2: Y2} = channels;
     const {rx, ry} = this;
-    const index = filter(I, X1, Y2, X2, Y2, F, FO, S, SO); // TODO filter standard channels
+    const index = filter(I, X1, Y2, X2, Y2);
     return create("svg:g")
         .call(applyIndirectStyles, this)
         .call(applyTransform, x, y)

src/marks/rule.js

@@ -37,8 +37,8 @@ export class RuleX extends Mark {
     channels,
     {width, height, marginTop, marginRight, marginLeft, marginBottom}
   ) {
-    const {x: X, y1: Y1, y2: Y2, stroke: S, strokeOpacity: SO} = channels;
-    const index = filter(I, X, Y1, Y2, S, SO); // TODO filter standard channels
+    const {x: X, y1: Y1, y2: Y2} = channels;
+    const index = filter(I, X, Y1, Y2);
     return create("svg:g")
         .call(applyIndirectStyles, this)
         .call(applyTransform, X && x, null, 0.5, 0)
@@ -84,8 +84,8 @@ export class RuleY extends Mark {
     channels,
     {width, height, marginTop, marginRight, marginLeft, marginBottom}
   ) {
-    const {y: Y, x1: X1, x2: X2, stroke: S, strokeOpacity: SO} = channels;
-    const index = filter(I, Y, X1, X2, S, SO); // TODO filter standard channels
+    const {y: Y, x1: X1, x2: X2} = channels;
+    const index = filter(I, Y, X1, X2);
     return create("svg:g")
         .call(applyIndirectStyles, this)
         .call(applyTransform, null, Y && y, 0, 0.5)

src/marks/text.js

@@ -53,9 +53,9 @@ export class Text extends Mark {
     channels,
     {width, height, marginTop, marginRight, marginBottom, marginLeft}
   ) {
-    const {x: X, y: Y, rotate: R, text: T, fill: F, fillOpacity: FO, fontSize: FS} = channels;
+    const {x: X, y: Y, rotate: R, text: T, fontSize: FS} = channels;
     const {rotate} = this;
-    const index = filter(I, X, Y, F, FO, R).filter(i => nonempty(T[i]));  // TODO filter standard channels
+    const index = filter(I, X, Y, R).filter(i => nonempty(T[i]));
     const cx = (marginLeft + width - marginRight) / 2;
     const cy = (marginTop + height - marginBottom) / 2;
     return create("svg:g")

src/marks/tick.js

@@ -13,8 +13,8 @@ class AbstractTick extends Mark {
     super(data, channels, options, defaults);
   }
   render(I, scales, channels, dimensions) {
-    const {x: X, y: Y, stroke: S, strokeOpacity: SO} = channels;
-    const index = filter(I, X, Y, S, SO); // TODO filter standard channels
+    const {x: X, y: Y} = channels;
+    const index = filter(I, X, Y);
     return create("svg:g")
         .call(applyIndirectStyles, this)
         .call(this._transform, scales)

src/plot.js

@@ -1,5 +1,6 @@
 import {create} from "d3";
 import {Axes, autoAxisTicks, autoAxisLabels} from "./axes.js";
+import {filter} from "./defined.js";
 import {facets} from "./facet.js";
 import {values} from "./mark.js";
 import {Scales, autoScaleRange} from "./scales.js";
@@ -83,8 +84,9 @@ export function plot(options = {}) {
 
   for (const mark of marks) {
     const channels = markChannels.get(mark);
-    const index = markIndex.get(mark);
-    const node = mark.render(index, scales, values(channels, scales), dimensions, axes);
+    const scaled = values(channels, scales);
+    const index = filter(markIndex.get(mark), scaled.fill, scaled.fillOpacity, scaled.stroke, scaled.strokeOpacity);
+    const node = mark.render(index, scales, scaled, dimensions, axes);
     if (node != null) svg.appendChild(node);
   }