Rbanh/schemeta
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Fix lock workflow: keep components draggable, add Unlock All, and relax Auto Layout locks
Some checks are pending
CI / test (push) Waiting to run
Details

Browse Source
This commit is contained in:
Rbanh 2026-02-20 03:22:39 -05:00
parent 9a21e111d0
commit 2131340c01
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
frontend/app.js
View File

@ -143,6 +143,7 @@ const el = {
copyReproBtn: document.getElementById("copyReproBtn"), copyReproBtn: document.getElementById("copyReproBtn"),
autoLayoutBtn: document.getElementById("autoLayoutBtn"), autoLayoutBtn: document.getElementById("autoLayoutBtn"),
autoTidyBtn: document.getElementById("autoTidyBtn"), autoTidyBtn: document.getElementById("autoTidyBtn"),
unlockAllBtn: document.getElementById("unlockAllBtn"),
themeToggleBtn: document.getElementById("themeToggleBtn"), themeToggleBtn: document.getElementById("themeToggleBtn"),
shortcutsBtn: document.getElementById("shortcutsBtn"), shortcutsBtn: document.getElementById("shortcutsBtn"),
undoBtn: document.getElementById("undoBtn"), undoBtn: document.getElementById("undoBtn"),
@ -1780,6 +1781,7 @@ function bindSvgInteractions() {
const dragRefsRaw = state.selectedRefs.length ? [...state.selectedRefs] : [ref]; const dragRefsRaw = state.selectedRefs.length ? [...state.selectedRefs] : [ref];
const dragRefs = dragRefsRaw.filter((r) => !instanceByRef(r)?.placement?.locked); const dragRefs = dragRefsRaw.filter((r) => !instanceByRef(r)?.placement?.locked);
if (!dragRefs.length) { if (!dragRefs.length) {
el.jsonFeedback.textContent = `${ref} is locked. Uncheck 'Locked' on the component or use 'Unlock All'.`;
return; return;
} }
const baseByRef = {}; const baseByRef = {};
@ -2494,7 +2496,7 @@ async function runLayoutAction(path) {
const out = await apiPost(path, { const out = await apiPost(path, {
payload: state.model, payload: state.model,
options: compileOptions({ options: compileOptions({
respect_locks: true respect_locks: path.includes("/tidy")
}) })
}); });
@ -2768,7 +2770,6 @@ function setupEvents() {
pushHistory("rotate"); pushHistory("rotate");
const current = Number(inst.placement.rotation ?? 0); const current = Number(inst.placement.rotation ?? 0);
inst.placement.rotation = ((Math.round(current / 90) * 90 + 90) % 360 + 360) % 360; inst.placement.rotation = ((Math.round(current / 90) * 90 + 90) % 360 + 360) % 360;
inst.placement.locked = true;
renderSelected(); renderSelected();
el.jsonFeedback.textContent = "Component rotated."; el.jsonFeedback.textContent = "Component rotated.";
queueCompile(true, "rotate"); queueCompile(true, "rotate");
@ -3416,7 +3417,6 @@ function setupEvents() {
if (inst) { if (inst) {
inst.placement.x = pos.x; inst.placement.x = pos.x;
inst.placement.y = pos.y; inst.placement.y = pos.y;
inst.placement.locked = true;
} }
} }
await compileModel(state.model, { source: "drag", keepView: true, preservePlacement: true }); await compileModel(state.model, { source: "drag", keepView: true, preservePlacement: true });
@ -3465,7 +3465,6 @@ function setupEvents() {
} }
const current = Number(inst.placement.rotation ?? 0); const current = Number(inst.placement.rotation ?? 0);
inst.placement.rotation = ((Math.round(current / 90) * 90 + 90) % 360 + 360) % 360; inst.placement.rotation = ((Math.round(current / 90) * 90 + 90) % 360 + 360) % 360;
inst.placement.locked = true;
} }
compileModel(state.model, { source: "rotate", keepView: true, preservePlacement: true }); compileModel(state.model, { source: "rotate", keepView: true, preservePlacement: true });
evt.preventDefault(); evt.preventDefault();
@ -3739,6 +3738,26 @@ function setupEvents() {
await runLayoutAction("/layout/tidy"); await runLayoutAction("/layout/tidy");
}); });
el.unlockAllBtn?.addEventListener("click", async () => {
if (!state.model) {
return;
}
pushHistory("unlock-all");
let changed = 0;
for (const inst of state.model.instances ?? []) {
if (inst?.placement?.locked) {
inst.placement.locked = false;
changed += 1;
}
}
if (!changed) {
el.jsonFeedback.textContent = "All components are already unlocked.";
return;
}
el.jsonFeedback.textContent = `Unlocked ${changed} component${changed === 1 ? "" : "s"}.`;
await compileModel(state.model, { keepView: true, source: "unlock-all", preservePlacement: true });
});
el.themeToggleBtn?.addEventListener("click", () => { el.themeToggleBtn?.addEventListener("click", () => {
applyTheme(state.theme === "dark" ? "light" : "dark"); applyTheme(state.theme === "dark" ? "light" : "dark");
}); });

1
frontend/index.html
View File

@ -20,6 +20,7 @@
<button id="exportBtn" aria-label="Export Schemeta JSON file">Export JSON</button> <button id="exportBtn" aria-label="Export Schemeta JSON file">Export JSON</button>
<button id="autoLayoutBtn" aria-label="Run automatic layout">Auto Layout</button> <button id="autoLayoutBtn" aria-label="Run automatic layout">Auto Layout</button>
<button id="autoTidyBtn" aria-label="Run automatic tidy layout">Auto Tidy</button> <button id="autoTidyBtn" aria-label="Run automatic tidy layout">Auto Tidy</button>
<button id="unlockAllBtn" aria-label="Unlock all components">Unlock All</button>
<button id="themeToggleBtn" aria-label="Toggle dark mode">Dark</button> <button id="themeToggleBtn" aria-label="Toggle dark mode">Dark</button>
<button id="shortcutsBtn" aria-label="Show keyboard shortcuts">Shortcuts</button> <button id="shortcutsBtn" aria-label="Show keyboard shortcuts">Shortcuts</button>
<button id="undoBtn" title="Undo (Ctrl/Cmd+Z)">Undo</button> <button id="undoBtn" title="Undo (Ctrl/Cmd+Z)">Undo</button>