Fix the pathoverlay normalization to take correct markDef

vega · Jul 19, 2023 · 98e0ebe · 98e0ebe
1 parent 538f6e8
commit 98e0ebe
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 1 deletion.
diff --git a/src/normalize/pathoverlay.ts b/src/normalize/pathoverlay.ts
@@ -9,6 +9,7 @@ import {isUnitSpec} from '../spec/unit';
 import {stack} from '../stack';
 import {keys, omit, pick} from '../util';
 import {NonFacetUnitNormalizer, NormalizeLayerOrUnit, NormalizerParams} from './base';
+import {initMarkdef} from '../compile/mark/init';
 
 type UnitSpecWithPathOverlay = GenericUnitSpec<Encoding<string>, Mark | MarkDef<'line' | 'area' | 'rule' | 'trail'>>;
 
@@ -109,6 +110,7 @@ export class PathOverlayNormalizer implements NonFacetUnitNormalizer<UnitSpecWit
     const markDef: MarkDef = isMarkDef(mark) ? mark : {type: mark};
 
     const pointOverlay = getPointOverlay(markDef, config[markDef.type], encoding);
+
     const lineOverlay = markDef.type === 'area' && getLineOverlay(markDef, config[markDef.type]);
 
     const layer: NormalizedUnitSpec[] = [
@@ -130,7 +132,7 @@ export class PathOverlayNormalizer implements NonFacetUnitNormalizer<UnitSpecWit
     // FIXME: determine rules for applying selections.
 
     // Need to copy stack config to overlayed layer
-    const stackProps = stack(markDef, encoding);
+    const stackProps = stack(initMarkdef(markDef, encoding, config), encoding);
 
     let overlayEncoding = encoding;
     if (stackProps) {

diff --git a/test/normalize/pathoverlay.test.ts b/test/normalize/pathoverlay.test.ts
@@ -324,6 +324,42 @@ describe('PathOverlayNormalizer', () => {
     });
   });
 
+  it('correctly normalizes default stacked area with overlay line', () => {
+    const spec: TopLevelSpec = {
+      data: {url: 'data/movies.json'},
+      mark: 'area',
+      encoding: {
+        x: {field: 'IMDB Rating', type: 'quantitative'},
+        y: {field: 'Rotten Tomatoes Rating', type: 'quantitative'},
+        color: {field: 'MPAA RATING', type: 'nominal'}
+      },
+      config: {area: {line: {}}}
+    };
+    const normalizedSpec = normalize(spec);
+    expect(normalizedSpec).toEqual({
+      data: {url: 'data/movies.json'},
+      layer: [
+        {
+          mark: {type: 'area', opacity: 0.7},
+          encoding: {
+            x: {field: 'IMDB Rating', type: 'quantitative'},
+            y: {field: 'Rotten Tomatoes Rating', type: 'quantitative'},
+            color: {field: 'MPAA RATING', type: 'nominal'}
+          }
+        },
+        {
+          mark: {type: 'line'},
+          encoding: {
+            x: {field: 'IMDB Rating', type: 'quantitative'},
+            y: {field: 'Rotten Tomatoes Rating', type: 'quantitative', stack: 'zero'},
+            color: {field: 'MPAA RATING', type: 'nominal'}
+          }
+        }
+      ],
+      config: {area: {line: {}}}
+    });
+  });
+
   it('correctly normalizes streamgraph with overlay line', () => {
     const spec: TopLevelSpec = {
       data: {url: 'data/stocks.csv'},