From de03f24b703aaf2556546af87a204e925f26f7af Mon Sep 17 00:00:00 2001 From: Kyle Geib Date: Sun, 13 Mar 2022 15:02:39 -0500 Subject: [PATCH] ISSUE-069 - Toast FL gem implemented. Appears to be a possible alignment issue with the PosFlag component - I think a margin above the component is missing. Will look into it. --- .../Common/PositionFlag/PositionFlag.tsx | 2 +- .../TimingTower/TimingTowerRow.tsx | 38 +++++++++++-------- .../TimingBoard/TimingTower/styles.ts | 20 ++++++++-- .../TimingTowerPrototypeControls.tsx | 11 +++++- src/features/event/eventSlice.ts | 4 ++ src/shared/theme.ts | 4 +- 6 files changed, 58 insertions(+), 21 deletions(-) diff --git a/src/components/BroadcastGraphics/Common/PositionFlag/PositionFlag.tsx b/src/components/BroadcastGraphics/Common/PositionFlag/PositionFlag.tsx index 82cbbf9..660d0ac 100644 --- a/src/components/BroadcastGraphics/Common/PositionFlag/PositionFlag.tsx +++ b/src/components/BroadcastGraphics/Common/PositionFlag/PositionFlag.tsx @@ -13,7 +13,7 @@ export function PositionFlag({ size, number, numberSizeFraction = 0.64, - color = theme.colors.positionFlagBG, + color = theme.colors.posWhite, }: PositionFlagProps) { return ( diff --git a/src/components/BroadcastGraphics/TimingBoard/TimingTower/TimingTowerRow.tsx b/src/components/BroadcastGraphics/TimingBoard/TimingTower/TimingTowerRow.tsx index 2a51827..238aaf1 100644 --- a/src/components/BroadcastGraphics/TimingBoard/TimingTower/TimingTowerRow.tsx +++ b/src/components/BroadcastGraphics/TimingBoard/TimingTower/TimingTowerRow.tsx @@ -36,6 +36,7 @@ import { AnimatedRowLeftHalfOutline, DriverNameContainer, DriverNameWipe, + FastestLapContainer, } from "./styles"; import useMeasure from "react-use-measure"; @@ -62,27 +63,28 @@ export function TimingTowerRow({ const [pastPos, setPastPos] = useState(car.position); const [posChange, setPosChange] = useState(0); + const [pastFLHolder, setPastFLHolder] = useState(false); const [pastDisplayMode, setPastDisplayMode] = useState(displayMode); const [hugRight, setHugRight] = useState(true); // Using timeouts and boolean states I can manipulate visiblity of the position - // change effects. wipeVisible is true for only 1ms before being switched back off. - const [showPosChange, setShowPosChange] = useState(false); + // change effects. showPosWipe is true for only 1ms before being switched back off. + const [showPosOutline, setShowPosOutline] = useState(false); const [showOutline, setShowOutline] = useState(false); - const [wipeVisible, setWipeVisible] = useState(false); - useTimeoutWhen(() => setShowPosChange(false), ( + const [showPosWipe, setShowPosWipe] = useState(false); + useTimeoutWhen(() => setShowPosOutline(false), ( ttTheme.wipeDelayMs + ttTheme.wipeDurationMs - ) * DDM, showPosChange); + ) * DDM, showPosOutline); useTimeoutWhen(() => setShowOutline(false), ttTheme.rowTravelDurationMs * DDM, showOutline); - useTimeoutWhen(() => setWipeVisible(false), 1, wipeVisible); + useTimeoutWhen(() => setShowPosWipe(false), 1, showPosWipe); useEffect(() => { if (car.position !== pastPos) { setPastPos(car.position); setPosChange(pastPos - car.position); - setShowPosChange(true); + setShowPosOutline(true); setShowOutline(true); - setWipeVisible(true); + setShowPosWipe(true); } }, [car.position]); @@ -103,7 +105,7 @@ export function TimingTowerRow({ }, [displayMode]); const { outlineClipPathProgress } = useSpring({ - outlineClipPathProgress: showPosChange ? 1 : 0, + outlineClipPathProgress: showPosOutline ? 1 : 0, config: { duration: 333 * DDM }, delay: 0 * DDM, }); @@ -154,9 +156,15 @@ export function TimingTowerRow({ top={(car.position - 1) * ttTheme.rowHeightPx} transitionTime={ttTheme.rowTravelDurationMs * DDM} > - {car.notices.includes(CarNotice.FastestLap) && ( - - )} + + + - {showPosChange && ( + {(showPosOutline) && ( ` `; TimeDiff.displayName = "TimeDiff"; -export const FastestLapGem = styled.div` +export const FastestLapContainer = styled.div` position: absolute; + left: ${p => -p.theme.design.timingTower.rowHeightPx + 2}px; + top: 0; height: ${p => p.theme.design.timingTower.rowHeightPx}px; width: ${p => p.theme.design.timingTower.rowHeightPx - 2}px; - left: ${p => -p.theme.design.timingTower.rowHeightPx + 2}px; + overflow: clip; +`; + +export const FastestLapGem = styled.div` + position: absolute; + left: ${({ open }) => open ? 0 + : p => p.theme.design.timingTower.rowHeightPx}px; top: 0; + height: ${p => p.theme.design.timingTower.rowHeightPx}px; + width: ${p => p.theme.design.timingTower.rowHeightPx - 2}px; + background-color: ${p => p.theme.colors.laps.purple}; background-image: url(${fastestLapIcon}); background-repeat: no-repeat; background-size: 89%; background-position: center 40%; + + ${({ transitionProps }) => commonTransition(transitionProps)} `; FastestLapGem.displayName = "FastestLapGem"; diff --git a/src/components/Workspaces/PrototypingControls/TimingTowerPrototype/TimingTowerPrototypeControls.tsx b/src/components/Workspaces/PrototypingControls/TimingTowerPrototype/TimingTowerPrototypeControls.tsx index ab8bcc9..af9dd9d 100644 --- a/src/components/Workspaces/PrototypingControls/TimingTowerPrototype/TimingTowerPrototypeControls.tsx +++ b/src/components/Workspaces/PrototypingControls/TimingTowerPrototype/TimingTowerPrototypeControls.tsx @@ -8,7 +8,7 @@ import { broadcastDirectorSelector } from "../../../../features/broadcast/direct import { broadcastGraphicsSelector } from "../../../../features/broadcast/graphics/broadcastGraphicsSelector"; import { setTimingTowerDisplayMode, setTimingTowerSplitsMode } from "../../../../features/broadcast/graphics/broadcastGraphicsSlice"; import { eventSelector } from "../../../../features/event/eventSelector"; -import { increaseDistance, refreshRunningOrder, setCarStatus } from "../../../../features/event/eventSlice"; +import { awardFastestLap, increaseDistance, refreshRunningOrder, setCarStatus } from "../../../../features/event/eventSlice"; import { BGTimingTowerDisplayMode, BGTimingTowerSplitsMode, CarStatus } from "../../../../types/state"; import { GridSelection } from "../GridSelection"; @@ -90,6 +90,15 @@ export function TimingTowerPrototypeControls() { > Un-retire + { + if (selectedCars.length > 0) { + dispatch(awardFastestLap(selectedCars[0])); + } + }} + > + Award FL +
diff --git a/src/features/event/eventSlice.ts b/src/features/event/eventSlice.ts index 65a691c..7140802 100644 --- a/src/features/event/eventSlice.ts +++ b/src/features/event/eventSlice.ts @@ -222,6 +222,10 @@ interface SetCarStatusAction { status: CarStatus; } +/** + * Note: Add `state.lastUpdate = Date.now();` to the end of every reducer to + * keep components up to date that watch for changes with useEffect() functions. + */ export const eventSlice = createSlice({ name: "event", initialState, diff --git a/src/shared/theme.ts b/src/shared/theme.ts index b6f91ee..ea0fd72 100644 --- a/src/shared/theme.ts +++ b/src/shared/theme.ts @@ -20,13 +20,14 @@ export const theme = { disabledRed: "#e08a91", posLostRed: "#e40030", posGainedGreen: "#10ff35", + posFastestLap: "#ae43ca", grey: "#aaa", lightGrey: "#ddd", faintGrey: "#eee", darkGrey: "#303030", dimGrey: "#999", videoFrameBG: "#333", - positionFlagBG: "#f4f3ee", + posWhite: "#f4f3ee", textWhite: "#f1f1f1", // I found it to be #f2f2f2 but whatever teams: { // 2021 Season alfaRomeo: "#900000", @@ -89,6 +90,7 @@ export const theme = { rowTravelDurationMs: 750, fullWidthDurationMs: 750, fullWidthCloseDelayMs: 333, + fastestLapToastDurationMs: 500, }, button: { borderRadius: "0.25rem",