Merge pull request #253 from TeamPiickle/hotfix/mobile_join

Hotfix/mobile join
TeamPiickle · Mar 31, 2023 · 578f63c · 578f63c
2 parents f5bdaa9 + fb9a7f5
commit 578f63c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/@components/JoinPage/AgreePage/index.tsx b/src/@components/JoinPage/AgreePage/index.tsx
@@ -10,21 +10,23 @@ import { agreeListsContents } from "../../../util/join/agreeListsContents";
 import { subHeaderInfo } from "../../../util/join/subHeaderInfo";
 import Footer from "../../@common/Footer";
 import useGTMPage from "../../@common/hooks/useGTMPage";
-import useOutClickCloser from "../../@common/hooks/useOutClickCloser";
+//import useOutClickCloser from "../../@common/hooks/useOutClickCloser";
+import useScroll from "../../@common/hooks/useScroll";
 import SubHeader from "../../@common/SubHeader";
 import { UserInfoFormDataContext } from "..";
 import { ModalContainerWithAnimation, St } from "./style";
 
 export default function AgreePage() {
   useGTMPage();
+  useScroll();
 
   const { userInfoFormDataForPost } = useOutletContext<UserInfoFormDataContext>();
 
   const navigate = useNavigate();
 
-  const outClickCloserRef = useOutClickCloser(() => {
-    setIsOpenAlert(false);
-  });
+  // const outClickCloserRef = useOutClickCloser(() => {
+  //   setIsOpenAlert(false);
+  // });
 
   const [isPickedItems, setIsPickedItems] = useState<boolean[]>([false, true, true, true, false]);
   const [isOpenAlert, setIsOpenAlert] = useState(false);
@@ -120,7 +122,7 @@ export default function AgreePage() {
       <St.JoinAgree>
         <St.AgreeTitle>약관을 동의해주세요</St.AgreeTitle>
         <St.AgreeContent>{agreeLists}</St.AgreeContent>
-        <ModalContainerWithAnimation isopen={isOpenAlert} ref={outClickCloserRef}>
+        <ModalContainerWithAnimation isopen={isOpenAlert} /*ref={outClickCloserRef}*/>
           필수 항목에 동의해주세요
         </ModalContainerWithAnimation>
         <St.JoinButton className={GTM_CLASS_NAME.joinAgreeComplete} onClick={completeJoinBtn}>

diff --git a/src/@components/JoinPage/UserProfilePage/index.tsx b/src/@components/JoinPage/UserProfilePage/index.tsx
@@ -7,6 +7,7 @@ import { JOIN_FORM_DATA_KEY } from "../../../util/join/formData";
 import { subHeaderInfo } from "../../../util/join/subHeaderInfo";
 import { JOIN_PROFILE_ALERT_KEY, JOIN_PROFILE_ALERT_MESSAGE } from "../../../util/join/userProfileErrorMessage";
 import Footer from "../../@common/Footer";
+import useScroll from "../../@common/hooks/useScroll";
 import SubHeader from "../../@common/SubHeader";
 import { UserInfoFormDataContext } from "..";
 import ProfileBirth from "./ProfileBirth";
@@ -16,6 +17,7 @@ import ProfileNickname from "./ProfileNickname";
 import { St } from "./style";
 
 export default function UserProfilePage() {
+  useScroll();
   const navigate = useNavigate();
 
   const { formDataNicknameValue, formDataBirthdayValue, formDataGenderValue, setUserInfoFormData } =