diff --git a/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/VenetianBlindsTransition.tsx b/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/VenetianBlindsTransition.tsx index 759db5e..1acfae1 100644 --- a/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/VenetianBlindsTransition.tsx +++ b/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/VenetianBlindsTransition.tsx @@ -1,10 +1,9 @@ -import { useSpring, animated, easings } from "@react-spring/web"; -import useMeasure from "react-use-measure"; +import { useSpring } from "@react-spring/web"; import { AnimatedVenetianBlindsFilter, VenetianBlindsFilter } from "./styles"; -import { wipeCustomDegClip } from "../../../../utils/styling"; import { Corner, Degrees, Fraction, Px } from "../../../../types/style"; import { Milliseconds } from "../../../../types/util"; +import { WipeTransition } from "../WipeTransition"; type VenetianBlindsTransitionProps = { visible: boolean, @@ -24,7 +23,7 @@ type VenetianBlindsTransitionProps = { opacityDelay?: Milliseconds, spanBlinkDuration?: Milliseconds, }; -export const VenetianBlindsTransition = ( +export function VenetianBlindsTransition( { visible, delay = 0, @@ -44,27 +43,7 @@ export const VenetianBlindsTransition = ( spanBlinkDuration, children, }: React.PropsWithChildren, -) => { - const [childRef, { - height: childHeight, - width: childWidth, - }] = useMeasure(); - - const { wipe } = useSpring({ - wipe: visible ? 1 : 0, - config: { - duration: wipeDuration, - easing: easings.easeInOutQuint, - }, - delay: 0 + delay, - }); - - const { opacity } = useSpring({ - opacity: visible ? 1 : opacityStart, - config: { duration: opacityDuration }, - delay: opacityDelay + delay, - }); - +) { const blindsSpring = useSpring({ opacity: visible ? 1 : 0, config: { duration: blindsOpenDuration }, @@ -72,21 +51,15 @@ export const VenetianBlindsTransition = ( }); return ( - { - const coordinates = wipeCustomDegClip( - childWidth, - childHeight, - wipeProgress, - wipeStartingCorner, - wipeAngle, - ); - return `polygon(${coordinates.map(([x, y]) => `${x}px ${y}px`).join(", ")})`; - }), - }} - ref={childRef} + {children} - + ); -}; +} diff --git a/src/components/BroadcastGraphics/Common/WipeTransition/WipeTransition.tsx b/src/components/BroadcastGraphics/Common/WipeTransition/WipeTransition.tsx new file mode 100644 index 0000000..ca81f33 --- /dev/null +++ b/src/components/BroadcastGraphics/Common/WipeTransition/WipeTransition.tsx @@ -0,0 +1,70 @@ +import { animated, easings, useSpring } from "@react-spring/web"; +import useMeasure from "react-use-measure"; + +import { Corner, Degrees, Fraction } from "../../../../types/style"; +import { Milliseconds } from "../../../../types/util"; +import { wipeCustomDegClip } from "../../../../utils/styling"; + +type WipeTransitionProps = { + visible: boolean, + delay?: Milliseconds, + angle: Degrees, + duration: Milliseconds, + startingCorner: Corner, + opacityStart?: Fraction, + opacityDuration?: Milliseconds, + opacityDelay?: Milliseconds, +} + +export function WipeTransition({ + visible, + delay = 0, + angle, + duration, + startingCorner, + opacityStart = 1, + opacityDuration = duration, + opacityDelay = 0, + children, +}: React.PropsWithChildren) { + const [childRef, { + height: childHeight, + width: childWidth, + }] = useMeasure(); + + const { wipe } = useSpring({ + wipe: visible ? 1 : 0, + config: { + duration: duration, + easing: easings.easeInOutQuint, + }, + delay: 0 + delay, + }); + + const { opacity } = useSpring({ + opacity: visible ? 1 : opacityStart, + config: { duration: opacityDuration }, + delay: opacityDelay + delay, + }); + + return ( + { + const coordinates = wipeCustomDegClip( + childWidth, + childHeight, + wipeProgress, + startingCorner, + angle, + ); + return `polygon(${coordinates.map(([x, y]) => `${x}px ${y}px`).join(", ")})`; + }), + }} + ref={childRef} + > + {children} + + ); +} diff --git a/src/components/BroadcastGraphics/Common/WipeTransition/index.ts b/src/components/BroadcastGraphics/Common/WipeTransition/index.ts new file mode 100644 index 0000000..1d82001 --- /dev/null +++ b/src/components/BroadcastGraphics/Common/WipeTransition/index.ts @@ -0,0 +1 @@ +export * from "./WipeTransition"; diff --git a/src/components/BroadcastGraphics/Common/WipeTransition/styles.ts b/src/components/BroadcastGraphics/Common/WipeTransition/styles.ts new file mode 100644 index 0000000..a2a013d --- /dev/null +++ b/src/components/BroadcastGraphics/Common/WipeTransition/styles.ts @@ -0,0 +1,3 @@ +import styled from "styled-components"; + +export const Foo = styled.div``;