diff --git a/src/components/BroadcastGraphics/TimingBoard/TimingTower/TimingTower.tsx b/src/components/BroadcastGraphics/TimingBoard/TimingTower/TimingTower.tsx index 7d3e445..fa1b1a4 100644 --- a/src/components/BroadcastGraphics/TimingBoard/TimingTower/TimingTower.tsx +++ b/src/components/BroadcastGraphics/TimingBoard/TimingTower/TimingTower.tsx @@ -48,7 +48,7 @@ export function TimingTower({ debugDurationMultiplier: DDM }: TimingTowerProps) trackLength={trackLength} debugDurationMultiplier={DDM} />)); - }, [lastUpdate, splitsMode]); + }, [lastUpdate, splitsMode, displayMode]); return ( setshowPosChange(false), (WIPE_DELAY + WIPE_DURATION) * DDM, showPosChange); + useTimeoutWhen(() => setShowPosChange(false), (WIPE_DELAY + WIPE_DURATION) * DDM, showPosChange); useTimeoutWhen(() => setShowOutline(false), TRAVEL_DURATION * DDM, showOutline); useTimeoutWhen(() => setWipeVisible(false), 1, wipeVisible); @@ -77,12 +81,28 @@ export function TimingTowerRow({ if (car.position !== pastPos) { setPastPos(car.position); setPosChange(pastPos - car.position); - setshowPosChange(true); + setShowPosChange(true); setShowOutline(true); setWipeVisible(true); } }, [car.position]); + useEffect(() => { + if (pastDisplayMode !== displayMode) { + if ((pastDisplayMode === BGTimingTowerDisplayMode.LeftAndRight + && displayMode === BGTimingTowerDisplayMode.FullLeft) || ( + pastDisplayMode === BGTimingTowerDisplayMode.FullLeft + && displayMode === BGTimingTowerDisplayMode.LeftAndRight + ) + ) { + setHugRight(true); + } else { + setHugRight(false); + } + setPastDisplayMode(displayMode); + } + }, [displayMode]); + const { outlineClipPathProgress } = useSpring({ outlineClipPathProgress: showPosChange ? 1 : 0, config: { duration: 333 * DDM }, @@ -146,7 +166,12 @@ export function TimingTowerRow({ BGTimingTowerDisplayMode.FullLeft, ) ? 5 : undefined } - transitionTime={TRAVEL_DURATION * DDM} + cornerTransitionTime={TRAVEL_DURATION * DDM} + transitionProps={[{ + property: "width", + duration: FULL_WIDTH_DURATION * DDM, + }]} + wide={displayMode === BGTimingTowerDisplayMode.FullLeft} ref={leftHalfRef} > @@ -182,12 +207,21 @@ export function TimingTowerRow({ )} - )} - - {car.driver.initials} - + + + {car.driver.initials} + + + {car.driver.lastName} + + @@ -231,7 +265,13 @@ export function TimingTowerRow({ BGTimingTowerSplitsMode.Interval, ) ? 5 : undefined } - transitionTime={TRAVEL_DURATION * DDM} + cornerTransitionTime={TRAVEL_DURATION * DDM} + collapsed={displayMode !== BGTimingTowerDisplayMode.LeftAndRight} + transitionProps={[{ + property: "width", + duration: FULL_WIDTH_DURATION * DDM, + }]} + hugRight={hugRight} > diff --git a/src/components/BroadcastGraphics/TimingBoard/TimingTower/styles.ts b/src/components/BroadcastGraphics/TimingBoard/TimingTower/styles.ts index eaaa8e3..90206d0 100644 --- a/src/components/BroadcastGraphics/TimingBoard/TimingTower/styles.ts +++ b/src/components/BroadcastGraphics/TimingBoard/TimingTower/styles.ts @@ -11,7 +11,7 @@ import fastestLapIcon from "../../../../public/images/icons/fastest-lap.svg"; type OpenProps = { open: boolean, }; -type TransitionProps = OpenProps & { +type TransitionProps = { transitionProps: TransitionArgs[], }; @@ -61,30 +61,38 @@ AnimatedRowContainer.displayName = "AnimatedRowContainer"; type RoundedProp = { roundedCornerTop?: Px, roundedCornerBottom?: Px, - transitionTime: Milliseconds, + cornerTransitionTime: Milliseconds, }; const Rounded = styled.div` ${({ roundedCornerTop }) => roundedCornerTop && css`border-top-right-radius: ${roundedCornerTop}px;`} ${({ roundedCornerBottom }) => roundedCornerBottom && css`border-bottom-right-radius: ${roundedCornerBottom}px;`} - transition: border-top-right-radius ${({ transitionTime }) => transitionTime}ms, - border-bottom-right-radius ${({ transitionTime }) => transitionTime}ms; + transition: border-top-right-radius ${({ cornerTransitionTime }) => cornerTransitionTime}ms, + border-bottom-right-radius ${({ cornerTransitionTime }) => cornerTransitionTime}ms; `; -export const RowLeftHalf = styled(Rounded)` +type RowLeftHalfProps = TransitionProps & { + wide: boolean, +}; +export const RowLeftHalf = styled(Rounded)` position: absolute; left: 0; top: 0; + z-index: 1; + overflow-x: clip; - width: ${p => p.theme.design.timingTower.rowLeftHalfWidthPx}px; // Future will be animated. + width: ${({ theme: { design: { timingTower } }, wide }) => + (wide ? timingTower.rowRightHalfWidthPx : 0) + timingTower.rowLeftHalfWidthPx}px; height: ${p => p.theme.design.timingTower.rowHeightPx}px; - background-color: #000000e5 + background-color: #000000e5; + + ${({ transitionProps }) => commonTransition(transitionProps)} `; RowLeftHalf.displayName = "RowLeftHalf"; -type AnimatedRowLeftHalfOutlineProps = TransitionProps & { +type AnimatedRowLeftHalfOutlineProps = OpenProps & TransitionProps & { startThickness: Px, endThickness: Px, startColor: string, @@ -115,7 +123,7 @@ export const RowLeftHalfLayout = styled.div` display: flex; padding-left: 3px; - align-items: center; + /* align-items: center; */ justify-content: flex-start; `; RowLeftHalfLayout.displayName = "RowLeftHalfLayout"; @@ -155,17 +163,27 @@ export const RowLeftHalfGemContainer = styled.div` `; RowLeftHalfGemContainer.displayName = "RowLeftHalfGemContainer"; -export const RowRightHalf = styled(Rounded)` +type RowRightHalfProps = TransitionProps & { + collapsed: boolean, + hugRight: boolean, +}; +export const RowRightHalf = styled(Rounded)` position: absolute; - right: 0; + ${({ hugRight }) => hugRight + ? css`right: 0;` : css` + left: ${p => p.theme.design.timingTower.rowLeftHalfWidthPx}px; + `} top: 0; - width: ${p => p.theme.design.timingTower.rowRightHalfWidthPx}px; // Future will be animated. + width: ${({ theme: { design: { timingTower } }, collapsed }) => + collapsed ? 0 : timingTower.rowRightHalfWidthPx}px; height: ${p => p.theme.design.timingTower.rowHeightPx}px; - overflow-x: hidden; + overflow-x: clip; - background-color: #0000007e + background-color: #0000007e; + + ${({ transitionProps }) => commonTransition(transitionProps)} `; RowRightHalf.displayName = "RowRightHalf"; @@ -181,14 +199,33 @@ export const RowRightHalfLayout = styled.div` `; RowRightHalfLayout.displayName = "RowRightHalfLayout"; -export const DriverName = styled.span` +type DriverNameProps = { + visible: boolean, +}; +export const DriverName = styled.span` + position: absolute; + top: 0; + left: 0; + + opacity: ${({ visible }) => visible ? 1 : 0}; + color: white; font-family: ${p => p.theme.fonts.f1Bold}; font-size: 20px; - margin-left: 14px; + text-transform: uppercase; `; DriverName.displayName = "DriverName"; +export const DriverNameContainer = styled.div` + position: relative; + margin-left: 14px; + + > span { + ${({ transitionProps }) => commonTransition(transitionProps)} + } +`; +DriverNameContainer.displayName = "DriverNameContainer"; + type TimeDiffProps = { xScale: Fraction, yScale: Fraction, diff --git a/src/components/Workspaces/PrototypingControls/TimingTowerPrototype/TimingTowerPrototypeControls.tsx b/src/components/Workspaces/PrototypingControls/TimingTowerPrototype/TimingTowerPrototypeControls.tsx index 908f8fe..3a88707 100644 --- a/src/components/Workspaces/PrototypingControls/TimingTowerPrototype/TimingTowerPrototypeControls.tsx +++ b/src/components/Workspaces/PrototypingControls/TimingTowerPrototype/TimingTowerPrototypeControls.tsx @@ -1,14 +1,16 @@ import { InlineCluster } from "@bedrock-layout/inline-cluster"; import { PadBox } from "@bedrock-layout/padbox"; import { Split } from "@bedrock-layout/split"; +import { Stack } from "@bedrock-layout/stack"; import { useDispatch, useSelector } from "react-redux"; import { broadcastDirectorSelector } from "../../../../features/broadcast/director/broadcastDirectorSelector"; import { broadcastGraphicsSelector } from "../../../../features/broadcast/graphics/broadcastGraphicsSelector"; -import { setTimingTowerSplitsMode } from "../../../../features/broadcast/graphics/broadcastGraphicsSlice"; +import { setTimingTowerDisplayMode, setTimingTowerSplitsMode } from "../../../../features/broadcast/graphics/broadcastGraphicsSlice"; import { eventSelector } from "../../../../features/event/eventSelector"; import { increaseDistance, refreshRunningOrder, setCarStatus } from "../../../../features/event/eventSlice"; -import { BGTimingTowerSplitsMode, CarStatus } from "../../../../types/state"; +import { BGTimingTowerDisplayMode, BGTimingTowerSplitsMode, CarStatus } from "../../../../types/state"; +import { SlotSelector } from "../../../Common/Inputs/SlotSelector"; import { GridSelection } from "../GridSelection"; import { ClickSpan } from "./styles"; @@ -16,75 +18,97 @@ import { ClickSpan } from "./styles"; export function TimingTowerPrototypeControls() { const dispatch = useDispatch(); const { selectedCars } = useSelector(broadcastDirectorSelector); - const { timingBoard: { timingTower: { splitsMode } } } = useSelector(broadcastGraphicsSelector); + const { timingBoard: { timingTower: { splitsMode, displayMode } } } = useSelector(broadcastGraphicsSelector); const { grid } = useSelector(eventSelector); return ( - - dispatch(refreshRunningOrder())}> - Refresh Running Order - - { - if (splitsMode === BGTimingTowerSplitsMode.Interval) { - dispatch(setTimingTowerSplitsMode(BGTimingTowerSplitsMode.Leader)); - } else { - dispatch(setTimingTowerSplitsMode(BGTimingTowerSplitsMode.Interval)); - } - }} - > - Splits Mode = {BGTimingTowerSplitsMode[splitsMode]} - - { - dispatch(increaseDistance({ - cars: selectedCars, - distance: 200, - randomness: 0, - usePerformance: false, - })); - dispatch(refreshRunningOrder()); - }} - > - +200m to cars - - { - dispatch(increaseDistance({ - cars: grid, - distance: 100, - randomness: 0.05, - usePerformance: true, - })); - dispatch(refreshRunningOrder()); - }} - > - +100m performance to all - - { - dispatch(setCarStatus({ - cars: selectedCars, - status: CarStatus.Retired, - })); - dispatch(refreshRunningOrder()); - }} - > - Retire cars - - { - dispatch(setCarStatus({ - cars: selectedCars, - status: CarStatus.Normal, - })); - dispatch(refreshRunningOrder()); - }} - > - Un-retire cars - - + + + + + dispatch(refreshRunningOrder())}> + Refresh Running Order + + { + dispatch(increaseDistance({ + cars: selectedCars, + distance: 200, + randomness: 0, + usePerformance: false, + })); + dispatch(refreshRunningOrder()); + }} + > + +200m + + { + dispatch(increaseDistance({ + cars: grid, + distance: 100, + randomness: 0.05, + usePerformance: true, + })); + dispatch(refreshRunningOrder()); + }} + > + +100m performance to all + + { + dispatch(setCarStatus({ + cars: selectedCars, + status: CarStatus.Retired, + })); + dispatch(refreshRunningOrder()); + }} + > + Retire + + { + dispatch(setCarStatus({ + cars: selectedCars, + status: CarStatus.Normal, + })); + dispatch(refreshRunningOrder()); + }} + > + Un-retire + + +
+ + { + if (splitsMode === BGTimingTowerSplitsMode.Interval) { + dispatch(setTimingTowerSplitsMode(BGTimingTowerSplitsMode.Leader)); + } else { + dispatch(setTimingTowerSplitsMode(BGTimingTowerSplitsMode.Interval)); + } + }} + > + Splits Mode = {BGTimingTowerSplitsMode[splitsMode]} + + dispatch(setTimingTowerDisplayMode(BGTimingTowerDisplayMode.LeftAndRight))}> + {(displayMode === BGTimingTowerDisplayMode.LeftAndRight ? "*" : "") + "LeftAndRight"} + + dispatch(setTimingTowerDisplayMode(BGTimingTowerDisplayMode.LeftOnly))}> + {(displayMode === BGTimingTowerDisplayMode.LeftOnly ? "*" : "") + "LeftOnly"} + + dispatch(setTimingTowerDisplayMode(BGTimingTowerDisplayMode.FullLeft))}> + {(displayMode === BGTimingTowerDisplayMode.FullLeft ? "*" : "") + "FullLeft"} + + dispatch(setTimingTowerDisplayMode(BGTimingTowerDisplayMode.Hidden))}> + {(displayMode === BGTimingTowerDisplayMode.Hidden ? "*" : "") + "Hidden"} + + + +
+
+ diff --git a/src/domain/data/teams.ts b/src/domain/data/teams.ts index 9ffbd8e..c825266 100644 --- a/src/domain/data/teams.ts +++ b/src/domain/data/teams.ts @@ -220,7 +220,8 @@ export const drivers: {[lastName: string]: Driver} = { perez: { id: "perez", firstName: "Sergio", - lastName: "Pérez", + // lastName: "Pérez", + lastName: "Perez", number: 11, team: teams.redBull, yellowTCam: true, @@ -231,7 +232,8 @@ export const drivers: {[lastName: string]: Driver} = { raikkonen: { id: "raikkonen", firstName: "Kimi", - lastName: "Räikkönen", + // lastName: "Räikkönen", + lastName: "Raikkonen", number: 7, team: teams.alfaRomeo, yellowTCam: false, diff --git a/src/features/broadcast/graphics/broadcastGraphicsSlice.ts b/src/features/broadcast/graphics/broadcastGraphicsSlice.ts index b0ab9c1..b8b2687 100644 --- a/src/features/broadcast/graphics/broadcastGraphicsSlice.ts +++ b/src/features/broadcast/graphics/broadcastGraphicsSlice.ts @@ -59,6 +59,9 @@ export const broadcastGraphicsSlice = createSlice({ setTimingTowerSplitsMode: (state, action: PayloadAction) => { state.timingBoard.timingTower.splitsMode = action.payload; }, + setTimingTowerDisplayMode: (state, action: PayloadAction) => { + state.timingBoard.timingTower.displayMode = action.payload; + }, }, }); @@ -68,5 +71,6 @@ export const { incrementChyronsOpenState, clearChyrons, setTimingTowerSplitsMode, + setTimingTowerDisplayMode, } = broadcastGraphicsSlice.actions; export default broadcastGraphicsSlice.reducer; diff --git a/src/utils/styling.ts b/src/utils/styling.ts index 11049b3..4d3c3e1 100644 --- a/src/utils/styling.ts +++ b/src/utils/styling.ts @@ -62,6 +62,13 @@ export function wipeCustomDegClip( } } +/** + * Takes in an array of transition properties, durations, delays, and timings + * in a special interface and returns them into a format understood by CSS. + * Includes a semi-colon as well. + * @param propsArray + * @returns + */ export function commonTransition(propsArray: TransitionArgs[]) { return ( "transition: "