7 files changed
+105
-66
No files matched your search
@@ -7,17 +7,19 @@ type PositionFlagProps = {
|
||||
size: Px,
|
||||
number: number,
|
||||
numberSizeFraction?: Fraction,
|
||||
color?: string;
|
||||
bgColor?: string,
|
||||
numberColor?: string,
|
||||
};
|
||||
export function PositionFlag({
|
||||
size,
|
||||
number,
|
||||
numberSizeFraction = 0.64,
|
||||
color = theme.colors.positionFlagBG,
|
||||
bgColor = theme.colors.posWhite,
|
||||
numberColor = theme.colors.black,
|
||||
}: PositionFlagProps) {
|
||||
return (
|
||||
<PositionFlagBox size={size} color={color}>
|
||||
<PositionNumber size={size * numberSizeFraction}>
|
||||
<PositionFlagBox size={size} color={bgColor}>
|
||||
<PositionNumber size={size * numberSizeFraction} color={numberColor}>
|
||||
{number}
|
||||
</PositionNumber>
|
||||
</PositionFlagBox>
|
||||
|
||||
@@ -21,10 +21,12 @@ PositionFlagBox.displayName = "PositionFlagBox";
|
||||
|
||||
type PositionNumberProps = {
|
||||
size: Px,
|
||||
color: string,
|
||||
};
|
||||
export const PositionNumber = styled.span<PositionNumberProps>`
|
||||
font-family: ${p => p.theme.fonts.f1Regular};
|
||||
font-size: ${({ size }) => size}px;
|
||||
color: ${({ color }) => color};
|
||||
margin-top: 2px;
|
||||
`;
|
||||
PositionNumber.displayName = "PositionNumber";
|
||||
@@ -36,6 +36,7 @@ import {
|
||||
AnimatedRowLeftHalfOutline,
|
||||
DriverNameContainer,
|
||||
DriverNameWipe,
|
||||
FastestLapContainer,
|
||||
} from "./styles";
|
||||
import useMeasure from "react-use-measure";
|
||||
|
||||
@@ -61,30 +62,38 @@ export function TimingTowerRow({
|
||||
const { design: { timingTower: ttTheme } } = theme;
|
||||
|
||||
const [pastPos, setPastPos] = useState(car.position);
|
||||
const [posChange, setPosChange] = useState(0);
|
||||
const [currentFL, setCurrentFL] = useState(false);
|
||||
const [pastDisplayMode, setPastDisplayMode] = useState(displayMode);
|
||||
const [hugRight, setHugRight] = useState(true);
|
||||
|
||||
// Using timeouts and boolean states I can manipulate visiblity of the position
|
||||
// change effects. wipeVisible is true for only 1ms before being switched back off.
|
||||
const [showPosChange, setShowPosChange] = useState(false);
|
||||
// change effects. When a
|
||||
const [showOutline, setShowOutline] = useState(false);
|
||||
const [wipeVisible, setWipeVisible] = useState(false);
|
||||
useTimeoutWhen(() => setShowPosChange(false), (
|
||||
ttTheme.wipeDelayMs + ttTheme.wipeDurationMs
|
||||
) * DDM, showPosChange);
|
||||
useTimeoutWhen(() => setShowOutline(false), ttTheme.rowTravelDurationMs * DDM, showOutline);
|
||||
useTimeoutWhen(() => setWipeVisible(false), 1, wipeVisible);
|
||||
const [showChangeFlag, setShowChangeFlag] = useState(false);
|
||||
useTimeoutWhen(() => setShowChangeFlag(false), ttTheme.wipeDelayMs * DDM, showChangeFlag);
|
||||
const [changeColors, setChangeColors] = useState<[string, string]>(["white", "black"]);
|
||||
|
||||
useEffect(() => {
|
||||
if (car.position !== pastPos) {
|
||||
// Position change.
|
||||
setShowChangeFlag(true);
|
||||
setChangeColors([
|
||||
car.position < pastPos ? theme.colors.posGainedGreen : theme.colors.posLostRed,
|
||||
theme.colors.black,
|
||||
]);
|
||||
setPastPos(car.position);
|
||||
setPosChange(pastPos - car.position);
|
||||
setShowPosChange(true);
|
||||
setShowOutline(true);
|
||||
setWipeVisible(true);
|
||||
} else if (car.notices.includes(CarNotice.FastestLap) && !currentFL) {
|
||||
// Fastest Lap gained.
|
||||
setShowChangeFlag(true);
|
||||
setCurrentFL(true);
|
||||
setChangeColors([theme.colors.posFastestLap, theme.colors.textWhite]);
|
||||
} else if (currentFL && !car.notices.includes(CarNotice.FastestLap)) {
|
||||
// Fastest Lap lost.
|
||||
setCurrentFL(false);
|
||||
}
|
||||
}, [car.position]);
|
||||
}, [car.position, car.notices]);
|
||||
|
||||
useEffect(() => {
|
||||
if (pastDisplayMode !== displayMode) {
|
||||
@@ -103,7 +112,7 @@ export function TimingTowerRow({
|
||||
}, [displayMode]);
|
||||
|
||||
const { outlineClipPathProgress } = useSpring({
|
||||
outlineClipPathProgress: showPosChange ? 1 : 0,
|
||||
outlineClipPathProgress: showOutline ? 1 : 0,
|
||||
config: { duration: 333 * DDM },
|
||||
delay: 0 * DDM,
|
||||
});
|
||||
@@ -154,9 +163,15 @@ export function TimingTowerRow({
|
||||
top={(car.position - 1) * ttTheme.rowHeightPx}
|
||||
transitionTime={ttTheme.rowTravelDurationMs * DDM}
|
||||
>
|
||||
{car.notices.includes(CarNotice.FastestLap) && (
|
||||
<FastestLapGem />
|
||||
)}
|
||||
<FastestLapContainer>
|
||||
<FastestLapGem
|
||||
open={car.notices.includes(CarNotice.FastestLap)}
|
||||
transitionProps={[{
|
||||
property: "left",
|
||||
duration: ttTheme.fastestLapToastDurationMs * DDM,
|
||||
}]}
|
||||
/>
|
||||
</FastestLapContainer>
|
||||
<RowLeftHalf
|
||||
roundedCornerBottom={
|
||||
bottomRounded && orMatch(
|
||||
@@ -193,36 +208,34 @@ export function TimingTowerRow({
|
||||
>
|
||||
<RowLeftHalfLayout>
|
||||
{car.status !== CarStatus.Retired && (
|
||||
/**
|
||||
* The "Change" PositionFlag (the colored one) is always present but
|
||||
* usually hidden under a second visible "Normal" PositionFlag. When
|
||||
* a change is made the normal PositionFlag is hidden instantly and
|
||||
* after a delay is revealed. With the reveal a WipeTransition also
|
||||
* takes place. Before, the "Change" PositionFlag would wipe away.
|
||||
* Now, instead, it is hidden under a revealed "Normal" PositionFlag.
|
||||
*/
|
||||
<RowLeftHalfPosFlagContainer size={ttTheme.posFlagSizePx}>
|
||||
<PositionFlag
|
||||
size={ttTheme.posFlagSizePx}
|
||||
number={car.position}
|
||||
numberSizeFraction={.6}
|
||||
numberSizeFraction={0.6}
|
||||
bgColor={changeColors[0]}
|
||||
numberColor={changeColors[1]}
|
||||
/>
|
||||
<RowLeftHalfPosFlagChangeContainer
|
||||
size={ttTheme.posFlagSizePx}
|
||||
visible={showPosChange}
|
||||
transitionTime={167 * DDM}
|
||||
>
|
||||
{showPosChange && (
|
||||
<WipeTransition
|
||||
visible={wipeVisible}
|
||||
delay={ttTheme.wipeDelayMs * DDM}
|
||||
angle={45}
|
||||
duration={ttTheme.wipeDurationMs * DDM}
|
||||
startingCorner="topLeft"
|
||||
>
|
||||
<PositionFlag
|
||||
size={ttTheme.posFlagSizePx}
|
||||
number={car.position}
|
||||
numberSizeFraction={.6}
|
||||
color={posChange > 0
|
||||
? theme.colors.posGainedGreen
|
||||
: theme.colors.posLostRed}
|
||||
/>
|
||||
</WipeTransition>
|
||||
|
||||
)}
|
||||
<RowLeftHalfPosFlagChangeContainer open={!showChangeFlag}>
|
||||
<WipeTransition
|
||||
visible={!showChangeFlag}
|
||||
angle={45}
|
||||
duration={ttTheme.wipeDurationMs * DDM}
|
||||
startingCorner="bottomRight"
|
||||
>
|
||||
<PositionFlag
|
||||
size={ttTheme.posFlagSizePx}
|
||||
number={car.position}
|
||||
/>
|
||||
</WipeTransition>
|
||||
</RowLeftHalfPosFlagChangeContainer>
|
||||
</RowLeftHalfPosFlagContainer>
|
||||
)}
|
||||
@@ -277,12 +290,8 @@ export function TimingTowerRow({
|
||||
open={showOutline}
|
||||
startThickness={1.5}
|
||||
endThickness={1.5}
|
||||
startColor={posChange > 0
|
||||
? theme.colors.posGainedGreen
|
||||
: theme.colors.posLostRed}
|
||||
endColor={posChange > 0
|
||||
? theme.colors.posGainedGreen
|
||||
: theme.colors.posLostRed}
|
||||
startColor={changeColors[0]}
|
||||
endColor={changeColors[0]}
|
||||
transitionProps={[{
|
||||
property: "opacity",
|
||||
duration: 333 * DDM,
|
||||
|
||||
@@ -5,9 +5,11 @@ import {
|
||||
Fraction,
|
||||
Px,
|
||||
DirectionalTransitionProps,
|
||||
TransitionProps,
|
||||
OpenProps,
|
||||
} from "../../../../types/style";
|
||||
import { Milliseconds } from "../../../../types/util";
|
||||
import { commonDirectionalTransition } from "../../../../utils/styling";
|
||||
import { commonDirectionalTransition, commonTransition } from "../../../../utils/styling";
|
||||
|
||||
import fastestLapIcon from "../../../../public/images/icons/fastest-lap.svg";
|
||||
|
||||
@@ -118,6 +120,7 @@ export const RowLeftHalfLayout = styled.div`
|
||||
display: flex;
|
||||
padding-left: 3px;
|
||||
|
||||
align-items: center;
|
||||
justify-content: flex-start;
|
||||
`;
|
||||
RowLeftHalfLayout.displayName = "RowLeftHalfLayout";
|
||||
@@ -132,20 +135,12 @@ export const RowLeftHalfPosFlagContainer = styled.div<RowLeftHalfPosFlagContaine
|
||||
`;
|
||||
RowLeftHalfPosFlagContainer.displayName = "RowLeftHalfPosFlagContainer";
|
||||
|
||||
type RowLeftHalfPosFlagChangeContainerProps = {
|
||||
size: Px,
|
||||
visible: boolean,
|
||||
transitionTime: Milliseconds,
|
||||
};
|
||||
export const RowLeftHalfPosFlagChangeContainer = styled.div<RowLeftHalfPosFlagChangeContainerProps>`
|
||||
export const RowLeftHalfPosFlagChangeContainer = styled.div<OpenProps>`
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
height: ${({ size }) => size}px;
|
||||
width: ${({ size }) => size}px;
|
||||
|
||||
opacity: ${({ visible }) => visible ? 1 : 0};
|
||||
transition: opacity ${({ transitionTime }) => transitionTime}ms;
|
||||
opacity: ${({ open }) => open ? 1 : 0};
|
||||
`;
|
||||
RowLeftHalfPosFlagChangeContainer.displayName = "RowLeftHalfPosFlagChangeContainer";
|
||||
|
||||
@@ -198,6 +193,7 @@ RowRightHalfLayout.displayName = "RowRightHalfLayout";
|
||||
export const DriverNameContainer = styled.div`
|
||||
position: relative;
|
||||
margin-left: ${p => p.theme.design.timingTower.nameLeftMarginPx}px;
|
||||
margin-top: ${p => p.theme.design.timingTower.nameTopMarginPx}px;
|
||||
`;
|
||||
DriverNameContainer.displayName = "DriverNameContainer";
|
||||
|
||||
@@ -251,19 +247,32 @@ export const TimeDiff = styled.span<TimeDiffProps>`
|
||||
`;
|
||||
TimeDiff.displayName = "TimeDiff";
|
||||
|
||||
export const FastestLapGem = styled.div`
|
||||
export const FastestLapContainer = styled.div`
|
||||
position: absolute;
|
||||
left: ${p => -p.theme.design.timingTower.rowHeightPx + 2}px;
|
||||
top: 0;
|
||||
|
||||
height: ${p => p.theme.design.timingTower.rowHeightPx}px;
|
||||
width: ${p => p.theme.design.timingTower.rowHeightPx - 2}px;
|
||||
|
||||
left: ${p => -p.theme.design.timingTower.rowHeightPx + 2}px;
|
||||
overflow: clip;
|
||||
`;
|
||||
|
||||
export const FastestLapGem = styled.div<TransitionProps>`
|
||||
position: absolute;
|
||||
left: ${({ open }) => open ? 0
|
||||
: p => p.theme.design.timingTower.rowHeightPx}px;
|
||||
top: 0;
|
||||
|
||||
height: ${p => p.theme.design.timingTower.rowHeightPx}px;
|
||||
width: ${p => p.theme.design.timingTower.rowHeightPx - 2}px;
|
||||
|
||||
background-color: ${p => p.theme.colors.laps.purple};
|
||||
background-image: url(${fastestLapIcon});
|
||||
background-repeat: no-repeat;
|
||||
background-size: 89%;
|
||||
background-position: center 40%;
|
||||
|
||||
${({ transitionProps }) => commonTransition(transitionProps)}
|
||||
`;
|
||||
FastestLapGem.displayName = "FastestLapGem";
|
||||
+10
-1
@@ -8,7 +8,7 @@ import { broadcastDirectorSelector } from "../../../../features/broadcast/direct
|
||||
import { broadcastGraphicsSelector } from "../../../../features/broadcast/graphics/broadcastGraphicsSelector";
|
||||
import { setTimingTowerDisplayMode, setTimingTowerSplitsMode } from "../../../../features/broadcast/graphics/broadcastGraphicsSlice";
|
||||
import { eventSelector } from "../../../../features/event/eventSelector";
|
||||
import { increaseDistance, refreshRunningOrder, setCarStatus } from "../../../../features/event/eventSlice";
|
||||
import { awardFastestLap, increaseDistance, refreshRunningOrder, setCarStatus } from "../../../../features/event/eventSlice";
|
||||
import { BGTimingTowerDisplayMode, BGTimingTowerSplitsMode, CarStatus } from "../../../../types/state";
|
||||
import { GridSelection } from "../GridSelection";
|
||||
|
||||
@@ -90,6 +90,15 @@ export function TimingTowerPrototypeControls() {
|
||||
>
|
||||
Un-retire
|
||||
</ClickSpan>
|
||||
<ClickSpan
|
||||
onClick={() => {
|
||||
if (selectedCars.length > 0) {
|
||||
dispatch(awardFastestLap(selectedCars[0]));
|
||||
}
|
||||
}}
|
||||
>
|
||||
Award FL
|
||||
</ClickSpan>
|
||||
</InlineCluster>
|
||||
<hr />
|
||||
<InlineCluster gutter="md">
|
||||
|
||||
@@ -222,6 +222,10 @@ interface SetCarStatusAction {
|
||||
status: CarStatus;
|
||||
}
|
||||
|
||||
/**
|
||||
* Note: Add `state.lastUpdate = Date.now();` to the end of every reducer to
|
||||
* keep components up to date that watch for changes with useEffect() functions.
|
||||
*/
|
||||
export const eventSlice = createSlice({
|
||||
name: "event",
|
||||
initialState,
|
||||
|
||||
+5
-1
@@ -20,13 +20,15 @@ export const theme = {
|
||||
disabledRed: "#e08a91",
|
||||
posLostRed: "#e40030",
|
||||
posGainedGreen: "#10ff35",
|
||||
posFastestLap: "#ae43ca",
|
||||
black: "#000",
|
||||
grey: "#aaa",
|
||||
lightGrey: "#ddd",
|
||||
faintGrey: "#eee",
|
||||
darkGrey: "#303030",
|
||||
dimGrey: "#999",
|
||||
videoFrameBG: "#333",
|
||||
positionFlagBG: "#f4f3ee",
|
||||
posWhite: "#f4f3ee",
|
||||
textWhite: "#f1f1f1", // I found it to be #f2f2f2 but whatever
|
||||
teams: { // 2021 Season
|
||||
alfaRomeo: "#900000",
|
||||
@@ -83,12 +85,14 @@ export const theme = {
|
||||
teamGemSizePx: 30,
|
||||
posFlagSizePx: 32,
|
||||
nameLeftMarginPx: 14,
|
||||
nameTopMarginPx: 4,
|
||||
rowRoundedCornerRadiusPx: 5,
|
||||
wipeDelayMs: 3500,
|
||||
wipeDurationMs: 400,
|
||||
rowTravelDurationMs: 750,
|
||||
fullWidthDurationMs: 750,
|
||||
fullWidthCloseDelayMs: 333,
|
||||
fastestLapToastDurationMs: 500,
|
||||
},
|
||||
button: {
|
||||
borderRadius: "0.25rem",
|
||||
|
||||
Reference in new issue
Block a user