fix reduceData on reindexed facets

Fil · Fil · commit aee4469cb82a · 2022-09-30T16:28:52.000+02:00
diff --git a/src/facet.js b/src/facet.js
@@ -50,6 +50,6 @@ export function expander({plan}, X) {
   return V;
 }
 
-export function originals(facets) {
-  return facets.plan ? facets.map((facet) => facet.map((i) => facets.plan[i])) : facets;
+export function originals({plan}, I) {
+  return plan ? I.map((i) => plan[i]) : I;
 }
diff --git a/src/transforms/bin.js b/src/transforms/bin.js
@@ -211,7 +211,7 @@ function binn(
                 const b = fy(bb);
                 if (filter && !filter.reduce(b, extent)) continue;
                 groupFacet.push(i++);
-                groupData.push(reduceData.reduce(originals(b), data, extent));
+                groupData.push(reduceData.reduce(originals(facets, b), data, extent));
                 if (K) GK.push(k);
                 if (Z) GZ.push(G === Z ? f : gZ(b[0]));
                 if (F) GF.push(G === F ? f : gF(b[0]));
diff --git a/src/transforms/group.js b/src/transforms/group.js
@@ -181,7 +181,7 @@ function groupn(
             for (const [x, g] of maybeGroup(gg, eX)) {
               if (filter && !filter.reduce(g)) continue;
               groupFacet.push(i++);
-              groupData.push(reduceData.reduce(originals(g), data));
+              groupData.push(reduceData.reduce(originals(facets, g), data));
               if (X) GX.push(x);
               if (Y) GY.push(y);
               if (Z) GZ.push(G === Z ? f : gZ(g[0]));

Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,6 @@ export function expander({plan}, X) {`
`50`	`50`	`return V;`
`51`	`51`	`}`
`52`	`52`
`53`		`-export function originals(facets) {`
`54`		`- return facets.plan ? facets.map((facet) => facet.map((i) => facets.plan[i])) : facets;`
	`53`	`+export function originals({plan}, I) {`
	`54`	`+ return plan ? I.map((i) => plan[i]) : I;`
`55`	`55`	`}`