OpenCode/History
2
0
Fork 0
Code Issues Pull Requests Actions Activity

Stop printing the static parent-country code in the region hover tooltip and dossier label (v0.18.0)
CI / build + unit + e2e (pull_request) Successful in 2m34s
Details

Browse Source
This commit is contained in:
kamilkrzywda
2026-10-13 18:58:43 +00:00
parent acb4f0800f
commit 3cd8dcecfa
4 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/WorldMap.tsx
+11 -11
View File
@@ -174,19 +174,20 @@ function statRow(label: string, value?: number): string {
}
/**
* Compact hover tooltip: the sub-region's name, its parent country (ISO_A3), its
* owner (color-chipped), and 1–2 key stats. When the parent country has no
* owning nation, a minimal "No owner" card is shown instead.
* Compact hover tooltip: the sub-region's name, its **current owner**
* (color-chipped), and 1–2 key stats. When the region's country has no owning
* nation, a minimal "No owner" card is shown instead. The static
* parent-country code (`properties.parent`) is deliberately NOT printed here —
* it never updates when ownership is transferred, so only the live owner chip
* (resolved from the RegionMap) is shown.
*/
function hoverHtml(subRegionName: string, parentCode: string, region?: RegionOwner, nation?: Nation): string {
function hoverHtml(subRegionName: string, region?: RegionOwner, nation?: Nation): string {
if (!region || !nation) {
return `<div class="hm-popup"><div class="hm-popup-title">${esc(subRegionName || parentCode || 'Unclaimed')}</div><div class="hm-popup-sub">No owner</div></div>`;
return `<div class="hm-popup"><div class="hm-popup-title">${esc(subRegionName || 'Unclaimed')}</div><div class="hm-popup-sub">No owner</div></div>`;
}
const stats = [statRow('Mil', nation.stats.military), statRow('Eco', nation.stats.economy)].join('');
const sub = parentCode ? `<div class="hm-popup-sub">${esc(parentCode)}</div>` : '';
return `<div class="hm-popup">
<div class="hm-popup-title">${esc(subRegionName || region.owner)}</div>
${sub}
<div class="hm-popup-owner"><span class="hm-chip" style="background:${region.color}"></span>${esc(region.owner)}</div>
<div class="hm-stats">${stats}</div>
</div>`;
@@ -221,7 +222,7 @@ interface Props {
* layer (z-0) behind the floating HUD windows: a dark-navy basemap with subtle
* terrain, per-nation stable fills (uniform per country, the choropleth is the
* star), thin sub-region borders, a brighter/thicker amber border for the
* player's countries, a hover tooltip (sub-region name + parent country + owner
* player's countries, a hover tooltip (sub-region name + current owner
* + key stats), a **click that switches the dossier to the sub-region's parent
* country's owning nation** (no popup — see #7), a transient flash when a
* country's owner changes (lighting up all its sub-regions), and a per-scenario
@@ -355,9 +356,8 @@ export default function WorldMap({
const onHover = (e: maplibregl.MapLayerMouseEvent) => {
const f = e.features?.[0];
if (!f) return;
const p = f.properties as { name?: string; regionId?: string; parent?: string };
const p = f.properties as { name?: string; regionId?: string };
const subId = typeof p?.regionId === 'string' ? p.regionId : '';
const parent = typeof p?.parent === 'string' ? p.parent : '';
if (subId && subId !== lastHoverId) {
lastHoverId = subId;
const geo = baseGeoRef.current;
@@ -373,7 +373,7 @@ export default function WorldMap({
const nation = region ? nationsRef.current[region.ownerId] : undefined;
hoverPopup
.setLngLat(e.lngLat)
.setHTML(hoverHtml(p?.name ?? parent ?? subId, parent, region, nation))
.setHTML(hoverHtml(p?.name ?? subId, region, nation))
.addTo(map);
map.getCanvas().style.cursor = 'pointer';
};