diff --git a/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/VenetianBlindsTransition.tsx b/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/VenetianBlindsTransition.tsx index 672013f..5dd068f 100644 --- a/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/VenetianBlindsTransition.tsx +++ b/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/VenetianBlindsTransition.tsx @@ -8,6 +8,7 @@ import { Milliseconds } from "../../../../types/util"; type VenetianBlindsTransitionProps = { visible: boolean, + delay?: Milliseconds, blindsColor: string, blindsColorFadeDuration: Milliseconds, blindsColorFadeDelay?: Milliseconds, @@ -26,6 +27,7 @@ type VenetianBlindsTransitionProps = { export const VenetianBlindsTransition = ( { visible, + delay = 0, blindsColor, blindsColorFadeDuration, blindsColorFadeDelay = 0, @@ -51,18 +53,19 @@ export const VenetianBlindsTransition = ( const { wipe } = useSpring({ wipe: visible ? 1 : 0, config: { duration: wipeDuration }, + delay: 0 + delay, }); const { opacity } = useSpring({ opacity: visible ? 1 : opacityStart, config: { duration: opacityDuration }, - delay: opacityDelay, + delay: opacityDelay + delay, }); const blindsSpring = useSpring({ opacity: visible ? 1 : 0, config: { duration: blindsOpenDuration }, - delay: blindsOpenDelay, + delay: blindsOpenDelay + delay, }); return ( @@ -92,6 +95,7 @@ export const VenetianBlindsTransition = ( blindsColorFadeDelay={blindsColorFadeDelay} blindsClosing={visible} spanBlinkDuration={spanBlinkDuration} + spanBlinkDelay={delay} mirror={true} // Mirror version provides the opposite blinds. > {children} @@ -105,6 +109,7 @@ export const VenetianBlindsTransition = ( blindsColorFadeDelay={blindsColorFadeDelay} blindsClosing={visible} spanBlinkDuration={spanBlinkDuration} + spanBlinkDelay={delay} mirror={false} > {children} diff --git a/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/styles.ts b/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/styles.ts index 5e4764c..73169a7 100644 --- a/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/styles.ts +++ b/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/styles.ts @@ -48,11 +48,11 @@ export const VenetianBlindsFilter = styled.div` ${({ blindsColorFadeDelay = 0 }) => blindsColorFadeDelay}ms; } - ${({ blindsClosing, spanBlinkDuration }) => ( + ${({ blindsClosing, spanBlinkDuration, spanBlinkDelay = 0 }) => ( blindsClosing && spanBlinkDuration ? css` span { - animation: ${spanBlinkAnimation} ${spanBlinkDuration}ms step-end; + animation: ${spanBlinkAnimation} ${spanBlinkDuration}ms step-end ${spanBlinkDelay}ms; }; ` : null) diff --git a/src/components/Workspaces/CustomWorkSpaces/VenetianBlindsWorkspace/VenetianBlindsWorkspace.tsx b/src/components/Workspaces/CustomWorkSpaces/VenetianBlindsWorkspace/VenetianBlindsWorkspace.tsx index 3bd5512..bd129da 100644 --- a/src/components/Workspaces/CustomWorkSpaces/VenetianBlindsWorkspace/VenetianBlindsWorkspace.tsx +++ b/src/components/Workspaces/CustomWorkSpaces/VenetianBlindsWorkspace/VenetianBlindsWorkspace.tsx @@ -4,6 +4,8 @@ import { useSelector } from "react-redux"; import { workspaceSelector } from "../../../../features/workspace/workspaceSelector"; import { theme } from "../../../../shared/theme"; import { BasicBlock } from "../styles"; +import { DriverId } from "../../../../types/state"; +import { getDriver } from "../../../../utils/dataLookup"; import { DriverPortrait } from "../../../BroadcastGraphics/Common/DriverPortrait"; import { PositionFlag } from "../../../BroadcastGraphics/Common/PositionFlag"; @@ -22,7 +24,11 @@ export function VenetianBlindsWorkspace() { {prototypeState?.venetianTransition?.mode === "driverPortrait" ? ( @@ -46,17 +54,19 @@ export function VenetianBlindsWorkspace() { blindsColorFadeDelay={200} blindsAngle={-45} blindsOpenDuration={100} - blindsOpenDelay={100} + blindsOpenDelay={150} blindsSize={{ transparent: 3, opaque: 6 }} wipeAngle={40} wipeDuration={300} - wipeStartingCorner="bottomRight" + wipeStartingCorner={ + prototypeState?.venetianTransition?.wipeStartingCorner ?? "bottomRight" + } opacityStart={0.1} opacityDuration={200} opacityDelay={100} spanBlinkDuration={500} > - + )} diff --git a/src/components/Workspaces/PrototypingControls/VenetianBlindsPrototype/VenetianBlindsPrototypeControls.tsx b/src/components/Workspaces/PrototypingControls/VenetianBlindsPrototype/VenetianBlindsPrototypeControls.tsx index 65e8980..787236d 100644 --- a/src/components/Workspaces/PrototypingControls/VenetianBlindsPrototype/VenetianBlindsPrototypeControls.tsx +++ b/src/components/Workspaces/PrototypingControls/VenetianBlindsPrototype/VenetianBlindsPrototypeControls.tsx @@ -1,26 +1,47 @@ import { InlineCluster } from "@bedrock-layout/inline-cluster"; import { PadBox } from "@bedrock-layout/padbox"; +import { useState } from "react"; import { useDispatch, useSelector } from "react-redux"; import { workspaceSelector } from "../../../../features/workspace/workspaceSelector"; import { updateVenetianTransition } from "../../../../features/workspace/workspaceSlice"; -import { VenetianTransitionWorkspaceMode } from "../../../../types/state"; +import { DriverId } from "../../../../types/state"; +import { Corner } from "../../../../types/style"; import { SlotSelector } from "../../../Common/Inputs/SlotSelector"; import { Toggle } from "../../../Common/Inputs/Toggle"; -const modes: Array = [ - "positionFlag", - "driverPortrait", + +// NOTE: This is all hacky and 100% wouldn't fly in production code. +const modes = ["positionFlag", "driverPortrait"]; +const subModes: [string[], DriverId[]] = [ + ["1", "3", "5", "10", "20"], + ["hamilton", "verstappen", "schumacher", "alonso", "leclerc"], ]; +const corners: Corner[] = ["bottomRight", "bottomLeft", "topLeft", "topRight"]; export function VenetianBlindsPrototypeControls() { + const [modeIndex, setModeIndex] = useState(0); + const dispatch = useDispatch(); const { prototypeState } = useSelector(workspaceSelector); - const onChange = (index: number) => { + const changeMode = (index: number) => { + setModeIndex(index); + dispatch(updateVenetianTransition({ mode: modes[index], + subMode: subModes[index][0], + })); + }; + const changeSubMode = (index: number) => { + dispatch(updateVenetianTransition({ + subMode: subModes[modeIndex][index], + })); + }; + const onChangeStartingCorner = (index: number) => { + dispatch(updateVenetianTransition({ + wipeStartingCorner: corners[index], })); }; @@ -34,10 +55,22 @@ export function VenetianBlindsPrototypeControls() { + + { if (state.prototypeState.venetianTransition == null) { state.prototypeState.venetianTransition = { - mode: "positionFlag", + mode: "portraitFlag", + subMode: "1", showBG: true, - timing: 500, - startingCorner: "topLeft", + wipeStartingCorner: "bottomRight", }; } state.prototypeState.venetianTransition = Object.assign( diff --git a/src/types/state.d.ts b/src/types/state.d.ts index d931dba..b9a1c5e 100644 --- a/src/types/state.d.ts +++ b/src/types/state.d.ts @@ -42,13 +42,12 @@ export interface PrototypeState { flagB: TeamId; }; venetianTransition?: { - mode: VenetianTransitionWorkspaceMode; + mode: string, + subMode: string, showBG: boolean; - timing: number, - startingCorner: Corner, + wipeStartingCorner: Corner, }; } -export type VenetianTransitionWorkspaceMode = "positionFlag" | "driverPortrait"; // Overlay Tool export interface OverlayTool {