From 76871dbb9948f7c6541d9eb2d6e72a5a7771a40a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89tienne=20T=C3=A9treault-Pinard?= Date: Mon, 4 Feb 2019 18:38:33 -0500 Subject: [PATCH 1/2] fix mathjax placement in ternary aaxis titles --- src/lib/svg_text_utils.js | 2 +- test/image/baselines/ternary-mathjax.png | Bin 0 -> 40096 bytes test/image/mocks/ternary-mathjax.json | 57 +++++++++++++++++++++++ 3 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 test/image/baselines/ternary-mathjax.png create mode 100644 test/image/mocks/ternary-mathjax.json diff --git a/src/lib/svg_text_utils.js b/src/lib/svg_text_utils.js index c2ddb368251..5578d85f2dc 100644 --- a/src/lib/svg_text_utils.js +++ b/src/lib/svg_text_utils.js @@ -134,7 +134,7 @@ exports.convertToTspans = function(_context, gd, _callback) { else if(svgClass[0] === 'l') { newSvg.attr({x: _context.attr('x'), y: dy - (newSvgH / 2)}); } - else if(svgClass[0] === 'a') { + else if(svgClass[0] === 'a' && svgClass.indexOf('atitle') === -1) { newSvg.attr({x: 0, y: dy}); } else { diff --git a/test/image/baselines/ternary-mathjax.png b/test/image/baselines/ternary-mathjax.png new file mode 100644 index 0000000000000000000000000000000000000000..cbf2d47d3f59823c3ed165dc9f2980a908e57c85 GIT binary patch literal 40096 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 literal 0 HcmV?d00001 diff --git a/test/image/mocks/ternary-mathjax.json b/test/image/mocks/ternary-mathjax.json new file mode 100644 index 00000000000..3ffda077e4a --- /dev/null +++ b/test/image/mocks/ternary-mathjax.json @@ -0,0 +1,57 @@ +{ + "data": [ + { + "type": "scatterternary", + "mode": "markers", + "a": [75], + "b": [25], + "c": [0], + "text": ["point 1"], + "marker": { + "symbol": 100, + "color": "#DB7365", + "size": 14, + "line": { + "width": 2 + } + } + } + ], + "layout": { + "ternary": { + "sum": 100, + "aaxis": { + "title": { + "text": "$A^2$" + }, + "showline": true, + "showgrid": true + }, + "baxis": { + "title": { + "text": "$B^2$" + }, + "showline": true, + "showgrid": true + }, + "caxis": { + "title": { + "text": "$C^2$" + }, + "showline": true, + "showgrid": true + } + }, + "annotations": [ + { + "showarrow": false, + "text": "Simple Ternary Plot with Markers", + "x": 0.5, + "y": 1.3, + "font": { + "size": 15 + } + } + ] + } +} From c7878b381dc5822faf20570abfa74a814297e4b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89tienne=20T=C3=A9treault-Pinard?= Date: Tue, 5 Feb 2019 16:57:52 -0500 Subject: [PATCH 2/2] make 'atitle' check more strict --- src/lib/svg_text_utils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/svg_text_utils.js b/src/lib/svg_text_utils.js index 5578d85f2dc..6f2a45a06d7 100644 --- a/src/lib/svg_text_utils.js +++ b/src/lib/svg_text_utils.js @@ -134,7 +134,7 @@ exports.convertToTspans = function(_context, gd, _callback) { else if(svgClass[0] === 'l') { newSvg.attr({x: _context.attr('x'), y: dy - (newSvgH / 2)}); } - else if(svgClass[0] === 'a' && svgClass.indexOf('atitle') === -1) { + else if(svgClass[0] === 'a' && svgClass.indexOf('atitle') !== 0) { newSvg.attr({x: 0, y: dy}); } else {