Skip to content

Commit db3c290

Browse files
get rid of navigation context
1 parent ef05929 commit db3c290

3 files changed

Lines changed: 9 additions & 48 deletions

File tree

packages/devextreme-cli/src/templates/nextjs/application/src/app/layout.tsx

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import { usePathname } from 'next/navigation';
44
import LoadPanel from 'devextreme-react/load-panel';
55
import { AuthProvider, useAuth} from '@/contexts/auth';
6-
import { NavigationProvider } from '@/contexts/navigation';
76
import { ThemeContext, useThemeContext} from "@/theme";
87

98
function Page({ children }) {
@@ -26,11 +25,9 @@ export default function RootLayout({ children }) {
2625
<body className="dx-viewport">
2726
<ThemeContext.Provider value={themeContext}>
2827
<AuthProvider>
29-
<NavigationProvider>
30-
<div className='app'>
31-
<Page key={pathname}>{children}</Page>
32-
</div>
33-
</NavigationProvider>
28+
<div className='app'>
29+
<Page key={pathname}>{children}</Page>
30+
</div>
3431
</AuthProvider>
3532
</ThemeContext.Provider>
3633
</body>

packages/devextreme-cli/src/templates/nextjs/application/src/components/side-navigation-menu/SideNavigationMenu.tsx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import React, { useEffect, useRef, useCallback, useMemo, useContext } from 'reac
33
import { TreeView<%=#isTypeScript%>, TreeViewRef<%=/isTypeScript%> } from 'devextreme-react/tree-view';
44
import * as events from 'devextreme-react/common/core/events';
55
import { navigation } from '../../app-navigation';
6-
import { useNavigation } from '../../contexts/navigation';
6+
import { usePathname } from 'next/navigation';
77
import { useScreenSize } from '../../utils/media-query';
88
import './SideNavigationMenu.scss';
99
<%=#isTypeScript%>import type { SideNavigationMenuProps } from '../../types';<%=/isTypeScript%>
@@ -33,7 +33,7 @@ export default function SideNavigationMenu(props<%=#isTypeScript%>: React.PropsW
3333
[]
3434
);
3535

36-
const { navigationData: { currentPath } } = useNavigation();
36+
const pathname = usePathname();
3737

3838
const treeViewRef = useRef<%=#isTypeScript%><TreeViewRef><%=/isTypeScript%>(null);
3939
const wrapperRef = useRef<%=#isTypeScript%><HTMLDivElement><%=/isTypeScript%>(null);
@@ -55,15 +55,15 @@ export default function SideNavigationMenu(props<%=#isTypeScript%>: React.PropsW
5555
return;
5656
}
5757

58-
if (currentPath !== undefined) {
59-
treeView.selectItem(currentPath);
60-
treeView.expandItem(currentPath);
58+
if (pathname !== undefined) {
59+
treeView.selectItem(pathname);
60+
treeView.expandItem(pathname);
6161
}
6262

6363
if (compactMode) {
6464
treeView.collapseAll();
6565
}
66-
}, [currentPath, compactMode]);
66+
}, [pathname, compactMode]);
6767

6868
return (
6969
<div

packages/devextreme-cli/src/templates/nextjs/application/src/contexts/navigation.tsx

Lines changed: 0 additions & 36 deletions
This file was deleted.

0 commit comments

Comments
 (0)