feat(overlay): flash the row on a new time, ticking pit clock and split badges (1.88.0)
This commit is contained in:
1 parent
ee290a4ab8
commit
f5b77d5589
11 files changed
+304
-6
No files matched your search
+15
-3
@@ -1,5 +1,6 @@
|
||||
import { sortValuesAttribute } from "./list_sorting.js";
|
||||
import { escapeHtml as escapeHtmlLocal } from "./html_escape.js";
|
||||
import { overlayLiveMarks, passingFlashAttrs, renderLiveMarkBadges } from "./overlay_live_marks.js";
|
||||
export function getOverlayModeLabel(mode, { t }) {
|
||||
return t(`overlay.mode_${String(mode || "leaderboard").toLowerCase()}`);
|
||||
}
|
||||
@@ -69,6 +70,8 @@ export function renderOverlayLeaderboard(rows, { t, escapeHtml, formatTeamActive
|
||||
// More than 12 cars (a busy Open Practice): compact rows so all of them fit on a TV that
|
||||
// can't scroll - no per-cell labels (the header names the columns), sub-line or prediction bar.
|
||||
const compact = rows.length > 12;
|
||||
const liveMarks = overlayLiveMarks.observe(rows);
|
||||
const markLabels = { pit: t("table.pit"), split: t("table.split") };
|
||||
return `
|
||||
<div class="overlay-race-list ${compact ? "overlay-race-list-compact" : ""}"${sortAttrs}>
|
||||
${rows
|
||||
@@ -76,13 +79,15 @@ export function renderOverlayLeaderboard(rows, { t, escapeHtml, formatTeamActive
|
||||
const posClass = idx === 0 ? "pos-1" : idx === 1 ? "pos-2" : idx === 2 ? "pos-3" : "";
|
||||
const rowSortAttr = sortable ? ` data-sort-values="${sortValuesAttribute([idx + 1, row.displayName || row.driverName, row.laps ?? 0, row.resultDisplay, row.gapDisplay || row.gapAhead || null, row.gapAhead || null, row.lapDelta || null, row.bestLapMs || null])}"` : "";
|
||||
const linkAttrs = driverLinks && row.driverId && !row.teamId ? ` data-training-driver="${escapeHtml(row.driverId)}" title="${escapeHtml(t("overlay.open_training_stats"))}"` : "";
|
||||
const mark = liveMarks.get(String(row.key ?? ""));
|
||||
const flash = passingFlashAttrs(mark);
|
||||
return `
|
||||
<article class="overlay-race-row ${idx === 0 ? "overlay-race-row-leader" : ""} ${row.invalidPending ? "overlay-race-row-invalid" : ""} ${linkAttrs ? "is-linked" : ""}"${rowSortAttr}${linkAttrs} data-overlay-competitor="${escapeHtml(row.key)}">
|
||||
<article class="overlay-race-row ${idx === 0 ? "overlay-race-row-leader" : ""} ${row.invalidPending ? "overlay-race-row-invalid" : ""} ${linkAttrs ? "is-linked" : ""}${flash.className}"${flash.style}${rowSortAttr}${linkAttrs} data-overlay-competitor="${escapeHtml(row.key)}">
|
||||
<div class="overlay-race-pos">
|
||||
<span class="pos-pill ${posClass}">${idx + 1}</span>
|
||||
</div>
|
||||
<div class="overlay-race-driver">
|
||||
<strong>${escapeHtml(row.displayName || row.driverName)}${row.personalTimeUp ? ` <span class="pill pill-green">🏁 ${t("timing.personal_time_up")}</span>` : ""}${row.suspectPending ? ` <span class="suspect-flag" title="${escapeHtml(t("suspect.flag_title"))}">⚠</span>` : ""}</strong>
|
||||
<strong>${escapeHtml(row.displayName || row.driverName)}${row.personalTimeUp ? ` <span class="pill pill-green">🏁 ${t("timing.personal_time_up")}</span>` : ""}${row.suspectPending ? ` <span class="suspect-flag" title="${escapeHtml(t("suspect.flag_title"))}">⚠</span>` : ""}${renderLiveMarkBadges(mark, { formatLap, escapeHtml, labels: markLabels })}</strong>
|
||||
${row.heatCarName ? `<span class="overlay-heat-car">🚗 ${escapeHtml(row.heatCarName)}</span>` : `<span>${escapeHtml(row.teamId ? `${t("overlay.active_member")}: ${formatTeamActiveMemberLabel(row)}` : row.subLabel || row.transponder || "-")}</span>`}
|
||||
${row.lastSplitMs || row.pitActive || row.pitStops ? `<span class="overlay-decoder-meta">${row.lastSplitMs ? `${t("table.split")}: ${formatLap(row.lastSplitMs)}` : ""}${row.lastSplitMs && (row.pitActive || row.pitStops) ? " • " : ""}${row.pitActive ? t("timing.pit_active") : row.pitStops ? `${t("table.pit")}: ${row.pitStops} / ${formatLap(row.totalPitMs)}` : ""}</span>` : ""}
|
||||
${row.invalidPending ? `<span class="overlay-invalid-note">${escapeHtml(row.invalidLabel)}${row.invalidLapMs ? ` • ${formatLap(row.invalidLapMs)}` : ""}</span>` : ""}
|
||||
@@ -219,11 +224,14 @@ function renderObsBroadcast({ active, compactRows, startOrder, showStartGrid, fa
|
||||
// With laps in their own column the result's "14/" prefix only repeats them.
|
||||
const timeOnly = (value) => (obsConfig.showLaps ? String(value || "").replace(/^\d+\//, "") : String(value || ""));
|
||||
const podium = (place) => (place <= 3 ? ` is-p${place}` : "");
|
||||
const liveMarks = showStartGrid ? null : overlayLiveMarks.observe(compactRows);
|
||||
const rows = showStartGrid
|
||||
? getSessionGridEntries(active).slice(0, obsConfig.rows).map((entry, idx) => `
|
||||
<div class="obs-tv-row${podium(idx + 1)}">${cell("pos", entry.slot)}${cell("name", escapeHtml(entry.name))}</div>`)
|
||||
: compactRows.map((row, idx) => {
|
||||
const start = startOrder.indexOf(row.driverId) + 1;
|
||||
const mark = liveMarks?.get(String(row.key ?? ""));
|
||||
const badges = renderLiveMarkBadges(mark, { formatLap, escapeHtml, labels: { pit: t("table.pit"), split: t("table.split") } });
|
||||
const values = {
|
||||
pos: idx + 1,
|
||||
start: start ? `<span class="obs-tv-slash">/</span>${start}` : "",
|
||||
@@ -234,7 +242,11 @@ function renderObsBroadcast({ active, compactRows, startOrder, showStartGrid, fa
|
||||
best: Number.isFinite(row.bestLapMs) ? escapeHtml(formatLap(row.bestLapMs)) : "-",
|
||||
gap: escapeHtml(idx === 0 ? "" : row.gapDisplay || row.gapAhead || ""),
|
||||
};
|
||||
return `<div class="obs-tv-row${podium(idx + 1)}${row.driverId === fastestRow?.driverId ? " is-fastest" : ""}">${columns.map(([key]) => cell(key, values[key])).join("")}</div>`;
|
||||
// Pit clock and split at the end of the name column, the one flexible column - in
|
||||
// the time columns they would push every other column out of line.
|
||||
if (badges) values.name = `<span class="obs-tv-name-text">${values.name}</span>${badges}`;
|
||||
const flash = passingFlashAttrs(mark);
|
||||
return `<div class="obs-tv-row${podium(idx + 1)}${row.driverId === fastestRow?.driverId ? " is-fastest" : ""}${flash.className}"${flash.style}>${columns.map(([key]) => cell(key, values[key])).join("")}</div>`;
|
||||
});
|
||||
const eventName = String(getEventName(active.eventId) || "").trim();
|
||||
return `
|
||||
|
||||
Reference in new issue
Block a user