Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: layer with shared encoding ignore repeater #9246

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
Open

fix: layer with shared encoding ignore repeater #9246

Changes from 4 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e64fe8b
fix: layer with shared encoding ignore repeater
ChiaLingWeng Feb 1, 2024
7cbd218
avoid undefined array error
ChiaLingWeng Feb 1, 2024
9800e97
Merge branch 'vega:main' into clw/repeat_layer
ChiaLingWeng Feb 1, 2024
74fb9c1
style: auto-formatting [CI]
Feb 1, 2024
5a46f11
simplify condition statement
ChiaLingWeng Feb 2, 2024
6a02b08
style: auto-formatting [CI]
Feb 2, 2024
5128a05
move empty check outside class
ChiaLingWeng Feb 2, 2024
1421933
style: auto-formatting [CI]
Feb 2, 2024
9d0c745
use defined isEmpty func instead
ChiaLingWeng Feb 2, 2024
4f30bf2
style: auto-formatting [CI]
Feb 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 31 additions & 9 deletions src/normalize/core.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ export class CoreNormalizer extends SpecMapper<NormalizerParams, FacetedUnitSpec
...(spec.name ? {name: [params.repeaterPrefix, spec.name].filter(n => n).join('_')} : {}),
...(encoding ? {encoding} : {})
};

if (parentEncoding || parentProjection) {
return this.mapUnitWithParentEncodingOrProjection(specWithReplacedEncoding, params);
}
Expand Down Expand Up @@ -212,6 +211,12 @@ export class CoreNormalizer extends SpecMapper<NormalizerParams, FacetedUnitSpec

return super.mapFacet(spec, params);
}
private isEmpty(obj: any) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this should be a helper function outside of this class, no?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, move this outside the class

if (obj == null) {
return true;
}
return Object.keys(obj).length === 0;
}

private mapUnitWithParentEncodingOrProjection(
spec: FacetedUnitSpec<Field>,
Expand All @@ -225,14 +230,31 @@ export class CoreNormalizer extends SpecMapper<NormalizerParams, FacetedUnitSpec
encoding: replaceRepeaterInEncoding(encoding, params.repeater)
});

return this.mapUnit(
{
...spec,
...(mergedProjection ? {projection: mergedProjection} : {}),
...(mergedEncoding ? {encoding: mergedEncoding} : {})
},
{config}
);
if (this.isEmpty(encoding) && !this.isEmpty(params.repeater)) {
Copy link
Member

@domoritz domoritz Feb 1, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we move this check to the second argument of the map unit method?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah yes, simplify and updated!

return this.mapUnit(
{
...spec,
...(mergedProjection ? {projection: mergedProjection} : {}),
...(mergedEncoding ? {encoding: mergedEncoding} : {})
},
{
...params,
config: config,
repeater: params.repeater
}
);
} else {
return this.mapUnit(
{
...spec,
...(mergedProjection ? {projection: mergedProjection} : {}),
...(mergedEncoding ? {encoding: mergedEncoding} : {})
},
{
config
}
);
}
}

private mapFacetedUnit(spec: FacetedUnitSpec<Field>, normParams: NormalizerParams): NormalizedFacetSpec {
Expand Down
Loading