diff --git a/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/VenetianBlindsTransition.tsx b/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/VenetianBlindsTransition.tsx index d1ce9ca..672013f 100644 --- a/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/VenetianBlindsTransition.tsx +++ b/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/VenetianBlindsTransition.tsx @@ -1,4 +1,3 @@ -import { useState } from "react"; import { useSpring, animated } from "@react-spring/web"; import useMeasure from "react-use-measure"; @@ -8,6 +7,7 @@ import { Corner, Degrees, Fraction, Px } from "../../../../types/style"; import { Milliseconds } from "../../../../types/util"; type VenetianBlindsTransitionProps = { + visible: boolean, blindsColor: string, blindsColorFadeDuration: Milliseconds, blindsColorFadeDelay?: Milliseconds, @@ -25,6 +25,7 @@ type VenetianBlindsTransitionProps = { }; export const VenetianBlindsTransition = ( { + visible, blindsColor, blindsColorFadeDuration, blindsColorFadeDelay = 0, @@ -47,71 +48,67 @@ export const VenetianBlindsTransition = ( width: childWidth, }] = useMeasure(); - const [state, toggle] = useState(true); - const { wipe } = useSpring({ - wipe: state ? 1 : 0, + wipe: visible ? 1 : 0, config: { duration: wipeDuration }, }); const { opacity } = useSpring({ - opacity: state ? 1 : opacityStart, + opacity: visible ? 1 : opacityStart, config: { duration: opacityDuration }, delay: opacityDelay, }); const blindsSpring = useSpring({ - opacity: state ? 1 : 0, + opacity: visible ? 1 : 0, config: { duration: blindsOpenDuration }, delay: blindsOpenDelay, }); return ( -
toggle(!state)}> - { - const [a1, a2, b1, b2, c1, c2] = wipeCustomDegClip( - childWidth, - childHeight, - wipeProgress, - wipeStartingCorner, - wipeAngle, - ); - return `polygon(${a1}px ${a2}px, ${b1}px ${b2}px, ${c1}px ${c2}px)`; - }), - }} - ref={childRef} + { + const [a1, a2, b1, b2, c1, c2] = wipeCustomDegClip( + childWidth, + childHeight, + wipeProgress, + wipeStartingCorner, + wipeAngle, + ); + return `polygon(${a1}px ${a2}px, ${b1}px ${b2}px, ${c1}px ${c2}px)`; + }), + }} + ref={childRef} + > + - - {children} - - - {children} - - -
+ {children} + + + {children} + + ); }; diff --git a/src/components/Workspaces/CustomWorkSpaces/VenetianBlindsWorkspace/VenetianBlindsWorkspace.tsx b/src/components/Workspaces/CustomWorkSpaces/VenetianBlindsWorkspace/VenetianBlindsWorkspace.tsx index 67ea085..3bd5512 100644 --- a/src/components/Workspaces/CustomWorkSpaces/VenetianBlindsWorkspace/VenetianBlindsWorkspace.tsx +++ b/src/components/Workspaces/CustomWorkSpaces/VenetianBlindsWorkspace/VenetianBlindsWorkspace.tsx @@ -1,6 +1,7 @@ +import { useState } from "react"; import { useSelector } from "react-redux"; -import { workspaceSelector } from "../../../../features/workspace/workspaceSelector"; +import { workspaceSelector } from "../../../../features/workspace/workspaceSelector"; import { theme } from "../../../../shared/theme"; import { BasicBlock } from "../styles"; @@ -14,10 +15,13 @@ export function VenetianBlindsWorkspace() { const bgColor = prototypeState?.venetianTransition?.showBG ?? true ? "black" : "transparent"; + const [visible, setVisible] = useState(true); + return ( - + setVisible(!visible)} > {prototypeState?.venetianTransition?.mode === "driverPortrait" ? ( ) : (