jeffemmett
/
rspace-online
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev'

This commit is contained in:
Jeff Emmett 2026-03-02 20:24:17 -08:00
parent 7c8bbc17c8 7d8f64d17c
commit 483c61966c
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
website/canvas.html
View File

@ -3215,6 +3215,7 @@
let ghostEl = null; let ghostEl = null;
function setPendingTool(tagName, props = {}) { function setPendingTool(tagName, props = {}) {
if (wbTool) setWbTool(null); // clear whiteboard tool when switching
pendingTool = { tagName, props }; pendingTool = { tagName, props };
canvas.style.cursor = "crosshair"; canvas.style.cursor = "crosshair";
@ -3270,10 +3271,11 @@
} }
}); });
// ESC clears pending tool // ESC returns to default selector tool
document.addEventListener("keydown", (e) => { document.addEventListener("keydown", (e) => {
if (e.key === "Escape" && pendingTool) { if (e.key === "Escape") {
clearPendingTool(); if (wbTool) setWbTool(null);
if (pendingTool) clearPendingTool();
} }
}); });
@ -3561,6 +3563,7 @@
const newArrowBtn = document.getElementById("new-arrow"); const newArrowBtn = document.getElementById("new-arrow");
newArrowBtn.addEventListener("click", () => { newArrowBtn.addEventListener("click", () => {
if (wbTool) setWbTool(null); // clear whiteboard tool
connectMode = !connectMode; connectMode = !connectMode;
newArrowBtn.classList.toggle("active", connectMode); newArrowBtn.classList.toggle("active", connectMode);
canvas.classList.toggle("connect-mode", connectMode); canvas.classList.toggle("connect-mode", connectMode);
@ -3770,6 +3773,11 @@
wbPreviewEl = null; wbPreviewEl = null;
wbCurrentPath = []; wbCurrentPath = [];
// Drawing tools are temporary — return to selector after one stroke
if (wbTool && wbTool !== "eraser") {
setWbTool(null);
}
}); });
// Eraser: click on existing SVG strokes to delete them + remove from Automerge // Eraser: click on existing SVG strokes to delete them + remove from Automerge