fix: improve sidebar pathname handling

Author: malav2110

apps/site/components/withSidebar.tsx

@@ -1,7 +1,7 @@
 'use client';
 
 import Sidebar from '@node-core/ui-components/Containers/Sidebar';
-import { useTranslations } from 'next-intl';
+import { useLocale, useTranslations } from 'next-intl';
 import { useRef } from 'react';
 
 import Link from '#site/components/Link';
@@ -21,6 +21,7 @@ type WithSidebarProps = {
 const WithSidebar: FC<WithSidebarProps> = ({ navKeys, context, ...props }) => {
   const { getSideNavigation } = useSiteNavigation();
   const pathname = usePathname()!;
+  const locale = useLocale();
   const t = useTranslations();
   const { push } = useRouter();
   const { frontmatter } = useClientContext();
@@ -44,7 +45,7 @@ const WithSidebar: FC<WithSidebarProps> = ({ navKeys, context, ...props }) => {
     <Sidebar
       ref={sidebarRef}
       groups={mappedSidebarItems}
-      pathname={pathname}
+      pathname={pathname.replace(`/${locale}`, '')}
       title={t('components.common.sidebar.title')}
       placeholder={frontmatter?.title}
       onSelect={push}

apps/site/hooks/client/useScrollToElement.ts

@@ -17,17 +17,16 @@ const useScrollToElement = <T extends HTMLElement>(
 
   // Restore scroll position on mount
   useEffect(() => {
-    const element = ref.current;
-    if (!element) {
+    if (!ref.current) {
       return;
     }
 
     // Restore scroll position if saved state exists
     const savedState = navigationState[id];
 
     // Scroll only if the saved position differs from current
-    if (savedState && savedState.y !== element.scrollTop) {
-      element.scroll({ top: savedState.y, behavior: 'auto' });
+    if (savedState && savedState.y !== ref.current.scrollTop) {
+      ref.current.scroll({ top: savedState.y, behavior: 'auto' });
     }
     // navigationState is intentionally excluded
     // it's a stable object reference that doesn't need to trigger re-runs