Skip to content

Add Ctrl drag pan shortcut #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dlv-gold wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add Ctrl drag pan shortcut #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 54 additions & 4 deletions public/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ const state = {
selected: [],
pan: { x: 24, y: 24 },
panning: null,
controlPan: false,
suppressPageClick: false,
viewBox: { x: 0, y: 0, width: 612, height: 792 },
calibration: {
x1: null,
Expand Down Expand Up @@ -82,6 +84,9 @@ els.x1Value.addEventListener("input", updateOutput);
els.x2Value.addEventListener("input", updateOutput);
els.y1Value.addEventListener("input", updateOutput);
els.y2Value.addEventListener("input", updateOutput);
window.addEventListener("keydown", onWindowKeyDown);
window.addEventListener("keyup", onWindowKeyUp);
window.addEventListener("blur", () => setControlPan(false));

document.querySelectorAll("[data-marker]").forEach(button => {
button.addEventListener("click", () => {
Expand Down Expand Up @@ -189,14 +194,22 @@ function onPagePointerDown(event) {
}

function onPagePointerMove(event) {
if (state.mode === "select" || state.mode === "calibrate") {
if (state.panning || canPan(event)) {
setHovered(null);
} else if (state.mode === "select" || state.mode === "calibrate") {
setHovered(traceableElement(event.target));
} else {
setHovered(null);
}
}

function onPageClick(event) {
if (state.suppressPageClick || event.ctrlKey) {
state.suppressPageClick = false;
event.preventDefault();
return;
}

if (state.mode === "calibrate") {
const target = traceableElement(event.target);
state.calibration[state.marker] = target ? elementCenterToSvg(target) : eventToSvgPoint(event);
Expand Down Expand Up @@ -284,10 +297,39 @@ function setMode(mode) {
els.panMode.classList.toggle("active", mode === "pan");
els.selectMode.classList.toggle("active", mode === "select");
els.calibrateMode.classList.toggle("active", mode === "calibrate");
els.viewport.classList.toggle("pan-ready", mode === "pan");
updatePanCursor();
setHovered(null);
}

function onWindowKeyDown(event) {
if (event.key === "Control") {
setControlPan(true);
}
}

function onWindowKeyUp(event) {
if (event.key === "Control") {
setControlPan(false);
}
}

function setControlPan(enabled) {
if (state.controlPan === enabled) return;
state.controlPan = enabled;
updatePanCursor();
if (enabled) {
setHovered(null);
}
}

function canPan(event) {
return state.mode === "pan" || state.controlPan || Boolean(event?.ctrlKey);
}

function updatePanCursor() {
els.viewport.classList.toggle("pan-ready", canPan());
}

function updateMarkerButtons() {
document.querySelectorAll("[data-marker]").forEach(button => {
button.classList.toggle("active", button.dataset.marker === state.marker);
Expand All @@ -309,14 +351,15 @@ function onViewportWheel(event) {
}

function onViewportPointerDown(event) {
if (state.mode !== "pan" || event.button !== 0) return;
if (!canPan(event) || event.button !== 0) return;

state.panning = {
pointerId: event.pointerId,
startX: event.clientX,
startY: event.clientY,
panX: state.pan.x,
panY: state.pan.y
panY: state.pan.y,
suppressClick: state.mode !== "pan"
};
els.viewport.setPointerCapture(event.pointerId);
els.viewport.classList.add("panning");
Expand All @@ -334,11 +377,18 @@ function onViewportPointerMove(event) {
function endPan(event) {
if (!state.panning || event.pointerId !== state.panning.pointerId) return;

const suppressClick = state.panning.suppressClick;
if (els.viewport.hasPointerCapture(event.pointerId)) {
els.viewport.releasePointerCapture(event.pointerId);
}
state.panning = null;
els.viewport.classList.remove("panning");
if (suppressClick) {
state.suppressPageClick = true;
window.setTimeout(() => {
state.suppressPageClick = false;
}, 250);
}
}

function resetView() {
Expand Down
2 changes: 1 addition & 1 deletion public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ <h1>paper2data</h1>

<section class="control-section">
<div class="segmented" role="group" aria-label="Mode">
<button id="panMode" type="button">Pan</button>
<button id="panMode" type="button" title="Pan (hold Ctrl)">Pan</button>
<button class="active" id="selectMode" type="button">Select</button>
<button id="calibrateMode" type="button">Calibrate</button>
</div>
Expand Down