From de03f24b703aaf2556546af87a204e925f26f7af Mon Sep 17 00:00:00 2001 From: Kyle Geib Date: Sun, 13 Mar 2022 15:02:39 -0500 Subject: [PATCH 1/3] 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", From 0e8ef14dcd408a4e6688e42d4940890e02b48d17 Mon Sep 17 00:00:00 2001 From: Kyle Geib Date: Mon, 14 Mar 2022 07:18:59 -0500 Subject: [PATCH 2/3] ISSUE-069 - Found and corrected alignment issue. --- .../BroadcastGraphics/TimingBoard/TimingTower/styles.ts | 2 ++ src/shared/theme.ts | 1 + 2 files changed, 3 insertions(+) diff --git a/src/components/BroadcastGraphics/TimingBoard/TimingTower/styles.ts b/src/components/BroadcastGraphics/TimingBoard/TimingTower/styles.ts index 6613039..a3c749d 100644 --- a/src/components/BroadcastGraphics/TimingBoard/TimingTower/styles.ts +++ b/src/components/BroadcastGraphics/TimingBoard/TimingTower/styles.ts @@ -119,6 +119,7 @@ export const RowLeftHalfLayout = styled.div` display: flex; padding-left: 3px; + align-items: center; justify-content: flex-start; `; RowLeftHalfLayout.displayName = "RowLeftHalfLayout"; @@ -199,6 +200,7 @@ RowRightHalfLayout.displayName = "RowRightHalfLayout"; export const DriverNameContainer = styled.div` position: relative; margin-left: ${p => p.theme.design.timingTower.nameLeftMarginPx}px; + margin-top: ${p => p.theme.design.timingTower.nameTopMarginPx}px; `; DriverNameContainer.displayName = "DriverNameContainer"; diff --git a/src/shared/theme.ts b/src/shared/theme.ts index ea0fd72..492cd38 100644 --- a/src/shared/theme.ts +++ b/src/shared/theme.ts @@ -84,6 +84,7 @@ export const theme = { teamGemSizePx: 30, posFlagSizePx: 32, nameLeftMarginPx: 14, + nameTopMarginPx: 4, rowRoundedCornerRadiusPx: 5, wipeDelayMs: 3500, wipeDurationMs: 400, From 4bf471bd99f739b10223a78c5c2696c7f6eb27f6 Mon Sep 17 00:00:00 2001 From: Kyle Geib Date: Mon, 14 Mar 2022 08:49:14 -0500 Subject: [PATCH 3/3] ISSUE-069 - FL wipe working. Big refactor of how the PositionFlag components work. I flipped the way the wipe effect works. Originally there was the complicated problem of revealing a flag instantly and then wiping it away, requiring some delicate work with mounting and unmounting components. Instead it now works by always having a colored PositionFlag component in place and temporarily disappearing the normal PositionFlag (that is on top of it) using a transition-free opacity switch that lets the WipeTransition work reliably. This makes for fewer states and conditional renders. Added textColor and bgColor props to the PositionFlag component for flexibility. --- .../Common/PositionFlag/PositionFlag.tsx | 10 +- .../Common/PositionFlag/styles.ts | 2 + .../TimingTower/TimingTowerRow.tsx | 91 ++++++++++--------- .../TimingBoard/TimingTower/styles.ts | 13 +-- src/shared/theme.ts | 1 + 5 files changed, 58 insertions(+), 59 deletions(-) diff --git a/src/components/BroadcastGraphics/Common/PositionFlag/PositionFlag.tsx b/src/components/BroadcastGraphics/Common/PositionFlag/PositionFlag.tsx index 660d0ac..e35c1ad 100644 --- a/src/components/BroadcastGraphics/Common/PositionFlag/PositionFlag.tsx +++ b/src/components/BroadcastGraphics/Common/PositionFlag/PositionFlag.tsx @@ -7,17 +7,19 @@ type PositionFlagProps = { size: Px, number: number, numberSizeFraction?: Fraction, - color?: string; + bgColor?: string, + numberColor?: string, }; export function PositionFlag({ size, number, numberSizeFraction = 0.64, - color = theme.colors.posWhite, + bgColor = theme.colors.posWhite, + numberColor = theme.colors.black, }: PositionFlagProps) { return ( - - + + {number} diff --git a/src/components/BroadcastGraphics/Common/PositionFlag/styles.ts b/src/components/BroadcastGraphics/Common/PositionFlag/styles.ts index 979d8bb..22967a5 100644 --- a/src/components/BroadcastGraphics/Common/PositionFlag/styles.ts +++ b/src/components/BroadcastGraphics/Common/PositionFlag/styles.ts @@ -21,10 +21,12 @@ PositionFlagBox.displayName = "PositionFlagBox"; type PositionNumberProps = { size: Px, + color: string, }; export const PositionNumber = styled.span` font-family: ${p => p.theme.fonts.f1Regular}; font-size: ${({ size }) => size}px; + color: ${({ color }) => color}; margin-top: 2px; `; PositionNumber.displayName = "PositionNumber"; diff --git a/src/components/BroadcastGraphics/TimingBoard/TimingTower/TimingTowerRow.tsx b/src/components/BroadcastGraphics/TimingBoard/TimingTower/TimingTowerRow.tsx index 238aaf1..d8c7772 100644 --- a/src/components/BroadcastGraphics/TimingBoard/TimingTower/TimingTowerRow.tsx +++ b/src/components/BroadcastGraphics/TimingBoard/TimingTower/TimingTowerRow.tsx @@ -62,31 +62,38 @@ export function TimingTowerRow({ const { design: { timingTower: ttTheme } } = theme; const [pastPos, setPastPos] = useState(car.position); - const [posChange, setPosChange] = useState(0); - const [pastFLHolder, setPastFLHolder] = useState(false); + const [currentFL, setCurrentFL] = 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. showPosWipe is true for only 1ms before being switched back off. - const [showPosOutline, setShowPosOutline] = useState(false); + // change effects. When a const [showOutline, setShowOutline] = useState(false); - const [showPosWipe, setShowPosWipe] = useState(false); - useTimeoutWhen(() => setShowPosOutline(false), ( - ttTheme.wipeDelayMs + ttTheme.wipeDurationMs - ) * DDM, showPosOutline); useTimeoutWhen(() => setShowOutline(false), ttTheme.rowTravelDurationMs * DDM, showOutline); - useTimeoutWhen(() => setShowPosWipe(false), 1, showPosWipe); + const [showChangeFlag, setShowChangeFlag] = useState(false); + useTimeoutWhen(() => setShowChangeFlag(false), ttTheme.wipeDelayMs * DDM, showChangeFlag); + const [changeColors, setChangeColors] = useState<[string, string]>(["white", "black"]); useEffect(() => { if (car.position !== pastPos) { + // Position change. + setShowChangeFlag(true); + setChangeColors([ + car.position < pastPos ? theme.colors.posGainedGreen : theme.colors.posLostRed, + theme.colors.black, + ]); setPastPos(car.position); - setPosChange(pastPos - car.position); - setShowPosOutline(true); setShowOutline(true); - setShowPosWipe(true); + } else if (car.notices.includes(CarNotice.FastestLap) && !currentFL) { + // Fastest Lap gained. + setShowChangeFlag(true); + setCurrentFL(true); + setChangeColors([theme.colors.posFastestLap, theme.colors.textWhite]); + } else if (currentFL && !car.notices.includes(CarNotice.FastestLap)) { + // Fastest Lap lost. + setCurrentFL(false); } - }, [car.position]); + }, [car.position, car.notices]); useEffect(() => { if (pastDisplayMode !== displayMode) { @@ -105,7 +112,7 @@ export function TimingTowerRow({ }, [displayMode]); const { outlineClipPathProgress } = useSpring({ - outlineClipPathProgress: showPosOutline ? 1 : 0, + outlineClipPathProgress: showOutline ? 1 : 0, config: { duration: 333 * DDM }, delay: 0 * DDM, }); @@ -201,36 +208,34 @@ export function TimingTowerRow({ > {car.status !== CarStatus.Retired && ( + /** + * The "Change" PositionFlag (the colored one) is always present but + * usually hidden under a second visible "Normal" PositionFlag. When + * a change is made the normal PositionFlag is hidden instantly and + * after a delay is revealed. With the reveal a WipeTransition also + * takes place. Before, the "Change" PositionFlag would wipe away. + * Now, instead, it is hidden under a revealed "Normal" PositionFlag. + */ - - {(showPosOutline) && ( - - 0 - ? theme.colors.posGainedGreen - : theme.colors.posLostRed} - /> - - - )} + + + + )} @@ -285,12 +290,8 @@ export function TimingTowerRow({ open={showOutline} startThickness={1.5} endThickness={1.5} - startColor={posChange > 0 - ? theme.colors.posGainedGreen - : theme.colors.posLostRed} - endColor={posChange > 0 - ? theme.colors.posGainedGreen - : theme.colors.posLostRed} + startColor={changeColors[0]} + endColor={changeColors[0]} transitionProps={[{ property: "opacity", duration: 333 * DDM, diff --git a/src/components/BroadcastGraphics/TimingBoard/TimingTower/styles.ts b/src/components/BroadcastGraphics/TimingBoard/TimingTower/styles.ts index a3c749d..715e4da 100644 --- a/src/components/BroadcastGraphics/TimingBoard/TimingTower/styles.ts +++ b/src/components/BroadcastGraphics/TimingBoard/TimingTower/styles.ts @@ -6,6 +6,7 @@ import { Px, DirectionalTransitionProps, TransitionProps, + OpenProps, } from "../../../../types/style"; import { Milliseconds } from "../../../../types/util"; import { commonDirectionalTransition, commonTransition } from "../../../../utils/styling"; @@ -134,20 +135,12 @@ export const RowLeftHalfPosFlagContainer = styled.div` +export const RowLeftHalfPosFlagChangeContainer = styled.div` position: absolute; top: 0; left: 0; - height: ${({ size }) => size}px; - width: ${({ size }) => size}px; - opacity: ${({ visible }) => visible ? 1 : 0}; - transition: opacity ${({ transitionTime }) => transitionTime}ms; + opacity: ${({ open }) => open ? 1 : 0}; `; RowLeftHalfPosFlagChangeContainer.displayName = "RowLeftHalfPosFlagChangeContainer"; diff --git a/src/shared/theme.ts b/src/shared/theme.ts index 492cd38..ca32eb4 100644 --- a/src/shared/theme.ts +++ b/src/shared/theme.ts @@ -21,6 +21,7 @@ export const theme = { posLostRed: "#e40030", posGainedGreen: "#10ff35", posFastestLap: "#ae43ca", + black: "#000", grey: "#aaa", lightGrey: "#ddd", faintGrey: "#eee",