From a208435dad4a4ab005a05c671501820e5814cbd9 Mon Sep 17 00:00:00 2001
From: Jeff Sieu <jeffsy00@gmail.com>
Date: Mon, 31 Oct 2022 16:38:56 +0800
Subject: [PATCH] [questions][fix] fix contribute dialog close (#476)

---
 .../questions/ContributeQuestionCard.tsx      | 88 ++++++++++---------
 .../questions/ContributeQuestionDialog.tsx    |  7 +-
 2 files changed, 51 insertions(+), 44 deletions(-)

diff --git a/apps/portal/src/components/questions/ContributeQuestionCard.tsx b/apps/portal/src/components/questions/ContributeQuestionCard.tsx
index ae53a914..f91e1eb4 100644
--- a/apps/portal/src/components/questions/ContributeQuestionCard.tsx
+++ b/apps/portal/src/components/questions/ContributeQuestionCard.tsx
@@ -30,54 +30,56 @@ export default function ContributeQuestionCard({
   });
 
   return (
-    <button
-      className="flex w-full flex-col items-stretch justify-center gap-2 rounded-md border border-slate-300 bg-white p-4 text-left hover:bg-slate-100"
-      type="button"
-      onClick={handleOpenContribute}>
-      <TextInput
-        disabled={true}
-        isLabelHidden={true}
-        label="Question"
-        placeholder="Contribute a question"
-        onChange={handleOpenContribute}
-      />
-      <div className="flex flex-wrap items-end justify-start gap-2">
-        <div className="min-w-[150px] flex-1">
-          <TextInput
-            disabled={true}
-            label="Company"
-            startAddOn={BuildingOffice2Icon}
-            startAddOnType="icon"
-            onChange={handleOpenContribute}
-          />
-        </div>
-        <div className="min-w-[150px] flex-1">
-          <TextInput
-            disabled={true}
-            label="Question type"
-            startAddOn={QuestionMarkCircleIcon}
-            startAddOnType="icon"
-            onChange={handleOpenContribute}
-          />
-        </div>
-        <div className="min-w-[150px] flex-1">
-          <TextInput
-            disabled={true}
-            label="Date"
-            startAddOn={CalendarDaysIcon}
-            startAddOnType="icon"
-            onChange={handleOpenContribute}
-          />
+    <div className="w-full">
+      <button
+        className="flex w-full flex-col items-stretch justify-center gap-2 rounded-md border border-slate-300 bg-white p-4 text-left hover:bg-slate-100"
+        type="button"
+        onClick={handleOpenContribute}>
+        <TextInput
+          disabled={true}
+          isLabelHidden={true}
+          label="Question"
+          placeholder="Contribute a question"
+          onChange={handleOpenContribute}
+        />
+        <div className="flex flex-wrap items-end justify-start gap-2">
+          <div className="min-w-[150px] flex-1">
+            <TextInput
+              disabled={true}
+              label="Company"
+              startAddOn={BuildingOffice2Icon}
+              startAddOnType="icon"
+              onChange={handleOpenContribute}
+            />
+          </div>
+          <div className="min-w-[150px] flex-1">
+            <TextInput
+              disabled={true}
+              label="Question type"
+              startAddOn={QuestionMarkCircleIcon}
+              startAddOnType="icon"
+              onChange={handleOpenContribute}
+            />
+          </div>
+          <div className="min-w-[150px] flex-1">
+            <TextInput
+              disabled={true}
+              label="Date"
+              startAddOn={CalendarDaysIcon}
+              startAddOnType="icon"
+              onChange={handleOpenContribute}
+            />
+          </div>
+          <h1 className="bg-primary-600 hover:bg-primary-700 rounded-full px-3 py-2 text-white">
+            Contribute
+          </h1>
         </div>
-        <h1 className="bg-primary-600 hover:bg-primary-700 rounded-full px-3 py-2 text-white">
-          Contribute
-        </h1>
-      </div>
+      </button>
       <ContributeQuestionDialog
         show={showDraftDialog}
         onCancel={handleDraftDialogCancel}
         onSubmit={onSubmit}
       />
-    </button>
+    </div>
   );
 }
diff --git a/apps/portal/src/components/questions/ContributeQuestionDialog.tsx b/apps/portal/src/components/questions/ContributeQuestionDialog.tsx
index ae08724b..8e481632 100644
--- a/apps/portal/src/components/questions/ContributeQuestionDialog.tsx
+++ b/apps/portal/src/components/questions/ContributeQuestionDialog.tsx
@@ -35,7 +35,12 @@ export default function ContributeQuestionDialog({
   return (
     <div>
       <Transition.Root as={Fragment} show={show}>
-        <Dialog as="div" className="relative z-10" onClose={onCancel}>
+        <Dialog
+          as="div"
+          className="relative z-10"
+          onClose={() => {
+            onCancel();
+          }}>
           <Transition.Child
             as={Fragment}
             enter="ease-out duration-300"