Let a mission label select its mission in the cockpit, and say what the merged click rule does

Under the card-on-top rule a mission label is the card on top for the
cockpit too, so the label no longer steps aside there: it selects its
mission without moving the camera the cockpit holds. Tests and docs no
longer claim a covered click reaches what lies under the label, and the
busy-restore note says an explicit Satellites action lets the saved state
go.

Co-authored-by: Manjunath Paparaju <[email protected]>
This commit is contained in:
Sameh KhamisandManjunath Paparaju committed 2026-11-18 20:24:16 -08:00
1 parent 0e5c5e624c
commit a29efa12c4
4 files changed
+32 -19

No files matched your search

+16 -7
View File
@@ -54,6 +54,7 @@ function rig(t, { overlayHit = null, geometryLaunchId = null } = {}) {
};
const state = createState({ services });
const focused = [];
const moved = [];
const restoreFailure = { error: null };
const parts = {
panel: stub(),
@@ -63,6 +64,7 @@ function rig(t, { overlayHit = null, geometryLaunchId = null } = {}) {
orbitRendering: stub(),
selection: stub({
setSelectedMission: (id) => focused.push(id),
focusMission: (launch) => moved.push(launch.id),
}),
satelliteIntents: stub(),
ingestion: stub({
@@ -97,6 +99,7 @@ function rig(t, { overlayHit = null, geometryLaunchId = null } = {}) {
});
return {
focused,
moved,
ambient,
state,
lifecycle,
@@ -122,8 +125,9 @@ test('a mission label click focuses its launch and covers the geometry beneath',
const r = rig(t, { overlayHit: label('launch:L2'), geometryLaunchId: 'L1' });
r.click();
assert.deepEqual(r.focused, ['L2'], 'the mission beneath is not picked');
// Other layers still hear it, to close their cards or clear selection,
// as a click on the label rather than on the geometry beneath.
// Other layers still hear it, as a click on the label rather than on the
// geometry beneath; the label is the card on top, so they keep their
// selections.
assert.equal(r.ambient.length, 1);
assert.equal(r.ambient[0].overlay, true);
assert.equal(r.ambient[0].drawHit, null);
@@ -164,14 +168,16 @@ test('a throwing globe-pick listener does not stop the pick', (t) => {
assert.equal(r.ambient[0].overlay, true);
});
test('a mission label for an unknown launch falls through to other layers', (t) => {
test('a mission label for an unknown launch selects nothing', (t) => {
const r = rig(t, {
overlayHit: label('launch:gone'),
geometryLaunchId: 'L1',
});
r.click();
assert.deepEqual(r.focused, [], 'nothing is focused');
assert.equal(r.ambient.length, 1, 'other layers still get the click');
// Other layers hear the click; the label is still the card on top for
// them (clickYield.test.mjs), so none acts under it.
assert.equal(r.ambient.length, 1);
});
test("another layer's label keeps the click above mission geometry", (t) => {
@@ -190,7 +196,7 @@ test("another layer's label keeps the click above mission geometry", (t) => {
assert.deepEqual(r.focused, ['L1']);
});
test('a mission label leaves the click to the cockpit while it is on', (t) => {
test('in the cockpit a mission label selects its mission without moving the camera', (t) => {
const r = rig(t, { overlayHit: label('launch:L2') });
const previous = Object.getOwnPropertyDescriptor(globalThis, 'document');
Object.defineProperty(globalThis, 'document', {
@@ -205,8 +211,11 @@ test('a mission label leaves the click to the cockpit while it is on', (t) => {
if (previous) Object.defineProperty(globalThis, 'document', previous);
else delete globalThis.document;
}
assert.deepEqual(r.focused, []);
assert.equal(r.ambient.length, 1, 'the cockpit click handler gets it');
assert.deepEqual(r.focused, ['L2'], 'the mission is selected');
assert.deepEqual(r.moved, [], 'the cockpit keeps the camera');
// Out of the cockpit the same click moves there too.
r.click();
assert.deepEqual(r.moved, ['L2']);
});
test('destroy releases the click handlers when the Satellites restore fails', async (t) => {
+7 -5
View File
@@ -181,12 +181,12 @@ export function createLifecycle({
services.overlays?.hitTestWorldOverlay?.(position?.x, position?.y);
const missionsShown = () =>
layerState._enabled && parts.rendering.missionsShown();
const focusLaunch = (id) => {
const focusLaunch = (id, { move = true } = {}) => {
if (!id) return false;
const launch = layerState._launches.find((entry) => entry.id === id);
if (!launch) return false;
parts.selection.setSelectedMission(launch.id);
parts.selection.focusMission(launch);
if (move) parts.selection.focusMission(launch);
for (const listener of [...layerState._globePickListeners]) {
try {
listener(launch.id);
@@ -245,14 +245,16 @@ export function createLifecycle({
const input = inputFor(viewer);
const overlayClicks = new WeakSet();
const unsubscribeLabelClick = input.onOverlayClick((event) => {
// The cockpit reads ambient clicks; a mission label must not take them.
if (!missionsShown() || cockpitActive()) return false;
if (!missionsShown()) return false;
const hit = overlayAt(event.screenPosition);
if (!hit) return false;
// Capture the painted hit before other handlers can invalidate the
// overlay. An unrelated label keeps the click above mission geometry.
overlayClicks.add(event);
return focusLaunch(markerLaunchId(hit));
// The label is the card on top, so every other layer and the cockpit
// leave its click alone. In the cockpit, which holds the camera, it
// selects the mission without moving there.
return focusLaunch(markerLaunchId(hit), { move: !cockpitActive() });
});
const unsubscribeClick = input.onClick((event) => {
// Another layer's card or label on top is that layer's click, read