From d4739c941d0429eae1fd17e8190aed09b9ecaa8e Mon Sep 17 00:00:00 2001
From: Joost De Cock <joost@joost.at>
Date: Mon, 27 Nov 2023 17:50:44 +0100
Subject: [PATCH] fix(shared): Stop modal from staying open

---
 sites/shared/components/inputs.mjs         |  7 ++++++-
 sites/shared/components/wrappers/modal.mjs | 18 ++++++++----------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/sites/shared/components/inputs.mjs b/sites/shared/components/inputs.mjs
index f04626bbe2e..7b2f69fd9f3 100644
--- a/sites/shared/components/inputs.mjs
+++ b/sites/shared/components/inputs.mjs
@@ -62,7 +62,12 @@ export const FormControl = ({
             className="btn btn-ghost btn-sm btn-circle hover:btn-secondary"
             onClick={() =>
               setModal(
-                <ModalWrapper flex="col" justify="top lg:justify-center" slideFrom="right">
+                <ModalWrapper
+                  flex="col"
+                  justify="top lg:justify-center"
+                  slideFrom="right"
+                  keepOpenOnClick
+                >
                   <div className="mdx max-w-prose">{docs}</div>
                 </ModalWrapper>
               )
diff --git a/sites/shared/components/wrappers/modal.mjs b/sites/shared/components/wrappers/modal.mjs
index 672d2baf3b9..fad95de1a40 100644
--- a/sites/shared/components/wrappers/modal.mjs
+++ b/sites/shared/components/wrappers/modal.mjs
@@ -67,26 +67,24 @@ export const ModalWrapper = ({
         transform-all duration-150 ${animation}
         bg-${bg} bg-opacity-${bgOpacity} z-50 hover:cursor-pointer
         flex flex-${flex} justify-${justify} items-${items} lg:p-12`}
-      onClick={keepOpenOnClick ? null : close}
+      onClick={close}
     >
       {bare ? (
         children
       ) : (
         <div
-          onClick={stopClick}
+          onClick={keepOpenOnClick ? stopClick : null}
           className={`z-30 bg-base-100 p-4 lg:px-8 lg:rounded-lg lg:shadow-lg max-h-full overflow-auto hover:cursor-default ${
             fullWidth ? 'w-full' : ''
           }`}
         >
           {children}
-          {!keepOpenOnClick && (
-            <button
-              className="fixed bottom-2 right-2 btn btn-neutral btn-circle lg:hidden"
-              onClick={close}
-            >
-              <CloseIcon className="w-8 h-8" />
-            </button>
-          )}
+          <button
+            className="fixed bottom-2 right-2 btn btn-neutral btn-circle lg:hidden"
+            onClick={close}
+          >
+            <CloseIcon className="w-8 h-8" />
+          </button>
         </div>
       )}
     </div>