From 1cccc7d09422bd02750d45385c96dc280874643d Mon Sep 17 00:00:00 2001 From: Kyle Geib Date: Thu, 3 Mar 2022 18:56:07 -0500 Subject: [PATCH 1/5] ISSUE-058 - Basic mode switching implemented. Still need to fade-in/fade-out the interval numbers. Also need to look into wipe-in fade animations for full names. Will see what I can do... --- .../TimingBoard/TimingTower/TimingTower.tsx | 2 +- .../TimingTower/TimingTowerRow.tsx | 58 ++++++- .../TimingBoard/TimingTower/styles.ts | 69 ++++++-- .../TimingTowerPrototypeControls.tsx | 158 ++++++++++-------- src/domain/data/teams.ts | 6 +- .../graphics/broadcastGraphicsSlice.ts | 4 + src/utils/styling.ts | 7 + 7 files changed, 209 insertions(+), 95 deletions(-) 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: " From b9e3447ff57a66cd40d6daa02338d578de2e78c6 Mon Sep 17 00:00:00 2001 From: Kyle Geib Date: Fri, 4 Mar 2022 16:21:14 -0500 Subject: [PATCH 2/5] ISSUE-058 - Fixed glitched corner rounding transition bug. Added fade-in/fade-out transition for interval/leader text data. --- .../TimingTower/TimingTowerRow.tsx | 36 +++++++++++++++---- .../TimingBoard/TimingTower/styles.ts | 15 ++++---- 2 files changed, 36 insertions(+), 15 deletions(-) diff --git a/src/components/BroadcastGraphics/TimingBoard/TimingTower/TimingTowerRow.tsx b/src/components/BroadcastGraphics/TimingBoard/TimingTower/TimingTowerRow.tsx index 7ff506a..1e92fe6 100644 --- a/src/components/BroadcastGraphics/TimingBoard/TimingTower/TimingTowerRow.tsx +++ b/src/components/BroadcastGraphics/TimingBoard/TimingTower/TimingTowerRow.tsx @@ -159,17 +159,26 @@ export function TimingTowerRow({ )} @@ -257,24 +266,37 @@ export function TimingTowerRow({ - + {rightHalfContent} diff --git a/src/components/BroadcastGraphics/TimingBoard/TimingTower/styles.ts b/src/components/BroadcastGraphics/TimingBoard/TimingTower/styles.ts index 90206d0..72973e7 100644 --- a/src/components/BroadcastGraphics/TimingBoard/TimingTower/styles.ts +++ b/src/components/BroadcastGraphics/TimingBoard/TimingTower/styles.ts @@ -61,15 +61,10 @@ AnimatedRowContainer.displayName = "AnimatedRowContainer"; type RoundedProp = { roundedCornerTop?: Px, roundedCornerBottom?: Px, - 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 ${({ cornerTransitionTime }) => cornerTransitionTime}ms, - border-bottom-right-radius ${({ cornerTransitionTime }) => cornerTransitionTime}ms; + border-top-right-radius: ${({ roundedCornerTop = 0 }) => roundedCornerTop}px; + border-bottom-right-radius: ${({ roundedCornerBottom = 0 }) => roundedCornerBottom}px; `; type RowLeftHalfProps = TransitionProps & { @@ -226,9 +221,10 @@ export const DriverNameContainer = styled.div` `; DriverNameContainer.displayName = "DriverNameContainer"; -type TimeDiffProps = { +type TimeDiffProps = TransitionProps & { xScale: Fraction, yScale: Fraction, + visible: boolean, }; export const TimeDiff = styled.span` color: white; @@ -240,6 +236,9 @@ export const TimeDiff = styled.span` font-feature-settings: 'tnum' 1; transform-origin: top right; transform: scale(${({ xScale, yScale }) => `${xScale}, ${yScale}`}); + + opacity: ${({ visible }) => visible ? 1 : 0}; + ${({ transitionProps }) => commonTransition(transitionProps)} `; TimeDiff.displayName = "TimeDiff"; From a38af0dec4f6df4a2be3c4b9e9d6f1885db9bfb0 Mon Sep 17 00:00:00 2001 From: Kyle Geib Date: Fri, 4 Mar 2022 18:02:45 -0500 Subject: [PATCH 3/5] ISSUE-058 - First attempt at a wipe effect for the full last name display. Discovered a limitation with WipeTransition and added a new optional prop for manual dimension definition. Going to attempt using a mask image next instead as the animation fades the name in, not using a direct clip. --- .../Common/WipeTransition/WipeTransition.tsx | 11 ++++-- .../TimingTower/TimingTowerRow.tsx | 38 ++++++++++++++----- .../TimingBoard/TimingTower/styles.ts | 2 +- src/shared/theme.ts | 3 ++ 4 files changed, 40 insertions(+), 14 deletions(-) diff --git a/src/components/BroadcastGraphics/Common/WipeTransition/WipeTransition.tsx b/src/components/BroadcastGraphics/Common/WipeTransition/WipeTransition.tsx index ca81f33..7f18d94 100644 --- a/src/components/BroadcastGraphics/Common/WipeTransition/WipeTransition.tsx +++ b/src/components/BroadcastGraphics/Common/WipeTransition/WipeTransition.tsx @@ -1,7 +1,7 @@ import { animated, easings, useSpring } from "@react-spring/web"; import useMeasure from "react-use-measure"; -import { Corner, Degrees, Fraction } from "../../../../types/style"; +import { Corner, Degrees, Fraction, Px } from "../../../../types/style"; import { Milliseconds } from "../../../../types/util"; import { wipeCustomDegClip } from "../../../../utils/styling"; @@ -14,6 +14,10 @@ type WipeTransitionProps = { opacityStart?: Fraction, opacityDuration?: Milliseconds, opacityDelay?: Milliseconds, + manualDimensions?: { + height: Px, + width: Px, + }, } export function WipeTransition({ @@ -25,6 +29,7 @@ export function WipeTransition({ opacityStart = 1, opacityDuration = duration, opacityDelay = 0, + manualDimensions, children, }: React.PropsWithChildren) { const [childRef, { @@ -53,8 +58,8 @@ export function WipeTransition({ opacity, clipPath: wipe.to(wipeProgress => { const coordinates = wipeCustomDegClip( - childWidth, - childHeight, + (manualDimensions?.width ?? 0) || childWidth, + (manualDimensions?.height ?? 0) || childHeight, wipeProgress, startingCorner, angle, diff --git a/src/components/BroadcastGraphics/TimingBoard/TimingTower/TimingTowerRow.tsx b/src/components/BroadcastGraphics/TimingBoard/TimingTower/TimingTowerRow.tsx index 1e92fe6..d6fd89b 100644 --- a/src/components/BroadcastGraphics/TimingBoard/TimingTower/TimingTowerRow.tsx +++ b/src/components/BroadcastGraphics/TimingBoard/TimingTower/TimingTowerRow.tsx @@ -147,12 +147,14 @@ export function TimingTowerRow({ yScale = rightHalfContent.includes("+") ? 1.1 : 1.0; } + const { design: { timingTower: timingTowerTheme } } = theme; + return ( {car.notices.includes(CarNotice.FastestLap) && ( @@ -185,14 +187,14 @@ export function TimingTowerRow({ > {car.status !== CarStatus.Retired && ( - + @@ -205,7 +207,7 @@ export function TimingTowerRow({ startingCorner="topLeft" > 0 @@ -221,19 +223,35 @@ export function TimingTowerRow({ {car.driver.initials} - - {car.driver.lastName} - + + + {car.driver.lastName} + + - + ` position: relative; - margin-left: 14px; + margin-left: ${p => p.theme.design.timingTower.nameLeftMargin}px; > span { ${({ transitionProps }) => commonTransition(transitionProps)} diff --git a/src/shared/theme.ts b/src/shared/theme.ts index 56c53ec..1436d21 100644 --- a/src/shared/theme.ts +++ b/src/shared/theme.ts @@ -72,6 +72,9 @@ export const theme = { rowLeftHalfWidthPx: 147, rowRightHalfWidthPx: 108, retiredTopGapPx: 3, + teamGemSize: 30, + posFlagSize: 32, + nameLeftMargin: 14, }, button: { borderRadius: "0.25rem", From 9f4e564a743967e78abd768f5af5b52b2c853cb4 Mon Sep 17 00:00:00 2001 From: Kyle Geib Date: Mon, 7 Mar 2022 11:50:05 -0500 Subject: [PATCH 4/5] ISSUE-058 - New opening/closing transition props feature added. Last name wiping added. Now we can define separate opening and closing transition settings as well as common (both ways) transition props. This is all pretty cool. Timing for open/close animations and transitions are looking better and more mature. --- .../TimingTower/TimingTowerRow.tsx | 101 ++++++++++++------ .../TimingBoard/TimingTower/styles.ts | 97 +++++++++-------- .../TimingTowerPrototypeControls.tsx | 1 - src/types/style.d.ts | 11 ++ src/utils/styling.ts | 32 +++++- 5 files changed, 162 insertions(+), 80 deletions(-) diff --git a/src/components/BroadcastGraphics/TimingBoard/TimingTower/TimingTowerRow.tsx b/src/components/BroadcastGraphics/TimingBoard/TimingTower/TimingTowerRow.tsx index d6fd89b..63b29be 100644 --- a/src/components/BroadcastGraphics/TimingBoard/TimingTower/TimingTowerRow.tsx +++ b/src/components/BroadcastGraphics/TimingBoard/TimingTower/TimingTowerRow.tsx @@ -35,6 +35,7 @@ import { RowLeftHalfPosFlagChangeContainer, AnimatedRowLeftHalfOutline, DriverNameContainer, + DriverNameWipe, } from "./styles"; import useMeasure from "react-use-measure"; @@ -42,6 +43,7 @@ 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; interface TimingTowerRowProps { car: Car; @@ -172,7 +174,8 @@ export function TimingTowerRow({ BGTimingTowerDisplayMode.FullLeft, ) ? 5 : 0 } - transitionProps={[{ + open={displayMode === BGTimingTowerDisplayMode.FullLeft} + transitionOpeningProps={[{ property: "width", duration: FULL_WIDTH_DURATION * DDM, }, { @@ -182,7 +185,19 @@ export function TimingTowerRow({ property: "border-bottom-right-radius", duration: TRAVEL_DURATION * DDM, }]} - wide={displayMode === BGTimingTowerDisplayMode.FullLeft} + transitionClosingProps={[{ + property: "width", + duration: FULL_WIDTH_DURATION * DDM, + delay: FULL_WIDTH_CLOSE_DELAY * DDM, + }, { + property: "border-top-right-radius", + duration: TRAVEL_DURATION * DDM, + delay: FULL_WIDTH_CLOSE_DELAY * DDM, + }, { + property: "border-bottom-right-radius", + duration: TRAVEL_DURATION * DDM, + delay: FULL_WIDTH_CLOSE_DELAY * DDM, + }]} ref={leftHalfRef} > @@ -220,34 +235,47 @@ export function TimingTowerRow({ )} - - + + {car.driver.initials} - - + {car.driver.lastName} - + @@ -292,25 +320,36 @@ export function TimingTowerRow({ BGTimingTowerSplitsMode.Interval, ) ? 5 : 0 } - collapsed={displayMode !== BGTimingTowerDisplayMode.LeftAndRight} + open={displayMode === BGTimingTowerDisplayMode.LeftAndRight} transitionProps={[{ - property: "width", - duration: FULL_WIDTH_DURATION * DDM, - }, { property: "border-top-right-radius", duration: TRAVEL_DURATION * DDM, }, { property: "border-bottom-right-radius", duration: TRAVEL_DURATION * DDM, }]} + transitionClosingProps={[{ + property: "width", + duration: FULL_WIDTH_DURATION * DDM, + }]} + transitionOpeningProps={[{ + property: "width", + duration: FULL_WIDTH_DURATION * DDM, + delay: FULL_WIDTH_CLOSE_DELAY * DDM, + }]} hugRight={hugRight} > ` border-bottom-right-radius: ${({ roundedCornerBottom = 0 }) => roundedCornerBottom}px; `; -type RowLeftHalfProps = TransitionProps & { - wide: boolean, -}; -export const RowLeftHalf = styled(Rounded)` +export const RowLeftHalf = styled(Rounded)` position: absolute; left: 0; top: 0; z-index: 1; overflow-x: clip; - width: ${({ theme: { design: { timingTower } }, wide }) => - (wide ? timingTower.rowRightHalfWidthPx : 0) + timingTower.rowLeftHalfWidthPx}px; + width: ${({ theme: { design: { timingTower } }, open }) => + (open ? timingTower.rowRightHalfWidthPx : 0) + timingTower.rowLeftHalfWidthPx}px; height: ${p => p.theme.design.timingTower.rowHeightPx}px; background-color: #000000e5; - ${({ transitionProps }) => commonTransition(transitionProps)} + ${({ open, transitionOpeningProps, transitionClosingProps, transitionProps }) => + commonDirectionalTransition(open, transitionOpeningProps, transitionClosingProps, transitionProps)} `; RowLeftHalf.displayName = "RowLeftHalf"; -type AnimatedRowLeftHalfOutlineProps = OpenProps & TransitionProps & { +type AnimatedRowLeftHalfOutlineProps = DirectionalTransitionProps & { startThickness: Px, endThickness: Px, startColor: string, endColor: string, }; -export const AnimatedRowLeftHalfOutline = animated(styled(Rounded) ` +export const AnimatedRowLeftHalfOutline = animated(styled(Rounded)` position: absolute; top: 0; left: 0; @@ -106,7 +101,8 @@ export const AnimatedRowLeftHalfOutline = animated(styled(Rounded) -startThickness}px; - ${({ transitionProps }) => commonTransition(transitionProps)} + ${({ open, transitionOpeningProps, transitionClosingProps, transitionProps }) => + commonDirectionalTransition(open, transitionOpeningProps, transitionClosingProps, transitionProps)} `); AnimatedRowLeftHalfOutline.displayName = "AnimatedRowLeftHalfOutline"; @@ -118,7 +114,6 @@ export const RowLeftHalfLayout = styled.div` display: flex; padding-left: 3px; - /* align-items: center; */ justify-content: flex-start; `; RowLeftHalfLayout.displayName = "RowLeftHalfLayout"; @@ -158,27 +153,29 @@ export const RowLeftHalfGemContainer = styled.div` `; RowLeftHalfGemContainer.displayName = "RowLeftHalfGemContainer"; -type RowRightHalfProps = TransitionProps & { - collapsed: boolean, +type RowRightHalfProps = DirectionalTransitionProps & { hugRight: boolean, }; export const RowRightHalf = styled(Rounded)` position: absolute; ${({ hugRight }) => hugRight - ? css`right: 0;` : css` - left: ${p => p.theme.design.timingTower.rowLeftHalfWidthPx}px; - `} + ? css` + right: 0; + ` : css` + left: ${p => p.theme.design.timingTower.rowLeftHalfWidthPx}px; + `} top: 0; - width: ${({ theme: { design: { timingTower } }, collapsed }) => - collapsed ? 0 : timingTower.rowRightHalfWidthPx}px; + width: ${({ theme: { design: { timingTower } }, open }) => + open ? timingTower.rowRightHalfWidthPx : 0}px; height: ${p => p.theme.design.timingTower.rowHeightPx}px; overflow-x: clip; background-color: #0000007e; - ${({ transitionProps }) => commonTransition(transitionProps)} + ${({ open, transitionOpeningProps, transitionClosingProps, transitionProps }) => + commonDirectionalTransition(open, transitionOpeningProps, transitionClosingProps, transitionProps)} `; RowRightHalf.displayName = "RowRightHalf"; @@ -194,37 +191,46 @@ export const RowRightHalfLayout = styled.div` `; RowRightHalfLayout.displayName = "RowRightHalfLayout"; -type DriverNameProps = { - visible: boolean, -}; -export const DriverName = styled.span` +export const DriverNameContainer = styled.div` + position: relative; + margin-left: ${p => p.theme.design.timingTower.nameLeftMargin}px; +`; +DriverNameContainer.displayName = "DriverNameContainer"; + +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; text-transform: uppercase; + + opacity: ${({ open }) => open ? 1 : 0}; + ${({ open, transitionOpeningProps, transitionClosingProps, transitionProps }) => + commonDirectionalTransition(open, transitionOpeningProps, transitionClosingProps, transitionProps)} `; DriverName.displayName = "DriverName"; -export const DriverNameContainer = styled.div` - position: relative; - margin-left: ${p => p.theme.design.timingTower.nameLeftMargin}px; +export const DriverNameWipe = styled.div` + /* background: #deadbe; */ - > span { - ${({ transitionProps }) => commonTransition(transitionProps)} - } + width: ${({ open }) => open ? 800 : 200}px; + height: ${p => p.theme.design.timingTower.rowHeightPx}px; + + mask-image: linear-gradient(to right, black 0, black 20%, transparent 30%); + mask-repeat: no-repeat; + + opacity: ${({ open }) => open ? 1 : 0}; + ${({ open, transitionOpeningProps, transitionClosingProps, transitionProps }) => + commonDirectionalTransition(open, transitionOpeningProps, transitionClosingProps, transitionProps)} `; -DriverNameContainer.displayName = "DriverNameContainer"; +DriverNameWipe.displayName = "DriverNameWipe"; -type TimeDiffProps = TransitionProps & { +type TimeDiffProps = DirectionalTransitionProps & { xScale: Fraction, yScale: Fraction, - visible: boolean, }; export const TimeDiff = styled.span` color: white; @@ -237,8 +243,9 @@ export const TimeDiff = styled.span` transform-origin: top right; transform: scale(${({ xScale, yScale }) => `${xScale}, ${yScale}`}); - opacity: ${({ visible }) => visible ? 1 : 0}; - ${({ transitionProps }) => commonTransition(transitionProps)} + opacity: ${({ open }) => open ? 1 : 0}; + ${({ open, transitionOpeningProps, transitionClosingProps, transitionProps }) => + commonDirectionalTransition(open, transitionOpeningProps, transitionClosingProps, transitionProps)} `; TimeDiff.displayName = "TimeDiff"; diff --git a/src/components/Workspaces/PrototypingControls/TimingTowerPrototype/TimingTowerPrototypeControls.tsx b/src/components/Workspaces/PrototypingControls/TimingTowerPrototype/TimingTowerPrototypeControls.tsx index 3a88707..bbc74f7 100644 --- a/src/components/Workspaces/PrototypingControls/TimingTowerPrototype/TimingTowerPrototypeControls.tsx +++ b/src/components/Workspaces/PrototypingControls/TimingTowerPrototype/TimingTowerPrototypeControls.tsx @@ -10,7 +10,6 @@ import { setTimingTowerDisplayMode, setTimingTowerSplitsMode } from "../../../.. import { eventSelector } from "../../../../features/event/eventSelector"; import { increaseDistance, refreshRunningOrder, setCarStatus } from "../../../../features/event/eventSlice"; import { BGTimingTowerDisplayMode, BGTimingTowerSplitsMode, CarStatus } from "../../../../types/state"; -import { SlotSelector } from "../../../Common/Inputs/SlotSelector"; import { GridSelection } from "../GridSelection"; import { ClickSpan } from "./styles"; diff --git a/src/types/style.d.ts b/src/types/style.d.ts index 64e22dd..e9b3e97 100644 --- a/src/types/style.d.ts +++ b/src/types/style.d.ts @@ -40,3 +40,14 @@ export interface TransitionArgs { timing?: string delay?: Milliseconds, } + +export type OpenProps = { + open: boolean, +}; +export type TransitionProps = OpenProps & { + transitionProps?: TransitionArgs[], +}; +export type DirectionalTransitionProps = TransitionProps & { + transitionOpeningProps?: TransitionArgs[], + transitionClosingProps?: TransitionArgs[], +} diff --git a/src/utils/styling.ts b/src/utils/styling.ts index 4d3c3e1..34ecfa1 100644 --- a/src/utils/styling.ts +++ b/src/utils/styling.ts @@ -69,16 +69,42 @@ export function wipeCustomDegClip( * @param propsArray * @returns */ -export function commonTransition(propsArray: TransitionArgs[]) { +export function commonTransition(propsArray: TransitionArgs[] = []) { + if (propsArray.length === 0){ + return ""; + } + return ( "transition: " + propsArray.map(p => ` - ${p?.property ?? "all"} ${p?.duration ?? 1000}ms ${p?.timing ?? ""} ${p?.delay ?? 0}ms - `).join(", ") + ${p?.property ?? "all"} ${p?.duration ?? 1000}ms ${p?.timing ?? ""} ${p?.delay ?? 0}ms`, + ).join(", ") + ";" ); } +/** + * An extension and evolution of commonTransition() provides a way to define + * transition configurations that can be differentiated by which direction + * (opening or closing) that they're going and can even support additional + * "shared" properties that are common in either direction. + * @param open the (often visible) state of the element + * @param openingPropsArray what transition props to use when "open" (opening) + * @param closingPropsArray what transition props to use when "closed" (closing) + * @param sharedPropsArray what transition props to use in either direction + * @returns + */ +export function commonDirectionalTransition( + open: boolean, + openingPropsArray: TransitionArgs[] = [], + closingPropsArray: TransitionArgs[] = [], + sharedPropsArray: TransitionArgs[] = [], +) { + return open + ? commonTransition(openingPropsArray.concat(sharedPropsArray)) + : commonTransition(closingPropsArray.concat(sharedPropsArray)); +} + /** * Provides the x, y coordinates of a six point polygon for use in a clip-path * mask. By taking a fraction to indicate the progress through the animation it From 061a7e0a0daff462a24508bfe335f98aa1333e31 Mon Sep 17 00:00:00 2001 From: Kyle Geib Date: Mon, 7 Mar 2022 11:56:26 -0500 Subject: [PATCH 5/5] ISSUE-058 - Added basic TimingTower hidden setting that simply fades the whole thing in/out. Don't think I have the desire to animate the mounting process right now. --- .../TimingBoard/TimingTower/TimingTower.tsx | 7 ++++++- .../BroadcastGraphics/TimingBoard/TimingTower/styles.ts | 6 +++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/components/BroadcastGraphics/TimingBoard/TimingTower/TimingTower.tsx b/src/components/BroadcastGraphics/TimingBoard/TimingTower/TimingTower.tsx index fa1b1a4..e103c31 100644 --- a/src/components/BroadcastGraphics/TimingBoard/TimingTower/TimingTower.tsx +++ b/src/components/BroadcastGraphics/TimingBoard/TimingTower/TimingTower.tsx @@ -3,7 +3,7 @@ import { useSelector } from "react-redux"; import { broadcastGraphicsSelector } from "../../../../features/broadcast/graphics/broadcastGraphicsSelector"; import { eventSelector } from "../../../../features/event/eventSelector"; -import { CarStatus } from "../../../../types/state"; +import { BGTimingTowerDisplayMode, CarStatus } from "../../../../types/state"; import { Fraction } from "../../../../types/style"; import { RowsContainer } from "./styles"; @@ -54,6 +54,11 @@ export function TimingTower({ debugDurationMultiplier: DDM }: TimingTowerProps) 0} + open={displayMode !== BGTimingTowerDisplayMode.Hidden} + transitionProps={[{ + property: "opacity", + duration: 1000, + }]} > {rows} diff --git a/src/components/BroadcastGraphics/TimingBoard/TimingTower/styles.ts b/src/components/BroadcastGraphics/TimingBoard/TimingTower/styles.ts index e3a5c8b..a92556e 100644 --- a/src/components/BroadcastGraphics/TimingBoard/TimingTower/styles.ts +++ b/src/components/BroadcastGraphics/TimingBoard/TimingTower/styles.ts @@ -12,7 +12,7 @@ import { commonDirectionalTransition } from "../../../../utils/styling"; import fastestLapIcon from "../../../../public/images/icons/fastest-lap.svg"; -type RowsContainerProps = { +type RowsContainerProps = DirectionalTransitionProps & { carsToDisplay: number, retiredCarsPresent: boolean, }; @@ -26,6 +26,10 @@ export const RowsContainer = styled.div` theme.design.timingTower.rowHeightPx * carsToDisplay + (retiredCarsPresent ? 3 : 0)}px; overflow-y: clip; // hidden doesn't work for some reason. + + opacity: ${({ open }) => open ? 1 : 0}; + ${({ open, transitionOpeningProps, transitionClosingProps, transitionProps }) => + commonDirectionalTransition(open, transitionOpeningProps, transitionClosingProps, transitionProps)} `; RowsContainer.displayName = "RowsContainer";