From b9e3447ff57a66cd40d6daa02338d578de2e78c6 Mon Sep 17 00:00:00 2001 From: Kyle Geib Date: Fri, 4 Mar 2022 16:21:14 -0500 Subject: [PATCH] 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";