Make plotly consistent behaviour across devices
This commit is contained in:
1 parent
3144befa69
commit
a0122818ed
3 files changed
+70
-11
No files matched your search
@@ -1682,11 +1682,15 @@ button:not(.tablinks):not(.action-btn):not(.editor-source-tab):not(.status-state
|
||||
position: relative;
|
||||
}
|
||||
|
||||
/* Touch-only devices cannot hover to reveal the Plotly toolbar. */
|
||||
@media (hover: none) {
|
||||
.parameter-plot-window .js-plotly-plot .modebar {
|
||||
opacity: 1 !important;
|
||||
}
|
||||
/* Plot tools are hidden until a deliberate tap/click inside this panel. */
|
||||
.parameter-plot-window .js-plotly-plot .modebar {
|
||||
opacity: 0 !important;
|
||||
pointer-events: none !important;
|
||||
transition: opacity 120ms ease;
|
||||
}
|
||||
.parameter-plot-window .js-plotly-plot.modebar-open .modebar {
|
||||
opacity: 1 !important;
|
||||
pointer-events: auto !important;
|
||||
}
|
||||
.parameter-plot-window .js-plotly-plot .modebar-container,
|
||||
.parameter-plot-window .js-plotly-plot .modebar {
|
||||
|
||||
+52
-2
@@ -2117,8 +2117,9 @@ function showMusrfitParameterPlotWindow(parameterPath, jobName = "", preferredPa
|
||||
editable: true,
|
||||
edits: { titleText: false, legendText: true },
|
||||
displaylogo: false,
|
||||
// Let Plotly handle toolbar visibility without intercepting plot clicks.
|
||||
displayModeBar: "hover",
|
||||
// Keep the toolbar mounted so a deliberate tap can reveal it on
|
||||
// mouse, pen and touch devices without relying on hover support.
|
||||
displayModeBar: true,
|
||||
|
||||
modeBarButtonsToAdd: [
|
||||
{
|
||||
@@ -2155,6 +2156,29 @@ function showMusrfitParameterPlotWindow(parameterPath, jobName = "", preferredPa
|
||||
});
|
||||
if (!panel.clickAttached && typeof panel.chart.on === "function") {
|
||||
panel.clickAttached = true;
|
||||
let toolbarPointer = null;
|
||||
panel.chart.addEventListener("pointerdown", function(event) {
|
||||
if (event.target && event.target.closest && event.target.closest(".modebar")) return;
|
||||
toolbarPointer = {
|
||||
id: event.pointerId,
|
||||
x: event.clientX,
|
||||
y: event.clientY
|
||||
};
|
||||
});
|
||||
panel.chart.addEventListener("pointerup", function(event) {
|
||||
if (!toolbarPointer || toolbarPointer.id !== event.pointerId) return;
|
||||
let movedX = event.clientX - toolbarPointer.x;
|
||||
let movedY = event.clientY - toolbarPointer.y;
|
||||
toolbarPointer = null;
|
||||
if ((movedX * movedX) + (movedY * movedY) > 64) return;
|
||||
if (event.target && event.target.closest && event.target.closest(".modebar")) return;
|
||||
let wasOpen = panel.chart.classList.contains("modebar-open");
|
||||
hideParameterModeBars();
|
||||
if (!wasOpen) panel.chart.classList.add("modebar-open");
|
||||
});
|
||||
panel.chart.addEventListener("pointercancel", function() {
|
||||
toolbarPointer = null;
|
||||
});
|
||||
// Map a click on a plotted marker back to its (data set, parameter)
|
||||
// series and offer style editing in a small popover near the pointer.
|
||||
panel.chart.on("plotly_click", function(clickEvent) {
|
||||
@@ -2867,6 +2891,19 @@ function showMusrfitParameterPlotWindow(parameterPath, jobName = "", preferredPa
|
||||
resizeObserver.observe(panelGrid);
|
||||
}
|
||||
|
||||
|
||||
function hideParameterModeBars() {
|
||||
for (let panel of panelStates) {
|
||||
if (panel.chart) panel.chart.classList.remove("modebar-open");
|
||||
}
|
||||
}
|
||||
|
||||
function dismissParameterModeBar(event) {
|
||||
let target = event.target;
|
||||
if (target && target.closest && target.closest(".parameter-plot-canvas")) return;
|
||||
hideParameterModeBars();
|
||||
}
|
||||
|
||||
function handleParameterPlotKeydown(event) {
|
||||
let target = event.target;
|
||||
let editableTarget = target && target.tagName
|
||||
@@ -2883,6 +2920,13 @@ function showMusrfitParameterPlotWindow(parameterPath, jobName = "", preferredPa
|
||||
plotly.relayout(panel.chart, { "xaxis.autorange": true, "yaxis.autorange": true });
|
||||
}
|
||||
} else if (shortcut === "q" || shortcut === "Escape") {
|
||||
let openModeBar = plotWindow.querySelector
|
||||
? plotWindow.querySelector(".modebar-open") : null;
|
||||
if (shortcut === "Escape" && openModeBar) {
|
||||
event.preventDefault();
|
||||
hideParameterModeBars();
|
||||
return;
|
||||
}
|
||||
if (stylePicker) {
|
||||
event.preventDefault();
|
||||
closeParameterStylePicker();
|
||||
@@ -2896,6 +2940,9 @@ function showMusrfitParameterPlotWindow(parameterPath, jobName = "", preferredPa
|
||||
if (keyTarget && typeof keyTarget.addEventListener === "function") {
|
||||
keyTarget.addEventListener("keydown", handleParameterPlotKeydown);
|
||||
}
|
||||
if (document && typeof document.addEventListener === "function") {
|
||||
document.addEventListener("pointerdown", dismissParameterModeBar, true);
|
||||
}
|
||||
|
||||
function cleanupParameterPlot() {
|
||||
saveParameterPlotStateNow();
|
||||
@@ -2903,6 +2950,9 @@ function showMusrfitParameterPlotWindow(parameterPath, jobName = "", preferredPa
|
||||
if (keyTarget && typeof keyTarget.removeEventListener === "function") {
|
||||
keyTarget.removeEventListener("keydown", handleParameterPlotKeydown);
|
||||
}
|
||||
if (document && typeof document.removeEventListener === "function") {
|
||||
document.removeEventListener("pointerdown", dismissParameterModeBar, true);
|
||||
}
|
||||
if (resizeObserver) resizeObserver.disconnect();
|
||||
if (plotly) {
|
||||
for (let panel of panelStates) {
|
||||
|
||||
@@ -1149,10 +1149,15 @@ function testAxisScaleSurvivesRefresh() {
|
||||
function testParameterToolbarVisibility() {
|
||||
const plot = fs.readFileSync(path.join(repoRoot, "muSRFitParameterPlot.js"), "utf8");
|
||||
const css = fs.readFileSync(path.join(repoRoot, "ZGUI.css"), "utf8");
|
||||
assert.match(plot, /displayModeBar: "hover"/);
|
||||
assert.doesNotMatch(plot, /toggleModeBar/);
|
||||
assert.doesNotMatch(css, /\.modebar\s*\{[^}]*display:\s*none/);
|
||||
assert.match(css, /@media \(hover: none\)\s*\{\s*\.parameter-plot-window \.js-plotly-plot \.modebar\s*\{\s*opacity: 1 !important/);
|
||||
assert.match(plot, /displayModeBar: true/);
|
||||
assert.match(plot, /addEventListener\("pointerdown"/);
|
||||
assert.match(plot, /addEventListener\("pointerup"/);
|
||||
assert.match(plot, /\(movedX \* movedX\) \+ \(movedY \* movedY\) > 64/);
|
||||
assert.match(plot, /classList\.add\("modebar-open"\)/);
|
||||
assert.match(plot, /document\.addEventListener\("pointerdown", dismissParameterModeBar, true\)/);
|
||||
assert.match(plot, /document\.removeEventListener\("pointerdown", dismissParameterModeBar, true\)/);
|
||||
assert.match(css, /\.js-plotly-plot \.modebar\s*\{[^}]*opacity: 0 !important;[^}]*pointer-events: none !important;/s);
|
||||
assert.match(css, /\.js-plotly-plot\.modebar-open \.modebar\s*\{[^}]*opacity: 1 !important;[^}]*pointer-events: auto !important;/s);
|
||||
// Marker styling must remain available after removing the generic click handlers.
|
||||
assert.match(plot, /panel\.chart\.on\("plotly_click"/);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user