ISSUE-062 - Expanding status indicator in place.

Moved some dimensions data to the themes object for re-use between components.
This commit is contained in:
Kyle Geib committed 2022-03-08 17:03:09 -05:00
1 parent 28e0e7f3d4
commit d2e4afb975
7 files changed
+79 -69

No files matched your search

@@ -2,7 +2,7 @@ import { useSpring } from "@react-spring/web";
import { useDispatch } from "react-redux";
import { BGChyronDriver, BGChyronSubMode, OpenState } from "../../../../types/state";
import { DebugDurationProps, Fraction } from "../../../../types/style";
import { DebugDurationProps } from "../../../../types/style";
import { clearChyrons } from "../../../../features/broadcast/graphics/broadcastGraphicsSlice";
import { theme } from "../../../../shared/theme";
import { outlineClipPath } from "../../../../utils/styling";
@@ -1,6 +1,8 @@
import { useSelector } from "react-redux";
import { broadcastGraphicsSelector } from "../../../../features/broadcast/graphics/broadcastGraphicsSelector";
import { theme } from "../../../../shared/theme";
import { BGStatusIndicatorModes } from "../../../../types/state";
import { DebugDurationProps } from "../../../../types/style";
import { StatusIndicatorBase } from "./styles";
@@ -10,12 +12,23 @@ type StatusIndicatorProps = DebugDurationProps;
export function StatusIndicator({
debugDurationMultiplier: DDM = 1.0,
}: StatusIndicatorProps) {
const { design: { timingTower: ttTheme } } = theme;
const { timingBoard: { statusIndicator: { mode } } } =
useSelector(broadcastGraphicsSelector);
return (
<StatusIndicatorBase
mode={mode}
open={mode !== BGStatusIndicatorModes.LapNarrow}
transitionOpeningProps={[{
property: "width",
duration: ttTheme.fullWidthDurationMs * DDM,
}]}
transitionClosingProps={[{
property: "width",
duration: ttTheme.fullWidthDurationMs * DDM,
delay: ttTheme.fullWidthCloseDelayMs * DDM,
}]}
/>
);
}
@@ -1,22 +1,17 @@
import styled, { css } from "styled-components";
import styled from "styled-components";
import { BGStatusIndicatorModes } from "../../../../types/state";
import { DirectionalTransitionProps } from "../../../../types/style";
import { commonDirectionalTransition } from "../../../../utils/styling";
type StatusIndicatorBaseProps = {
mode: BGStatusIndicatorModes,
};
export const StatusIndicatorBase = styled.div<StatusIndicatorBaseProps>`
export const StatusIndicatorBase = styled.div<DirectionalTransitionProps>`
background-color: black;
border-top-right-radius: ${p => p.theme.design.statusIndicator.roundedCornerRadiusPx}px;
height: ${p => p.theme.design.statusIndicator.heightNormalPx}px;
width: ${({ theme: { design: { timingTower } }, mode }) => {
if (mode === BGStatusIndicatorModes.LapNarrow) {
return timingTower.rowLeftHalfWidthPx;
}
if (mode === BGStatusIndicatorModes.LapWide) {
return timingTower.rowLeftHalfWidthPx + timingTower.rowRightHalfWidthPx;
}
return 10;
}}px;
width: ${({ theme: { design: { timingTower: ttTheme } }, open }) => open
? ttTheme.rowLeftHalfWidthPx + ttTheme.rowRightHalfWidthPx
: ttTheme.rowLeftHalfWidthPx}px;
${({ open, transitionOpeningProps, transitionClosingProps, transitionProps }) =>
commonDirectionalTransition(open, transitionOpeningProps, transitionClosingProps, transitionProps)}
`;
StatusIndicatorBase.displayName = "StatusIndicatorBase";
@@ -8,7 +8,7 @@ import { getCarAtPos, timeDiff } from "../../../../utils/event";
import { formatTime, outlineClipPath } from "../../../../utils/styling";
import { DebugDurationProps, Fraction } from "../../../../types/style";
import { Meters, Milliseconds } from "../../../../types/util";
import { Meters } from "../../../../types/util";
import {
BGTimingTowerDisplayMode,
BGTimingTowerSplitsMode,
@@ -39,12 +39,6 @@ import {
} from "./styles";
import useMeasure from "react-use-measure";
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;
type TimingTowerRowProps = DebugDurationProps & {
car: Car;
grid: Grid;
@@ -64,6 +58,8 @@ export function TimingTowerRow({
trackLength,
debugDurationMultiplier: DDM = 1.0,
}: TimingTowerRowProps) {
const { design: { timingTower: ttTheme } } = theme;
const [pastPos, setPastPos] = useState(car.position);
const [posChange, setPosChange] = useState(0);
const [pastDisplayMode, setPastDisplayMode] = useState(displayMode);
@@ -74,8 +70,10 @@ export function TimingTowerRow({
const [showPosChange, setShowPosChange] = useState(false);
const [showOutline, setShowOutline] = useState(false);
const [wipeVisible, setWipeVisible] = useState(false);
useTimeoutWhen(() => setShowPosChange(false), (WIPE_DELAY + WIPE_DURATION) * DDM, showPosChange);
useTimeoutWhen(() => setShowOutline(false), TRAVEL_DURATION * DDM, showOutline);
useTimeoutWhen(() => setShowPosChange(false), (
ttTheme.wipeDelayMs + ttTheme.wipeDurationMs
) * DDM, showPosChange);
useTimeoutWhen(() => setShowOutline(false), ttTheme.rowTravelDurationMs * DDM, showOutline);
useTimeoutWhen(() => setWipeVisible(false), 1, wipeVisible);
useEffect(() => {
@@ -148,80 +146,74 @@ export function TimingTowerRow({
yScale = rightHalfContent.includes("+") ? 1.1 : 1.0;
}
const { design: { timingTower: timingTowerTheme } } = theme;
return (
<AnimatedRowContainer
key={car.driver.id}
retired={car.status === CarStatus.Retired}
wide={displayMode !== BGTimingTowerDisplayMode.LeftOnly}
top={(car.position - 1) * timingTowerTheme.rowHeightPx}
transitionTime={TRAVEL_DURATION * DDM}
top={(car.position - 1) * ttTheme.rowHeightPx}
transitionTime={ttTheme.rowTravelDurationMs * DDM}
>
{car.notices.includes(CarNotice.FastestLap) && (
<FastestLapGem />
)}
<RowLeftHalf
roundedCornerTop={
(displayMode === BGTimingTowerDisplayMode.FullLeft &&
car.position === 1) ? timingTowerTheme.rowRoundedCornerRadiusPx : 0
}
roundedCornerBottom={
bottomRounded && orMatch(
displayMode,
BGTimingTowerDisplayMode.LeftOnly,
BGTimingTowerDisplayMode.FullLeft,
) ? timingTowerTheme.rowRoundedCornerRadiusPx : 0
) ? ttTheme.rowRoundedCornerRadiusPx : 0
}
open={displayMode === BGTimingTowerDisplayMode.FullLeft}
transitionOpeningProps={[{
property: "width",
duration: FULL_WIDTH_DURATION * DDM,
duration: ttTheme.fullWidthDurationMs * DDM,
}, {
property: "border-top-right-radius",
duration: TRAVEL_DURATION * DDM,
duration: ttTheme.rowTravelDurationMs * DDM,
}, {
property: "border-bottom-right-radius",
duration: TRAVEL_DURATION * DDM,
duration: ttTheme.rowTravelDurationMs * DDM,
}]}
transitionClosingProps={[{
property: "width",
duration: FULL_WIDTH_DURATION * DDM,
delay: FULL_WIDTH_CLOSE_DELAY * DDM,
duration: ttTheme.fullWidthDurationMs * DDM,
delay: ttTheme.fullWidthCloseDelayMs * DDM,
}, {
property: "border-top-right-radius",
duration: TRAVEL_DURATION * DDM,
delay: FULL_WIDTH_CLOSE_DELAY * DDM,
duration: ttTheme.rowTravelDurationMs * DDM,
delay: ttTheme.fullWidthCloseDelayMs * DDM,
}, {
property: "border-bottom-right-radius",
duration: TRAVEL_DURATION * DDM,
delay: FULL_WIDTH_CLOSE_DELAY * DDM,
duration: ttTheme.rowTravelDurationMs * DDM,
delay: ttTheme.fullWidthCloseDelayMs * DDM,
}]}
ref={leftHalfRef}
>
<RowLeftHalfLayout>
{car.status !== CarStatus.Retired && (
<RowLeftHalfPosFlagContainer size={timingTowerTheme.posFlagSize}>
<RowLeftHalfPosFlagContainer size={ttTheme.posFlagSizePx}>
<PositionFlag
size={timingTowerTheme.posFlagSize}
size={ttTheme.posFlagSizePx}
number={car.position}
numberSizeFraction={.6}
/>
<RowLeftHalfPosFlagChangeContainer
size={timingTowerTheme.posFlagSize}
size={ttTheme.posFlagSizePx}
visible={showPosChange}
transitionTime={167 * DDM}
>
{showPosChange && (
<WipeTransition
visible={wipeVisible}
delay={WIPE_DELAY * DDM}
delay={ttTheme.wipeDelayMs * DDM}
angle={45}
duration={WIPE_DURATION * DDM}
duration={ttTheme.wipeDurationMs * DDM}
startingCorner="topLeft"
>
<PositionFlag
size={timingTowerTheme.posFlagSize}
size={ttTheme.posFlagSizePx}
number={car.position}
numberSizeFraction={.6}
color={posChange > 0
@@ -240,7 +232,7 @@ export function TimingTowerRow({
transitionOpeningProps={[{
property: "opacity",
duration: 333 * DDM,
delay: (FULL_WIDTH_DURATION - 333) * DDM,
delay: (ttTheme.fullWidthDurationMs - 333) * DDM,
}]}
transitionClosingProps={[{
property: "opacity",
@@ -254,7 +246,7 @@ export function TimingTowerRow({
open={displayMode === BGTimingTowerDisplayMode.FullLeft}
transitionOpeningProps={[{
property: "width",
duration: FULL_WIDTH_DURATION * 2 * DDM,
duration: ttTheme.fullWidthDurationMs * 2 * DDM,
delay: 0 * DDM,
}, {
property: "opacity",
@@ -263,12 +255,12 @@ export function TimingTowerRow({
}]}
transitionClosingProps={[{
property: "width",
duration: FULL_WIDTH_DURATION * DDM,
duration: ttTheme.fullWidthDurationMs * DDM,
delay: 0 * DDM,
}, {
property: "opacity",
duration: 333 * DDM,
delay: (FULL_WIDTH_DURATION - 333) * DDM,
delay: (ttTheme.fullWidthDurationMs - 333) * DDM,
}]}
>
<DriverName open>
@@ -278,7 +270,7 @@ export function TimingTowerRow({
</DriverNameContainer>
</RowLeftHalfLayout>
<RowLeftHalfGemContainer>
<TeamGem team={car.driver.team.id} height={timingTowerTheme.teamGemSize} />
<TeamGem team={car.driver.team.id} height={ttTheme.teamGemSizePx} />
</RowLeftHalfGemContainer>
<AnimatedRowLeftHalfOutline
@@ -312,30 +304,30 @@ export function TimingTowerRow({
<RowRightHalf
roundedCornerTop={car.position === 1
? timingTowerTheme.rowRoundedCornerRadiusPx : 0}
? ttTheme.rowRoundedCornerRadiusPx : 0}
roundedCornerBottom={
bottomRounded && orMatch(
splitsMode,
BGTimingTowerSplitsMode.Leader,
BGTimingTowerSplitsMode.Interval,
) ? timingTowerTheme.rowRoundedCornerRadiusPx : 0
) ? ttTheme.rowRoundedCornerRadiusPx : 0
}
open={displayMode === BGTimingTowerDisplayMode.LeftAndRight}
transitionProps={[{
property: "border-top-right-radius",
duration: TRAVEL_DURATION * DDM,
duration: ttTheme.rowTravelDurationMs * DDM,
}, {
property: "border-bottom-right-radius",
duration: TRAVEL_DURATION * DDM,
duration: ttTheme.rowTravelDurationMs * DDM,
}]}
transitionClosingProps={[{
property: "width",
duration: FULL_WIDTH_DURATION * DDM,
duration: ttTheme.fullWidthDurationMs * DDM,
}]}
transitionOpeningProps={[{
property: "width",
duration: FULL_WIDTH_DURATION * DDM,
delay: FULL_WIDTH_CLOSE_DELAY * DDM,
duration: ttTheme.fullWidthDurationMs * DDM,
delay: ttTheme.fullWidthCloseDelayMs * DDM,
}]}
hugRight={hugRight}
>
@@ -346,12 +338,12 @@ export function TimingTowerRow({
open={displayMode === BGTimingTowerDisplayMode.LeftAndRight}
transitionOpeningProps={[{
property: "opacity",
duration: FULL_WIDTH_DURATION * DDM,
delay: FULL_WIDTH_CLOSE_DELAY * DDM,
duration: ttTheme.fullWidthDurationMs * DDM,
delay: ttTheme.fullWidthCloseDelayMs * DDM,
}]}
transitionClosingProps={[{
property: "opacity",
duration: FULL_WIDTH_DURATION * DDM,
duration: ttTheme.fullWidthDurationMs * DDM,
}]}
>
{rightHalfContent}
@@ -197,7 +197,7 @@ RowRightHalfLayout.displayName = "RowRightHalfLayout";
export const DriverNameContainer = styled.div`
position: relative;
margin-left: ${p => p.theme.design.timingTower.nameLeftMargin}px;
margin-left: ${p => p.theme.design.timingTower.nameLeftMarginPx}px;
`;
DriverNameContainer.displayName = "DriverNameContainer";