monkey-front-components 0.0.277 → 0.0.281

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -10,7 +10,6 @@ export class BaseScrollComponent extends BaseComponent {
10
10
  this._pId = _pId;
11
11
  this._rt = _rt;
12
12
  this.routeScrollPositions = {};
13
- this.deferredRestore = false;
14
13
  }
15
14
  saveScroll(url) {
16
15
  const element = document.getElementById('container-3');
@@ -20,12 +19,9 @@ export class BaseScrollComponent extends BaseComponent {
20
19
  const savedScroll = this.routeScrollPositions[url];
21
20
  const element = document.getElementById('container-3');
22
21
  if (!savedScroll) {
23
- this.deferredRestore = false;
24
- return false;
22
+ return;
25
23
  }
26
24
  element.scrollTop = savedScroll;
27
- this.deferredRestore = false;
28
- return true;
29
25
  }
30
26
  addScrollTopListeners() {
31
27
  if ('scrollRestoration' in history) {
@@ -36,15 +32,9 @@ export class BaseScrollComponent extends BaseComponent {
36
32
  this.saveScroll(this._rt.url);
37
33
  }
38
34
  else if (event instanceof NavigationEnd) {
39
- if (!this.restoreScroll(event.url)) {
40
- setTimeout(() => {
41
- if (this.deferredRestore) {
42
- this.restoreScroll(event.url);
43
- this.deferredRestore = false;
44
- }
45
- });
46
- this.deferredRestore = true;
47
- }
35
+ setTimeout(() => {
36
+ this.restoreScroll(event.url);
37
+ });
48
38
  }
49
39
  });
50
40
  }
@@ -53,11 +43,6 @@ export class BaseScrollComponent extends BaseComponent {
53
43
  this.addScrollTopListeners();
54
44
  }
55
45
  }
56
- ngAfterContentChecked() {
57
- if (this.deferredRestore) {
58
- this.restoreScroll(this._rt.url);
59
- }
60
- }
61
46
  }
62
47
  BaseScrollComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.0", ngImport: i0, type: BaseScrollComponent, deps: [{ token: Object }, { token: i1.Router }], target: i0.ɵɵFactoryTarget.Directive });
63
48
  BaseScrollComponent.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "12.0.0", version: "13.2.0", type: BaseScrollComponent, selector: "[baseScrollComponent]", usesInheritance: true, ngImport: i0 });
@@ -67,4 +52,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.0", ngImpor
67
52
  selector: '[baseScrollComponent]'
68
53
  }]
69
54
  }], ctorParameters: function () { return [{ type: Object }, { type: i1.Router }]; } });
70
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmFzZS1zY3JvbGwtY29tcG9uZW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvbW9ua2V5LWZyb250LWNvbXBvbmVudHMvc3JjL2xpYi9jb21wb25lbnRzL2Jhc2UvYmFzZS1zY3JvbGwtY29tcG9uZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQ3BELE9BQU8sRUFBdUIsU0FBUyxFQUFVLE1BQU0sZUFBZSxDQUFDO0FBQ3ZFLE9BQU8sRUFBRSxhQUFhLEVBQUUsZUFBZSxFQUFVLE1BQU0saUJBQWlCLENBQUM7QUFDekUsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLGtCQUFrQixDQUFDOzs7QUFLakQsTUFBTSxPQUFnQixtQkFBb0IsU0FBUSxhQUFhO0lBTTdELFlBQW9CLElBQVksRUFBVSxHQUFXO1FBQ25ELEtBQUssRUFBRSxDQUFDO1FBRFUsU0FBSSxHQUFKLElBQUksQ0FBUTtRQUFVLFFBQUcsR0FBSCxHQUFHLENBQVE7UUFKN0MseUJBQW9CLEdBQThCLEVBQUUsQ0FBQztRQUVyRCxvQkFBZSxHQUFHLEtBQUssQ0FBQztJQUloQyxDQUFDO0lBRU8sVUFBVSxDQUFDLEdBQVc7UUFDNUIsTUFBTSxPQUFPLEdBQVEsUUFBUSxDQUFDLGNBQWMsQ0FBQyxhQUFhLENBQUMsQ0FBQztRQUM1RCxJQUFJLENBQUMsb0JBQW9CLENBQUMsR0FBRyxDQUFDLEdBQUcsT0FBTyxDQUFDLFNBQVMsQ0FBQztJQUNyRCxDQUFDO0lBRU8sYUFBYSxDQUFDLEdBQVc7UUFDL0IsTUFBTSxXQUFXLEdBQUcsSUFBSSxDQUFDLG9CQUFvQixDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQ25ELE1BQU0sT0FBTyxHQUFRLFFBQVEsQ0FBQyxjQUFjLENBQUMsYUFBYSxDQUFDLENBQUM7UUFDNUQsSUFBSSxDQUFDLFdBQVcsRUFBRTtZQUNoQixJQUFJLENBQUMsZUFBZSxHQUFHLEtBQUssQ0FBQztZQUM3QixPQUFPLEtBQUssQ0FBQztTQUNkO1FBRUQsT0FBTyxDQUFDLFNBQVMsR0FBRyxXQUFXLENBQUM7UUFDaEMsSUFBSSxDQUFDLGVBQWUsR0FBRyxLQUFLLENBQUM7UUFDN0IsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDO0lBRU8scUJBQXFCO1FBQzNCLElBQUksbUJBQW1CLElBQUksT0FBTyxFQUFFO1lBQ2xDLE9BQU8sQ0FBQyxpQkFBaUIsR0FBRyxRQUFRLENBQUM7U0FDdEM7UUFFRCxJQUFJLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxTQUFTLENBQUMsS0FBSyxDQUFDLEVBQUU7WUFDaEMsSUFBSSxLQUFLLFlBQVksZUFBZSxFQUFFO2dCQUNwQyxJQUFJLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUM7YUFDL0I7aUJBQU0sSUFBSSxLQUFLLFlBQVksYUFBYSxFQUFFO2dCQUN6QyxJQUFJLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLEVBQUU7b0JBQ2xDLFVBQVUsQ0FBQyxHQUFHLEVBQUU7d0JBQ2QsSUFBSSxJQUFJLENBQUMsZUFBZSxFQUFFOzRCQUN4QixJQUFJLENBQUMsYUFBYSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQzs0QkFDOUIsSUFBSSxDQUFDLGVBQWUsR0FBRyxLQUFLLENBQUM7eUJBQzlCO29CQUNILENBQUMsQ0FBQyxDQUFDO29CQUNILElBQUksQ0FBQyxlQUFlLEdBQUcsSUFBSSxDQUFDO2lCQUM3QjthQUNGO1FBQ0gsQ0FBQyxDQUFDLENBQUM7SUFDTCxDQUFDO0lBRUQsUUFBUTtRQUNOLElBQUksaUJBQWlCLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxFQUFFO1lBQ2hDLElBQUksQ0FBQyxxQkFBcUIsRUFBRSxDQUFDO1NBQzlCO0lBQ0gsQ0FBQztJQUVELHFCQUFxQjtRQUNuQixJQUFJLElBQUksQ0FBQyxlQUFlLEVBQUU7WUFDeEIsSUFBSSxDQUFDLGFBQWEsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1NBQ2xDO0lBQ0gsQ0FBQzs7Z0hBNURtQixtQkFBbUIsa0JBTWIsTUFBTTtvR0FOWixtQkFBbUI7MkZBQW5CLG1CQUFtQjtrQkFIeEMsU0FBUzttQkFBQztvQkFDVCxRQUFRLEVBQUUsdUJBQXVCO2lCQUNsQzswREFPMkIsTUFBTSIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IGlzUGxhdGZvcm1Ccm93c2VyIH0gZnJvbSAnQGFuZ3VsYXIvY29tbW9uJztcbmltcG9ydCB7IEFmdGVyQ29udGVudENoZWNrZWQsIERpcmVjdGl2ZSwgT25Jbml0IH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQgeyBOYXZpZ2F0aW9uRW5kLCBOYXZpZ2F0aW9uU3RhcnQsIFJvdXRlciB9IGZyb20gJ0Bhbmd1bGFyL3JvdXRlcic7XG5pbXBvcnQgeyBCYXNlQ29tcG9uZW50IH0gZnJvbSAnLi9iYXNlLWNvbXBvbmVudCc7XG5cbkBEaXJlY3RpdmUoe1xuICBzZWxlY3RvcjogJ1tiYXNlU2Nyb2xsQ29tcG9uZW50XSdcbn0pXG5leHBvcnQgYWJzdHJhY3QgY2xhc3MgQmFzZVNjcm9sbENvbXBvbmVudCBleHRlbmRzIEJhc2VDb21wb25lbnRcbiAgaW1wbGVtZW50cyBPbkluaXQsIEFmdGVyQ29udGVudENoZWNrZWQge1xuICBwcml2YXRlIHJvdXRlU2Nyb2xsUG9zaXRpb25zOiB7IFt1cmw6IHN0cmluZ106IG51bWJlciB9ID0ge307XG5cbiAgcHJpdmF0ZSBkZWZlcnJlZFJlc3RvcmUgPSBmYWxzZTtcblxuICBjb25zdHJ1Y3Rvcihwcml2YXRlIF9wSWQ6IE9iamVjdCwgcHJpdmF0ZSBfcnQ6IFJvdXRlcikge1xuICAgIHN1cGVyKCk7XG4gIH1cblxuICBwcml2YXRlIHNhdmVTY3JvbGwodXJsOiBzdHJpbmcpIHtcbiAgICBjb25zdCBlbGVtZW50OiBhbnkgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgnY29udGFpbmVyLTMnKTtcbiAgICB0aGlzLnJvdXRlU2Nyb2xsUG9zaXRpb25zW3VybF0gPSBlbGVtZW50LnNjcm9sbFRvcDtcbiAgfVxuXG4gIHByaXZhdGUgcmVzdG9yZVNjcm9sbCh1cmw6IHN0cmluZykge1xuICAgIGNvbnN0IHNhdmVkU2Nyb2xsID0gdGhpcy5yb3V0ZVNjcm9sbFBvc2l0aW9uc1t1cmxdO1xuICAgIGNvbnN0IGVsZW1lbnQ6IGFueSA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdjb250YWluZXItMycpO1xuICAgIGlmICghc2F2ZWRTY3JvbGwpIHtcbiAgICAgIHRoaXMuZGVmZXJyZWRSZXN0b3JlID0gZmFsc2U7XG4gICAgICByZXR1cm4gZmFsc2U7XG4gICAgfVxuXG4gICAgZWxlbWVudC5zY3JvbGxUb3AgPSBzYXZlZFNjcm9sbDtcbiAgICB0aGlzLmRlZmVycmVkUmVzdG9yZSA9IGZhbHNlO1xuICAgIHJldHVybiB0cnVlO1xuICB9XG5cbiAgcHJpdmF0ZSBhZGRTY3JvbGxUb3BMaXN0ZW5lcnMoKSB7XG4gICAgaWYgKCdzY3JvbGxSZXN0b3JhdGlvbicgaW4gaGlzdG9yeSkge1xuICAgICAgaGlzdG9yeS5zY3JvbGxSZXN0b3JhdGlvbiA9ICdtYW51YWwnO1xuICAgIH1cblxuICAgIHRoaXMuX3J0LmV2ZW50cy5zdWJzY3JpYmUoZXZlbnQgPT4ge1xuICAgICAgaWYgKGV2ZW50IGluc3RhbmNlb2YgTmF2aWdhdGlvblN0YXJ0KSB7XG4gICAgICAgIHRoaXMuc2F2ZVNjcm9sbCh0aGlzLl9ydC51cmwpO1xuICAgICAgfSBlbHNlIGlmIChldmVudCBpbnN0YW5jZW9mIE5hdmlnYXRpb25FbmQpIHtcbiAgICAgICAgaWYgKCF0aGlzLnJlc3RvcmVTY3JvbGwoZXZlbnQudXJsKSkge1xuICAgICAgICAgIHNldFRpbWVvdXQoKCkgPT4ge1xuICAgICAgICAgICAgaWYgKHRoaXMuZGVmZXJyZWRSZXN0b3JlKSB7XG4gICAgICAgICAgICAgIHRoaXMucmVzdG9yZVNjcm9sbChldmVudC51cmwpO1xuICAgICAgICAgICAgICB0aGlzLmRlZmVycmVkUmVzdG9yZSA9IGZhbHNlO1xuICAgICAgICAgICAgfVxuICAgICAgICAgIH0pO1xuICAgICAgICAgIHRoaXMuZGVmZXJyZWRSZXN0b3JlID0gdHJ1ZTtcbiAgICAgICAgfVxuICAgICAgfVxuICAgIH0pO1xuICB9XG5cbiAgbmdPbkluaXQoKTogdm9pZCB7XG4gICAgaWYgKGlzUGxhdGZvcm1Ccm93c2VyKHRoaXMuX3BJZCkpIHtcbiAgICAgIHRoaXMuYWRkU2Nyb2xsVG9wTGlzdGVuZXJzKCk7XG4gICAgfVxuICB9XG5cbiAgbmdBZnRlckNvbnRlbnRDaGVja2VkKCkge1xuICAgIGlmICh0aGlzLmRlZmVycmVkUmVzdG9yZSkge1xuICAgICAgdGhpcy5yZXN0b3JlU2Nyb2xsKHRoaXMuX3J0LnVybCk7XG4gICAgfVxuICB9XG59XG4iXX0=
55
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmFzZS1zY3JvbGwtY29tcG9uZW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvbW9ua2V5LWZyb250LWNvbXBvbmVudHMvc3JjL2xpYi9jb21wb25lbnRzL2Jhc2UvYmFzZS1zY3JvbGwtY29tcG9uZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQ3BELE9BQU8sRUFBRSxTQUFTLEVBQVUsTUFBTSxlQUFlLENBQUM7QUFDbEQsT0FBTyxFQUFFLGFBQWEsRUFBRSxlQUFlLEVBQVUsTUFBTSxpQkFBaUIsQ0FBQztBQUN6RSxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7OztBQUtqRCxNQUFNLE9BQWdCLG1CQUFvQixTQUFRLGFBQWE7SUFHN0QsWUFBb0IsSUFBWSxFQUFVLEdBQVc7UUFDbkQsS0FBSyxFQUFFLENBQUM7UUFEVSxTQUFJLEdBQUosSUFBSSxDQUFRO1FBQVUsUUFBRyxHQUFILEdBQUcsQ0FBUTtRQUY3Qyx5QkFBb0IsR0FBOEIsRUFBRSxDQUFDO0lBSTdELENBQUM7SUFFTyxVQUFVLENBQUMsR0FBVztRQUM1QixNQUFNLE9BQU8sR0FBUSxRQUFRLENBQUMsY0FBYyxDQUFDLGFBQWEsQ0FBQyxDQUFDO1FBQzVELElBQUksQ0FBQyxvQkFBb0IsQ0FBQyxHQUFHLENBQUMsR0FBRyxPQUFPLENBQUMsU0FBUyxDQUFDO0lBQ3JELENBQUM7SUFFTyxhQUFhLENBQUMsR0FBVztRQUMvQixNQUFNLFdBQVcsR0FBRyxJQUFJLENBQUMsb0JBQW9CLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDbkQsTUFBTSxPQUFPLEdBQVEsUUFBUSxDQUFDLGNBQWMsQ0FBQyxhQUFhLENBQUMsQ0FBQztRQUM1RCxJQUFJLENBQUMsV0FBVyxFQUFFO1lBQ2hCLE9BQU87U0FDUjtRQUVELE9BQU8sQ0FBQyxTQUFTLEdBQUcsV0FBVyxDQUFDO0lBQ2xDLENBQUM7SUFFTyxxQkFBcUI7UUFDM0IsSUFBSSxtQkFBbUIsSUFBSSxPQUFPLEVBQUU7WUFDbEMsT0FBTyxDQUFDLGlCQUFpQixHQUFHLFFBQVEsQ0FBQztTQUN0QztRQUVELElBQUksQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLFNBQVMsQ0FBQyxLQUFLLENBQUMsRUFBRTtZQUNoQyxJQUFJLEtBQUssWUFBWSxlQUFlLEVBQUU7Z0JBQ3BDLElBQUksQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQzthQUMvQjtpQkFBTSxJQUFJLEtBQUssWUFBWSxhQUFhLEVBQUU7Z0JBQ3pDLFVBQVUsQ0FBQyxHQUFHLEVBQUU7b0JBQ2QsSUFBSSxDQUFDLGFBQWEsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7Z0JBQ2hDLENBQUMsQ0FBQyxDQUFDO2FBQ0o7UUFDSCxDQUFDLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRCxRQUFRO1FBQ04sSUFBSSxpQkFBaUIsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEVBQUU7WUFDaEMsSUFBSSxDQUFDLHFCQUFxQixFQUFFLENBQUM7U0FDOUI7SUFDSCxDQUFDOztnSEExQ21CLG1CQUFtQixrQkFHYixNQUFNO29HQUhaLG1CQUFtQjsyRkFBbkIsbUJBQW1CO2tCQUh4QyxTQUFTO21CQUFDO29CQUNULFFBQVEsRUFBRSx1QkFBdUI7aUJBQ2xDOzBEQUkyQixNQUFNIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgaXNQbGF0Zm9ybUJyb3dzZXIgfSBmcm9tICdAYW5ndWxhci9jb21tb24nO1xuaW1wb3J0IHsgRGlyZWN0aXZlLCBPbkluaXQgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IE5hdmlnYXRpb25FbmQsIE5hdmlnYXRpb25TdGFydCwgUm91dGVyIH0gZnJvbSAnQGFuZ3VsYXIvcm91dGVyJztcbmltcG9ydCB7IEJhc2VDb21wb25lbnQgfSBmcm9tICcuL2Jhc2UtY29tcG9uZW50JztcblxuQERpcmVjdGl2ZSh7XG4gIHNlbGVjdG9yOiAnW2Jhc2VTY3JvbGxDb21wb25lbnRdJ1xufSlcbmV4cG9ydCBhYnN0cmFjdCBjbGFzcyBCYXNlU2Nyb2xsQ29tcG9uZW50IGV4dGVuZHMgQmFzZUNvbXBvbmVudCBpbXBsZW1lbnRzIE9uSW5pdCB7XG4gIHByaXZhdGUgcm91dGVTY3JvbGxQb3NpdGlvbnM6IHsgW3VybDogc3RyaW5nXTogbnVtYmVyIH0gPSB7fTtcblxuICBjb25zdHJ1Y3Rvcihwcml2YXRlIF9wSWQ6IE9iamVjdCwgcHJpdmF0ZSBfcnQ6IFJvdXRlcikge1xuICAgIHN1cGVyKCk7XG4gIH1cblxuICBwcml2YXRlIHNhdmVTY3JvbGwodXJsOiBzdHJpbmcpIHtcbiAgICBjb25zdCBlbGVtZW50OiBhbnkgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgnY29udGFpbmVyLTMnKTtcbiAgICB0aGlzLnJvdXRlU2Nyb2xsUG9zaXRpb25zW3VybF0gPSBlbGVtZW50LnNjcm9sbFRvcDtcbiAgfVxuXG4gIHByaXZhdGUgcmVzdG9yZVNjcm9sbCh1cmw6IHN0cmluZykge1xuICAgIGNvbnN0IHNhdmVkU2Nyb2xsID0gdGhpcy5yb3V0ZVNjcm9sbFBvc2l0aW9uc1t1cmxdO1xuICAgIGNvbnN0IGVsZW1lbnQ6IGFueSA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdjb250YWluZXItMycpO1xuICAgIGlmICghc2F2ZWRTY3JvbGwpIHtcbiAgICAgIHJldHVybjtcbiAgICB9XG5cbiAgICBlbGVtZW50LnNjcm9sbFRvcCA9IHNhdmVkU2Nyb2xsO1xuICB9XG5cbiAgcHJpdmF0ZSBhZGRTY3JvbGxUb3BMaXN0ZW5lcnMoKSB7XG4gICAgaWYgKCdzY3JvbGxSZXN0b3JhdGlvbicgaW4gaGlzdG9yeSkge1xuICAgICAgaGlzdG9yeS5zY3JvbGxSZXN0b3JhdGlvbiA9ICdtYW51YWwnO1xuICAgIH1cblxuICAgIHRoaXMuX3J0LmV2ZW50cy5zdWJzY3JpYmUoZXZlbnQgPT4ge1xuICAgICAgaWYgKGV2ZW50IGluc3RhbmNlb2YgTmF2aWdhdGlvblN0YXJ0KSB7XG4gICAgICAgIHRoaXMuc2F2ZVNjcm9sbCh0aGlzLl9ydC51cmwpO1xuICAgICAgfSBlbHNlIGlmIChldmVudCBpbnN0YW5jZW9mIE5hdmlnYXRpb25FbmQpIHtcbiAgICAgICAgc2V0VGltZW91dCgoKSA9PiB7XG4gICAgICAgICAgdGhpcy5yZXN0b3JlU2Nyb2xsKGV2ZW50LnVybCk7XG4gICAgICAgIH0pO1xuICAgICAgfVxuICAgIH0pO1xuICB9XG5cbiAgbmdPbkluaXQoKTogdm9pZCB7XG4gICAgaWYgKGlzUGxhdGZvcm1Ccm93c2VyKHRoaXMuX3BJZCkpIHtcbiAgICAgIHRoaXMuYWRkU2Nyb2xsVG9wTGlzdGVuZXJzKCk7XG4gICAgfVxuICB9XG59XG4iXX0=
@@ -650,7 +650,6 @@ class BaseScrollComponent extends BaseComponent {
650
650
  this._pId = _pId;
651
651
  this._rt = _rt;
652
652
  this.routeScrollPositions = {};
653
- this.deferredRestore = false;
654
653
  }
655
654
  saveScroll(url) {
656
655
  const element = document.getElementById('container-3');
@@ -660,12 +659,9 @@ class BaseScrollComponent extends BaseComponent {
660
659
  const savedScroll = this.routeScrollPositions[url];
661
660
  const element = document.getElementById('container-3');
662
661
  if (!savedScroll) {
663
- this.deferredRestore = false;
664
- return false;
662
+ return;
665
663
  }
666
664
  element.scrollTop = savedScroll;
667
- this.deferredRestore = false;
668
- return true;
669
665
  }
670
666
  addScrollTopListeners() {
671
667
  if ('scrollRestoration' in history) {
@@ -676,15 +672,9 @@ class BaseScrollComponent extends BaseComponent {
676
672
  this.saveScroll(this._rt.url);
677
673
  }
678
674
  else if (event instanceof NavigationEnd) {
679
- if (!this.restoreScroll(event.url)) {
680
- setTimeout(() => {
681
- if (this.deferredRestore) {
682
- this.restoreScroll(event.url);
683
- this.deferredRestore = false;
684
- }
685
- });
686
- this.deferredRestore = true;
687
- }
675
+ setTimeout(() => {
676
+ this.restoreScroll(event.url);
677
+ });
688
678
  }
689
679
  });
690
680
  }
@@ -693,11 +683,6 @@ class BaseScrollComponent extends BaseComponent {
693
683
  this.addScrollTopListeners();
694
684
  }
695
685
  }
696
- ngAfterContentChecked() {
697
- if (this.deferredRestore) {
698
- this.restoreScroll(this._rt.url);
699
- }
700
- }
701
686
  }
702
687
  BaseScrollComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.0", ngImport: i0, type: BaseScrollComponent, deps: [{ token: Object }, { token: i1$1.Router }], target: i0.ɵɵFactoryTarget.Directive });
703
688
  BaseScrollComponent.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "12.0.0", version: "13.2.0", type: BaseScrollComponent, selector: "[baseScrollComponent]", usesInheritance: true, ngImport: i0 });