From fdc92dfd199219101d8795f2f9551089f6bc47e9 Mon Sep 17 00:00:00 2001
From: cv <34649812+cpvalente@users.noreply.github.com>
Date: Tue, 27 Apr 2021 09:15:47 +0200
Subject: [PATCH] lower fadeout

---
 client/src/features/viewers/lower/Lower.jsx   | 92 ++++++++++++-------
 .../features/viewers/lower/Lower.module.css   | 22 +----
 2 files changed, 62 insertions(+), 52 deletions(-)

diff --git a/client/src/features/viewers/lower/Lower.jsx b/client/src/features/viewers/lower/Lower.jsx
index 2f614f008..7fe81f8ff 100644
--- a/client/src/features/viewers/lower/Lower.jsx
+++ b/client/src/features/viewers/lower/Lower.jsx
@@ -4,6 +4,7 @@ import style from './Lower.module.css';
 
 export default function Lower(props) {
   const { lower, title, time, general } = props;
+  const [showLower, setShowLower] = useState(true);
 
   // Set window title
   useEffect(() => {
@@ -15,7 +16,6 @@ export default function Lower(props) {
   // eg. http://localhost:3000/lower?bg=ff2&text=f00&size=0.6&transition=5
   let params = new URLSearchParams(props.location.search);
 
-  // Preset: choose from an animation preset, not yet
   const preset = params.get('preset') ? params.get('preset') : 1;
 
   const size = params.get('size') ? params.get('size') : 1;
@@ -23,9 +23,25 @@ export default function Lower(props) {
   const textColour = params.get('text') ? `#${params.get('text')}` : '#fffffa';
   const bgColour = params.get('bg') ? `#${params.get('bg')}` : '#00000033';
   const key = params.get('key') ? `#${params.get('key')}` : 'null';
+  const fadeOut = params.get('fadeout') ? `${params.get('fadeout')}` : 'null';
+
+  useEffect(() => {
+    if (!fadeOut) return;
+
+    // Calculate time
+    let transitionTime = parseInt(transitionIn) || 0;
+    let fadeOutTime = (parseInt(fadeOut) + transitionTime) * 1000;
+    if (isNaN(fadeOutTime)) return;
+
+    const timeout = setTimeout(() => {
+      setShowLower(false);
+    }, fadeOutTime);
+
+    return () => clearTimeout(timeout);
+  }, []);
 
   // Format messages
-  const showLower = lower.text !== '' && lower.visible;
+  const showLowerMessage = lower.text !== '' && lower.visible;
 
   // transition segments
   const eight = transitionIn / 8;
@@ -44,6 +60,13 @@ export default function Lower(props) {
         duration: third,
       },
     },
+    exit: {
+      opacity: 0,
+      x: -1000,
+      transition: {
+        duration: third,
+      },
+    },
   };
 
   const titleContainerVariants = {
@@ -106,42 +129,49 @@ export default function Lower(props) {
         fontSize: `${size * 4}vh`,
       }}
     >
-      <motion.div
-        className={style.lowerContainer}
-        style={{ backgroundColor: bgColour }}
-        variants={lowerThirdVariants}
-        initial='hidden'
-        animate='visible'
-        exit={{ opacity: 0 }}
-      >
-        <motion.div
-          className={style.titleContainer}
-          variants={titleContainerVariants}
-        >
-          <motion.div className={style.title} variants={titleVariants}>
-            {title.titleNow}
-          </motion.div>
-          <div className={style.titleDecor} />
-        </motion.div>
-        <motion.div
-          className={style.subtitleContainer}
-          variants={subtitleContainerVariants}
-        >
-          <div className={style.subDecor} />
-          <motion.div className={style.subtitle} variants={subtitleVariants}>
-            {title.presenterNow}
-          </motion.div>
-        </motion.div>
-      </motion.div>
-
       <AnimatePresence>
         {showLower && (
+          <motion.div
+            className={style.lowerContainer}
+            style={{ backgroundColor: bgColour }}
+            variants={lowerThirdVariants}
+            initial='hidden'
+            animate='visible'
+            exit='exit'
+          >
+            <motion.div
+              className={style.titleContainer}
+              variants={titleContainerVariants}
+            >
+              <motion.div className={style.title} variants={titleVariants}>
+                {title.titleNow}
+              </motion.div>
+              <div className={style.titleDecor} />
+            </motion.div>
+            <motion.div
+              className={style.subtitleContainer}
+              variants={subtitleContainerVariants}
+            >
+              <div className={style.subDecor} />
+              <motion.div
+                className={style.subtitle}
+                variants={subtitleVariants}
+              >
+                {title.presenterNow}
+              </motion.div>
+            </motion.div>
+          </motion.div>
+        )}
+      </AnimatePresence>
+
+      <AnimatePresence>
+        {showLowerMessage && (
           <motion.div
             className={style.messageContainer}
             key='modal'
             initial={{ opacity: 0 }}
             animate={{ opacity: 1 }}
-            exit={{ scaleY: 0 }}
+            exit={{ scaleY: 0, opacity: 0 }}
             transition={{ duration: 0.5 }}
           >
             <div className={style.message}>{lower.text}</div>
diff --git a/client/src/features/viewers/lower/Lower.module.css b/client/src/features/viewers/lower/Lower.module.css
index 8cc77c631..37fa9dba2 100644
--- a/client/src/features/viewers/lower/Lower.module.css
+++ b/client/src/features/viewers/lower/Lower.module.css
@@ -14,7 +14,7 @@
   top: 75vh;
   background-color: #00000033;
 
-  padding: 1vw 1vw 1vw 0;
+  padding: 1vh 1vw 1vh 0;
   display: flex;
   flex-direction: column;
   width: 45vw;
@@ -27,7 +27,6 @@
   bottom: 2vh;
   width: 100%;
   text-align: center;
-  filter: blur(0);
 }
 
 .titleContainer,
@@ -72,27 +71,8 @@
   width: fit-content;
 }
 
-.title {
-}
-
-.subtitleContainer {
-}
-
-.subtitle {
-}
-
 .messageContainer {
   background-color: #00000033;
-  opacity: 1;
-  transition: 0.5s;
-  transition-property: opacity;
-}
-
-.messageContainerHidden {
-  background-color: #00000033;
-  opacity: 0;
-  transition: 0.5s;
-  transition-property: opacity;
 }
 
 .message {