From 177272df6f0edb6a96e80ca60bf91135c353c268 Mon Sep 17 00:00:00 2001 From: Kyle Geib Date: Tue, 8 Feb 2022 12:19:54 -0500 Subject: [PATCH] ISSUE-045 - Venetian Blinds - Calibrated portrait example to be more accurate to real example. Added opacity props for the filter to allow for an opacity rule on the entire filter - as is apparent with the real position flag example. --- .../VenetianBlindsTransition.tsx | 15 ++++++++++++++- .../VenetianBlindsWorkspace.tsx | 11 ++++++++--- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/VenetianBlindsTransition.tsx b/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/VenetianBlindsTransition.tsx index ae01c5d..1c72082 100644 --- a/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/VenetianBlindsTransition.tsx +++ b/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/VenetianBlindsTransition.tsx @@ -4,7 +4,7 @@ import useMeasure from "react-use-measure"; import { AnimatedVenetianBlindsFilter, VenetianBlindsFilter } from "./styles"; import { wipeCustomDegClip } from "../../../../utils/styling"; -import { Corner, Degrees, Px } from "../../../../types/style"; +import { Corner, Degrees, Fraction, Px } from "../../../../types/style"; import { Milliseconds } from "../../../../types/util"; type VenetianBlindsTransitionProps = { @@ -18,6 +18,9 @@ type VenetianBlindsTransitionProps = { wipeAngle: Degrees, wipeDuration: Milliseconds, wipeStartingCorner: Corner, + opacityStart?: Fraction, + opacityDuration?: Milliseconds, + opacityDelay?: Milliseconds, }; export const VenetianBlindsTransition = ( { @@ -31,6 +34,9 @@ export const VenetianBlindsTransition = ( wipeAngle, wipeDuration, wipeStartingCorner, + opacityStart = 1, + opacityDuration = wipeDuration, + opacityDelay = 0, children, }: React.PropsWithChildren, ) => { @@ -46,6 +52,12 @@ export const VenetianBlindsTransition = ( config: { duration: wipeDuration }, }); + const { opacity } = useSpring({ + opacity: state ? 1 : opacityStart, + config: { duration: opacityDuration }, + delay: opacityDelay, + }); + const blindsSpring = useSpring({ opacity: state ? 1 : 0, config: { duration: blindsOpenDuration }, @@ -56,6 +68,7 @@ export const VenetianBlindsTransition = (
toggle(!state)}> { const [a1, a2, b1, b2, c1, c2] = wipeCustomDegClip( childWidth, diff --git a/src/components/Workspaces/CustomWorkSpaces/VenetianBlindsWorkspace/VenetianBlindsWorkspace.tsx b/src/components/Workspaces/CustomWorkSpaces/VenetianBlindsWorkspace/VenetianBlindsWorkspace.tsx index 97aebae..b54a4dc 100644 --- a/src/components/Workspaces/CustomWorkSpaces/VenetianBlindsWorkspace/VenetianBlindsWorkspace.tsx +++ b/src/components/Workspaces/CustomWorkSpaces/VenetianBlindsWorkspace/VenetianBlindsWorkspace.tsx @@ -35,13 +35,18 @@ export function VenetianBlindsWorkspace() { ) : (