Never act on what lies under a mission label when it is clicked

A click on a Space Missions label reaches every click subscriber so they can
let go of their selection, but the layers that test their own painted cards
or pick the scene themselves still found what lay under the label: CCTV
turned that camera on, FIRMS and Vessels selected and flew to theirs, News
and Wildlife Sightings opened their item, Perimeters, Ghost Maps and
Shipwrecks opened the card's link, ALPR selected its reader, and Local ADS-B
drilled the scene itself and selected the aircraft. Each now skips its own
test on such a click, and Local ADS-B drills through the click, so the click
only releases selections, as a click on empty map or another layer's
contact does. Ordinary clicks behave as before.

Co-authored-by: Manjunath Paparaju <[email protected]>
This commit is contained in:
Sameh KhamisandManjunath Paparaju committed 2026-11-18 17:05:43 -08:00
1 parent 8675ead171
commit 5feac417d6
22 files changed
+453 -72

No files matched your search

+13 -11
View File
@@ -64,17 +64,19 @@ export function createSelection({
// Cards are painted on a pointer-events:none canvas, so the scene pick is
// usually terrain behind the card. Resolve against the host's current
// actionable hit rectangles before treating the click as empty space.
const cardHit = !record
? vesselState._vesselOverlayHost.hitTest?.(
event.screenPosition?.x,
event.screenPosition?.y,
{
...(cycloneBackground
? {}
: { sourceId: VESSEL_OVERLAY_SOURCE_ID }),
},
)
: null;
// A click a label painted over the cards took is not on a card.
const cardHit =
!record && !event.overlay
? vesselState._vesselOverlayHost.hitTest?.(
event.screenPosition?.x,
event.screenPosition?.y,
{
...(cycloneBackground
? {}
: { sourceId: VESSEL_OVERLAY_SOURCE_ID }),
},
)
: null;
if (cycloneBackground && cardHit?.sourceId !== VESSEL_OVERLAY_SOURCE_ID)
return;
if (!record && cardHit) {
+89
View File
@@ -0,0 +1,89 @@
import test from 'node:test';
import assert from 'node:assert/strict';
import { VESSEL_OVERLAY_SOURCE_ID } from '../../data/vesselLabels.js';
import { fakeInputUnderLabel } from '../../input/testDoubles.mjs';
import { createSelection } from './selection.js';
/** Calls on any member are recorded by name and do nothing else. */
function recorder(calls) {
return new Proxy(
{},
{
get:
(_target, name) =>
(...args) =>
calls.push([name, ...args]),
},
);
}
/** The vessel selection over a viewer whose clicks a label may take. */
function selectionHarness(t) {
const viewer = { scene: { canvas: {}, pick: () => null } };
const fake = fakeInputUnderLabel(viewer);
t.after(() => fake.destroy());
const vessel = { id: 'v1', name: 'NORTHERN STAR', lat: 0, lon: 0 };
const focused = [];
const calls = [];
const state = {
feed: { enabled: true },
records: { byId: new Map([[vessel.id, vessel]]) },
icons: { setId: 'vessels:icons', has: () => false },
selectedRecord: null,
interactionKeyTarget: new EventTarget(),
};
const vesselState = {
state,
// The vessel's card lies under the click.
_vesselOverlayHost: {
hitTest: (_x, _y, { sourceId } = {}) =>
sourceId === VESSEL_OVERLAY_SOURCE_ID
? { sourceId, entryId: `vessel:${vessel.id}` }
: null,
},
};
const selection = createSelection({
vesselState,
services: {
picking: { isOwnedByOtherLayer: () => false },
worldFocus: { requestWorldFocus: (request) => focused.push(request.id) },
context: recorder(calls),
},
parts: {
queries: {
reduceVesselSelection: ({ selectedId, pickedId }) =>
pickedId
? { action: pickedId === selectedId ? 'none' : 'select' }
: { action: selectedId ? 'deselect' : 'none' },
},
rendering: recorder(calls),
cards: recorder(calls),
photos: recorder(calls),
tracking: recorder(calls),
},
layer: { source: 'AIS' },
});
selection.installInteraction(viewer);
t.after(() => selection.removeVesselInteraction());
return { fake, state, vessel, focused };
}
test("a click a label painted over a vessel's card takes never selects or focuses the vessel", (t) => {
const h = selectionHarness(t);
h.fake.label.over = true;
h.fake.click();
assert.equal(h.state.selectedRecord, null);
assert.deepEqual(h.focused, [], 'the camera is not sent to the vessel');
});
test('a click a label painted over the map takes lets go of the selected vessel', (t) => {
const h = selectionHarness(t);
// Off the label, a click on the card selects and focuses its vessel.
h.fake.click();
assert.equal(h.state.selectedRecord, h.vessel);
assert.deepEqual(h.focused, ['v1']);
h.fake.label.over = true;
h.fake.click();
assert.equal(h.state.selectedRecord, null);
assert.deepEqual(h.focused, ['v1']);
});