fix(click): the card or label on top takes the click in every layer

Review fixes for #1781:

- One rule for cards: the world-overlay host hands its hit test to the
  pick registry, and every click handler reads the topmost interactive
  card or label once per click (`clickCard`, `isUnderOtherCard` in
  src/data/pickRegistry.js), so all handlers agree in any listener order.
  A layer whose own card or label is on top acts on it whatever is drawn
  under it; a layer under another layer's card neither acts nor treats
  the click as empty space (a tracked aircraft stays tracked, a selection
  stays selected); Context names nothing under a card. A selected news
  card over a vessel no longer opens the link and selects the vessel.
- With one rule, the per-owner arbitration options are no longer read
  and are removed: `passive`, `expanded` and `declinesClick` pick owners,
  `rememberClickPickActions`, `isActedOnByOtherLayer`, card backgrounds
  and `cardKeepsClick`. The dispatcher is unchanged from main.
- A drag that ends on a quake disc, label or card does nothing; opening
  the USGS page or clearing the selection needs a clean click.
- A click on the map under another layer's card opens no Street Level
  ground image.
- A CCTV card that is going away is still not the scene under it.
- Docs and changelog describe the new rule.
This commit is contained in:
Sameh Khamis committed 2026-11-18 18:23:41 -08:00
1 parent 7312280817
commit bb3bf9858b
87 files changed
+1398 -1775

No files matched your search

+1 -21
View File
@@ -4,8 +4,6 @@ import { canvasOf, findCamera, findFrame } from '../../render/rendererOf.js';
import { worldClock } from '../../time/worldClock.js';
const HOVER_PICK_INTERVAL_MS = 120;
/** Our id in the pick registry's card backgrounds. */
const CARD_BACKGROUND_ID = 'rocket-launches';
/**
* Bound hover picking independently of precise click selection. A move inside
@@ -206,29 +204,12 @@ export function createLifecycle({
layerState._orbitMatches = 0;
parts.overlays.clearMissionOverlaySources();
const input = inputFor(viewer);
// Our mission items stand aside for a card painted over them (below),
// so that card's layer may act on the click; without a hit-test they
// cannot.
if (services.overlays?.hitTestWorldOverlay)
services.picking?.registerCardBackground?.(
CARD_BACKGROUND_ID,
(hit) =>
layerState._enabled &&
parts.rendering.missionsShown() &&
parts.rendering.launchIdFromPicks([hit]) !== null,
);
const unsubscribeClick = input.onClick((event) => {
if (!layerState._enabled || !parts.rendering.missionsShown()) return;
// Mission overlays are not interactive, so any overlay entry hit
// here is another layer's card or label painted over the click: that
// layer's click, not a mission's.
if (
services.overlays?.hitTestWorldOverlay?.(
event.screenPosition?.x,
event.screenPosition?.y,
)
)
return;
if (services.picking?.clickCard?.(event)) return;
// The click's pick position (CSS px), as the click picked it.
const launchId = parts.rendering.launchIdFromPicks(
parts.rendering.missionHitsAt(event.position, 12),
@@ -248,7 +229,6 @@ export function createLifecycle({
layerState._inputSubscription = () => {
unsubscribeClick();
unsubscribeHover();
services.picking?.unregisterCardBackground?.(CARD_BACKGROUND_ID);
};
// Apply horizon visibility before the renderer draws and picks.
// A postRender write is one frame late and can remain visibly stale when