From a38af0dec4f6df4a2be3c4b9e9d6f1885db9bfb0 Mon Sep 17 00:00:00 2001 From: Kyle Geib Date: Fri, 4 Mar 2022 18:02:45 -0500 Subject: [PATCH] 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",