Merge pull request #64 from BCSDLab/feature/#58

Feature/#58
BCSDLab · Jan 11, 2024 · 74d326b · 74d326b
2 parents 9242f55 + 9ea2329
commit 74d326b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/src/page/AddMenu/components/AddMenuImgModal/index.tsx b/src/page/AddMenu/components/AddMenuImgModal/index.tsx
@@ -10,11 +10,10 @@ interface AddMenuImgModalProps {
 }
 
 export default function AddMenuImgModal({ isOpen, closeModal }: AddMenuImgModalProps) {
-  const { imgRef, saveImgFile } = useMenuImageUpload();
+  const { imgRef, saveImgFile } = useMenuImageUpload(closeModal);
 
   const handleFileChange = () => {
     saveImgFile();
-    closeModal();
   };
 
   const triggerFileInput = () => {

diff --git a/src/page/AddMenu/components/MenuImage/index.tsx b/src/page/AddMenu/components/MenuImage/index.tsx
@@ -15,13 +15,12 @@ interface MenuImageProps {
 export default function MenuImage({ isComplete }: MenuImageProps) {
   const { isMobile } = useMediaQuery();
   const { imageUrl, removeImageUrl } = useAddMenuStore();
-  const { imgRef, saveImgFile } = useMenuImageUpload();
   const {
     value: isAddMenuImgModal,
     setTrue: openAddMenuImgModal,
     setFalse: closeAddMenuImgModal,
   } = useBooleanState(false);
-
+  const { imgRef, saveImgFile } = useMenuImageUpload(closeAddMenuImgModal);
   const handleAddImage = () => {
     imgRef.current?.click();
   };

diff --git a/src/page/AddMenu/hook/useMenuImageUpload.ts b/src/page/AddMenu/hook/useMenuImageUpload.ts
@@ -2,7 +2,7 @@ import { useRef } from 'react';
 import useUploadFile from 'query/upload';
 import useAddMenuStore from 'store/addMenu';
 
-export default function useMenuImageUpload() {
+export default function useMenuImageUpload(closeModal: () => void) {
   const imgRef = useRef<HTMLInputElement>(null);
   const { setImageUrl } = useAddMenuStore();
   const { uploadFile } = useUploadFile();
@@ -17,6 +17,7 @@ export default function useMenuImageUpload() {
 
       if (data?.data?.file_url) {
         setImageUrl(`https://${data.data.file_url}`);
+        closeModal();
       }
     }
   };