From 8835add69c73a15dc4291433e20775059044ff02 Mon Sep 17 00:00:00 2001 From: Ya-Fan Chen Date: Sat, 20 Jul 2024 18:10:38 +0200 Subject: [PATCH 1/9] fix missing cursor for ternary plot --- src/plots/ternary/index.js | 15 +++++++++++++++ src/plots/ternary/ternary.js | 12 ++++++++++++ 2 files changed, 27 insertions(+) diff --git a/src/plots/ternary/index.js b/src/plots/ternary/index.js index 2f65f155961..37e18f52c2b 100644 --- a/src/plots/ternary/index.js +++ b/src/plots/ternary/index.js @@ -1,5 +1,7 @@ 'use strict'; +var d3 = require('@plotly/d3'); + var Ternary = require('./ternary'); var getSubplotCalcData = require('../../plots/get_data').getSubplotCalcData; @@ -75,3 +77,16 @@ exports.clean = function(newFullData, newFullLayout, oldFullData, oldFullLayout) } } }; + +exports.updateFx = function(gd) { + var fullLayout = gd._fullLayout; + var dragmode = fullLayout.dragmode; + var toplevel = d3.select(gd).selectAll('g.toplevel'); + + // set proper cursor + if(dragmode === 'pan') { + toplevel.style('cursor', 'move'); + } else { + toplevel.style('cursor', 'crosshair'); + } +}; diff --git a/src/plots/ternary/ternary.js b/src/plots/ternary/ternary.js index 45bdd84e47f..a00e62b4e20 100644 --- a/src/plots/ternary/ternary.js +++ b/src/plots/ternary/ternary.js @@ -67,6 +67,7 @@ proto.plot = function(ternaryCalcData, fullLayout) { _this.updateLayers(ternaryLayout); _this.adjustLayout(ternaryLayout, graphSize); + _this.updateFx(fullLayout.dragmode); Plots.generalUpdatePerTraceModule(_this.graphDiv, _this, ternaryCalcData, ternaryLayout); _this.layers.plotbg.select('path').call(Color.fill, ternaryLayout.bgcolor); }; @@ -97,6 +98,17 @@ proto.makeFramework = function(fullLayout) { Drawing.setClipUrl(_this.layers.grids, clipId, gd); }; +proto.updateFx = function(dragmode) { + var toplevel = this.plotContainer.selectAll('g.toplevel'); + + // set proper cursor + if(dragmode === 'pan') { + toplevel.style('cursor', 'move'); + } else { + toplevel.style('cursor', 'crosshair'); + } +}; + proto.updateLayers = function(ternaryLayout) { var _this = this; var layers = _this.layers; From 9ec32e82e1b82d16c9a431a06a3840c299b2998e Mon Sep 17 00:00:00 2001 From: Ya-Fan Chen Date: Sat, 20 Jul 2024 18:29:35 +0200 Subject: [PATCH 2/9] Fix missing cursor for ternary plot --- src/plots/ternary/index.js | 1 - src/plots/ternary/ternary.js | 1 - 2 files changed, 2 deletions(-) diff --git a/src/plots/ternary/index.js b/src/plots/ternary/index.js index 37e18f52c2b..378e8228994 100644 --- a/src/plots/ternary/index.js +++ b/src/plots/ternary/index.js @@ -83,7 +83,6 @@ exports.updateFx = function(gd) { var dragmode = fullLayout.dragmode; var toplevel = d3.select(gd).selectAll('g.toplevel'); - // set proper cursor if(dragmode === 'pan') { toplevel.style('cursor', 'move'); } else { diff --git a/src/plots/ternary/ternary.js b/src/plots/ternary/ternary.js index a00e62b4e20..e41b60ed397 100644 --- a/src/plots/ternary/ternary.js +++ b/src/plots/ternary/ternary.js @@ -101,7 +101,6 @@ proto.makeFramework = function(fullLayout) { proto.updateFx = function(dragmode) { var toplevel = this.plotContainer.selectAll('g.toplevel'); - // set proper cursor if(dragmode === 'pan') { toplevel.style('cursor', 'move'); } else { From 06b71487fd356f8f6b30a5963819376cf05edf4b Mon Sep 17 00:00:00 2001 From: Ya-Fan Chen Date: Sat, 20 Jul 2024 18:39:05 +0200 Subject: [PATCH 3/9] Create 7057_fix.md --- draftlogs/7057_fix.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 draftlogs/7057_fix.md diff --git a/draftlogs/7057_fix.md b/draftlogs/7057_fix.md new file mode 100644 index 00000000000..359fc80c3fa --- /dev/null +++ b/draftlogs/7057_fix.md @@ -0,0 +1 @@ + - Fix missing cursor for Ternary Plot[[#7057](https://github.com/plotly/plotly.js/pull/7057)] From b203a254b8c8b1d7b11ec9d917d79d07074bc82f Mon Sep 17 00:00:00 2001 From: Ya-Fan Chen Date: Mon, 22 Jul 2024 19:11:23 +0200 Subject: [PATCH 4/9] Update src/plots/ternary/ternary.js Co-authored-by: Mojtaba Samimi <33888540+archmoj@users.noreply.github.com> --- src/plots/ternary/ternary.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/plots/ternary/ternary.js b/src/plots/ternary/ternary.js index e41b60ed397..9db4bc08021 100644 --- a/src/plots/ternary/ternary.js +++ b/src/plots/ternary/ternary.js @@ -101,11 +101,7 @@ proto.makeFramework = function(fullLayout) { proto.updateFx = function(dragmode) { var toplevel = this.plotContainer.selectAll('g.toplevel'); - if(dragmode === 'pan') { - toplevel.style('cursor', 'move'); - } else { - toplevel.style('cursor', 'crosshair'); - } + toplevel.style('cursor', dragmode === 'pan' ? 'move' : 'crosshair'); }; proto.updateLayers = function(ternaryLayout) { From e8de4c9e3b70ed83976c9ea1b0d6f21acc599b78 Mon Sep 17 00:00:00 2001 From: Ya-Fan Chen Date: Mon, 22 Jul 2024 19:11:55 +0200 Subject: [PATCH 5/9] Update draftlogs/7057_fix.md Co-authored-by: Mojtaba Samimi <33888540+archmoj@users.noreply.github.com> --- draftlogs/7057_fix.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/draftlogs/7057_fix.md b/draftlogs/7057_fix.md index 359fc80c3fa..b310a59d947 100644 --- a/draftlogs/7057_fix.md +++ b/draftlogs/7057_fix.md @@ -1 +1,2 @@ - - Fix missing cursor for Ternary Plot[[#7057](https://github.com/plotly/plotly.js/pull/7057)] + - Fix missing cursor for Ternary Plot[[#7057](https://github.com/plotly/plotly.js/pull/7057)], + with thanks to @Lexachoc for the contribution! From a48213c0f1b2131cc439133f5ec68ec79a206ee2 Mon Sep 17 00:00:00 2001 From: Ya-Fan Chen Date: Mon, 22 Jul 2024 19:18:03 +0200 Subject: [PATCH 6/9] Update index.js update as suggusted --- src/plots/ternary/index.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/plots/ternary/index.js b/src/plots/ternary/index.js index 378e8228994..04a794c9d85 100644 --- a/src/plots/ternary/index.js +++ b/src/plots/ternary/index.js @@ -83,9 +83,5 @@ exports.updateFx = function(gd) { var dragmode = fullLayout.dragmode; var toplevel = d3.select(gd).selectAll('g.toplevel'); - if(dragmode === 'pan') { - toplevel.style('cursor', 'move'); - } else { - toplevel.style('cursor', 'crosshair'); - } + toplevel.style('cursor', dragmode === 'pan' ? 'move' : 'crosshair'); }; From 99de97e95ac1e17abe0ced86b97f6812a70a8fb5 Mon Sep 17 00:00:00 2001 From: Ya-Fan Chen Date: Mon, 22 Jul 2024 20:04:46 +0200 Subject: [PATCH 7/9] Update index.js update and clean as suggested --- src/plots/ternary/index.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/plots/ternary/index.js b/src/plots/ternary/index.js index 04a794c9d85..c7256abd738 100644 --- a/src/plots/ternary/index.js +++ b/src/plots/ternary/index.js @@ -1,7 +1,5 @@ 'use strict'; -var d3 = require('@plotly/d3'); - var Ternary = require('./ternary'); var getSubplotCalcData = require('../../plots/get_data').getSubplotCalcData; @@ -80,8 +78,8 @@ exports.clean = function(newFullData, newFullLayout, oldFullData, oldFullLayout) exports.updateFx = function(gd) { var fullLayout = gd._fullLayout; - var dragmode = fullLayout.dragmode; - var toplevel = d3.select(gd).selectAll('g.toplevel'); - - toplevel.style('cursor', dragmode === 'pan' ? 'move' : 'crosshair'); + + fullLayout._ternarylayer + .selectAll('g.toplevel') + .style('cursor', fullLayout.dragmode === 'pan' ? 'move' : 'crosshair'); }; From 99ccd12801a67c44f91a3c80805e9361378090c6 Mon Sep 17 00:00:00 2001 From: Ya-Fan Chen Date: Mon, 22 Jul 2024 20:05:49 +0200 Subject: [PATCH 8/9] Update ternary.js update and clean as suggested --- src/plots/ternary/ternary.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/plots/ternary/ternary.js b/src/plots/ternary/ternary.js index 9db4bc08021..06a457d6d3e 100644 --- a/src/plots/ternary/ternary.js +++ b/src/plots/ternary/ternary.js @@ -30,6 +30,7 @@ function Ternary(options, fullLayout) { this.graphDiv = options.graphDiv; this.init(fullLayout); this.makeFramework(fullLayout); + this.updateFx(fullLayout); // unfortunately, we have to keep track of some axis tick settings // as ternary subplots do not implement the 'ticks' editType @@ -67,7 +68,6 @@ proto.plot = function(ternaryCalcData, fullLayout) { _this.updateLayers(ternaryLayout); _this.adjustLayout(ternaryLayout, graphSize); - _this.updateFx(fullLayout.dragmode); Plots.generalUpdatePerTraceModule(_this.graphDiv, _this, ternaryCalcData, ternaryLayout); _this.layers.plotbg.select('path').call(Color.fill, ternaryLayout.bgcolor); }; @@ -98,10 +98,10 @@ proto.makeFramework = function(fullLayout) { Drawing.setClipUrl(_this.layers.grids, clipId, gd); }; -proto.updateFx = function(dragmode) { - var toplevel = this.plotContainer.selectAll('g.toplevel'); - - toplevel.style('cursor', dragmode === 'pan' ? 'move' : 'crosshair'); +proto.updateFx = function(fullLayout) { + fullLayout._ternarylayer + .selectAll('g.toplevel') + .style('cursor', fullLayout.dragmode === 'pan' ? 'move' : 'crosshair'); }; proto.updateLayers = function(ternaryLayout) { From 7e9abcf8660c740c537b918579defb21019fc9bf Mon Sep 17 00:00:00 2001 From: Ya-Fan Chen Date: Mon, 22 Jul 2024 20:15:18 +0000 Subject: [PATCH 9/9] fix with lint --- src/plots/ternary/index.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/plots/ternary/index.js b/src/plots/ternary/index.js index c7256abd738..12147231744 100644 --- a/src/plots/ternary/index.js +++ b/src/plots/ternary/index.js @@ -78,7 +78,6 @@ exports.clean = function(newFullData, newFullLayout, oldFullData, oldFullLayout) exports.updateFx = function(gd) { var fullLayout = gd._fullLayout; - fullLayout._ternarylayer .selectAll('g.toplevel') .style('cursor', fullLayout.dragmode === 'pan' ? 'move' : 'crosshair');