piral-ng 0.14.30 → 0.14.32
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.
- package/esm/RoutingService.js +15 -6
- package/esm/RoutingService.js.map +1 -1
- package/lib/RoutingService.js +15 -6
- package/lib/RoutingService.js.map +1 -1
- package/package.json +3 -3
- package/src/RoutingService.ts +17 -8
package/esm/RoutingService.js
CHANGED
|
@@ -3,7 +3,6 @@ import { __decorate, __metadata, __param } from "tslib";
|
|
|
3
3
|
import * as ngCore from '@angular/core';
|
|
4
4
|
import { Inject, Injectable, NgZone, Optional } from '@angular/core';
|
|
5
5
|
import { NavigationError, Router } from '@angular/router';
|
|
6
|
-
import { filter } from 'rxjs/operators';
|
|
7
6
|
const ngc = ngCore;
|
|
8
7
|
let RoutingService = RoutingService_1 = class RoutingService {
|
|
9
8
|
constructor(context, router, zone) {
|
|
@@ -25,12 +24,22 @@ let RoutingService = RoutingService_1 = class RoutingService {
|
|
|
25
24
|
this.zone.run(() => this.router.navigateByUrl(path));
|
|
26
25
|
}
|
|
27
26
|
});
|
|
28
|
-
this.subscription = this.router.events.
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
this.invalidRoutes.
|
|
27
|
+
this.subscription = this.router.events.subscribe((e) => {
|
|
28
|
+
if (e instanceof NavigationError) {
|
|
29
|
+
const path = e.url;
|
|
30
|
+
if (!this.invalidRoutes.includes(path)) {
|
|
31
|
+
this.invalidRoutes.push(path);
|
|
32
|
+
}
|
|
33
|
+
this.context.router.history.push(path);
|
|
34
|
+
}
|
|
35
|
+
else if (e.type === 15) {
|
|
36
|
+
// consistency check to avoid #535 and other Angular-specific issues
|
|
37
|
+
const locationUrl = this.context.router.history.location.pathname;
|
|
38
|
+
const routerUrl = e.routerEvent.url;
|
|
39
|
+
if (routerUrl !== locationUrl) {
|
|
40
|
+
this.context.router.history.push(routerUrl);
|
|
41
|
+
}
|
|
32
42
|
}
|
|
33
|
-
this.context.router.history.push(path);
|
|
34
43
|
});
|
|
35
44
|
}
|
|
36
45
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RoutingService.js","sourceRoot":"","sources":["../src/RoutingService.ts"],"names":[],"mappings":";;AAEA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAa,QAAQ,EAAE,MAAM,eAAe,CAAC;AAChF,OAAO,EAAE,eAAe,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"RoutingService.js","sourceRoot":"","sources":["../src/RoutingService.ts"],"names":[],"mappings":"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"}
|
package/lib/RoutingService.js
CHANGED
|
@@ -6,7 +6,6 @@ const tslib_1 = require("tslib");
|
|
|
6
6
|
const ngCore = require("@angular/core");
|
|
7
7
|
const core_1 = require("@angular/core");
|
|
8
8
|
const router_1 = require("@angular/router");
|
|
9
|
-
const operators_1 = require("rxjs/operators");
|
|
10
9
|
const ngc = ngCore;
|
|
11
10
|
let RoutingService = RoutingService_1 = class RoutingService {
|
|
12
11
|
constructor(context, router, zone) {
|
|
@@ -28,12 +27,22 @@ let RoutingService = RoutingService_1 = class RoutingService {
|
|
|
28
27
|
this.zone.run(() => this.router.navigateByUrl(path));
|
|
29
28
|
}
|
|
30
29
|
});
|
|
31
|
-
this.subscription = this.router.events.
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
this.invalidRoutes.
|
|
30
|
+
this.subscription = this.router.events.subscribe((e) => {
|
|
31
|
+
if (e instanceof router_1.NavigationError) {
|
|
32
|
+
const path = e.url;
|
|
33
|
+
if (!this.invalidRoutes.includes(path)) {
|
|
34
|
+
this.invalidRoutes.push(path);
|
|
35
|
+
}
|
|
36
|
+
this.context.router.history.push(path);
|
|
37
|
+
}
|
|
38
|
+
else if (e.type === 15) {
|
|
39
|
+
// consistency check to avoid #535 and other Angular-specific issues
|
|
40
|
+
const locationUrl = this.context.router.history.location.pathname;
|
|
41
|
+
const routerUrl = e.routerEvent.url;
|
|
42
|
+
if (routerUrl !== locationUrl) {
|
|
43
|
+
this.context.router.history.push(routerUrl);
|
|
44
|
+
}
|
|
35
45
|
}
|
|
36
|
-
this.context.router.history.push(path);
|
|
37
46
|
});
|
|
38
47
|
}
|
|
39
48
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RoutingService.js","sourceRoot":"","sources":["../src/RoutingService.ts"],"names":[],"mappings":";;;;;AAEA,wCAAwC;AACxC,wCAAgF;AAChF,
|
|
1
|
+
{"version":3,"file":"RoutingService.js","sourceRoot":"","sources":["../src/RoutingService.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "piral-ng",
|
|
3
|
-
"version": "0.14.
|
|
3
|
+
"version": "0.14.32",
|
|
4
4
|
"description": "Plugin for integrating Angular components in Piral.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"piral",
|
|
@@ -79,7 +79,7 @@
|
|
|
79
79
|
"@angular/platform-browser": "^14.0.0",
|
|
80
80
|
"@angular/platform-browser-dynamic": "^14.0.0",
|
|
81
81
|
"@angular/router": "^14.0.0",
|
|
82
|
-
"piral-core": "^0.14.
|
|
82
|
+
"piral-core": "^0.14.32",
|
|
83
83
|
"rxjs": "^7.3.0"
|
|
84
84
|
},
|
|
85
85
|
"peerDependencies": {
|
|
@@ -90,5 +90,5 @@
|
|
|
90
90
|
"@angular/router": "^2.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0 || ^10.0.0 || ^11.0.0 || ^12.0.0 || ^13.0.0 || ^14.0.0",
|
|
91
91
|
"rxjs": "^5.0.0 || ^6.0.0 || ^7.0.0"
|
|
92
92
|
},
|
|
93
|
-
"gitHead": "
|
|
93
|
+
"gitHead": "8a27552a2ad6150e58d6d841937538b8158afc4b"
|
|
94
94
|
}
|
package/src/RoutingService.ts
CHANGED
|
@@ -2,8 +2,7 @@ import type { Subscription } from 'rxjs';
|
|
|
2
2
|
import type { ComponentContext, Disposable } from 'piral-core';
|
|
3
3
|
import * as ngCore from '@angular/core';
|
|
4
4
|
import { Inject, Injectable, NgZone, OnDestroy, Optional } from '@angular/core';
|
|
5
|
-
import { NavigationError, Router } from '@angular/router';
|
|
6
|
-
import { filter } from 'rxjs/operators';
|
|
5
|
+
import { NavigationError, Router, Scroll } from '@angular/router';
|
|
7
6
|
|
|
8
7
|
const ngc = ngCore as any;
|
|
9
8
|
|
|
@@ -35,14 +34,24 @@ export class RoutingService implements OnDestroy {
|
|
|
35
34
|
}
|
|
36
35
|
});
|
|
37
36
|
|
|
38
|
-
this.subscription = this.router.events.
|
|
39
|
-
|
|
37
|
+
this.subscription = this.router.events.subscribe((e: NavigationError | Scroll) => {
|
|
38
|
+
if (e instanceof NavigationError) {
|
|
39
|
+
const path = e.url;
|
|
40
40
|
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
41
|
+
if (!this.invalidRoutes.includes(path)) {
|
|
42
|
+
this.invalidRoutes.push(path);
|
|
43
|
+
}
|
|
44
44
|
|
|
45
|
-
|
|
45
|
+
this.context.router.history.push(path);
|
|
46
|
+
} else if (e.type === 15) {
|
|
47
|
+
// consistency check to avoid #535 and other Angular-specific issues
|
|
48
|
+
const locationUrl = this.context.router.history.location.pathname;
|
|
49
|
+
const routerUrl = e.routerEvent.url;
|
|
50
|
+
|
|
51
|
+
if (routerUrl !== locationUrl) {
|
|
52
|
+
this.context.router.history.push(routerUrl);
|
|
53
|
+
}
|
|
54
|
+
}
|
|
46
55
|
});
|
|
47
56
|
}
|
|
48
57
|
}
|