Merge pull request #501 from GTable/develop

feat: 페이지 전환 애니메이션 임시 제거

Author: hwangdae

apps/nowait-user/src/components/layout/PageTransitionWrapper.tsx

@@ -1,4 +1,4 @@
-import React, { useEffect, useRef } from "react";
+import React, { useRef } from "react";
 import "./transition.css";
 import { TransitionGroup, CSSTransition } from "react-transition-group";
 import { useNavigationType } from "react-router-dom";
@@ -21,13 +21,14 @@ const PageTransitionWrapper = ({ location, children }: PropsType) => {
   const pathname = location.pathname;
   const isBack = location.state?.isBack as boolean | undefined;
   console.log(isBack, "이즈백");
+
   //라우터 이동 방향에 따른 애니메이션 분리
   const isNavigatePush = navigateType === "PUSH" && !isBack;
-  const isNavigatePop = navigateType === "POP" || isBack;
-  const isNavigateReplace = navigateType === "REPLACE";
+  const isNavigateReplace = navigateType === "REPLACE" && !isBack;
+
   const isAnimation = () => {
     if (isNavigatePush) return "navigate-push";
-    if (isNavigatePop) return "navigate-pop";
+    if (isBack) return "navigate-pop";
     if (isNavigateReplace) return "";
     return "";
   };
@@ -41,11 +42,6 @@ const PageTransitionWrapper = ({ location, children }: PropsType) => {
 
   const currentNodeRef = nodeRefs.current[pathname];
 
-  useEffect(() => {
-    if (isNavigatePush || isNavigatePop) {
-      window.scrollTo(0, 0);
-    }
-  }, [pathname, isNavigatePush, isNavigatePop]);
   return (
     <TransitionGroup
       className={"transition-wrapper"}

apps/nowait-user/src/routes/Router.tsx

@@ -10,7 +10,6 @@ import OrderSuccessPage from "../pages/order/orderSuccess/OrderSuccessPage";
 import LoginPage from "../pages/login/LoginPage";
 import KakaoRedirectHandler from "../pages/login/KakaoRedirectHandler";
 import AuthGuard from "../components/AuthGuard";
-import PageTransitionWrapper from "../components/layout/PageTransitionWrapper";
 import WaitingPartySizeForm from "../pages/waiting/waitingPartysize/WaitingPartySizeForm";
 import AddMenuPage from "../pages/order/addMenu/AddMenuPage";
 import RemittanceWaitPage from "../pages/order/remittenceWait/RemittanceWaitPage";
@@ -34,7 +33,6 @@ const withAuth = (Component: React.ComponentType) => (
 const Router = () => {
   const location = useLocation();
   return (
-    <PageTransitionWrapper location={location}>
       <Routes location={location}>
         {/* 공개 라우트 - 인증 불필요 */}
         <Route path="/login/success" element={<KakaoRedirectHandler />} />
@@ -84,7 +82,6 @@ const Router = () => {
         <Route path="/:storeId/orderDetails" element={<OrderDetailsPage />} />
         <Route path="*" element={<NotFound />} />
       </Routes>
-    </PageTransitionWrapper>
   );
 };