Skip to content

Commit 3367a55

Browse files
Merge branch 'dev_nextjs' of https://github.com/GoodDayForSurf/devextreme-cli into dev_nextjs
2 parents 3e74085 + b646db0 commit 3367a55

File tree

5 files changed

+2
-51
lines changed

5 files changed

+2
-51
lines changed

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
@use "../../dx-styles" as *;
2-
@use "../../utils/patches";
32

43
.dx-swatch-additional, .dx-swatch-additional-dark {
54
&.side-navigation-menu {
@@ -70,7 +69,3 @@
7069
}
7170
}
7271
}
73-
74-
.dx-drawer-overlap.pre-init-blink-fix {
75-
@include patches.menu-pre-init-patch;
76-
}

packages/devextreme-cli/src/templates/nextjs/application/src/layouts/side-nav-inner-toolbar/side-nav-inner-toolbar.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import { Header, SideNavigationMenu, Footer } from '../../components';
99
import './side-nav-inner-toolbar.scss';
1010
import { useScreenSize } from '../../utils/media-query';
1111
import { Template } from 'devextreme-react/core/template';
12-
import { useMenuPatch } from '../../utils/patches';
1312
<%=#isTypeScript%>import { TreeViewTypes } from 'devextreme-react/tree-view';<%=/isTypeScript%>
1413
<%=#isTypeScript%>import type { SideNavToolbarProps } from '../../types';<%=/isTypeScript%>
1514
<%=#isTypeScript%>import { ButtonTypes } from 'devextreme-react/button';<%=/isTypeScript%>
@@ -18,7 +17,6 @@ export default function SideNavInnerToolbar({ title, children }<%=#isTypeScript%
1817
const scrollViewRef = useRef<%=#isTypeScript%><ScrollViewRef><%=/isTypeScript%>(null);
1918
const router = useRouter();
2019
const { isXSmall, isLarge } = useScreenSize();
21-
const [patchCssClass, onMenuReady] = useMenuPatch();
2220
const [menuStatus, setMenuStatus] = useState(
2321
isLarge ? MenuStatus.Opened : MenuStatus.Closed
2422
);
@@ -67,7 +65,7 @@ export default function SideNavInnerToolbar({ title, children }<%=#isTypeScript%
6765
return (
6866
<div className={'side-nav-inner-toolbar'}>
6967
<Drawer
70-
className={['drawer', patchCssClass].join(' ')}
68+
className={'drawer'}
7169
position={'before'}
7270
closeOnOutsideClick={onOutsideClick}
7371
openedStateMode={isLarge ? 'shrink' : 'overlap'}
@@ -107,7 +105,6 @@ export default function SideNavInnerToolbar({ title, children }<%=#isTypeScript%
107105
compactMode={menuStatus === MenuStatus.Closed}
108106
selectedItemChanged={onNavigationChanged}
109107
openMenu={temporaryOpenMenu}
110-
onMenuReady={onMenuReady}
111108
>
112109
<Toolbar id={'navigation-header'}>
113110
{

packages/devextreme-cli/src/templates/nextjs/application/src/layouts/side-nav-outer-toolbar/side-nav-outer-toolbar.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import { Header, SideNavigationMenu, Footer } from '../../components';
77
import './side-nav-outer-toolbar.scss';
88
import { useScreenSize } from '../../utils/media-query';
99
import { Template } from 'devextreme-react/core/template';
10-
import { useMenuPatch } from '../../utils/patches';
1110
<%=#isTypeScript%>import { ButtonTypes } from 'devextreme-react/button';<%=/isTypeScript%>
1211
<%=#isTypeScript%>import { TreeViewTypes } from 'devextreme-react/tree-view';<%=/isTypeScript%>
1312
<%=#isTypeScript%>import type { SideNavToolbarProps } from '../../types';<%=/isTypeScript%>
@@ -16,7 +15,6 @@ export default function SideNavOuterToolbar({ title, children }<%=#isTypeScript%
1615
const scrollViewRef = useRef<%=#isTypeScript%><ScrollViewRef><%=/isTypeScript%>(null);
1716
const router = useRouter();
1817
const { isXSmall, isLarge } = useScreenSize();
19-
const [patchCssClass, onMenuReady] = useMenuPatch();
2018
const [menuStatus, setMenuStatus] = useState(
2119
isLarge ? MenuStatus.Opened : MenuStatus.Closed
2220
);
@@ -70,7 +68,7 @@ router.push(itemData.path);
7068
title={title}
7169
/>
7270
<Drawer
73-
className={['drawer layout-body', patchCssClass].join(' ')}
71+
className={'drawer layout-body'}
7472
position={'before'}
7573
closeOnOutsideClick={onOutsideClick}
7674
openedStateMode={isLarge ? 'shrink' : 'overlap'}
@@ -106,7 +104,6 @@ router.push(itemData.path);
106104
compactMode={menuStatus === MenuStatus.Closed}
107105
selectedItemChanged={onNavigationChanged}
108106
openMenu={temporaryOpenMenu}
109-
onMenuReady={onMenuReady}
110107
>
111108
</SideNavigationMenu>
112109
</Template>

packages/devextreme-cli/src/templates/nextjs/application/src/utils/patches.scss

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

packages/devextreme-cli/src/templates/nextjs/application/src/utils/patches.tsx

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

0 commit comments

Comments
 (0)