default fill to none if stroke

observablehq · Mar 10, 2021 · f8fd2e5 · f8fd2e5
1 parent 89023cb
commit f8fd2e5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/marks/area.js b/src/marks/area.js
@@ -23,8 +23,8 @@ export class Area extends Mark {
       ...options
     } = {}
   ) {
-    const [vfill, cfill] = maybeColor(fill, "currentColor");
     const [vstroke, cstroke] = maybeColor(stroke, "none");
+    const [vfill, cfill] = maybeColor(fill, cstroke === "none" ? "currentColor" : "none");
     if (z === undefined && vfill != null) z = vfill;
     if (z === undefined && vstroke != null) z = vstroke;
     super(

diff --git a/src/marks/bar.js b/src/marks/bar.js
@@ -23,8 +23,8 @@ export class AbstractBar extends Mark {
       ...options
     } = {}
   ) {
-    const [vfill, cfill] = maybeColor(fill, "currentColor");
     const [vstroke, cstroke] = maybeColor(stroke, "none");
+    const [vfill, cfill] = maybeColor(fill, cstroke === "none" ? "currentColor" : "none");
     super(
       data,
       [

diff --git a/src/marks/rect.js b/src/marks/rect.js
@@ -26,8 +26,8 @@ export class Rect extends Mark {
       ...options
     } = {}
   ) {
-    const [vfill, cfill] = maybeColor(fill, "currentColor");
     const [vstroke, cstroke] = maybeColor(stroke, "none");
+    const [vfill, cfill] = maybeColor(fill, cstroke === "none" ? "currentColor" : "none");
     super(
       data,
       [