Merge pull request #334 from Aar-if/modern

Issue #0000 feat: Modal bug fixes
tekdi · Nov 21, 2024 · 2f0a9ca · 2f0a9ca
2 parents 6fcd0be + 5795910
commit 2f0a9ca
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 8 deletions.
diff --git a/src/components/AddBlockModal.tsx b/src/components/AddBlockModal.tsx
@@ -116,7 +116,6 @@ export const AddBlockModal: React.FC<AddBlockModalProps> = ({
 
       const districtCodeArray = districts.map((item: any) => item.value);
       setDistrictCodeArr(districtCodeArray);
-
     } catch (error) {
       console.error("Error fetching districts", error);
     }
@@ -296,7 +295,14 @@ export const AddBlockModal: React.FC<AddBlockModalProps> = ({
     : t("COMMON.ADD_BLOCK");
 
   return (
-    <Dialog open={open} onClose={onClose}>
+    <Dialog
+      open={open}
+      onClose={(event, reason) => {
+        if (reason !== "backdropClick") {
+          onClose();
+        }
+      }}
+    >
       <DialogTitle sx={{ fontSize: "14px" }}>{dialogTitle}</DialogTitle>
       <Divider />
       <DialogContent>

diff --git a/src/components/AddDistrictModal.tsx b/src/components/AddDistrictModal.tsx
@@ -163,7 +163,14 @@ const AddDistrictModal: React.FC<AddDistrictBlockModalProps> = ({
     : t("COMMON.ADD_DISTRICT");
 
   return (
-    <Dialog open={open} onClose={onClose}>
+    <Dialog
+      open={open}
+      onClose={(event, reason) => {
+        if (reason !== "backdropClick") {
+          onClose();
+        }
+      }}
+    >
       <DialogTitle sx={{ fontSize: "14px" }}>{dialogTitle}</DialogTitle>
       <Divider />
       <DialogContent>

diff --git a/src/components/AddStateModal.tsx b/src/components/AddStateModal.tsx
@@ -94,7 +94,7 @@ export const AddStateModal: React.FC<AddStateModalProps> = ({
       newErrors.name = t("COMMON.STATE_NAME_REQUIRED");
     } else if (!isValidName(formData.name.trim())) {
       newErrors.name = t("COMMON.INVALID_TEXT");
-    } 
+    }
 
     if (!formData.value) {
       newErrors.value = t("COMMON.CODE_REQUIRED");
@@ -113,7 +113,14 @@ export const AddStateModal: React.FC<AddStateModalProps> = ({
   };
 
   return (
-    <Dialog open={open} onClose={onClose}>
+    <Dialog
+      open={open}
+      onClose={(event, reason) => {
+        if (reason !== "backdropClick") {
+          onClose();
+        }
+      }}
+    >
       <DialogTitle sx={{ fontSize: "14px" }}>
         {stateId ? t("COMMON.UPDATE_STATE") : t("COMMON.ADD_STATE")}
       </DialogTitle>

diff --git a/src/components/ConfirmationModal.tsx b/src/components/ConfirmationModal.tsx
@@ -46,7 +46,11 @@ const ConfirmationModal: React.FC<ConfirmationModalProps> = ({
   return (
     <Modal
       open={modalOpen}
-      onClose={handleCloseModal}
+      onClose={(event, reason) => {
+        if (reason !== "backdropClick") {
+          handleCloseModal();
+        }
+      }}
       aria-labelledby="confirmation-modal-title"
       aria-describedby="confirmation-modal-description"
     >

diff --git a/src/components/FileUploadDialog.tsx b/src/components/FileUploadDialog.tsx
@@ -33,7 +33,16 @@ const FileUploadDialog: React.FC<FileUploadDialogProps> = ({
 
   return (
     <Box>
-      <Dialog open={open} onClose={onClose} maxWidth="lg" fullWidth>
+      <Dialog
+        open={open}
+        onClose={(event, reason) => {
+          if (reason !== "backdropClick") {
+            onClose();
+          }
+        }}
+        maxWidth="lg"
+        fullWidth
+      >
         <Box sx={{ display: "flex", flexDirection: "column" }}>
           <Box
             sx={{

diff --git a/src/components/SimpleModal.tsx b/src/components/SimpleModal.tsx
@@ -78,7 +78,11 @@ const SimpleModal: React.FC<SimpleModalProps> = ({
   return (
     <Modal
       open={open}
-      onClose={onClose}
+      onClose={(event, reason) => {
+        if (reason !== "backdropClick") {
+          onClose();
+        }
+      }}
       aria-labelledby="child-modal-title"
       aria-describedby="child-modal-description"
     >