diff --git a/src/components/BroadcastGraphics/Chyrons/Driver/ChyronDriver.tsx b/src/components/BroadcastGraphics/Chyrons/Driver/ChyronDriver.tsx index be5f22b..888442e 100644 --- a/src/components/BroadcastGraphics/Chyrons/Driver/ChyronDriver.tsx +++ b/src/components/BroadcastGraphics/Chyrons/Driver/ChyronDriver.tsx @@ -2,7 +2,7 @@ import { useSpring } from "@react-spring/web"; import { useDispatch } from "react-redux"; import { BGChyronDriver, BGChyronSubMode, OpenState } from "../../../../types/state"; -import { DebugDurationProps, Fraction } from "../../../../types/style"; +import { DebugDurationProps } from "../../../../types/style"; import { clearChyrons } from "../../../../features/broadcast/graphics/broadcastGraphicsSlice"; import { theme } from "../../../../shared/theme"; import { outlineClipPath } from "../../../../utils/styling"; diff --git a/src/components/BroadcastGraphics/TimingBoard/StatusIndicator/StatusIndicator.tsx b/src/components/BroadcastGraphics/TimingBoard/StatusIndicator/StatusIndicator.tsx index 5dce1b6..96453ac 100644 --- a/src/components/BroadcastGraphics/TimingBoard/StatusIndicator/StatusIndicator.tsx +++ b/src/components/BroadcastGraphics/TimingBoard/StatusIndicator/StatusIndicator.tsx @@ -1,6 +1,8 @@ import { useSelector } from "react-redux"; import { broadcastGraphicsSelector } from "../../../../features/broadcast/graphics/broadcastGraphicsSelector"; +import { theme } from "../../../../shared/theme"; +import { BGStatusIndicatorModes } from "../../../../types/state"; import { DebugDurationProps } from "../../../../types/style"; import { StatusIndicatorBase } from "./styles"; @@ -10,12 +12,23 @@ type StatusIndicatorProps = DebugDurationProps; export function StatusIndicator({ debugDurationMultiplier: DDM = 1.0, }: StatusIndicatorProps) { + const { design: { timingTower: ttTheme } } = theme; + const { timingBoard: { statusIndicator: { mode } } } = useSelector(broadcastGraphicsSelector); return ( ); } diff --git a/src/components/BroadcastGraphics/TimingBoard/StatusIndicator/styles.ts b/src/components/BroadcastGraphics/TimingBoard/StatusIndicator/styles.ts index bf7d4d0..4c3229c 100644 --- a/src/components/BroadcastGraphics/TimingBoard/StatusIndicator/styles.ts +++ b/src/components/BroadcastGraphics/TimingBoard/StatusIndicator/styles.ts @@ -1,22 +1,17 @@ -import styled, { css } from "styled-components"; +import styled from "styled-components"; -import { BGStatusIndicatorModes } from "../../../../types/state"; +import { DirectionalTransitionProps } from "../../../../types/style"; +import { commonDirectionalTransition } from "../../../../utils/styling"; -type StatusIndicatorBaseProps = { - mode: BGStatusIndicatorModes, -}; -export const StatusIndicatorBase = styled.div` +export const StatusIndicatorBase = styled.div` background-color: black; border-top-right-radius: ${p => p.theme.design.statusIndicator.roundedCornerRadiusPx}px; height: ${p => p.theme.design.statusIndicator.heightNormalPx}px; - width: ${({ theme: { design: { timingTower } }, mode }) => { - if (mode === BGStatusIndicatorModes.LapNarrow) { - return timingTower.rowLeftHalfWidthPx; - } - if (mode === BGStatusIndicatorModes.LapWide) { - return timingTower.rowLeftHalfWidthPx + timingTower.rowRightHalfWidthPx; - } - return 10; - }}px; + width: ${({ theme: { design: { timingTower: ttTheme } }, open }) => open + ? ttTheme.rowLeftHalfWidthPx + ttTheme.rowRightHalfWidthPx + : ttTheme.rowLeftHalfWidthPx}px; + + ${({ open, transitionOpeningProps, transitionClosingProps, transitionProps }) => + commonDirectionalTransition(open, transitionOpeningProps, transitionClosingProps, transitionProps)} `; StatusIndicatorBase.displayName = "StatusIndicatorBase"; diff --git a/src/components/BroadcastGraphics/TimingBoard/TimingTower/TimingTowerRow.tsx b/src/components/BroadcastGraphics/TimingBoard/TimingTower/TimingTowerRow.tsx index 854c499..2a51827 100644 --- a/src/components/BroadcastGraphics/TimingBoard/TimingTower/TimingTowerRow.tsx +++ b/src/components/BroadcastGraphics/TimingBoard/TimingTower/TimingTowerRow.tsx @@ -8,7 +8,7 @@ import { getCarAtPos, timeDiff } from "../../../../utils/event"; import { formatTime, outlineClipPath } from "../../../../utils/styling"; import { DebugDurationProps, Fraction } from "../../../../types/style"; -import { Meters, Milliseconds } from "../../../../types/util"; +import { Meters } from "../../../../types/util"; import { BGTimingTowerDisplayMode, BGTimingTowerSplitsMode, @@ -39,12 +39,6 @@ import { } from "./styles"; import useMeasure from "react-use-measure"; -const WIPE_DELAY: Milliseconds = 3500; -const WIPE_DURATION: Milliseconds = 400; -const TRAVEL_DURATION: Milliseconds = 750; -const FULL_WIDTH_DURATION: Milliseconds = 750; -const FULL_WIDTH_CLOSE_DELAY: Milliseconds = 333; - type TimingTowerRowProps = DebugDurationProps & { car: Car; grid: Grid; @@ -64,6 +58,8 @@ export function TimingTowerRow({ trackLength, debugDurationMultiplier: DDM = 1.0, }: TimingTowerRowProps) { + const { design: { timingTower: ttTheme } } = theme; + const [pastPos, setPastPos] = useState(car.position); const [posChange, setPosChange] = useState(0); const [pastDisplayMode, setPastDisplayMode] = useState(displayMode); @@ -74,8 +70,10 @@ export function TimingTowerRow({ const [showPosChange, setShowPosChange] = useState(false); const [showOutline, setShowOutline] = useState(false); const [wipeVisible, setWipeVisible] = useState(false); - useTimeoutWhen(() => setShowPosChange(false), (WIPE_DELAY + WIPE_DURATION) * DDM, showPosChange); - useTimeoutWhen(() => setShowOutline(false), TRAVEL_DURATION * DDM, showOutline); + useTimeoutWhen(() => setShowPosChange(false), ( + ttTheme.wipeDelayMs + ttTheme.wipeDurationMs + ) * DDM, showPosChange); + useTimeoutWhen(() => setShowOutline(false), ttTheme.rowTravelDurationMs * DDM, showOutline); useTimeoutWhen(() => setWipeVisible(false), 1, wipeVisible); useEffect(() => { @@ -148,80 +146,74 @@ export function TimingTowerRow({ yScale = rightHalfContent.includes("+") ? 1.1 : 1.0; } - const { design: { timingTower: timingTowerTheme } } = theme; - return ( {car.notices.includes(CarNotice.FastestLap) && ( )} {car.status !== CarStatus.Retired && ( - + {showPosChange && ( 0 @@ -240,7 +232,7 @@ export function TimingTowerRow({ transitionOpeningProps={[{ property: "opacity", duration: 333 * DDM, - delay: (FULL_WIDTH_DURATION - 333) * DDM, + delay: (ttTheme.fullWidthDurationMs - 333) * DDM, }]} transitionClosingProps={[{ property: "opacity", @@ -254,7 +246,7 @@ export function TimingTowerRow({ open={displayMode === BGTimingTowerDisplayMode.FullLeft} transitionOpeningProps={[{ property: "width", - duration: FULL_WIDTH_DURATION * 2 * DDM, + duration: ttTheme.fullWidthDurationMs * 2 * DDM, delay: 0 * DDM, }, { property: "opacity", @@ -263,12 +255,12 @@ export function TimingTowerRow({ }]} transitionClosingProps={[{ property: "width", - duration: FULL_WIDTH_DURATION * DDM, + duration: ttTheme.fullWidthDurationMs * DDM, delay: 0 * DDM, }, { property: "opacity", duration: 333 * DDM, - delay: (FULL_WIDTH_DURATION - 333) * DDM, + delay: (ttTheme.fullWidthDurationMs - 333) * DDM, }]} > @@ -278,7 +270,7 @@ export function TimingTowerRow({ - + @@ -346,12 +338,12 @@ export function TimingTowerRow({ open={displayMode === BGTimingTowerDisplayMode.LeftAndRight} transitionOpeningProps={[{ property: "opacity", - duration: FULL_WIDTH_DURATION * DDM, - delay: FULL_WIDTH_CLOSE_DELAY * DDM, + duration: ttTheme.fullWidthDurationMs * DDM, + delay: ttTheme.fullWidthCloseDelayMs * DDM, }]} transitionClosingProps={[{ property: "opacity", - duration: FULL_WIDTH_DURATION * DDM, + duration: ttTheme.fullWidthDurationMs * DDM, }]} > {rightHalfContent} diff --git a/src/components/BroadcastGraphics/TimingBoard/TimingTower/styles.ts b/src/components/BroadcastGraphics/TimingBoard/TimingTower/styles.ts index a92556e..4db4e76 100644 --- a/src/components/BroadcastGraphics/TimingBoard/TimingTower/styles.ts +++ b/src/components/BroadcastGraphics/TimingBoard/TimingTower/styles.ts @@ -197,7 +197,7 @@ RowRightHalfLayout.displayName = "RowRightHalfLayout"; export const DriverNameContainer = styled.div` position: relative; - margin-left: ${p => p.theme.design.timingTower.nameLeftMargin}px; + margin-left: ${p => p.theme.design.timingTower.nameLeftMarginPx}px; `; DriverNameContainer.displayName = "DriverNameContainer"; diff --git a/src/features/broadcast/graphics/broadcastGraphicsSlice.ts b/src/features/broadcast/graphics/broadcastGraphicsSlice.ts index b8b2687..ffcbc5f 100644 --- a/src/features/broadcast/graphics/broadcastGraphicsSlice.ts +++ b/src/features/broadcast/graphics/broadcastGraphicsSlice.ts @@ -60,6 +60,11 @@ export const broadcastGraphicsSlice = createSlice({ state.timingBoard.timingTower.splitsMode = action.payload; }, setTimingTowerDisplayMode: (state, action: PayloadAction) => { + if (action.payload === BGTimingTowerDisplayMode.FullLeft) { + state.timingBoard.statusIndicator.mode = BGStatusIndicatorModes.LapWide; + } else { + state.timingBoard.statusIndicator.mode = BGStatusIndicatorModes.LapNarrow; + } state.timingBoard.timingTower.displayMode = action.payload; }, }, diff --git a/src/shared/theme.ts b/src/shared/theme.ts index cbd4ea7..437f3ee 100644 --- a/src/shared/theme.ts +++ b/src/shared/theme.ts @@ -76,10 +76,15 @@ export const theme = { rowLeftHalfWidthPx: 147, rowRightHalfWidthPx: 108, retiredTopGapPx: 3, - teamGemSize: 30, - posFlagSize: 32, - nameLeftMargin: 14, + teamGemSizePx: 30, + posFlagSizePx: 32, + nameLeftMarginPx: 14, rowRoundedCornerRadiusPx: 5, + wipeDelayMs: 3500, + wipeDurationMs: 400, + rowTravelDurationMs: 750, + fullWidthDurationMs: 750, + fullWidthCloseDelayMs: 333, }, button: { borderRadius: "0.25rem",