Merge pull request #53 from ehdrhelr/fe/refactor

[FE]라우터 link reload 오류 해결
codesquad-members-2021 · Jun 3, 2021 · 9db5578 · 9db5578
2 parents 27b4a99 + b40717c
commit 9db5578
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/FE/airbnb/src/components/header/form/FormGuest.tsx b/FE/airbnb/src/components/header/form/FormGuest.tsx
@@ -48,10 +48,6 @@ const FormGuest = () => {
     resetGuests();
   };
 
-  const handleSubmitClick = (e: MouseEvent): void => {
-    e.stopPropagation();
-  };
-
   const linkCondition =
     Object.values(reserveInfo as reserveInfoType).filter((v) => !v).length === 0;
   const linkURL = clientReserveAPI(reserveInfo as reserveInfoType);
@@ -62,7 +58,7 @@ const FormGuest = () => {
           <FormColumn title='인원' description={getGuestDesc()} />
           {isShowDeleteBtn && <DeleteBtn onClick={resetClickHandler} />}
           <ConditionalLink to={linkURL} condition={linkCondition}>
-            <div className='search-icon' onClick={handleSubmitClick}>
+            <div className='search-icon'>
               <IoSearch />
               {isFormOpened && <div className='search'>검색</div>}
             </div>

diff --git a/FE/airbnb/src/hooks/useToggle.ts b/FE/airbnb/src/hooks/useToggle.ts
@@ -34,6 +34,10 @@ const useToggle = ({ clickRef, toggleRef, isChekcInSelected }: refsType): toggle
 
     if (clickRef instanceof Array) {
       for (const elem of clickRef) {
+        if (!elem.current) {
+          setOpen(false);
+          return;
+        }
         if (
           (elem.current as HTMLDivElement).contains(target as HTMLDivElement) &&
           selectType === elem.current?.dataset.type
@@ -47,6 +51,10 @@ const useToggle = ({ clickRef, toggleRef, isChekcInSelected }: refsType): toggle
         }
       }
     } else {
+      if (!clickRef.current) {
+        setOpen(false);
+        return;
+      }
       if ((clickRef.current as HTMLDivElement).contains(target as HTMLDivElement)) {
         setOpen((open) => !open);
         return;