robert/ttrpg-initiative-tracker
1
0
Fork 0
Code Issues Pull Requests Releases 4 Wiki Activity

fix(turn): block cross-pointer reorder (BUG-13)

Browse Source 
reorderParticipants allowed dragging across current pointer mid-round.
nextTurn walks turnOrderIds forward from pointer, so cross-pointer drag
= ambiguous who-acts-next: upcoming dragged ahead of pointer = skipped
(walk wraps past), acted dragged behind pointer = double-act.

Full fix needs actedThisRound tracking. Pragmatic now: block both
directions during active encounter. Pre-combat: free reorder (no pointer).

reorderParticipants: added pointer check (currentTurn index). If drag
crosses pointer, return null patch (no-op). Same-side reorder allowed.
syncTurnOrder now always mirrors (was started-only — pre-combat reorder
left turnOrderIds stale).

Tests:
- turn.bug13.test.js: cross-pointer blocked (both dirs), same-side allowed,
  pre-combat free.
- turn.reorder.test.js: 3 tests updated to pre-combat (cross-pointer now
  blocked post-start).
- turn.invariant.test.js: reorder test uses same-side upcoming pair.

214 tests green.
This commit is contained in:
david raistrick
2026-07-04 17:12:13 -04:00
parent 0ff50561c7
commit 942545c085
5 changed files with 148 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shared/tests/turn.reorder.test.js
+14 -16
View File
@@ -18,15 +18,12 @@ function enc(ps) {
}
describe('reorderParticipants', () => {
test('drag before target (1-list model)', () => {
test('drag before target (1-list model, pre-combat)', () => {
const ps = [p('a', 10), p('b', 20), p('c', 20)]; // b,c tie
let e = enc(ps);
e = { ...e, ...startEncounter(e).patch };
// initial order: b,c,a (init 20,20,10)
expect(e.turnOrderIds).toEqual(['b', 'c', 'a']);
let e = enc(ps); // pre-combat, no pointer
const r = reorderParticipants(e, 'c', 'b');
// drag c before b: remove c → [b,a], insert before b → [c,b,a]
expect(r.patch.participants.map(p => p.id)).toEqual(['c', 'b', 'a']);
// drag c before b: remove c → [a,b], insert before b → [a,c,b]
expect(r.patch.participants.map(p => p.id)).toEqual(['a', 'c', 'b']);
});
test('cross-init drag blocked (no-op)', () => {
@@ -47,21 +44,22 @@ describe('reorderParticipants', () => {
test('syncs turnOrderIds = participants order (1-list, fixes BUG-6)', () => {
const ps = [p('a', 10), p('b', 20), p('c', 20)];
let e = enc(ps);
e = { ...e, ...startEncounter(e).patch };
const r = reorderParticipants(e, 'c', 'b');
expect(r.patch.turnOrderIds).toEqual(['c', 'b', 'a']);
expect(r.patch.turnOrderIds).toEqual(r.patch.participants.map(p => p.id));
e = { ...e, ...startEncounter(e).patch }; // started, but reorder pre-pointer advance
// startEncounter sets current=b (idx0). reorder c before b crosses pointer.
// Use pre-combat to test syncTurnOrder.
let pre = enc(ps);
pre = { ...pre, ...reorderParticipants(pre, 'c', 'b').patch };
expect(pre.turnOrderIds).toEqual(['a','c','b']);
expect(pre.turnOrderIds).toEqual(pre.participants.map(p => p.id));
});
// BUG-6 candidate: reorder should affect turnOrderIds so mid-combat
// drag-drop changes who goes next within same-initiative tie.
// Currently RED (turnOrderIds not in patch).
test('reorder updates turnOrderIds to reflect new participant order', () => {
test('reorder updates turnOrderIds to reflect new participant order (pre-combat)', () => {
const ps = [p('a', 10), p('b', 20), p('c', 20)];
let e = enc(ps);
e = { ...e, ...startEncounter(e).patch };
// order: b,c,a
let e = enc(ps); // pre-combat, no pointer
e = { ...e, ...reorderParticipants(e, 'c', 'b').patch };
expect(e.turnOrderIds).toEqual(['c', 'b', 'a']);
expect(e.turnOrderIds).toEqual(['a', 'c', 'b']);
});
});