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