From 2ad7ede9fe4f6e40917fa3082de20dbfa606dd0b Mon Sep 17 00:00:00 2001
From: Steven <stevenlgtm@gmail.com>
Date: Thu, 13 Apr 2023 22:40:17 +0800
Subject: [PATCH] chore: update modal props

---
 src/components/ActionConfirmModal.tsx         |  5 ++---
 src/components/ClearDataButton.tsx            |  2 +-
 src/components/ClearDataConfirmModal.tsx      |  5 ++---
 src/components/ConnectionSidebar.tsx          | 13 +++++------
 src/components/CreateConnectionModal.tsx      | 22 +++++++++----------
 src/components/EditConversationTitleModal.tsx |  5 ++---
 src/components/SettingModal.tsx               |  5 ++---
 src/components/kit/Modal.tsx                  |  7 +++---
 8 files changed, 28 insertions(+), 36 deletions(-)

diff --git a/src/components/ActionConfirmModal.tsx b/src/components/ActionConfirmModal.tsx
index e1f811a..ae4f696 100644
--- a/src/components/ActionConfirmModal.tsx
+++ b/src/components/ActionConfirmModal.tsx
@@ -5,17 +5,16 @@ export interface ActionConfirmModalProps {
   title: string;
   content: string;
   confirmButtonStyle: string;
-  open: boolean;
   close: () => void;
   confirm: () => void;
 }
 
 const ActionConfirmModal = (props: ActionConfirmModalProps) => {
-  const { close, confirm, title, content, open, confirmButtonStyle } = props;
+  const { close, confirm, title, content, confirmButtonStyle } = props;
   const { t } = useTranslation();
 
   return (
-    <Modal title={title} open={open} onClose={close}>
+    <Modal title={title} onClose={close}>
       <div className="w-full flex flex-col justify-start items-start mt-2">
         <p className="text-gray-500">{content}</p>
       </div>
diff --git a/src/components/ClearDataButton.tsx b/src/components/ClearDataButton.tsx
index 1ceec0c..34bd56a 100644
--- a/src/components/ClearDataButton.tsx
+++ b/src/components/ClearDataButton.tsx
@@ -12,7 +12,7 @@ const ClearDataButton = () => {
         {t("common.clear")}
       </button>
 
-      <ClearDataConfirmModal open={showClearDataConfirmModal} close={() => setShowClearDataConfirmModal(false)} />
+      {showClearDataConfirmModal && <ClearDataConfirmModal close={() => setShowClearDataConfirmModal(false)} />}
     </>
   );
 };
diff --git a/src/components/ClearDataConfirmModal.tsx b/src/components/ClearDataConfirmModal.tsx
index 2c10ec0..cebe873 100644
--- a/src/components/ClearDataConfirmModal.tsx
+++ b/src/components/ClearDataConfirmModal.tsx
@@ -3,12 +3,11 @@ import { useTranslation } from "react-i18next";
 import Modal from "./kit/Modal";
 
 interface Props {
-  open: boolean;
   close: () => void;
 }
 
 const ClearDataConfirmModal = (props: Props) => {
-  const { open, close } = props;
+  const { close } = props;
   const { t } = useTranslation();
 
   const handleClearData = () => {
@@ -21,7 +20,7 @@ const ClearDataConfirmModal = (props: Props) => {
   };
 
   return (
-    <Modal title="Clear all data" className="!w-96" open={open} onClose={close}>
+    <Modal title="Clear all data" className="!w-96" onClose={close}>
       <div>
         <div className="w-full flex flex-col justify-start items-start mt-2">
           <p className="text-gray-500">SQL Chat saves all your data in your local browser. Are you sure to clear all of them?</p>
diff --git a/src/components/ConnectionSidebar.tsx b/src/components/ConnectionSidebar.tsx
index 8524088..1cf83b9 100644
--- a/src/components/ConnectionSidebar.tsx
+++ b/src/components/ConnectionSidebar.tsx
@@ -294,18 +294,15 @@ const ConnectionSidebar = () => {
         </div>
       </Drawer>
 
-      <CreateConnectionModal
-        connection={editConnectionModalContext}
-        open={state.showCreateConnectionModal}
-        close={() => toggleCreateConnectionModal(false)}
-      />
+      {state.showCreateConnectionModal && (
+        <CreateConnectionModal connection={editConnectionModalContext} close={() => toggleCreateConnectionModal(false)} />
+      )}
 
-      <SettingModal open={state.showSettingModal} close={() => toggleSettingModal(false)} />
+      {state.showSettingModal && <SettingModal close={() => toggleSettingModal(false)} />}
 
-      {editConversationTitleModalContext && (
+      {editConversationTitleModalContext && state.showEditConversationTitleModal && (
         <EditConversationTitleModal
           close={() => toggleEditConversationTitleModal(false)}
-          open={state.showEditConversationTitleModal}
           conversation={editConversationTitleModalContext}
         />
       )}
diff --git a/src/components/CreateConnectionModal.tsx b/src/components/CreateConnectionModal.tsx
index 0dac509..46c4b0c 100644
--- a/src/components/CreateConnectionModal.tsx
+++ b/src/components/CreateConnectionModal.tsx
@@ -13,7 +13,6 @@ import ActionConfirmModal from "./ActionConfirmModal";
 
 interface Props {
   connection?: Connection;
-  open: boolean;
   close: () => void;
 }
 
@@ -47,7 +46,7 @@ const defaultConnection: Connection = {
 };
 
 const CreateConnectionModal = (props: Props) => {
-  const { connection: editConnection, open, close } = props;
+  const { connection: editConnection, close } = props;
   const connectionStore = useConnectionStore();
   const [connection, setConnection] = useState<Connection>(defaultConnection);
   const [showDeleteConnectionModal, setShowDeleteConnectionModal] = useState(false);
@@ -207,7 +206,7 @@ const CreateConnectionModal = (props: Props) => {
 
   return (
     <>
-      <Modal title={isEditing ? "Edit Connection" : "Create Connection"} open={open} onClose={close}>
+      <Modal title={isEditing ? "Edit Connection" : "Create Connection"} onClose={close}>
         <div className="w-full flex flex-col justify-start items-start space-y-3 mt-2">
           <DataStorageBanner className="rounded-lg bg-white border dark:border-zinc-700 py-2 !justify-start" alwaysShow={true} />
           <div className="w-full flex flex-col">
@@ -348,14 +347,15 @@ const CreateConnectionModal = (props: Props) => {
         </div>
       </Modal>
 
-      <ActionConfirmModal
-        title="Delete Connection"
-        content="Are you sure you want to delete this connection?"
-        confirmButtonStyle="btn-error"
-        open={showDeleteConnectionModal}
-        close={() => setShowDeleteConnectionModal(false)}
-        confirm={() => handleDeleteConnection()}
-      />
+      {showDeleteConnectionModal && (
+        <ActionConfirmModal
+          title="Delete Connection"
+          content="Are you sure you want to delete this connection?"
+          confirmButtonStyle="btn-error"
+          close={() => setShowDeleteConnectionModal(false)}
+          confirm={() => handleDeleteConnection()}
+        />
+      )}
     </>
   );
 };
diff --git a/src/components/EditConversationTitleModal.tsx b/src/components/EditConversationTitleModal.tsx
index ffc1d79..d38e408 100644
--- a/src/components/EditConversationTitleModal.tsx
+++ b/src/components/EditConversationTitleModal.tsx
@@ -8,12 +8,11 @@ import Modal from "./kit/Modal";
 
 interface Props {
   conversation: Conversation;
-  open: boolean;
   close: () => void;
 }
 
 const EditConversationTitleModal = (props: Props) => {
-  const { close, conversation, open } = props;
+  const { close, conversation } = props;
   const { t } = useTranslation();
   const conversationStore = useConversationStore();
   const [title, setTitle] = useState(conversation.title);
@@ -33,7 +32,7 @@ const EditConversationTitleModal = (props: Props) => {
   };
 
   return (
-    <Modal title={t("conversation.edit-title")} open={open} onClose={close}>
+    <Modal title={t("conversation.edit-title")} onClose={close}>
       <div className="w-full flex flex-col justify-start items-start mt-2">
         <TextField placeholder={t("conversation.conversation-title") || ""} value={title} onChange={(value) => setTitle(value)} />
       </div>
diff --git a/src/components/SettingModal.tsx b/src/components/SettingModal.tsx
index 4a958f9..a20f1da 100644
--- a/src/components/SettingModal.tsx
+++ b/src/components/SettingModal.tsx
@@ -8,16 +8,15 @@ import ThemeSelector from "./ThemeSelector";
 import OpenAIApiConfigView from "./OpenAIApiConfigView";
 
 interface Props {
-  open: boolean;
   close: () => void;
 }
 
 const SettingModal = (props: Props) => {
-  const { open, close } = props;
+  const { close } = props;
   const { t } = useTranslation();
 
   return (
-    <Modal title={t("setting.self")} open={open} onClose={close}>
+    <Modal title={t("setting.self")} onClose={close}>
       <div className="w-full flex flex-col justify-start items-start space-y-3 pt-4">
         <div className="w-full flex flex-row justify-start items-start flex-wrap gap-2">
           <a
diff --git a/src/components/kit/Modal.tsx b/src/components/kit/Modal.tsx
index 9aa5f8d..bd0ee54 100644
--- a/src/components/kit/Modal.tsx
+++ b/src/components/kit/Modal.tsx
@@ -4,21 +4,20 @@ import Icon from "../Icon";
 
 interface Props {
   title: string;
-  open: boolean;
   children: ReactNode;
   onClose: () => void;
   className?: string;
 }
 
 const Modal = (props: Props) => {
-  const { children, open, title, onClose, className } = props;
+  const { children, title, onClose, className } = props;
 
   return (
-    <ModalUI className="!z-100" open={open} onClose={onClose}>
+    <ModalUI className="!z-100" open={true} onClose={onClose}>
       <div
         className={`${
           className || ""
-        } flex flex-col bg-white dark:bg-zinc-800 rounded-xl p-4 fixed top-[50%] left-[50%] h-auto max-h-[85vh] w-[90vw] max-w-lg translate-x-[-50%] translate-y-[-50%] z-100`}
+        } flex flex-col bg-white dark:bg-zinc-800 rounded-xl p-4 fixed top-[50%] left-[50%] h-auto max-h-[85vh] w-[90vw] max-w-[90vw] sm:max-w-lg translate-x-[-50%] translate-y-[-50%] z-100`}
       >
         <p className="text-lg pl-1 text-black dark:text-gray-300 font-medium mb-2">{title}</p>
         <button