diff --git a/src/components/BroadcastGraphics/TimingBoard/TimingTower/TimingTower.tsx b/src/components/BroadcastGraphics/TimingBoard/TimingTower/TimingTower.tsx index 52a565b..8361b49 100644 --- a/src/components/BroadcastGraphics/TimingBoard/TimingTower/TimingTower.tsx +++ b/src/components/BroadcastGraphics/TimingBoard/TimingTower/TimingTower.tsx @@ -3,40 +3,16 @@ import { useSelector } from "react-redux"; import { broadcastGraphicsSelector } from "../../../../features/broadcast/graphics/broadcastGraphicsSelector"; import { eventSelector } from "../../../../features/event/eventSelector"; -import { theme } from "../../../../shared/theme"; -import { - BGTimingTowerDisplayModes, - BGTimingTowerSplitsMode, - Car, - CarNotice, - CarStatus, -} from "../../../../types/state"; -import { Fraction } from "../../../../types/style"; -import { orMatch } from "../../../../utils/common"; -import { getCarAtPos, timeDiff } from "../../../../utils/event"; -import { formatTime } from "../../../../utils/styling"; +import { CarStatus } from "../../../../types/state"; -import { PositionFlag } from "../../Common/PositionFlag"; -import { TeamGem } from "../../Common/TeamGem"; - -import { - DriverName, - FastestLapGem, - AnimatedRowContainer, - RowLeftHalf, - RowLeftHalfGemContainer, - RowLeftHalfLayout, - RowRightHalf, - RowRightHalfLayout, - RowsContainer, - TimeDiff, -} from "./styles"; +import { RowsContainer } from "./styles"; +import { TimingTowerRow } from "./TimingTowerRow"; export function TimingTower() { const { lastUpdate, grid, trackLength } = useSelector(eventSelector); - const { timingBoard: { timingTower }, timingBoard: { timingTower: { splitsMode } } } = useSelector( + const { timingBoard: { timingTower: { splitsMode, displayMode } } } = useSelector( broadcastGraphicsSelector, ); @@ -57,102 +33,18 @@ export function TimingTower() { }); setRetiredCarsCount(retiredCount); - setRows(startingGrid.map(car => buildRow(car, startingGrid.length, retiredCount))); - }, [lastUpdate, splitsMode]); - - - const buildRow = ( - car: Car, - startingCarsCount: number, - retiredCarsCount: number, - ) => { - const bottomRounded = car.status === CarStatus.Retired ? ( - car.position === startingCarsCount - ) : ( - car.position === startingCarsCount - retiredCarsCount - ); - - let rightHalfContent = ""; - let xScale: Fraction = 1.0; - let yScale: Fraction = 1.0; - - if (car.position === 1) { - rightHalfContent = splitsMode === BGTimingTowerSplitsMode.Leader - ? "Leader" : splitsMode === BGTimingTowerSplitsMode.Interval - ? "Interval" : ""; - } else if (car.status === CarStatus.Retired) { - rightHalfContent = "OUT"; - } else { - const deltaCar = getCarAtPos( - grid, - splitsMode === BGTimingTowerSplitsMode.Leader ? 1 : car.position - 1, - ); - - const plusLaps = Math.floor((deltaCar.distance - car.distance) / trackLength); - - rightHalfContent = - splitsMode === BGTimingTowerSplitsMode.Leader && plusLaps > 0 - ? `+${plusLaps} LAP${plusLaps > 1 ? "S" : ""}` - : `+${formatTime(timeDiff(deltaCar.distance, car.distance), 60)}`; - - xScale = rightHalfContent.includes(":") ? 0.75 : 0.9; - yScale = rightHalfContent.includes("+") ? 1.1 : 1.0; - } - - return ( - + - {car.notices.includes(CarNotice.FastestLap) && ( - - )} - - - {car.status !== CarStatus.Retired && ( - - )} - - {car.driver.initials} - - - - - - - - - - {rightHalfContent} - - - - - ); - }; + car={car} + grid={grid} + startingCarsCount={startingGrid.length} + retiredCarsCount={retiredCount} + splitsMode={splitsMode} + displayMode={displayMode} + trackLength={trackLength} + />)); + }, [lastUpdate, splitsMode]); return ( 0 + ? `+${plusLaps} LAP${plusLaps > 1 ? "S" : ""}` + : `+${formatTime(timeDiff(deltaCar.distance, car.distance), 60)}`; + + xScale = rightHalfContent.includes(":") ? 0.75 : 0.9; + yScale = rightHalfContent.includes("+") ? 1.1 : 1.0; + } + + return ( + + {car.notices.includes(CarNotice.FastestLap) && ( + + )} + + + {car.status !== CarStatus.Retired && ( + + )} + + {car.driver.initials} + + + + + + + + + + {rightHalfContent} + + + + + ); +} diff --git a/src/features/broadcast/graphics/broadcastGraphicsSlice.ts b/src/features/broadcast/graphics/broadcastGraphicsSlice.ts index 9d1eb55..b0ab9c1 100644 --- a/src/features/broadcast/graphics/broadcastGraphicsSlice.ts +++ b/src/features/broadcast/graphics/broadcastGraphicsSlice.ts @@ -3,7 +3,7 @@ import { createSlice, PayloadAction } from "@reduxjs/toolkit"; import { BGChyrons, BGStatusIndicatorModes, - BGTimingTowerDisplayModes, + BGTimingTowerDisplayMode, BGTimingTowerFocusedCarsMode, BGTimingTowerSplitsMode, OpenState, @@ -20,7 +20,7 @@ const initialState: RootState["broadcastGraphics"] = { }, timingTower: { open: 1, - displayMode: BGTimingTowerDisplayModes.LeftAndRight, + displayMode: BGTimingTowerDisplayMode.LeftAndRight, splitsMode: BGTimingTowerSplitsMode.Leader, focusedCars: [], focusedCarsMode: BGTimingTowerFocusedCarsMode.None, diff --git a/src/types/state.ts b/src/types/state.ts index 9c95c0f..109752b 100644 --- a/src/types/state.ts +++ b/src/types/state.ts @@ -294,12 +294,12 @@ export enum BGStatusIndicatorModes { // Timing Tower export interface BGTimingTower { open: OpenState; - displayMode: BGTimingTowerDisplayModes; + displayMode: BGTimingTowerDisplayMode; splitsMode: BGTimingTowerSplitsMode, focusedCars: Car[], focusedCarsMode: BGTimingTowerFocusedCarsMode, } -export enum BGTimingTowerDisplayModes { +export enum BGTimingTowerDisplayMode { Hidden, LeftOnly, LeftAndRight,