Fixed the scrolling and fragment handling
This commit is contained in:
parent
975d743a88
commit
8527ca8568
|
@ -37,7 +37,7 @@ const routes: Routes = [
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [RouterModule.forRoot(routes, {
|
imports: [RouterModule.forRoot(routes, {
|
||||||
// preloadingStrategy: PreloadAllModules,
|
// preloadingStrategy: PreloadAllModules,
|
||||||
scrollPositionRestoration: 'top',
|
// scrollPositionRestoration: 'top',
|
||||||
onSameUrlNavigation: 'reload',
|
onSameUrlNavigation: 'reload',
|
||||||
// relativeLinkResolution: 'corrected'
|
// relativeLinkResolution: 'corrected'
|
||||||
})],
|
})],
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
import { Component } from '@angular/core';
|
import { Component } from '@angular/core';
|
||||||
import {Router} from '@angular/router';
|
import { Router } from '@angular/router';
|
||||||
|
import { SmoothScroll } from './services/smooth-scroll';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-root',
|
selector: 'app-root',
|
||||||
|
@ -9,7 +10,7 @@ import {Router} from '@angular/router';
|
||||||
export class AppComponent {
|
export class AppComponent {
|
||||||
title = 'open-science-observatory-ui';
|
title = 'open-science-observatory-ui';
|
||||||
|
|
||||||
constructor(private router: Router) {
|
constructor(private router: Router, private smoothScroll: SmoothScroll) {
|
||||||
}
|
}
|
||||||
|
|
||||||
isEmbedRoute() {
|
isEmbedRoute() {
|
||||||
|
|
|
@ -1,6 +1,4 @@
|
||||||
import { Component, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core';
|
import { Component, ViewEncapsulation } from '@angular/core';
|
||||||
import { ActivatedRoute } from '@angular/router';
|
|
||||||
import { Subscription } from 'rxjs';
|
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-methodology',
|
selector: 'app-methodology',
|
||||||
|
@ -9,35 +7,5 @@ import { Subscription } from 'rxjs';
|
||||||
encapsulation: ViewEncapsulation.None
|
encapsulation: ViewEncapsulation.None
|
||||||
})
|
})
|
||||||
|
|
||||||
export class MethodologyPageComponent implements OnInit, OnDestroy {
|
export class MethodologyPageComponent {
|
||||||
|
|
||||||
private subscriptions: any[] = [];
|
|
||||||
|
|
||||||
constructor(private route: ActivatedRoute) {
|
|
||||||
}
|
|
||||||
|
|
||||||
ngOnInit(): void {
|
|
||||||
this.subscriptions.push(this.route.fragment.subscribe(fragment => {
|
|
||||||
setTimeout(() => {
|
|
||||||
this.goTo(fragment);
|
|
||||||
}, 100);
|
|
||||||
}));
|
|
||||||
}
|
|
||||||
|
|
||||||
goTo(id: string) {
|
|
||||||
const yOffset = -100;
|
|
||||||
const element = document.getElementById(id);
|
|
||||||
if (element) {
|
|
||||||
const y = element.getBoundingClientRect().top + window.pageYOffset + yOffset;
|
|
||||||
window.scrollTo({top: y, behavior: 'smooth'});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
ngOnDestroy(): void {
|
|
||||||
this.subscriptions.forEach(subscription => {
|
|
||||||
if (subscription instanceof Subscription) {
|
|
||||||
subscription.unsubscribe();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,69 @@
|
||||||
|
import {NavigationEnd, Router} from '@angular/router';
|
||||||
|
import {Injectable} from '@angular/core';
|
||||||
|
import {Subscription} from 'rxjs';
|
||||||
|
|
||||||
|
@Injectable({
|
||||||
|
providedIn: 'root'
|
||||||
|
})
|
||||||
|
export class SmoothScroll {
|
||||||
|
private interval;
|
||||||
|
private readonly sub;
|
||||||
|
private lastRoute;
|
||||||
|
|
||||||
|
constructor(private router: Router) {
|
||||||
|
this.sub = router.events.subscribe(event => {
|
||||||
|
if (event instanceof NavigationEnd) {
|
||||||
|
if(this.interval) {
|
||||||
|
clearInterval(this.interval);
|
||||||
|
}
|
||||||
|
const fragment = router.parseUrl(router.url).fragment;
|
||||||
|
if (fragment) {
|
||||||
|
let i = 0;
|
||||||
|
this.interval = setInterval(() => {
|
||||||
|
i++;
|
||||||
|
const element = document.getElementById(fragment);
|
||||||
|
if (element) {
|
||||||
|
if(this.interval) {
|
||||||
|
clearInterval(this.interval);
|
||||||
|
}
|
||||||
|
const yOffset = -100;
|
||||||
|
let position = 0;
|
||||||
|
let interval = setInterval(() => {
|
||||||
|
if(position !== element.getBoundingClientRect().top) {
|
||||||
|
position = element.getBoundingClientRect().top;
|
||||||
|
} else {
|
||||||
|
clearInterval(interval);
|
||||||
|
const y = element.getBoundingClientRect().top + window.pageYOffset + yOffset;
|
||||||
|
window.scrollTo({top: y, behavior: 'smooth'});
|
||||||
|
}
|
||||||
|
}, 50);
|
||||||
|
}
|
||||||
|
if(i > 4 && this.interval) {
|
||||||
|
clearInterval(this.interval);
|
||||||
|
}
|
||||||
|
}, 100);
|
||||||
|
} else {
|
||||||
|
if(this.lastRoute !== this.getUrl(event.url)) {
|
||||||
|
window.scrollTo({top: 0});
|
||||||
|
} else {
|
||||||
|
window.scrollTo({top: 0, behavior: "smooth"});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
this.lastRoute = this.getUrl(event.url);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private getUrl(url: string) {
|
||||||
|
return url.split('?')[0].split('#')[0];
|
||||||
|
}
|
||||||
|
|
||||||
|
public clearSubscriptions() {
|
||||||
|
if(this.sub && this.sub instanceof Subscription) {
|
||||||
|
this.sub.unsubscribe();
|
||||||
|
}
|
||||||
|
if(this.interval) {
|
||||||
|
clearInterval(this.interval);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -22,6 +22,7 @@
|
||||||
<link rel="stylesheet" href="assets/css/main.css" media="all">
|
<link rel="stylesheet" href="assets/css/main.css" media="all">
|
||||||
<link rel="stylesheet" href="assets/css/os-observatory-custom.css" media="all">
|
<link rel="stylesheet" href="assets/css/os-observatory-custom.css" media="all">
|
||||||
|
|
||||||
|
<script src="https://unpkg.com/smoothscroll-polyfill@0.4.3/dist/smoothscroll.min.js"></script>
|
||||||
|
|
||||||
</head>
|
</head>
|
||||||
<body class="">
|
<body class="">
|
||||||
|
|
Loading…
Reference in New Issue