ISSUE-045 - Venetian Blinds - Moved visibility state outside of the Transition component and into the workspace.

This commit is contained in:
Kyle Geib committed 2022-02-08 12:29:37 -05:00
1 parent b1b3b62d3a
commit 9518f934ae
2 files changed
+55 -53

No files matched your search

@@ -1,4 +1,3 @@
import { useState } from "react";
import { useSpring, animated } from "@react-spring/web"; import { useSpring, animated } from "@react-spring/web";
import useMeasure from "react-use-measure"; import useMeasure from "react-use-measure";
@@ -8,6 +7,7 @@ import { Corner, Degrees, Fraction, Px } from "../../../../types/style";
import { Milliseconds } from "../../../../types/util"; import { Milliseconds } from "../../../../types/util";
type VenetianBlindsTransitionProps = { type VenetianBlindsTransitionProps = {
visible: boolean,
blindsColor: string, blindsColor: string,
blindsColorFadeDuration: Milliseconds, blindsColorFadeDuration: Milliseconds,
blindsColorFadeDelay?: Milliseconds, blindsColorFadeDelay?: Milliseconds,
@@ -25,6 +25,7 @@ type VenetianBlindsTransitionProps = {
}; };
export const VenetianBlindsTransition = ( export const VenetianBlindsTransition = (
{ {
visible,
blindsColor, blindsColor,
blindsColorFadeDuration, blindsColorFadeDuration,
blindsColorFadeDelay = 0, blindsColorFadeDelay = 0,
@@ -47,71 +48,67 @@ export const VenetianBlindsTransition = (
width: childWidth, width: childWidth,
}] = useMeasure(); }] = useMeasure();
const [state, toggle] = useState(true);
const { wipe } = useSpring({ const { wipe } = useSpring({
wipe: state ? 1 : 0, wipe: visible ? 1 : 0,
config: { duration: wipeDuration }, config: { duration: wipeDuration },
}); });
const { opacity } = useSpring({ const { opacity } = useSpring({
opacity: state ? 1 : opacityStart, opacity: visible ? 1 : opacityStart,
config: { duration: opacityDuration }, config: { duration: opacityDuration },
delay: opacityDelay, delay: opacityDelay,
}); });
const blindsSpring = useSpring({ const blindsSpring = useSpring({
opacity: state ? 1 : 0, opacity: visible ? 1 : 0,
config: { duration: blindsOpenDuration }, config: { duration: blindsOpenDuration },
delay: blindsOpenDelay, delay: blindsOpenDelay,
}); });
return ( return (
<div onClick={() => toggle(!state)}> <animated.div
<animated.div style={{
style={{ opacity,
opacity, clipPath: wipe.to(wipeProgress => {
clipPath: wipe.to(wipeProgress => { const [a1, a2, b1, b2, c1, c2] = wipeCustomDegClip(
const [a1, a2, b1, b2, c1, c2] = wipeCustomDegClip( childWidth,
childWidth, childHeight,
childHeight, wipeProgress,
wipeProgress, wipeStartingCorner,
wipeStartingCorner, wipeAngle,
wipeAngle, );
); return `polygon(${a1}px ${a2}px, ${b1}px ${b2}px, ${c1}px ${c2}px)`;
return `polygon(${a1}px ${a2}px, ${b1}px ${b2}px, ${c1}px ${c2}px)`; }),
}), }}
}} ref={childRef}
ref={childRef} >
<AnimatedVenetianBlindsFilter
style={blindsSpring}
blindsAngle={blindsAngle}
transparentWidth={blindsSize.transparent}
opaqueWidth={blindsSize.opaque}
blindsColor={blindsColor}
blindsColorFadeDuration={blindsColorFadeDuration}
blindsColorFadeDelay={blindsColorFadeDelay}
blindsClosing={visible}
spanBlinkDuration={spanBlinkDuration}
mirror={true} // Mirror version provides the opposite blinds.
> >
<AnimatedVenetianBlindsFilter {children}
style={blindsSpring} </AnimatedVenetianBlindsFilter>
blindsAngle={blindsAngle} <VenetianBlindsFilter
transparentWidth={blindsSize.transparent} blindsAngle={blindsAngle}
opaqueWidth={blindsSize.opaque} transparentWidth={blindsSize.transparent}
blindsColor={blindsColor} opaqueWidth={blindsSize.opaque}
blindsColorFadeDuration={blindsColorFadeDuration} blindsColor={blindsColor}
blindsColorFadeDelay={blindsColorFadeDelay} blindsColorFadeDuration={blindsColorFadeDuration}
blindsClosing={!!state} blindsColorFadeDelay={blindsColorFadeDelay}
spanBlinkDuration={spanBlinkDuration} blindsClosing={visible}
mirror={true} // Mirror version provides the opposite blinds. spanBlinkDuration={spanBlinkDuration}
> mirror={false}
{children} >
</AnimatedVenetianBlindsFilter> {children}
<VenetianBlindsFilter </VenetianBlindsFilter>
blindsAngle={blindsAngle} </animated.div>
transparentWidth={blindsSize.transparent}
opaqueWidth={blindsSize.opaque}
blindsColor={blindsColor}
blindsColorFadeDuration={blindsColorFadeDuration}
blindsColorFadeDelay={blindsColorFadeDelay}
blindsClosing={!!state}
spanBlinkDuration={spanBlinkDuration}
mirror={false}
>
{children}
</VenetianBlindsFilter>
</animated.div>
</div>
); );
}; };
@@ -1,6 +1,7 @@
import { useState } from "react";
import { useSelector } from "react-redux"; import { useSelector } from "react-redux";
import { workspaceSelector } from "../../../../features/workspace/workspaceSelector";
import { workspaceSelector } from "../../../../features/workspace/workspaceSelector";
import { theme } from "../../../../shared/theme"; import { theme } from "../../../../shared/theme";
import { BasicBlock } from "../styles"; import { BasicBlock } from "../styles";
@@ -14,10 +15,13 @@ export function VenetianBlindsWorkspace() {
const bgColor = prototypeState?.venetianTransition?.showBG ?? true const bgColor = prototypeState?.venetianTransition?.showBG ?? true
? "black" : "transparent"; ? "black" : "transparent";
const [visible, setVisible] = useState(true);
return ( return (
<BasicBlock width={450} height={450} color={bgColor} > <BasicBlock width={450} height={450} color={bgColor} onClick={() => setVisible(!visible)} >
{prototypeState?.venetianTransition?.mode === "driverPortrait" ? ( {prototypeState?.venetianTransition?.mode === "driverPortrait" ? (
<VenetianBlindsTransition <VenetianBlindsTransition
visible={visible}
blindsColor={theme.colors.teams.redBull} blindsColor={theme.colors.teams.redBull}
blindsColorFadeDuration={600} blindsColorFadeDuration={600}
blindsColorFadeDelay={300} blindsColorFadeDelay={300}
@@ -36,6 +40,7 @@ export function VenetianBlindsWorkspace() {
</VenetianBlindsTransition> </VenetianBlindsTransition>
) : ( ) : (
<VenetianBlindsTransition <VenetianBlindsTransition
visible={visible}
blindsColor="#f60d0d" blindsColor="#f60d0d"
blindsColorFadeDuration={300} blindsColorFadeDuration={300}
blindsColorFadeDelay={200} blindsColorFadeDelay={200}