Skip to content

feat: 페이지 이동 시 스크롤 상단 이동 시 스크롤 위치 복구 #57

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
y00eunji merged 3 commits into from
May 26, 2026
Merged

feat: 페이지 이동 시 스크롤 상단 이동 시 스크롤 위치 복구 #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
163a756
feat(pyconkr-2026): 페이지 이동 시 스크롤 상단 이동 및 뒤로가기 시 스크롤 위치 복구
y00eunji May 15, 2026
cc201eb
feat: 동일하게 2025에도 적용
y00eunji May 15, 2026
eb449a4
Merge remote-tracking branch 'origin/main' into feature/scroll-restor…
y00eunji May 26, 2026
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
24 changes: 5 additions & 19 deletions apps/pyconkr-2025/src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,8 @@ import { useBackendClient, useFlattenSiteMapQuery, useSponsorQuery } from "@fron
import { NestedSiteMapSchema } from "@frontend/common/schemas/backendAPI";
import { buildNestedSiteMap } from "@frontend/common/utils";
import { FC, useEffect } from "react";
import { Route, Routes, useLocation } from "react-router-dom";
import { Outlet, ScrollRestoration, useLocation } from "react-router-dom";
import { isEmpty, isNullish } from "remeda";

import MainLayout from "./components/layout/index.tsx";
import { PageIdParamRenderer, RouteRenderer } from "./components/pages/dynamic_route.tsx";
import { PresentationDetailPage } from "./components/pages/presentation_detail.tsx";
import { ShopSignInPage } from "./components/pages/sign_in.tsx";
import { SponsorDetailPage } from "./components/pages/sponsor_detail.tsx";
import { Test } from "./components/pages/test.tsx";
import { IS_DEBUG_ENV } from "./consts";
import { useAppContext } from "./contexts/app_context";

export const App: FC = () => {
Expand Down Expand Up @@ -45,15 +37,9 @@ export const App: FC = () => {
}, [location, language, flatSiteMap, sponsorTiers]);

return (
<Routes>
<Route element={<MainLayout />}>
{IS_DEBUG_ENV && <Route path="/debug" element={<Test />} />}
<Route path="/account/sign-in" element={<ShopSignInPage />} />
<Route path="/sponsors/:id" element={<SponsorDetailPage />} />
<Route path="/presentations/:id" element={<PresentationDetailPage />} />
<Route path="/pages/:id" element={<PageIdParamRenderer />} />
<Route path="*" element={<RouteRenderer />} />
</Route>
</Routes>
<>
<ScrollRestoration />
<Outlet />
</>
);
};
36 changes: 17 additions & 19 deletions apps/pyconkr-2025/src/main.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import { ReactQueryDevtools } from "@tanstack/react-query-devtools";
import { SnackbarProvider } from "notistack";
import { FC, StrictMode, useState } from "react";
import { createRoot } from "react-dom/client";
import { BrowserRouter } from "react-router-dom";
import { RouterProvider } from "react-router-dom";

import { App } from "./App.tsx";
import { router } from "./router.tsx";
import { IS_DEBUG_ENV } from "./consts";
import { LOCAL_STORAGE_LANGUAGE_KEY } from "./consts/local_stroage.ts";
import { PyConKRMDXComponents } from "./consts/mdx_components.ts";
Expand Down Expand Up @@ -84,23 +84,21 @@ export const MainApp: FC = () => {
<QueryClientProvider client={queryClient}>
<ReactQueryDevtools initialIsOpen={false} />
<SnackbarProvider>
<BrowserRouter>
<AppContext.Provider value={{ ...appState, setAppContext }}>
<CommonContextProvider options={{ ...CommonOptions, language: appState.language }}>
<ShopContextProvider options={{ ...ShopOptions, language: appState.language }}>
<ErrorBoundary fallback={ErrorFallback}>
<Suspense fallback={SuspenseFallback}>
<ThemeProvider theme={muiTheme}>
<CssBaseline />
<Global styles={globalStyles} />
<App />
</ThemeProvider>
</Suspense>
</ErrorBoundary>
</ShopContextProvider>
</CommonContextProvider>
</AppContext.Provider>
</BrowserRouter>
<AppContext.Provider value={{ ...appState, setAppContext }}>
<CommonContextProvider options={{ ...CommonOptions, language: appState.language }}>
<ShopContextProvider options={{ ...ShopOptions, language: appState.language }}>
<ErrorBoundary fallback={ErrorFallback}>
<Suspense fallback={SuspenseFallback}>
<ThemeProvider theme={muiTheme}>
<CssBaseline />
<Global styles={globalStyles} />
<RouterProvider router={router} />
</ThemeProvider>
</Suspense>
</ErrorBoundary>
</ShopContextProvider>
</CommonContextProvider>
</AppContext.Provider>
</SnackbarProvider>
</QueryClientProvider>
</StrictMode>
Expand Down
29 changes: 29 additions & 0 deletions apps/pyconkr-2025/src/router.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
import { createBrowserRouter } from "react-router-dom";

import { App } from "./App.tsx";
import MainLayout from "./components/layout/index.tsx";
import { PageIdParamRenderer, RouteRenderer } from "./components/pages/dynamic_route.tsx";
import { PresentationDetailPage } from "./components/pages/presentation_detail.tsx";
import { ShopSignInPage } from "./components/pages/sign_in.tsx";
import { SponsorDetailPage } from "./components/pages/sponsor_detail.tsx";
import { Test } from "./components/pages/test.tsx";
import { IS_DEBUG_ENV } from "./consts";

export const router = createBrowserRouter([
{
element: <App />,
children: [
{
element: <MainLayout />,
children: [
...(IS_DEBUG_ENV ? [{ path: "/debug", element: <Test /> }] : []),
{ path: "/account/sign-in", element: <ShopSignInPage /> },
{ path: "/sponsors/:id", element: <SponsorDetailPage /> },
{ path: "/presentations/:id", element: <PresentationDetailPage /> },
{ path: "/pages/:id", element: <PageIdParamRenderer /> },
{ path: "*", element: <RouteRenderer /> },
],
},
],
},
]);
20 changes: 5 additions & 15 deletions apps/pyconkr-2026/src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,9 @@ import { useBackendClient, useFlattenSiteMapQuery, useSponsorQuery } from "@fron
import { NestedSiteMapSchema } from "@frontend/common/schemas/backendAPI";
import { buildNestedSiteMap } from "@frontend/common/utils";
import { FC, useEffect } from "react";
import { Route, Routes, useLocation } from "react-router-dom";
import { Outlet, ScrollRestoration, useLocation } from "react-router-dom";
import { isEmpty, isNullish } from "remeda";

import MainLayout from "./components/layout/index.tsx";
import { PageIdParamRenderer, RouteRenderer } from "./components/pages/dynamic_route.tsx";
import { PresentationDetailPage } from "./components/pages/presentation_detail.tsx";
import { ShopSignInPage } from "./components/pages/sign_in.tsx";
import { SponsorDetailPage } from "./components/pages/sponsor_detail.tsx";
import { useAppContext } from "./contexts/app_context";

export const App: FC = () => {
Expand Down Expand Up @@ -43,14 +38,9 @@ export const App: FC = () => {
}, [location, language, flatSiteMap, sponsorTiers]);

return (
<Routes>
<Route element={<MainLayout />}>
<Route path="/account/sign-in" element={<ShopSignInPage />} />
<Route path="/sponsors/:id" element={<SponsorDetailPage />} />
<Route path="/presentations/:id" element={<PresentationDetailPage />} />
<Route path="/pages/:id" element={<PageIdParamRenderer />} />
<Route path="*" element={<RouteRenderer />} />
</Route>
</Routes>
<>
<ScrollRestoration />
<Outlet />
</>
);
};
36 changes: 17 additions & 19 deletions apps/pyconkr-2026/src/main.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ import { ReactQueryDevtools } from "@tanstack/react-query-devtools";
import { SnackbarProvider } from "notistack";
import { FC, StrictMode, useState } from "react";
import { createRoot } from "react-dom/client";
import { BrowserRouter } from "react-router-dom";
import { RouterProvider } from "react-router-dom";

import { App } from "./App.tsx";
import { IS_DEBUG_ENV } from "./consts";
import { LOCAL_STORAGE_LANGUAGE_KEY } from "./consts/local_stroage.ts";
import { PyConKRMDXComponents } from "./consts/mdx_components.ts";
import { AppContext, AppContextType } from "./contexts/app_context.tsx";
import { router } from "./router.tsx";
import { globalStyles, muiTheme } from "./styles/globalStyles.ts";

const queryClient = new QueryClient({
Expand Down Expand Up @@ -84,23 +84,21 @@ export const MainApp: FC = () => {
<QueryClientProvider client={queryClient}>
<ReactQueryDevtools initialIsOpen={false} />
<SnackbarProvider>
<BrowserRouter>
<AppContext.Provider value={{ ...appState, setAppContext }}>
<CommonContextProvider options={{ ...CommonOptions, language: appState.language }}>
<ShopContextProvider options={{ ...ShopOptions, language: appState.language }}>
<ErrorBoundary fallback={ErrorFallback}>
<Suspense fallback={SuspenseFallback}>
<ThemeProvider theme={muiTheme}>
<CssBaseline />
<Global styles={globalStyles} />
<App />
</ThemeProvider>
</Suspense>
</ErrorBoundary>
</ShopContextProvider>
</CommonContextProvider>
</AppContext.Provider>
</BrowserRouter>
<AppContext.Provider value={{ ...appState, setAppContext }}>
<CommonContextProvider options={{ ...CommonOptions, language: appState.language }}>
<ShopContextProvider options={{ ...ShopOptions, language: appState.language }}>
<ErrorBoundary fallback={ErrorFallback}>
<Suspense fallback={SuspenseFallback}>
<ThemeProvider theme={muiTheme}>
<CssBaseline />
<Global styles={globalStyles} />
<RouterProvider router={router} />
</ThemeProvider>
</Suspense>
</ErrorBoundary>
</ShopContextProvider>
</CommonContextProvider>
</AppContext.Provider>
</SnackbarProvider>
</QueryClientProvider>
</StrictMode>
Expand Down
26 changes: 26 additions & 0 deletions apps/pyconkr-2026/src/router.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
import { createBrowserRouter } from "react-router-dom";

import { App } from "./App.tsx";
import MainLayout from "./components/layout/index.tsx";
import { PageIdParamRenderer, RouteRenderer } from "./components/pages/dynamic_route.tsx";
import { PresentationDetailPage } from "./components/pages/presentation_detail.tsx";
import { ShopSignInPage } from "./components/pages/sign_in.tsx";
import { SponsorDetailPage } from "./components/pages/sponsor_detail.tsx";

export const router = createBrowserRouter([
{
element: <App />,
children: [
{
element: <MainLayout />,
children: [
{ path: "/account/sign-in", element: <ShopSignInPage /> },
{ path: "/sponsors/:id", element: <SponsorDetailPage /> },
{ path: "/presentations/:id", element: <PresentationDetailPage /> },
{ path: "/pages/:id", element: <PageIdParamRenderer /> },
{ path: "*", element: <RouteRenderer /> },
],
},
],
},
]);