Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hwangdae merged 2 commits into from
Sep 12, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
00f87c4
feat: 페이지 전환 임시 제거
hwangdae Sep 12, 2025
6504971
Merge pull request #500 from GTable/feature/user/page-conversion
hwangdae Sep 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 5 additions & 9 deletions apps/nowait-user/src/components/layout/PageTransitionWrapper.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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";
Expand All @@ -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 "";
};
Expand All @@ -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"}
Expand Down
3 changes: 0 additions & 3 deletions apps/nowait-user/src/routes/Router.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand All @@ -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 />} />
Expand Down Expand Up @@ -84,7 +82,6 @@ const Router = () => {
<Route path="/:storeId/orderDetails" element={<OrderDetailsPage />} />
<Route path="*" element={<NotFound />} />
</Routes>
</PageTransitionWrapper>
);
};

Expand Down