From a0977bbdfbed7e93dcea0cc98d0a7ae2004d5bb1 Mon Sep 17 00:00:00 2001 From: Mojtaba Samimi Date: Fri, 17 Nov 2023 19:27:22 -0500 Subject: [PATCH 1/2] fix scattergl legend with marker angle array --- src/components/drawing/index.js | 5 ++++- .../baselines/gl2d_period_positioning.png | Bin 20102 -> 21814 bytes test/image/mocks/gl2d_period_positioning.json | 5 +++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/components/drawing/index.js b/src/components/drawing/index.js index fb1724489c6..d02095aaa86 100644 --- a/src/components/drawing/index.js +++ b/src/components/drawing/index.js @@ -1607,7 +1607,10 @@ function getMarkerAngle(d, trace) { var angle = d.ma; if(angle === undefined) { - angle = trace.marker.angle || 0; + angle = trace.marker.angle; + if(!angle || Lib.isArrayOrTypedArray(angle)) { + angle = 0; + } } var x, y; diff --git a/test/image/baselines/gl2d_period_positioning.png b/test/image/baselines/gl2d_period_positioning.png index eb3fbd667a4a2ccd41e953264b933125aecfb694..ad4ca0a1ae73e124170a24ecd996063790d41154 100644 GIT binary patch literal 21814 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 D%za-G literal 20102 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 M`sE9yY6#^20nyLQR{#J2 diff --git a/test/image/mocks/gl2d_period_positioning.json b/test/image/mocks/gl2d_period_positioning.json index 358e8872653..3a9adefb628 100644 --- a/test/image/mocks/gl2d_period_positioning.json +++ b/test/image/mocks/gl2d_period_positioning.json @@ -3,6 +3,11 @@ { "name": "scattergl", "type": "scattergl", + "marker": { + "size": 20, + "symbol": "arrow-wide", + "angle": [150, -30, 150, -30, 150, -30] + }, "x": ["2001-01-01", "2002-01-01", "2003-01-01", "2004-01-01", "2005-01-01", "2006-01-01"], "y": ["1970-01-01", "1970-02-01", "1970-03-01", "1970-04-01", "1970-05-01", "1970-06-01"], "xperiod": "M12", From fd91d7a9c94a0ba6c2c9fe432085dc9e47ab8345 Mon Sep 17 00:00:00 2001 From: Mojtaba Samimi Date: Fri, 17 Nov 2023 20:59:24 -0500 Subject: [PATCH 2/2] draftlog for PR 6787 --- draftlogs/6787_fix.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 draftlogs/6787_fix.md diff --git a/draftlogs/6787_fix.md b/draftlogs/6787_fix.md new file mode 100644 index 00000000000..301c15a447d --- /dev/null +++ b/draftlogs/6787_fix.md @@ -0,0 +1 @@ + - Fix `scattergl` legend when `marker.angle` is an array [[#6787](https://github.com/plotly/plotly.js/pull/6787)]