diff --git a/src/marks/waffle.js b/src/marks/waffle.js
index c7ced9c36f..6b16f4700f 100644
--- a/src/marks/waffle.js
+++ b/src/marks/waffle.js
@@ -34,8 +34,8 @@ export class WaffleY extends BarY {
}
function waffleRender(y) {
- const {unit, gap, rx, ry, round} = this;
return function (index, scales, {href, ...values}, dimensions, context) {
+ const {unit, gap, rx, ry, round} = this;
const {document} = context;
const Y1 = values.channels[`${y}1`].value;
const Y2 = values.channels[`${y}2`].value;
@@ -103,7 +103,7 @@ function waffleRender(y) {
.join("L")}Z`
)
.attr("fill", (i) => `url(#${patternId}-${i})`)
- .attr("stroke", this.stroke == null ? null : (i) => `url(#${patternId}-${i})`)
+ .attr("stroke", this.stroke == null ? null : "none")
.call(applyChannelStyles, this, {href})
)
.node();
diff --git a/test/output/waffleHref.svg b/test/output/waffleHref.svg
index 0117ade5f9..77b4734b75 100644
--- a/test/output/waffleHref.svg
+++ b/test/output/waffleHref.svg
@@ -265,159 +265,159 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
\ No newline at end of file
diff --git a/test/output/waffleStroke.svg b/test/output/waffleStroke.svg
index ff8bc9a54a..a5e317c71a 100644
--- a/test/output/waffleStroke.svg
+++ b/test/output/waffleStroke.svg
@@ -66,12 +66,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
@@ -92,11 +92,11 @@
-
-
-
-
-
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/test/output/waffleStrokeMixed.svg b/test/output/waffleStrokeMixed.svg
index fceae2f5af..a8fe5022d4 100644
--- a/test/output/waffleStrokeMixed.svg
+++ b/test/output/waffleStrokeMixed.svg
@@ -70,12 +70,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/test/output/waffleStrokeNegative.svg b/test/output/waffleStrokeNegative.svg
index 8e03565a10..263cc64772 100644
--- a/test/output/waffleStrokeNegative.svg
+++ b/test/output/waffleStrokeNegative.svg
@@ -100,12 +100,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/test/output/waffleStrokePositive.svg b/test/output/waffleStrokePositive.svg
index cb2ab9cd2b..7e6499571f 100644
--- a/test/output/waffleStrokePositive.svg
+++ b/test/output/waffleStrokePositive.svg
@@ -100,12 +100,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/test/output/waffleStrokeWidth.svg b/test/output/waffleStrokeWidth.svg
new file mode 100644
index 0000000000..73458ca22b
--- /dev/null
+++ b/test/output/waffleStrokeWidth.svg
@@ -0,0 +1,346 @@
+
\ No newline at end of file
diff --git a/test/output/waffleStrokeWidthConst.svg b/test/output/waffleStrokeWidthConst.svg
new file mode 100644
index 0000000000..9d6b885897
--- /dev/null
+++ b/test/output/waffleStrokeWidthConst.svg
@@ -0,0 +1,346 @@
+
\ No newline at end of file
diff --git a/test/plots/waffle.ts b/test/plots/waffle.ts
index 933619b9fc..a5755480f2 100644
--- a/test/plots/waffle.ts
+++ b/test/plots/waffle.ts
@@ -263,3 +263,17 @@ export function waffleHref() {
]
});
}
+
+export function waffleStrokeWidth() {
+ return Plot.plot({
+ inset: 10,
+ marks: [Plot.waffleY({length: 77}, {y: 1, stroke: (d, i) => i % 7, gap: 15, strokeWidth: 15, strokeOpacity: 0.8})]
+ });
+}
+
+export function waffleStrokeWidthConst() {
+ return Plot.plot({
+ inset: 10,
+ marks: [Plot.waffleY({length: 77}, {y: 1, stroke: "black", gap: 15, strokeWidth: 15, strokeOpacity: 0.8})]
+ });
+}