Skip to content

Commit

Permalink
fix: prevent duplicate child_(width|height) signals for facet decen…
Browse files Browse the repository at this point in the history
…dents
  • Loading branch information
drgould committed Mar 15, 2021
1 parent 5d7a0a2 commit 5b7ba8d
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
7 changes: 6 additions & 1 deletion src/compile/facet.ts
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,12 @@ export class FacetModel extends ModelWithField {
const layoutSignals = assembleLayoutSignals(this);

for (const child of this.children) {
layoutSignals.push(...child.assembleLayoutSignals());
for (const signal of child.assembleLayoutSignals()) {
const currentSignals = layoutSignals.map(s => s.name);
if (!currentSignals.includes(signal.name)) {
layoutSignals.push(signal);
}
}
}

return layoutSignals;
Expand Down
3 changes: 2 additions & 1 deletion src/compile/layoutsize/assemble.ts
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,15 @@ export function sizeSignals(model: Model, sizeType: LayoutSizeType): (NewSignal
update: autosizedFacetExpr(facetParent, sizeType)
}
];
} else {
} else if (size !== 'merged') {
return [
{
name,
value: size
}
];
}
return [];
}

function stepSignal(scaleName: string, range: VgRangeStep): NewSignal {
Expand Down

0 comments on commit 5b7ba8d

Please sign in to comment.