From ce64b3fbcd7ce16a2fbe0f76de52eb806372ff27 Mon Sep 17 00:00:00 2001 From: loucass003 Date: Wed, 26 Aug 2026 00:15:06 +0200 Subject: [PATCH] Fix cursor alignment --- .../components/tracker/DongleTelemetry.tsx | 41 +++++++------------ .../src/components/tracker/GapEventsChart.tsx | 41 ++++++++++++------- .../src/components/tracker/RssiLossChart.tsx | 41 ++++++++++++------- 3 files changed, 68 insertions(+), 55 deletions(-) diff --git a/gui/app/src/components/tracker/DongleTelemetry.tsx b/gui/app/src/components/tracker/DongleTelemetry.tsx index 1116eb6fb..09643039e 100644 --- a/gui/app/src/components/tracker/DongleTelemetry.tsx +++ b/gui/app/src/components/tracker/DongleTelemetry.tsx @@ -57,51 +57,38 @@ export function relativeTimeTick(v: number, endSec: number) { return `${diff}s`; } -export function pxToTimeSec( +export function screenXToTimeSec( clientX: number, - rect: DOMRect, + plotLeftScreen: number, + plotWidth: number, startSec: number, endSec: number ): number { - const plotLeft = Y_AXIS_WIDTH + CHART_MARGIN.left; - const plotWidth = - rect.width - - Y_AXIS_WIDTH - - CHART_MARGIN.left - - RIGHT_AXIS_WIDTH - - CHART_MARGIN.right; - const pct = Math.max( - 0, - Math.min(1, (clientX - rect.left - plotLeft) / plotWidth) - ); + if (plotWidth <= 0) return startSec; + const pct = Math.max(0, Math.min(1, (clientX - plotLeftScreen) / plotWidth)); return startSec + pct * (endSec - startSec); } -export function timeSecToPx( +export function timeSecToScreenX( t: number, - rectWidth: number, + plotLeftScreen: number, + plotWidth: number, startSec: number, endSec: number ): number { - const plotLeft = Y_AXIS_WIDTH + CHART_MARGIN.left; - const plotWidth = - rectWidth - - Y_AXIS_WIDTH - - CHART_MARGIN.left - - RIGHT_AXIS_WIDTH - - CHART_MARGIN.right; + if (endSec <= startSec) return plotLeftScreen; const pct = Math.max(0, Math.min(1, (t - startSec) / (endSec - startSec))); - return plotLeft + pct * plotWidth; + return plotLeftScreen + pct * plotWidth; } export function flipTooltipLeft( - hoveredPx: number, - containerWidth: number, + clientX: number, + screenWidth: number, tooltipWidth: number, offset: number ): number { - const wouldOverflow = hoveredPx + offset + tooltipWidth > containerWidth; - return wouldOverflow ? hoveredPx - offset - tooltipWidth : hoveredPx + offset; + const wouldOverflow = clientX + offset + tooltipWidth > screenWidth; + return wouldOverflow ? clientX - offset - tooltipWidth : clientX + offset; } export function isGapEventActive( diff --git a/gui/app/src/components/tracker/GapEventsChart.tsx b/gui/app/src/components/tracker/GapEventsChart.tsx index dff7170af..f00eaa818 100644 --- a/gui/app/src/components/tracker/GapEventsChart.tsx +++ b/gui/app/src/components/tracker/GapEventsChart.tsx @@ -14,10 +14,10 @@ import { getGapColor, HoveredChart, isGapEventActive, - pxToTimeSec, relativeTimeTick, + screenXToTimeSec, TelemetryTracker, - timeSecToPx, + timeSecToScreenX, } from './DongleTelemetry'; import { TelemetryPopoverTooltip, @@ -212,27 +212,40 @@ function GapEventsChartComponent({ const [hoveredY, setHoveredY] = useState(null); const handleMouseMove = (e: React.MouseEvent) => { - if (!wrapperRef.current) return; - const rect = wrapperRef.current.getBoundingClientRect(); - onHoveredTimeChange(pxToTimeSec(e.clientX, rect, startSec, endSec)); - setHoveredY(e.clientY - rect.top); + const canvas = canvasRef.current; + if (!canvas) return; + const canvasRect = canvas.getBoundingClientRect(); + const plotLeftScreen = canvasRect.left; + const plotWidth = canvasRect.width - RIGHT_AXIS_WIDTH; + onHoveredTimeChange( + screenXToTimeSec(e.clientX, plotLeftScreen, plotWidth, startSec, endSec) + ); + setHoveredY(e.clientY); onActiveChange('gap'); }; let clientPos: { x: number; y: number } | null = null; - if (hoveredTime != null && wrapperRef.current) { - const rect = wrapperRef.current.getBoundingClientRect(); - const hoveredPx = timeSecToPx(hoveredTime, rect.width, startSec, endSec); - const tooltipLeftPx = flipTooltipLeft( - hoveredPx, - rect.width, + if (hoveredTime != null && canvasRef.current) { + const canvasRect = canvasRef.current.getBoundingClientRect(); + const plotLeftScreen = canvasRect.left; + const plotWidth = canvasRect.width - RIGHT_AXIS_WIDTH; + const screenX = timeSecToScreenX( + hoveredTime, + plotLeftScreen, + plotWidth, + startSec, + endSec + ); + const tooltipX = flipTooltipLeft( + screenX, + window.innerWidth, TOOLTIP_WIDTH, TOOLTIP_OFFSET ); clientPos = { - x: rect.left + tooltipLeftPx, - y: rect.top + (hoveredY ?? 8) + TOOLTIP_OFFSET, + x: tooltipX, + y: (hoveredY ?? canvasRect.top) + TOOLTIP_OFFSET, }; } diff --git a/gui/app/src/components/tracker/RssiLossChart.tsx b/gui/app/src/components/tracker/RssiLossChart.tsx index a98a6b308..d1fc98271 100644 --- a/gui/app/src/components/tracker/RssiLossChart.tsx +++ b/gui/app/src/components/tracker/RssiLossChart.tsx @@ -10,10 +10,10 @@ import { ChartRow, GapEvent } from '@/hooks/telemetry-history'; import { flipTooltipLeft, HoveredChart, - pxToTimeSec, relativeTimeTick, + screenXToTimeSec, TelemetryTracker, - timeSecToPx, + timeSecToScreenX, } from './DongleTelemetry'; import { TelemetryPopoverTooltip, @@ -364,26 +364,39 @@ function RssiLossChartComponent({ const [hoveredY, setHoveredY] = useState(null); const handleMouseMove = (e: React.MouseEvent) => { - if (!wrapperRef.current) return; - const rect = wrapperRef.current.getBoundingClientRect(); - onHoveredTimeChange(pxToTimeSec(e.clientX, rect, startSec, endSec)); - setHoveredY(e.clientY - rect.top); + const canvas = canvasRef.current; + if (!canvas) return; + const canvasRect = canvas.getBoundingClientRect(); + const plotLeftScreen = canvasRect.left + Y_AXIS_WIDTH; + const plotWidth = canvasRect.width - Y_AXIS_WIDTH - RIGHT_AXIS_WIDTH; + onHoveredTimeChange( + screenXToTimeSec(e.clientX, plotLeftScreen, plotWidth, startSec, endSec) + ); + setHoveredY(e.clientY); onActiveChange('rssi'); }; let clientPos: { x: number; y: number } | null = null; - if (hoveredTime != null && wrapperRef.current) { - const rect = wrapperRef.current.getBoundingClientRect(); - const hoveredPx = timeSecToPx(hoveredTime, rect.width, startSec, endSec); - const tooltipLeftPx = flipTooltipLeft( - hoveredPx, - rect.width, + if (hoveredTime != null && canvasRef.current) { + const canvasRect = canvasRef.current.getBoundingClientRect(); + const plotLeftScreen = canvasRect.left + Y_AXIS_WIDTH; + const plotWidth = canvasRect.width - Y_AXIS_WIDTH - RIGHT_AXIS_WIDTH; + const screenX = timeSecToScreenX( + hoveredTime, + plotLeftScreen, + plotWidth, + startSec, + endSec + ); + const tooltipX = flipTooltipLeft( + screenX, + window.innerWidth, TOOLTIP_WIDTH, TOOLTIP_OFFSET ); clientPos = { - x: rect.left + tooltipLeftPx, - y: rect.top + (hoveredY ?? 8) + TOOLTIP_OFFSET, + x: tooltipX, + y: (hoveredY ?? canvasRect.top) + TOOLTIP_OFFSET, }; }