From 3fa7ff9858d14d132151f3329164d55d74638f53 Mon Sep 17 00:00:00 2001
From: sct <sctsnipe@gmail.com>
Date: Fri, 11 Dec 2020 12:17:00 +0000
Subject: [PATCH] fix(frontend): properly remove site overlay when closing
 modals

---
 src/components/Common/Modal/index.tsx             |  2 --
 src/components/RequestModal/MovieRequestModal.tsx |  3 ---
 src/components/RequestModal/TvRequestModal.tsx    |  2 --
 src/components/RequestModal/index.tsx             | 10 ++++------
 4 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/src/components/Common/Modal/index.tsx b/src/components/Common/Modal/index.tsx
index a7ead473..2a734702 100644
--- a/src/components/Common/Modal/index.tsx
+++ b/src/components/Common/Modal/index.tsx
@@ -84,7 +84,6 @@ const Modal: React.FC<ModalProps> = ({
             leave="transition opacity-100 duration-300"
             leaveFrom="opacity-100"
             leaveTo="opacity-0"
-            appear
             show={loading}
           >
             <div style={{ position: 'absolute' }}>
@@ -98,7 +97,6 @@ const Modal: React.FC<ModalProps> = ({
             leave="transition opacity-100 duration-300"
             leaveFrom="opacity-100"
             leaveTo="opacity-0"
-            appear
             show={!loading}
           >
             <div
diff --git a/src/components/RequestModal/MovieRequestModal.tsx b/src/components/RequestModal/MovieRequestModal.tsx
index 3b5b0272..10f8e8e3 100644
--- a/src/components/RequestModal/MovieRequestModal.tsx
+++ b/src/components/RequestModal/MovieRequestModal.tsx
@@ -43,7 +43,6 @@ const MovieRequestModal: React.FC<RequestModalProps> = ({
   onComplete,
   tmdbId,
   onUpdating,
-  ...props
 }) => {
   const [isUpdating, setIsUpdating] = useState(false);
   const { addToast } = useToasts();
@@ -140,7 +139,6 @@ const MovieRequestModal: React.FC<RequestModalProps> = ({
         okButtonType={'danger'}
         cancelText={intl.formatMessage(messages.close)}
         iconSvg={<DownloadIcon className="w-6 h-6" />}
-        {...props}
       >
         {intl.formatMessage(messages.requestfrom, {
           username: activeRequest.requestedBy.username,
@@ -164,7 +162,6 @@ const MovieRequestModal: React.FC<RequestModalProps> = ({
       }
       okButtonType={'primary'}
       iconSvg={<DownloadIcon className="w-6 h-6" />}
-      {...props}
     >
       {text}
     </Modal>
diff --git a/src/components/RequestModal/TvRequestModal.tsx b/src/components/RequestModal/TvRequestModal.tsx
index 6f13a670..9df7b9b2 100644
--- a/src/components/RequestModal/TvRequestModal.tsx
+++ b/src/components/RequestModal/TvRequestModal.tsx
@@ -47,7 +47,6 @@ const TvRequestModal: React.FC<RequestModalProps> = ({
   onComplete,
   tmdbId,
   onUpdating,
-  ...props
 }) => {
   const { addToast } = useToasts();
   const { data, error } = useSWR<TvDetails>(`/api/v1/tv/${tmdbId}`);
@@ -222,7 +221,6 @@ const TvRequestModal: React.FC<RequestModalProps> = ({
           />
         </svg>
       }
-      {...props}
     >
       <div className="flex flex-col">
         <div className="-mx-4 sm:mx-0 overflow-auto max-h-96">
diff --git a/src/components/RequestModal/index.tsx b/src/components/RequestModal/index.tsx
index b1164d5a..ecd66062 100644
--- a/src/components/RequestModal/index.tsx
+++ b/src/components/RequestModal/index.tsx
@@ -25,13 +25,12 @@ const RequestModal: React.FC<RequestModalProps> = ({
   if (type === 'tv') {
     return (
       <Transition
-        enter="opacity-0"
+        enter="transition opacity-0 duration-300"
         enterFrom="opacity-0"
         enterTo="opacity-100"
-        leave="opacity-100"
+        leave="transition opacity-100 duration-300"
         leaveFrom="opacity-100"
         leaveTo="opacity-0"
-        appear
         show={show}
       >
         <TvRequestModal
@@ -46,13 +45,12 @@ const RequestModal: React.FC<RequestModalProps> = ({
 
   return (
     <Transition
-      enter="opacity-0"
+      enter="transition opacity-0 duration-300"
       enterFrom="opacity-0"
       enterTo="opacity-100"
-      leave="opacity-100"
+      leave="transition opacity-100 duration-300"
       leaveFrom="opacity-100"
       leaveTo="opacity-0"
-      appear
       show={show}
     >
       <MovieRequestModal