Merge branch 'main' of https://github.com/arc53/DocsGPT into dependabot/npm_and_yarn/frontend/tailwindcss-4.1.10

frontend/src/modals/ChunkModal.tsx

@@ -33,6 +33,19 @@ export default function ChunkModal({
     setChunkText(originalText || '');
   }, [originalTitle, originalText]);
 
+  const resetForm = () => {
+    setTitle('');
+    setChunkText('');
+  };
+
+  const handleDeleteConfirmed = () => {
+    if (handleDelete) {
+      handleDelete();
+    }
+    setDeleteModal('INACTIVE');
+    setModalState('INACTIVE');
+  };
+
   if (modalState !== 'ACTIVE') return null;
 
   const content = (
@@ -71,6 +84,7 @@ export default function ChunkModal({
             onClick={() => {
               handleSubmit(title, chunkText);
               setModalState('INACTIVE');
+              resetForm();
             }}
             className="bg-purple-30 hover:bg-violets-are-blue rounded-3xl px-5 py-2 text-sm text-white transition-all"
           >
@@ -79,6 +93,7 @@ export default function ChunkModal({
           <button
             onClick={() => {
               setModalState('INACTIVE');
+              resetForm();
             }}
             className="dark:text-light-gray cursor-pointer rounded-3xl px-5 py-2 text-sm font-medium hover:bg-gray-100 dark:bg-transparent dark:hover:bg-[#767183]/50"
           >
@@ -124,6 +139,7 @@ export default function ChunkModal({
       <WrapperModal
         close={() => setModalState('INACTIVE')}
         className="sm:w-[620px]"
+        isPerformingTask={true}
       >
         {content}
       </WrapperModal>
@@ -133,13 +149,7 @@ export default function ChunkModal({
           message={t('modals.chunk.deleteConfirmation')}
           modalState={deleteModal}
           setModalState={setDeleteModal}
-          handleSubmit={
-            handleDelete
-              ? handleDelete
-              : () => {
-                  /* no-op */
-                }
-          }
+          handleSubmit={handleDeleteConfirmed}
           submitLabel={t('modals.chunk.delete')}
         />
       )}

frontend/src/modals/ConfirmationModal.tsx

@@ -29,33 +29,40 @@ export default function ConfirmationModal({
       ? 'rounded-3xl bg-rosso-corsa px-5 py-2 text-sm text-lotion transition-all hover:bg-red-2000 hover:font-bold tracking-[0.019em] hover:tracking-normal'
       : 'rounded-3xl bg-purple-30 px-5 py-2 text-sm text-lotion transition-all hover:bg-violets-are-blue';
 
+  const handleSubmitClick = (e: React.MouseEvent) => {
+    e.preventDefault();
+    e.stopPropagation();
+    handleSubmit();
+    setModalState('INACTIVE');
+  };
+
+  const handleCancelClick = (e: React.MouseEvent) => {
+    e.preventDefault();
+    e.stopPropagation();
+    setModalState('INACTIVE');
+    handleCancel?.();
+  };
+
   return (
     <>
       {modalState === 'ACTIVE' && (
         <WrapperModal close={() => setModalState('INACTIVE')}>
           <div className="relative">
             <div>
-              <p className="font-base mb-1 w-[90%] break-words text-lg text-jet dark:text-bright-gray">
+              <p className="font-base text-jet dark:text-bright-gray mb-1 w-[90%] text-lg break-words">
                 {message}
               </p>
               <div>
                 <div className="mt-6 flex flex-row-reverse gap-1">
                   <button
-                    onClick={(e) => {
-                      e.stopPropagation();
-                      handleSubmit();
-                    }}
+                    onClick={handleSubmitClick}
                     className={submitButtonClasses}
                   >
                     {submitLabel}
                   </button>
                   <button
-                    onClick={(e) => {
-                      e.stopPropagation();
-                      setModalState('INACTIVE');
-                      handleCancel && handleCancel();
-                    }}
-                    className="cursor-pointer rounded-3xl px-5 py-2 text-sm font-medium hover:bg-gray-100 dark:bg-transparent dark:text-light-gray dark:hover:bg-[#767183]/50"
+                    onClick={handleCancelClick}
+                    className="dark:text-light-gray cursor-pointer rounded-3xl px-5 py-2 text-sm font-medium hover:bg-gray-100 dark:bg-transparent dark:hover:bg-[#767183]/50"
                   >
                     {cancelLabel ? cancelLabel : t('cancel')}
                   </button>

frontend/src/modals/WrapperModal.tsx

@@ -3,38 +3,33 @@ import { createPortal } from 'react-dom';
 
 import Exit from '../assets/exit.svg';
 
-interface WrapperModalPropsType {
+type WrapperModalPropsType = {
   children: React.ReactNode;
   close: () => void;
   isPerformingTask?: boolean;
   className?: string;
   contentClassName?: string;
-}
+};
 
 export default function WrapperModal({
   children,
   close,
   isPerformingTask = false,
-  className = '', // Default width, but can be overridden
-  contentClassName = '', // Default padding, but can be overridden
+  className = '',
+  contentClassName = '',
 }: WrapperModalPropsType) {
   const modalRef = useRef<HTMLDivElement>(null);
 
   useEffect(() => {
     if (isPerformingTask) return;
+
     const handleClickOutside = (event: MouseEvent) => {
-      if (
-        modalRef.current &&
-        !modalRef.current.contains(event.target as Node)
-      ) {
+      if (modalRef.current && !modalRef.current.contains(event.target as Node))
         close();
-      }
     };
 
     const handleEscapePress = (event: KeyboardEvent) => {
-      if (event.key === 'Escape') {
-        close();
-      }
+      if (event.key === 'Escape') close();
     };
 
     document.addEventListener('mousedown', handleClickOutside);
@@ -44,17 +39,17 @@ export default function WrapperModal({
       document.removeEventListener('mousedown', handleClickOutside);
       document.removeEventListener('keydown', handleEscapePress);
     };
-  }, [close]);
+  }, [close, isPerformingTask]);
 
   const modalContent = (
-    <div className="fixed left-0 top-0 z-30 flex h-screen w-screen items-center justify-center bg-gray-alpha bg-opacity-50">
+    <div className="bg-gray-alpha bg-opacity-50 fixed top-0 left-0 z-30 flex h-screen w-screen items-center justify-center">
       <div
         ref={modalRef}
-        className={`relative w-11/12 rounded-2xl bg-white p-8 dark:bg-[#26272E] sm:w-[512px] ${className}`}
+        className={`relative w-11/12 rounded-2xl bg-white p-8 sm:w-[512px] dark:bg-[#26272E] ${className}`}
       >
         {!isPerformingTask && (
           <button
-            className="absolute right-4 top-3 z-50 m-2 w-3"
+            className="absolute top-3 right-4 z-50 m-2 w-3"
             onClick={close}
           >
             <img className="filter dark:invert" src={Exit} alt="Close" />