From 6224fb32c4a1fe59be1042a956ff8553a47b409d Mon Sep 17 00:00:00 2001
From: Jelle van Snik <jellevs@gmail.com>
Date: Tue, 7 Feb 2023 19:40:53 +0100
Subject: [PATCH] popout transitions

Co-authored-by: Jip Frijlink <JipFr@users.noreply.github.com>
---
 src/components/Transition.tsx                 | 35 ++++++++++---------
 .../popouts/PopoutProviderAction.tsx          | 12 +++----
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/src/components/Transition.tsx b/src/components/Transition.tsx
index c594038f..3d70b540 100644
--- a/src/components/Transition.tsx
+++ b/src/components/Transition.tsx
@@ -8,7 +8,7 @@ type TransitionAnimations = "slide-down" | "slide-up" | "fade";
 
 interface Props {
   show: boolean;
-  durationClass?: "duration-200" | string; // default is specified so tailwind doesnt remove the class in prod builds
+  durationClass?: string;
   animation: TransitionAnimations;
   className?: string;
   children?: ReactNode;
@@ -16,14 +16,15 @@ interface Props {
 
 function getClasses(
   animation: TransitionAnimations,
-  duration: number
+  extraClasses: string,
+  duration: string
 ): TransitionClasses {
   if (animation === "slide-down") {
     return {
-      leave: `transition-[transform,opacity] duration-${duration}`,
+      leave: `transition-[transform,opacity] ${duration} ${extraClasses}`,
       leaveFrom: "opacity-100 translate-y-0",
       leaveTo: "-translate-y-4 opacity-0",
-      enter: `transition-[transform,opacity] duration-${duration}`,
+      enter: `transition-[transform,opacity] ${duration} ${extraClasses}`,
       enterFrom: "opacity-0 -translate-y-4",
       enterTo: "translate-y-0 opacity-100",
     };
@@ -31,10 +32,10 @@ function getClasses(
 
   if (animation === "slide-up") {
     return {
-      leave: `transition-[transform,opacity] duration-${duration}`,
+      leave: `transition-[transform,opacity] ${duration} ${extraClasses}`,
       leaveFrom: "opacity-100 translate-y-0",
       leaveTo: "translate-y-4 opacity-0",
-      enter: `transition-[transform,opacity] duration-${duration}`,
+      enter: `transition-[transform,opacity] ${duration} ${extraClasses}`,
       enterFrom: "opacity-0 translate-y-4",
       enterTo: "translate-y-0 opacity-100",
     };
@@ -42,10 +43,10 @@ function getClasses(
 
   if (animation === "fade") {
     return {
-      leave: `transition-[transform,opacity] duration-${duration}`,
+      leave: `transition-[transform,opacity] ${duration} ${extraClasses}`,
       leaveFrom: "opacity-100",
       leaveTo: "opacity-0",
-      enter: `transition-[transform,opacity] duration-${duration}`,
+      enter: `transition-[transform,opacity] ${duration} ${extraClasses}`,
       enterFrom: "opacity-0",
       enterTo: "opacity-100",
     };
@@ -55,16 +56,16 @@ function getClasses(
 }
 
 export function Transition(props: Props) {
-  const duration = props.durationClass
-    ? parseInt(props.durationClass.split("-")[1], 10)
-    : 200;
-  const classes = getClasses(props.animation, duration);
+  const duration = props.durationClass ?? "duration-200";
+  const classes = getClasses(props.animation, props.className ?? "", duration);
 
   return (
-    <div className={props.className}>
-      <HeadlessTransition show={props.show} {...classes}>
-        {props.children}
-      </HeadlessTransition>
-    </div>
+    <HeadlessTransition
+      show={props.show}
+      {...classes}
+      entered={props.className}
+    >
+      {props.children}
+    </HeadlessTransition>
   );
 }
diff --git a/src/video/components/popouts/PopoutProviderAction.tsx b/src/video/components/popouts/PopoutProviderAction.tsx
index c8bb9345..0296f416 100644
--- a/src/video/components/popouts/PopoutProviderAction.tsx
+++ b/src/video/components/popouts/PopoutProviderAction.tsx
@@ -43,16 +43,16 @@ export function PopoutProviderAction() {
   }, [videoInterface]);
   const distanceFromBottom = useMemo(() => {
     return videoInterface.popoutBounds
-      ? `${Math.max(
-          videoInterface.popoutBounds.bottom -
-            videoInterface.popoutBounds.top +
-            videoInterface.popoutBounds.height
-        )}px`
+      ? `${videoInterface.popoutBounds.height + 30}px`
       : "30px";
   }, [videoInterface]);
 
   return (
-    <Transition show={!!videoInterface.popout} animation="fade">
+    <Transition
+      show={!!videoInterface.popout}
+      animation="slide-up"
+      className="h-full"
+    >
       <div className="popout-wrapper pointer-events-auto absolute inset-0">
         <div onClick={handleClick} className="absolute inset-0" />
         <div