Files
meshcore-analyzer/public/drag-manager.js
T
2b45f7872c fix(live): corner-cycle button clears drag state (#1567) (#1568)
## Summary
Fixes the move-panel corner-cycle button silently no-op'ing after a
panel is dragged on `/live`.

Two coexisting positioning systems were mutating disjoint state:
- `public/drag-manager.js` sets inline
`top/left/right/bottom/transform/position`, stamps
`data-dragged="true"`, and persists `localStorage['panel-drag-<id>']`.
- `public/live.js` `applyPanelPosition()` only flips the `data-position`
attribute (selecting a `.live-overlay[data-position="…"]` rule with
`top/left/right/bottom`).

Inline styles win the cascade, so after any drag the corner button
updated the glyph but the panel never moved. The fix has `onCornerClick`
clear drag state (attribute, inline coords, localStorage) before calling
`applyPanelPosition`.

## Commits
- Red: `ea2f8009` — `test(live): failing E2E for corner-cycle button
after drag (#1567)` — Playwright test injects DragManager-shaped drag
state on `#liveFeed`, clicks `.panel-corner-btn`, asserts
`data-dragged`/inline styles/`localStorage` are cleared AND
`getBoundingClientRect()` matches the CSS corner anchor (not the dragged
coords). Fails on master at the post-click assertion.
- Green: `abb5a21f` — `fix(live): corner-cycle button clears drag state
(#1567)` — 11-line change in `onCornerClick`, plus new E2E wired into
the workflow.

## Files
- `public/live.js` — `onCornerClick` clears `data-dragged`, inline
`top/left/right/bottom/transform/position`, and
`localStorage['panel-drag-<id>']` before `applyPanelPosition`.
- `test-issue-1567-corner-clears-drag-e2e.js` — new Playwright E2E
(drag-state injection + post-click rect assertion).
- `.github/workflows/deploy.yml` — runs the new E2E next to
`test-drag-manager-e2e.js`.

## E2E
E2E assertion added: `test-issue-1567-corner-clears-drag-e2e.js:108`
(post-click drag-state + anchor-match assertions).
Browser verified: red-on-master gated by assertion (`'data-dragged must
be cleared after corner click'`) — green commit makes it pass.

## Scope
- No changes to `drag-manager.js` (out of scope per triage fix path).
- No config / API surface changes.
- Desktop drag path only; mobile / coarse-pointer path unchanged (drag
is gated off there at `live.js:1941`, so the button was always the only
repositioning affordance on touch — preserved).

Partial fix for #1567 — addresses the corner-button-no-op symptom called
out in triage; leaves the issue open for the user to verify in the
browser and close.

---------

Co-authored-by: Kpa-clawbot <bot@openclaw.local>
Co-authored-by: mc-bot <bot@meshcore.local>
2026-06-04 09:32:18 -07:00

238 lines
8.2 KiB
JavaScript

/* drag-manager.js — Free-form panel dragging (#608 M1)
* State machine: IDLE → PENDING → DRAGGING → IDLE
* Pointer events on .panel-header, transform: translate() during drag,
* snap-to-edge on release, z-index on focus, viewport % persistence.
*/
(function () {
'use strict';
var DEAD_ZONE = 5; // px — disambiguate click vs drag
var SNAP_THRESHOLD = 20; // px — snap to edge on release
var SNAP_MARGIN = 12; // px — margin when snapped
// Shared drag-state cleaner (#1568 round-1 MAJOR 2).
// Removes every side-effect _detachFromCorner/_finalizePosition/_persist
// can leave on a panel element so subsequent corner CSS rules win the
// cascade. Call sites: Escape revert, responsive gate, panel corner-
// click, reset-to-defaults. Keep this list in sync with _detachFromCorner.
// - removes `data-dragged` attribute
// - removes `is-dragging` class (defensive: normally cleared on
// pointerup, but cheap symmetry for races)
// - clears inline top/left/right/bottom/transform/position/zIndex
// (zIndex is bumped on every DRAGGING transition; must reset)
// - removes `panel-drag-<id>` from localStorage when clearStorage !== false
function clearPanel(el, panelId, opts) {
if (!el) return;
el.removeAttribute('data-dragged');
el.classList.remove('is-dragging');
['top', 'left', 'right', 'bottom', 'transform', 'position', 'zIndex'].forEach(function (p) {
el.style[p] = '';
});
if (!opts || opts.clearStorage !== false) {
try { localStorage.removeItem('panel-drag-' + panelId); } catch (_) { /* ignore */ }
}
}
function DragManager() {
this.state = 'IDLE';
this.activePanel = null;
this.startX = 0;
this.startY = 0;
this.panelStartX = 0;
this.panelStartY = 0;
this.preTransform = '';
this.enabled = true;
this.zCounter = 1000;
this._panels = [];
this._onKeyDown = this._handleKeyDown.bind(this);
}
DragManager.prototype.register = function (panel) {
if (!panel) return;
var header = panel.querySelector('.panel-header');
if (!header) return;
this._panels.push(panel);
var self = this;
header.addEventListener('pointerdown', function (e) {
if (!self.enabled) return;
if (e.button !== 0) return;
if (e.target.closest('button')) return;
e.preventDefault();
header.setPointerCapture(e.pointerId);
self.state = 'PENDING';
self.activePanel = panel;
self.startX = e.clientX;
self.startY = e.clientY;
var rect = panel.getBoundingClientRect();
self.panelStartX = rect.left;
self.panelStartY = rect.top;
self.preTransform = panel.style.transform || '';
document.addEventListener('keydown', self._onKeyDown);
});
header.addEventListener('pointermove', function (e) {
if (self.state === 'IDLE') return;
if (self.activePanel !== panel) return;
var dx = e.clientX - self.startX;
var dy = e.clientY - self.startY;
if (self.state === 'PENDING') {
if (Math.hypot(dx, dy) < DEAD_ZONE) return;
self.state = 'DRAGGING';
panel.classList.add('is-dragging');
panel.style.zIndex = ++self.zCounter;
self._detachFromCorner(panel);
}
panel.style.transform = 'translate(' + dx + 'px, ' + dy + 'px)';
});
header.addEventListener('pointerup', function (e) {
if (self.activePanel !== panel) return;
header.releasePointerCapture(e.pointerId);
if (self.state === 'DRAGGING') {
panel.classList.remove('is-dragging');
self._finalizePosition(panel);
}
self._reset();
});
header.addEventListener('pointercancel', function () {
if (self.activePanel !== panel) return;
panel.classList.remove('is-dragging');
if (self.state === 'DRAGGING') {
self._finalizePosition(panel);
}
self._reset();
});
};
DragManager.prototype._handleKeyDown = function (e) {
if (e.key === 'Escape' && this.state === 'DRAGGING' && this.activePanel) {
var panel = this.activePanel;
panel.style.transform = this.preTransform;
// Revert: re-attach to corner if it was cornered before
var saved = localStorage.getItem('panel-drag-' + panel.id);
if (!saved) {
// Was in corner mode — restore corner CSS via shared helper.
// No storage key existed, so clearStorage is a no-op.
DragManager.clearPanel(panel, panel.id);
// Re-apply corner position from M0
var corner = localStorage.getItem('panel-corner-' + panel.id);
if (corner) panel.setAttribute('data-position', corner);
} else {
// Was already dragged — revert to pre-drag position
panel.classList.remove('is-dragging');
panel.style.transform = 'none';
}
this._reset();
}
};
DragManager.prototype._reset = function () {
document.removeEventListener('keydown', this._onKeyDown);
this.state = 'IDLE';
this.activePanel = null;
};
DragManager.prototype._detachFromCorner = function (panel) {
var rect = panel.getBoundingClientRect();
panel.removeAttribute('data-position');
panel.dataset.dragged = 'true';
panel.style.position = 'fixed';
panel.style.top = rect.top + 'px';
panel.style.left = rect.left + 'px';
panel.style.right = 'auto';
panel.style.bottom = 'auto';
panel.style.transform = 'none';
};
DragManager.prototype._finalizePosition = function (panel) {
var rect = panel.getBoundingClientRect();
var vw = window.innerWidth;
var vh = window.innerHeight;
var x = Math.max(0, Math.min(rect.left, vw - 40));
var y = Math.max(0, Math.min(rect.top, vh - 40));
// Snap to edge
if (x < SNAP_THRESHOLD) x = SNAP_MARGIN;
if (y < SNAP_THRESHOLD) y = SNAP_MARGIN;
if (x + rect.width > vw - SNAP_THRESHOLD) x = vw - rect.width - SNAP_MARGIN;
if (y + rect.height > vh - SNAP_THRESHOLD) y = vh - rect.height - SNAP_MARGIN;
panel.style.top = y + 'px';
panel.style.left = x + 'px';
panel.style.transform = 'none';
this._persist(panel.id, x / vw, y / vh);
};
DragManager.prototype._persist = function (id, xPct, yPct) {
try {
localStorage.setItem('panel-drag-' + id,
JSON.stringify({ xPct: xPct, yPct: yPct }));
} catch (_) { /* quota exceeded — silent */ }
};
DragManager.prototype.enable = function () { this.enabled = true; };
DragManager.prototype.disable = function () {
this.enabled = false;
if (this.state !== 'IDLE' && this.activePanel) {
this.activePanel.classList.remove('is-dragging');
this._reset();
}
};
DragManager.prototype.restorePositions = function () {
var panels = this._panels;
for (var i = 0; i < panels.length; i++) {
var panel = panels[i];
var raw = localStorage.getItem('panel-drag-' + panel.id);
if (!raw) continue;
try {
var pos = JSON.parse(raw);
var x = pos.xPct * window.innerWidth;
var y = pos.yPct * window.innerHeight;
panel.removeAttribute('data-position');
panel.dataset.dragged = 'true';
panel.style.position = 'fixed';
panel.style.top = y + 'px';
panel.style.left = x + 'px';
panel.style.right = 'auto';
panel.style.bottom = 'auto';
panel.style.transform = 'none';
} catch (_) {
localStorage.removeItem('panel-drag-' + panel.id);
}
}
};
DragManager.prototype.handleResize = function () {
var panels = document.querySelectorAll('.live-overlay[data-dragged="true"]');
for (var i = 0; i < panels.length; i++) {
var panel = panels[i];
var rect = panel.getBoundingClientRect();
var vw = window.innerWidth;
var vh = window.innerHeight;
var x = rect.left, y = rect.top, moved = false;
if (rect.right > vw) { x = vw - rect.width - SNAP_MARGIN; moved = true; }
if (rect.bottom > vh) { y = vh - rect.height - SNAP_MARGIN; moved = true; }
if (x < 0) { x = SNAP_MARGIN; moved = true; }
if (y < 0) { y = SNAP_MARGIN; moved = true; }
if (moved) {
panel.style.left = x + 'px';
panel.style.top = y + 'px';
this._persist(panel.id, x / vw, y / vh);
}
}
};
// Export
window.DragManager = DragManager;
DragManager.clearPanel = clearPanel;
})();