Skip to content
This repository was archived by the owner on May 26, 2020. It is now read-only.

Commit 8411fd2

Browse files
Fix scrolling after navigation (#111)
1 parent b9041f8 commit 8411fd2

File tree

4 files changed

+10
-6
lines changed

4 files changed

+10
-6
lines changed

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "devextreme-schematics",
3-
"version": "1.0.12",
3+
"version": "1.0.13",
44
"description": "DevExtreme schematics",
55
"scripts": {
66
"build": "tsc -p tsconfig.json",

src/add-layout/files/src/app/layouts/side-nav-inner-toolbar/side-nav-inner-toolbar.component.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import { Component, OnInit, NgModule, Input } from '@angular/core';
1+
import { Component, OnInit, NgModule, Input, ViewChild } from '@angular/core';
22
import { SideNavigationMenuModule, HeaderModule } from '../../shared/components';
33
import { ScreenService } from '../../shared/services';
44
import { DxDrawerModule } from 'devextreme-angular/ui/drawer';
5-
import { DxScrollViewModule } from 'devextreme-angular/ui/scroll-view';
5+
import { DxScrollViewModule, DxScrollViewComponent } from 'devextreme-angular/ui/scroll-view';
66
import { DxToolbarModule } from 'devextreme-angular/ui/toolbar';
77
import { CommonModule } from '@angular/common';
88

@@ -15,6 +15,7 @@ import { Router, NavigationEnd } from '@angular/router';
1515
styleUrls: ['./side-nav-inner-toolbar.component.scss']
1616
})
1717
export class SideNavInnerToolbarComponent implements OnInit {
18+
@ViewChild(DxScrollViewComponent, { static: true }) scrollView: DxScrollViewComponent;
1819
menuItems = navigation;
1920
selectedRoute = '';
2021

@@ -77,6 +78,7 @@ export class SideNavInnerToolbarComponent implements OnInit {
7778
pointerEvent.preventDefault();
7879
} else {
7980
this.router.navigate([path]);
81+
this.scrollView.instance.scrollTo(0);
8082
}
8183

8284
if (this.hideMenuAfterNavigation) {

src/add-layout/files/src/app/layouts/side-nav-outer-toolbar/side-nav-outer-toolbar.component.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import { Component, OnInit, NgModule, Input } from '@angular/core';
1+
import { Component, OnInit, NgModule, Input, ViewChild } from '@angular/core';
22
import { SideNavigationMenuModule, HeaderModule } from '../../shared/components';
33
import { ScreenService } from '../../shared/services';
44
import { DxDrawerModule } from 'devextreme-angular/ui/drawer';
5-
import { DxScrollViewModule } from 'devextreme-angular/ui/scroll-view';
5+
import { DxScrollViewModule, DxScrollViewComponent } from 'devextreme-angular/ui/scroll-view';
66
import { CommonModule } from '@angular/common';
77

88
import { navigation } from '../../app-navigation';
@@ -14,6 +14,7 @@ import { Router, NavigationEnd } from '@angular/router';
1414
styleUrls: ['./side-nav-outer-toolbar.component.scss']
1515
})
1616
export class SideNavOuterToolbarComponent implements OnInit {
17+
@ViewChild(DxScrollViewComponent, { static: true }) scrollView: DxScrollViewComponent;
1718
menuItems = navigation;
1819
selectedRoute = '';
1920

@@ -71,6 +72,7 @@ export class SideNavOuterToolbarComponent implements OnInit {
7172
pointerEvent.preventDefault();
7273
} else {
7374
this.router.navigate([path]);
75+
this.scrollView.instance.scrollTo(0);
7476
}
7577

7678
if (this.hideMenuAfterNavigation) {

0 commit comments

Comments
 (0)