From 216746dccdb719e7b71df56c0905a005840c791e Mon Sep 17 00:00:00 2001 From: Pelayo Felgueroso Date: Thu, 16 Oct 2025 09:21:58 +0200 Subject: [PATCH 1/2] Made changes requested --- apps/website/pages/_app.tsx | 19 +------------------ packages/lib/src/layout/ApplicationLayout.tsx | 12 +++++++++--- 2 files changed, 10 insertions(+), 21 deletions(-) diff --git a/apps/website/pages/_app.tsx b/apps/website/pages/_app.tsx index 2c5102037..fd97164cc 100644 --- a/apps/website/pages/_app.tsx +++ b/apps/website/pages/_app.tsx @@ -1,4 +1,4 @@ -import { ReactElement, ReactNode, useEffect, useMemo, useState } from "react"; +import { ReactElement, ReactNode, useMemo, useState } from "react"; import type { NextPage } from "next"; import type { AppProps } from "next/app"; import Head from "next/head"; @@ -47,23 +47,6 @@ export default function App({ Component, pageProps, emotionCache = clientSideEmo return pathToBeMatched ? desiredPaths.includes(pathToBeMatched) : false; }; - const router = useRouter(); - - useEffect(() => { - const handleRouteChange = () => { - const el = document.getElementById("MainScroll"); - if (el) el.scrollTo(0, 0); - }; - - router.events.on("routeChangeComplete", handleRouteChange); - router.events.on("hashChangeComplete", handleRouteChange); - - return () => { - router.events.off("routeChangeComplete", handleRouteChange); - router.events.off("hashChangeComplete", handleRouteChange); - }; - }, [router.events]); - return ( diff --git a/packages/lib/src/layout/ApplicationLayout.tsx b/packages/lib/src/layout/ApplicationLayout.tsx index 31ecb7081..996daff45 100644 --- a/packages/lib/src/layout/ApplicationLayout.tsx +++ b/packages/lib/src/layout/ApplicationLayout.tsx @@ -127,7 +127,7 @@ const DxcApplicationLayout = ({ }: ApplicationLayoutPropsType): JSX.Element => { const [isSidenavVisibleResponsive, setIsSidenavVisibleResponsive] = useState(false); const isResponsive = useResponsive(responsiveSizes.large); - const ref = useRef(null); + const mainContentRef = useRef(null); const translatedLabels = useContext(HalstackLanguageContext); const handleSidenavVisibility = () => { @@ -140,8 +140,14 @@ const DxcApplicationLayout = ({ } }, [isResponsive]); + useEffect(() => { + if (mainContentRef.current) { + mainContentRef.current.scrollTop = 0; + } + }, [children]); + return ( - + {header ?? } {sidenav && isResponsive && ( @@ -167,7 +173,7 @@ const DxcApplicationLayout = ({ {sidenav} )} - + {findChildType(children, Main)} From c052c95c5df7da295cca4ebce2bcf3bd1c664311 Mon Sep 17 00:00:00 2001 From: Pelayo Felgueroso Date: Mon, 20 Oct 2025 12:11:49 +0200 Subject: [PATCH 2/2] Remove unnecesary id --- apps/website/screens/common/MainContent.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/website/screens/common/MainContent.tsx b/apps/website/screens/common/MainContent.tsx index 24adc14a9..16ec1b5f2 100644 --- a/apps/website/screens/common/MainContent.tsx +++ b/apps/website/screens/common/MainContent.tsx @@ -65,7 +65,7 @@ const MainContent = ({ children }: { children: ReactNode }) => { } }, [latestRelease, toast]); - return {children}; + return {children}; }; export default MainContent;