diff --git a/src/transforms/initializer.js b/src/transforms/initializer.js index f5646d2808..f2664c6fce 100644 --- a/src/transforms/initializer.js +++ b/src/transforms/initializer.js @@ -11,9 +11,9 @@ export function composeInitializer(i1, i2) { if (i1 == null) return i2 === null ? undefined : i2; if (i2 == null) return i1 === null ? undefined : i1; return function(data, facets, channels, scales, dimensions) { - let c1, c2; - ({data, facets, channels: c1} = i1.call(this, data, facets, channels, scales, dimensions)); - ({data, facets, channels: c2} = i2.call(this, data, facets, {...channels, ...c1}, scales, dimensions)); - return {data, facets, channels: {...c1, ...c2}}; + let c1, d1, f1, c2, d2, f2; + ({data: d1 = data, facets: f1 = facets, channels: c1} = i1.call(this, data, facets, channels, scales, dimensions)); + ({data: d2 = d1, facets: f2 = f1, channels: c2} = i2.call(this, d1, f1, {...channels, ...c1}, scales, dimensions)); + return {data: d2, facets: f2, channels: {...c1, ...c2}}; }; } diff --git a/test/output/hexbinText.svg b/test/output/hexbinText.svg index eee645ce84..b251c8c6f7 100644 --- a/test/output/hexbinText.svg +++ b/test/output/hexbinText.svg @@ -86,64 +86,58 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + 7447546101148212213115315122311311111115712313414662111 @@ -152,75 +146,81 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5141131318111414541111112111225522111138131466654241110113111211 - - - - - - + + + + + + + + 11211111 diff --git a/test/output/penguinDodgeHexbin.svg b/test/output/penguinDodgeHexbin.svg index 863a0fb098..2a4b7b57fd 100644 --- a/test/output/penguinDodgeHexbin.svg +++ b/test/output/penguinDodgeHexbin.svg @@ -360,8 +360,6 @@ - - @@ -437,6 +435,8 @@ + + @@ -503,8 +503,6 @@ - - @@ -635,6 +633,8 @@ + +