From e95a2c42cfa69820564e90177e6d9ae0d0beb50d Mon Sep 17 00:00:00 2001 From: archmoj Date: Tue, 18 May 2021 18:38:13 -0400 Subject: [PATCH 1/2] fix bar get color when cd has mcc --- src/traces/bar/style.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/traces/bar/style.js b/src/traces/bar/style.js index b5a587d8988..df30b7c3850 100644 --- a/src/traces/bar/style.js +++ b/src/traces/bar/style.js @@ -158,7 +158,7 @@ function getBarColor(cd, trace) { if(trace.type === 'waterfall') { return trace[cd.dir].marker.color; } - return cd.mc || trace.marker.color; + return cd.mcc || cd.mc || trace.marker.color; } module.exports = { From 9a92c489a10e1703678bc725d6b16138ea00d457 Mon Sep 17 00:00:00 2001 From: archmoj Date: Tue, 18 May 2021 18:44:54 -0400 Subject: [PATCH 2/2] adjust image test --- .../baselines/bar-colorscale-colorbar.png | Bin 23628 -> 25411 bytes test/image/mocks/bar-colorscale-colorbar.json | 4 ++++ 2 files changed, 4 insertions(+) diff --git a/test/image/baselines/bar-colorscale-colorbar.png b/test/image/baselines/bar-colorscale-colorbar.png index 371fcece1a2146cd963cce9ba66e33d577020226..306baed1e12e1644f1c6cdb5f444feefed19d8da 100644 GIT binary patch literal 25411 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 L^>bP0l+XkK3Hyz< literal 23628 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 TMUdc@@HJ{GS|@UpFZ%o+sdLsV diff --git a/test/image/mocks/bar-colorscale-colorbar.json b/test/image/mocks/bar-colorscale-colorbar.json index ded7348e948..1c5906d1afc 100644 --- a/test/image/mocks/bar-colorscale-colorbar.json +++ b/test/image/mocks/bar-colorscale-colorbar.json @@ -2,6 +2,10 @@ "data": [ { "type": "bar", + "textfont": { + "size": 24 + }, + "texttemplate": "%{y}", "y": [ 1, 2,