[] is an empty facet (observablehq#1216)

* [] is an empty facet closes observablehq#1212 alternative to observablehq#1215 * consistent filtering Co-authored-by: Mike Bostock <[email protected]>
chaichontat · Jan 14, 2024 · 721df8e · 721df8e
1 parent d5be54e
commit 721df8e
Show file tree

Hide file tree

Showing 8 changed files with 68 additions and 14 deletions.
diff --git a/src/plot.js b/src/plot.js
@@ -304,8 +304,8 @@ export function plot(options = {}) {
           if (facets) {
             const fi = facetPosition.get(key);
             facet = facets[fi] ?? facets[0];
-            if (!facet) continue;
             facet = mark.filter(facet, channels, values);
+            if (!facet.length) continue;
             facet.fi = fi;
           }
           const node = mark.render(facet, scales, values, subdimensions, context);
@@ -317,8 +317,8 @@ export function plot(options = {}) {
       let facet = null;
       if (facets) {
         facet = facets[0];
-        if (!facet) continue;
         facet = mark.filter(facet, channels, values);
+        if (!facet.length) continue;
       }
       const node = mark.render(facet, scales, values, dimensions, context);
       if (node != null) svg.appendChild(node);
@@ -656,8 +656,8 @@ function maybeMarkFacet(mark, topFacetState, options) {
 // Facet filter, by mark; for now only the "eq" filter is provided.
 function filterFacets(facets, {channels: {fx, fy}, groups}) {
   return fx && fy
-    ? facets.map(({x, y}) => groups.get(x)?.get(y))
+    ? facets.map(({x, y}) => groups.get(x)?.get(y) ?? [])
     : fx
-    ? facets.map(({x}) => groups.get(x))
-    : facets.map(({y}) => groups.get(y));
+    ? facets.map(({x}) => groups.get(x) ?? [])
+    : facets.map(({y}) => groups.get(y) ?? []);
 }
diff --git a/test/output/athletesSample.svg b/test/output/athletesSample.svg
diff --git a/test/output/athletesSportWeight.svg b/test/output/athletesSportWeight.svg
diff --git a/test/output/emptyFacet.svg b/test/output/emptyFacet.svg
diff --git a/test/output/projectionFitAntarctica.svg b/test/output/projectionFitAntarctica.svg
diff --git a/test/output/shorthandBoxX.svg b/test/output/shorthandBoxX.svg
diff --git a/test/plots/empty-facet.js b/test/plots/empty-facet.js
@@ -0,0 +1,13 @@
+import * as Plot from "@observablehq/plot";
+
+export default async function () {
+  const data = [
+    {PERIOD: 1, VALUE: 3, TYPE: "c"},
+    {PERIOD: 2, VALUE: 4, TYPE: "c"}
+  ];
+  return Plot.plot({
+    facet: {data, x: "TYPE"},
+    fx: {domain: ["a", "b"]},
+    marks: [Plot.barY(data, {x: "PERIOD", y: "VALUE"})]
+  });
+}
diff --git a/test/plots/index.js b/test/plots/index.js
@@ -64,6 +64,7 @@ export {default as downloads} from "./downloads.js";
 export {default as downloadsOrdinal} from "./downloads-ordinal.js";
 export {default as driving} from "./driving.js";
 export {default as empty} from "./empty.js";
+export {default as emptyFacet} from "./empty-facet.js";
 export {default as emptyLegend} from "./empty-legend.js";
 export {default as emptyX} from "./empty-x.js";
 export {default as energyProduction} from "./energy-production.js";