From 96e1c51c87a701564b14afc2984fc2098cf47e6c Mon Sep 17 00:00:00 2001 From: Robb Traister Date: Mon, 12 Feb 2024 11:53:16 -0500 Subject: [PATCH 1/3] coerce textposition if textinfo is "none" --- src/traces/funnelarea/defaults.js | 2 ++ src/traces/pie/defaults.js | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/traces/funnelarea/defaults.js b/src/traces/funnelarea/defaults.js index 6ce2a86bab9..13df25b35fb 100644 --- a/src/traces/funnelarea/defaults.js +++ b/src/traces/funnelarea/defaults.js @@ -55,6 +55,8 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout moduleHasTextangle: false, moduleHasInsideanchor: false }); + } else if (textInfo === 'none') { + coerce('textposition', 'none'); } handleDomainDefaults(traceOut, layout, coerce); diff --git a/src/traces/pie/defaults.js b/src/traces/pie/defaults.js index ec66b67e08f..606a3968bfe 100644 --- a/src/traces/pie/defaults.js +++ b/src/traces/pie/defaults.js @@ -111,6 +111,8 @@ function supplyDefaults(traceIn, traceOut, defaultColor, layout) { if(textposition === 'inside' || textposition === 'auto' || Array.isArray(textposition)) { coerce('insidetextorientation'); } + } else if (textInfo === 'none') { + coerce('textposition', 'none'); } handleDomainDefaults(traceOut, layout, coerce); From e8517a788ba3b58152bdd5d7b7815271d7ee6151 Mon Sep 17 00:00:00 2001 From: Robb Traister Date: Mon, 12 Feb 2024 12:14:13 -0500 Subject: [PATCH 2/3] add draft log --- draftlogs/6893_fix.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 draftlogs/6893_fix.md diff --git a/draftlogs/6893_fix.md b/draftlogs/6893_fix.md new file mode 100644 index 00000000000..13bd218710d --- /dev/null +++ b/draftlogs/6893_fix.md @@ -0,0 +1 @@ +- Fix possible NPE when `textinfo: "none"` for pie and funnelarea traces From 3a9aa1bc5b50b081f60674af599403707c0738c9 Mon Sep 17 00:00:00 2001 From: Robb Traister Date: Mon, 12 Feb 2024 12:27:08 -0500 Subject: [PATCH 3/3] fix linting --- src/traces/funnelarea/defaults.js | 2 +- src/traces/pie/defaults.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/traces/funnelarea/defaults.js b/src/traces/funnelarea/defaults.js index 13df25b35fb..9067c6f2542 100644 --- a/src/traces/funnelarea/defaults.js +++ b/src/traces/funnelarea/defaults.js @@ -55,7 +55,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout moduleHasTextangle: false, moduleHasInsideanchor: false }); - } else if (textInfo === 'none') { + } else if(textInfo === 'none') { coerce('textposition', 'none'); } diff --git a/src/traces/pie/defaults.js b/src/traces/pie/defaults.js index 606a3968bfe..f2aef62d0e2 100644 --- a/src/traces/pie/defaults.js +++ b/src/traces/pie/defaults.js @@ -111,7 +111,7 @@ function supplyDefaults(traceIn, traceOut, defaultColor, layout) { if(textposition === 'inside' || textposition === 'auto' || Array.isArray(textposition)) { coerce('insidetextorientation'); } - } else if (textInfo === 'none') { + } else if(textInfo === 'none') { coerce('textposition', 'none'); }