@worktile/planet 18.0.0-next.0 → 18.0.1
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/CHANGELOG.md +14 -0
- package/application/ng-planet-application-ref.d.ts +2 -2
- package/application/ng-planet-application-ref.d.ts.map +1 -1
- package/application/planet-application.service.d.ts.map +1 -1
- package/esm2022/application/ng-planet-application-ref.mjs +12 -4
- package/esm2022/application/planet-application.service.mjs +3 -2
- package/fesm2022/worktile-planet.mjs +13 -4
- package/fesm2022/worktile-planet.mjs.map +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,20 @@
|
|
|
2
2
|
|
|
3
3
|
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
|
|
4
4
|
|
|
5
|
+
## [18.0.1](https://github.com/worktile/ngx-planet/compare/18.0.0...18.0.1) (2024-09-05)
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
### Bug Fixes
|
|
9
|
+
|
|
10
|
+
* should filter app for getAppsByMatchedUrl when routerPathPrefix is prefix of other app ([#341](https://github.com/worktile/ngx-planet/issues/341)) ([50e090a](https://github.com/worktile/ngx-planet/commit/50e090a31ae6a5386cbf3429a90fa06bccc0bbe1))
|
|
11
|
+
* sync router of portal support browserUrl ([#340](https://github.com/worktile/ngx-planet/issues/340)) ([ebfa6c3](https://github.com/worktile/ngx-planet/commit/ebfa6c358c34a7b075ef208534e06f56235b141d))
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
# [18.0.0](https://github.com/worktile/ngx-planet/compare/18.0.0-next.0...18.0.0) (2024-08-19)
|
|
16
|
+
|
|
17
|
+
|
|
18
|
+
|
|
5
19
|
# [18.0.0-next.0](https://github.com/worktile/ngx-planet/compare/17.1.0...18.0.0-next.0) (2024-08-14)
|
|
6
20
|
|
|
7
21
|
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { ApplicationRef, NgModuleRef, NgZone } from '@angular/core';
|
|
2
|
-
import { Router } from '@angular/router';
|
|
2
|
+
import { Router, NavigationBehaviorOptions } from '@angular/router';
|
|
3
3
|
import { Observable } from 'rxjs';
|
|
4
4
|
import { PlanetPortalApplication } from './portal-application';
|
|
5
5
|
import { PlantComponentFactory } from '../component/planet-component-types';
|
|
@@ -38,7 +38,7 @@ export declare class NgPlanetApplicationRef implements PlanetApplicationRef {
|
|
|
38
38
|
bootstrap(app: PlanetPortalApplication): Observable<this>;
|
|
39
39
|
getRouter(): Router;
|
|
40
40
|
getCurrentRouterStateUrl(): string;
|
|
41
|
-
navigateByUrl(url: string): void;
|
|
41
|
+
navigateByUrl(url: string, extras?: NavigationBehaviorOptions): void;
|
|
42
42
|
getComponentFactory(): PlantComponentFactory;
|
|
43
43
|
registerComponentFactory(componentFactory: PlantComponentFactory): void;
|
|
44
44
|
destroy(): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ng-planet-application-ref.d.ts","sourceRoot":"","sources":["../../../packages/planet/src/application/ng-planet-application-ref.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,EAAuB,MAAM,eAAe,CAAC;AACzF,OAAO,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"ng-planet-application-ref.d.ts","sourceRoot":"","sources":["../../../packages/planet/src/application/ng-planet-application-ref.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,EAAuB,MAAM,eAAe,CAAC;AACzF,OAAO,EAAE,MAAM,EAAkC,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AAEpG,OAAO,EAAE,UAAU,EAAQ,MAAM,MAAM,CAAC;AACxC,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAC/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AAE5E,OAAO,EAAsB,OAAO,EAAE,MAAM,aAAa,CAAC;AAC1D,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAEhE,MAAM,MAAM,oBAAoB,GAAG,CAC/B,SAAS,EAAE,uBAAuB,KACjC,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,IAAI,GAAG,cAAc,GAAG,SAAS,GAAG,IAAI,CAAC,CAAC;AAE1E,MAAM,WAAW,kBAAkB;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,oBAAoB,CAAC;CACnC;AAED;;GAEG;AACH,MAAM,MAAM,kBAAkB,GAAG,oBAAoB,CAAC;AACtD;;GAEG;AACH,MAAM,WAAW,gBAAiB,SAAQ,kBAAkB;CAAG;AAE/D,qBAAa,sBAAuB,YAAW,oBAAoB;IAC/D,OAAO,CAAC,QAAQ,CAAC,CAAsB;IACvC,OAAO,CAAC,MAAM,CAAC,CAAiB;IACzB,YAAY,CAAC,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC;IAChC,QAAQ,CAAC,EAAE,MAAM,CAAC;IACzB,OAAO,CAAC,aAAa,CAAC,CAAS;IAC/B,OAAO,CAAC,IAAI,CAAS;IACrB,OAAO,CAAC,SAAS,CAA2B;IAC5C,OAAO,CAAC,kBAAkB,CAAC,CAAuB;IAClD,OAAO,CAAC,gBAAgB,CAAC,CAAwB;IAEjD,IAAW,QAAQ,WAElB;IAED,IAAW,MAAM,IAAI,MAAM,GAAG,SAAS,CAEtC;IAED,IAAW,OAAO,IAAI,OAAO,CAE5B;IAED,IAAW,YAAY,IAAI,OAAO,CAEjC;gBAEW,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,gBAAgB;IAgBpD,OAAO,CAAC,gCAAgC;IAyBxC,SAAS,CAAC,GAAG,EAAE,uBAAuB,GAAG,UAAU,CAAC,IAAI,CAAC;IAuBzD,SAAS;IAIT,wBAAwB;IAIxB,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,yBAAyB,GAAG,IAAI;IAOpE,mBAAmB;IAInB,wBAAwB,CAAC,gBAAgB,EAAE,qBAAqB;IAIhE,OAAO,IAAI,IAAI;CAgBlB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"planet-application.service.d.ts","sourceRoot":"","sources":["../../../packages/planet/src/application/planet-application.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAEpD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAGlD,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAClC,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;;AAGhD,qBAGa,wBAAwB;
|
|
1
|
+
{"version":3,"file":"planet-application.service.d.ts","sourceRoot":"","sources":["../../../packages/planet/src/application/planet-application.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAEpD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAGlD,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAClC,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;;AAGhD,qBAGa,wBAAwB;IAM7B,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,YAAY;IANxB,OAAO,CAAC,IAAI,CAA2B;IAEvC,OAAO,CAAC,OAAO,CAA4C;gBAG/C,IAAI,EAAE,UAAU,EAChB,YAAY,EAAE,YAAY;IAOtC,QAAQ,CAAC,MAAM,EAAE,SAAS,EAAE,iBAAiB,CAAC,MAAM,CAAC,GAAG,iBAAiB,CAAC,MAAM,CAAC,EAAE;IAWnF,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,CAAC,IAAI,CAAC;IAe5C,UAAU,CAAC,IAAI,EAAE,MAAM;IASvB,mBAAmB,CAAC,MAAM,GAAG,OAAO,EAAE,GAAG,EAAE,MAAM,GAAG,iBAAiB,CAAC,MAAM,CAAC,EAAE;IAa/E,YAAY,CAAC,IAAI,EAAE,MAAM;IAIzB,gBAAgB,CAAC,eAAe,CAAC,EAAE,MAAM,EAAE;IAU3C,OAAO;yCA5EE,wBAAwB;6CAAxB,wBAAwB;CA+EpC"}
|
|
@@ -37,12 +37,20 @@ export class NgPlanetApplicationRef {
|
|
|
37
37
|
if (router) {
|
|
38
38
|
router.events.subscribe(event => {
|
|
39
39
|
if (event instanceof NavigationEnd) {
|
|
40
|
+
const currentNavigation = router.getCurrentNavigation();
|
|
40
41
|
this.ngZone?.onStable
|
|
41
42
|
.asObservable()
|
|
42
43
|
.pipe(take(1))
|
|
43
44
|
.subscribe(() => {
|
|
44
45
|
this.portalApp.ngZone.run(() => {
|
|
45
|
-
|
|
46
|
+
if (currentNavigation?.extras?.browserUrl) {
|
|
47
|
+
this.portalApp.router.navigateByUrl(event.url, {
|
|
48
|
+
browserUrl: currentNavigation.extras.browserUrl
|
|
49
|
+
});
|
|
50
|
+
}
|
|
51
|
+
else {
|
|
52
|
+
this.portalApp.router.navigateByUrl(event.url);
|
|
53
|
+
}
|
|
46
54
|
});
|
|
47
55
|
});
|
|
48
56
|
}
|
|
@@ -76,10 +84,10 @@ export class NgPlanetApplicationRef {
|
|
|
76
84
|
getCurrentRouterStateUrl() {
|
|
77
85
|
return this.getRouter()?.routerState.snapshot.url;
|
|
78
86
|
}
|
|
79
|
-
navigateByUrl(url) {
|
|
87
|
+
navigateByUrl(url, extras) {
|
|
80
88
|
const router = this.getRouter();
|
|
81
89
|
this.ngZone?.run(() => {
|
|
82
|
-
router?.navigateByUrl(url);
|
|
90
|
+
router?.navigateByUrl(url, extras);
|
|
83
91
|
});
|
|
84
92
|
}
|
|
85
93
|
getComponentFactory() {
|
|
@@ -105,4 +113,4 @@ export class NgPlanetApplicationRef {
|
|
|
105
113
|
}
|
|
106
114
|
}
|
|
107
115
|
}
|
|
108
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ng-planet-application-ref.js","sourceRoot":"","sources":["../../../../packages/planet/src/application/ng-planet-application-ref.ts"],"names":[],"mappings":"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","sourcesContent":["import { ApplicationRef, NgModuleRef, NgZone, EnvironmentInjector } from '@angular/core';\nimport { Router, NavigationEnd } from '@angular/router';\nimport { take } from 'rxjs/operators';\nimport { Observable, from } from 'rxjs';\nimport { PlanetPortalApplication } from './portal-application';\nimport { PlantComponentFactory } from '../component/planet-component-types';\nimport { getTagNameByTemplate } from '../helpers';\nimport { getSandboxInstance, Sandbox } from '../sandbox/';\nimport { PlanetApplicationRef } from './planet-application-ref';\n\nexport type NgBootstrapAppModule = (\n    portalApp: PlanetPortalApplication\n) => Promise<NgModuleRef<any> | void | ApplicationRef | undefined | null>;\n\nexport interface NgBootstrapOptions {\n    template: string;\n    bootstrap: NgBootstrapAppModule;\n}\n\n/**\n * @deprecated please use NgBootstrapAppModule\n */\nexport type BootstrapAppModule = NgBootstrapAppModule;\n/**\n * @deprecated please use NgBootstrapOptions\n */\nexport interface BootstrapOptions extends NgBootstrapOptions {}\n\nexport class NgPlanetApplicationRef implements PlanetApplicationRef {\n    private injector?: EnvironmentInjector;\n    private appRef?: ApplicationRef;\n    public appModuleRef?: NgModuleRef<any>;\n    public template?: string;\n    private innerSelector?: string;\n    private name: string;\n    private portalApp!: PlanetPortalApplication;\n    private appModuleBootstrap?: NgBootstrapAppModule;\n    private componentFactory?: PlantComponentFactory;\n\n    public get selector() {\n        return this.innerSelector;\n    }\n\n    public get ngZone(): NgZone | undefined {\n        return (this.injector || this.appModuleRef?.injector)?.get(NgZone);\n    }\n\n    public get sandbox(): Sandbox {\n        return getSandboxInstance();\n    }\n\n    public get bootstrapped(): boolean {\n        return !!(this.appModuleRef || this.appRef);\n    }\n\n    constructor(name: string, options?: BootstrapOptions) {\n        this.name = name;\n        if (options) {\n            this.template = options.template;\n            this.innerSelector = this.template ? getTagNameByTemplate(this.template) : '';\n            this.appModuleBootstrap = options.bootstrap;\n        }\n        // This is a hack, since NgZone doesn't allow you to configure the property that identifies your zone.\n        // See https://github.com/PlaceMe-SAS/single-spa-angular-cli/issues/33,\n        // NgZone.isInAngularZone = () => {\n        //     // @ts-ignore\n        //     return window.Zone.current._properties[`ngx-planet-${name}`] === true;\n        // };\n    }\n\n    // 子应用路由变化后同步修改 portal 的 Route\n    private syncPortalRouteWhenNavigationEnd() {\n        const router = (this.injector || this.appModuleRef?.injector)?.get(Router);\n        if (router) {\n            router.events.subscribe(event => {\n                if (event instanceof NavigationEnd) {\n                    this.ngZone?.onStable\n                        .asObservable()\n                        .pipe(take(1))\n                        .subscribe(() => {\n                            this.portalApp.ngZone.run(() => {\n                                this.portalApp.router!.navigateByUrl(event.url);\n                            });\n                        });\n                }\n            });\n        }\n    }\n\n    bootstrap(app: PlanetPortalApplication): Observable<this> {\n        if (!this.appModuleBootstrap) {\n            throw new Error(`app(${this.name}) is not defined`);\n        }\n        this.portalApp = app;\n        return from(\n            this.appModuleBootstrap(app).then(appModuleRef => {\n                if (appModuleRef['instance']) {\n                    this.appModuleRef = appModuleRef as NgModuleRef<any>;\n                    this.appModuleRef.instance.appName = this.name;\n                    this.injector = this.appModuleRef.injector;\n                } else {\n                    this.appRef = appModuleRef as unknown as ApplicationRef;\n                    this.injector = this.appRef.injector;\n                    const moduleRef = this.appRef.injector.get(NgModuleRef);\n                    (moduleRef as any).instance = { appName: this.name };\n                }\n                this.syncPortalRouteWhenNavigationEnd();\n                return this;\n            })\n        );\n    }\n\n    getRouter() {\n        return (this.injector || this.appModuleRef?.injector)?.get(Router);\n    }\n\n    getCurrentRouterStateUrl() {\n        return this.getRouter()?.routerState.snapshot.url;\n    }\n\n    navigateByUrl(url: string): void {\n        const router = this.getRouter();\n        this.ngZone?.run(() => {\n            router?.navigateByUrl(url);\n        });\n    }\n\n    getComponentFactory() {\n        return this.componentFactory;\n    }\n\n    registerComponentFactory(componentFactory: PlantComponentFactory) {\n        this.componentFactory = componentFactory;\n    }\n\n    destroy(): void {\n        if (this.appModuleRef || this.appRef) {\n            const router = (this.injector || this.appModuleRef?.injector)?.get(Router);\n            if (router) {\n                router.dispose();\n            }\n            if (this.sandbox) {\n                this.sandbox.destroy();\n            }\n            this.appModuleRef?.destroy();\n            this.appModuleRef = undefined;\n            this.appRef?.destroy();\n            this.appRef = undefined;\n            this.injector = undefined;\n        }\n    }\n}\n"]}
|
|
116
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ng-planet-application-ref.js","sourceRoot":"","sources":["../../../../packages/planet/src/application/ng-planet-application-ref.ts"],"names":[],"mappings":"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","sourcesContent":["import { ApplicationRef, NgModuleRef, NgZone, EnvironmentInjector } from '@angular/core';\nimport { Router, NavigationEnd, NavigationStart, NavigationBehaviorOptions } from '@angular/router';\nimport { take } from 'rxjs/operators';\nimport { Observable, from } from 'rxjs';\nimport { PlanetPortalApplication } from './portal-application';\nimport { PlantComponentFactory } from '../component/planet-component-types';\nimport { getTagNameByTemplate } from '../helpers';\nimport { getSandboxInstance, Sandbox } from '../sandbox/';\nimport { PlanetApplicationRef } from './planet-application-ref';\n\nexport type NgBootstrapAppModule = (\n    portalApp: PlanetPortalApplication\n) => Promise<NgModuleRef<any> | void | ApplicationRef | undefined | null>;\n\nexport interface NgBootstrapOptions {\n    template: string;\n    bootstrap: NgBootstrapAppModule;\n}\n\n/**\n * @deprecated please use NgBootstrapAppModule\n */\nexport type BootstrapAppModule = NgBootstrapAppModule;\n/**\n * @deprecated please use NgBootstrapOptions\n */\nexport interface BootstrapOptions extends NgBootstrapOptions {}\n\nexport class NgPlanetApplicationRef implements PlanetApplicationRef {\n    private injector?: EnvironmentInjector;\n    private appRef?: ApplicationRef;\n    public appModuleRef?: NgModuleRef<any>;\n    public template?: string;\n    private innerSelector?: string;\n    private name: string;\n    private portalApp!: PlanetPortalApplication;\n    private appModuleBootstrap?: NgBootstrapAppModule;\n    private componentFactory?: PlantComponentFactory;\n\n    public get selector() {\n        return this.innerSelector;\n    }\n\n    public get ngZone(): NgZone | undefined {\n        return (this.injector || this.appModuleRef?.injector)?.get(NgZone);\n    }\n\n    public get sandbox(): Sandbox {\n        return getSandboxInstance();\n    }\n\n    public get bootstrapped(): boolean {\n        return !!(this.appModuleRef || this.appRef);\n    }\n\n    constructor(name: string, options?: BootstrapOptions) {\n        this.name = name;\n        if (options) {\n            this.template = options.template;\n            this.innerSelector = this.template ? getTagNameByTemplate(this.template) : '';\n            this.appModuleBootstrap = options.bootstrap;\n        }\n        // This is a hack, since NgZone doesn't allow you to configure the property that identifies your zone.\n        // See https://github.com/PlaceMe-SAS/single-spa-angular-cli/issues/33,\n        // NgZone.isInAngularZone = () => {\n        //     // @ts-ignore\n        //     return window.Zone.current._properties[`ngx-planet-${name}`] === true;\n        // };\n    }\n\n    // 子应用路由变化后同步修改 portal 的 Route\n    private syncPortalRouteWhenNavigationEnd() {\n        const router = (this.injector || this.appModuleRef?.injector)?.get(Router);\n        if (router) {\n            router.events.subscribe(event => {\n                if (event instanceof NavigationEnd) {\n                    const currentNavigation = router.getCurrentNavigation();\n                    this.ngZone?.onStable\n                        .asObservable()\n                        .pipe(take(1))\n                        .subscribe(() => {\n                            this.portalApp.ngZone.run(() => {\n                                if (currentNavigation?.extras?.browserUrl) {\n                                    this.portalApp.router!.navigateByUrl(event.url, {\n                                        browserUrl: currentNavigation.extras.browserUrl\n                                    });\n                                } else {\n                                    this.portalApp.router!.navigateByUrl(event.url);\n                                }\n                            });\n                        });\n                }\n            });\n        }\n    }\n\n    bootstrap(app: PlanetPortalApplication): Observable<this> {\n        if (!this.appModuleBootstrap) {\n            throw new Error(`app(${this.name}) is not defined`);\n        }\n        this.portalApp = app;\n        return from(\n            this.appModuleBootstrap(app).then(appModuleRef => {\n                if (appModuleRef['instance']) {\n                    this.appModuleRef = appModuleRef as NgModuleRef<any>;\n                    this.appModuleRef.instance.appName = this.name;\n                    this.injector = this.appModuleRef.injector;\n                } else {\n                    this.appRef = appModuleRef as unknown as ApplicationRef;\n                    this.injector = this.appRef.injector;\n                    const moduleRef = this.appRef.injector.get(NgModuleRef);\n                    (moduleRef as any).instance = { appName: this.name };\n                }\n                this.syncPortalRouteWhenNavigationEnd();\n                return this;\n            })\n        );\n    }\n\n    getRouter() {\n        return (this.injector || this.appModuleRef?.injector)?.get(Router);\n    }\n\n    getCurrentRouterStateUrl() {\n        return this.getRouter()?.routerState.snapshot.url;\n    }\n\n    navigateByUrl(url: string, extras?: NavigationBehaviorOptions): void {\n        const router = this.getRouter();\n        this.ngZone?.run(() => {\n            router?.navigateByUrl(url, extras);\n        });\n    }\n\n    getComponentFactory() {\n        return this.componentFactory;\n    }\n\n    registerComponentFactory(componentFactory: PlantComponentFactory) {\n        this.componentFactory = componentFactory;\n    }\n\n    destroy(): void {\n        if (this.appModuleRef || this.appRef) {\n            const router = (this.injector || this.appModuleRef?.injector)?.get(Router);\n            if (router) {\n                router.dispose();\n            }\n            if (this.sandbox) {\n                this.sandbox.destroy();\n            }\n            this.appModuleRef?.destroy();\n            this.appModuleRef = undefined;\n            this.appRef?.destroy();\n            this.appRef = undefined;\n            this.injector = undefined;\n        }\n    }\n}\n"]}
|
|
@@ -53,7 +53,8 @@ export class PlanetApplicationService {
|
|
|
53
53
|
return app.routerPathPrefix.test(url);
|
|
54
54
|
}
|
|
55
55
|
else {
|
|
56
|
-
return url
|
|
56
|
+
return (url === app.routerPathPrefix ||
|
|
57
|
+
(url.startsWith(app.routerPathPrefix) && ['/', '?'].includes(url[app.routerPathPrefix.length])));
|
|
57
58
|
}
|
|
58
59
|
});
|
|
59
60
|
}
|
|
@@ -82,4 +83,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.4", ngImpor
|
|
|
82
83
|
providedIn: 'root'
|
|
83
84
|
}]
|
|
84
85
|
}], ctorParameters: () => [{ type: i1.HttpClient }, { type: i2.AssetsLoader }] });
|
|
85
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
86
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGxhbmV0LWFwcGxpY2F0aW9uLnNlcnZpY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9wYWNrYWdlcy9wbGFuZXQvc3JjL2FwcGxpY2F0aW9uL3BsYW5ldC1hcHBsaWNhdGlvbi5zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDM0MsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ2xELE9BQU8sRUFBRSxXQUFXLEVBQUUsR0FBRyxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFDbEQsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLFlBQVksQ0FBQztBQUV6QyxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDaEQsT0FBTyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sa0JBQWtCLENBQUM7Ozs7QUFLekQsTUFBTSxPQUFPLHdCQUF3QjtJQUtqQyxZQUNZLElBQWdCLEVBQ2hCLFlBQTBCO1FBRDFCLFNBQUksR0FBSixJQUFJLENBQVk7UUFDaEIsaUJBQVksR0FBWixZQUFZLENBQWM7UUFOOUIsU0FBSSxHQUF3QixFQUFFLENBQUM7UUFFL0IsWUFBTyxHQUF5QyxFQUFFLENBQUM7UUFNdkQsSUFBSSxxQkFBcUIsRUFBRSxFQUFFLENBQUM7WUFDMUIsTUFBTSxJQUFJLEtBQUssQ0FBQyw2RkFBNkYsQ0FBQyxDQUFDO1FBQ25ILENBQUM7SUFDTCxDQUFDO0lBRUQsUUFBUSxDQUFTLFNBQWtFO1FBQy9FLE1BQU0sSUFBSSxHQUFHLFdBQVcsQ0FBQyxTQUFTLENBQUMsQ0FBQztRQUNwQyxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxFQUFFO1lBQ2YsSUFBSSxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDO2dCQUN6QixNQUFNLElBQUksS0FBSyxDQUFDLEdB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cEMsVUFBVTttQkFBQztvQkFDUixVQUFVLEVBQUUsTUFBTTtpQkFDckIiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBQbGFuZXRBcHBsaWNhdGlvbiB9IGZyb20gJy4uL3BsYW5ldC5jbGFzcyc7XG5pbXBvcnQgeyBJbmplY3RhYmxlIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQgeyBIdHRwQ2xpZW50IH0gZnJvbSAnQGFuZ3VsYXIvY29tbW9uL2h0dHAnO1xuaW1wb3J0IHsgc2hhcmVSZXBsYXksIG1hcCB9IGZyb20gJ3J4anMvb3BlcmF0b3JzJztcbmltcG9ydCB7IGNvZXJjZUFycmF5IH0gZnJvbSAnLi4vaGVscGVycyc7XG5pbXBvcnQgeyBPYnNlcnZhYmxlIH0gZnJvbSAncnhqcyc7XG5pbXBvcnQgeyBBc3NldHNMb2FkZXIgfSBmcm9tICcuLi9hc3NldHMtbG9hZGVyJztcbmltcG9ydCB7IGdldEFwcGxpY2F0aW9uU2VydmljZSB9IGZyb20gJy4uL2dsb2JhbC1wbGFuZXQnO1xuXG5ASW5qZWN0YWJsZSh7XG4gICAgcHJvdmlkZWRJbjogJ3Jvb3QnXG59KVxuZXhwb3J0IGNsYXNzIFBsYW5ldEFwcGxpY2F0aW9uU2VydmljZSB7XG4gICAgcHJpdmF0ZSBhcHBzOiBQbGFuZXRBcHBsaWNhdGlvbltdID0gW107XG5cbiAgICBwcml2YXRlIGFwcHNNYXA6IHsgW2tleTogc3RyaW5nXTogUGxhbmV0QXBwbGljYXRpb24gfSA9IHt9O1xuXG4gICAgY29uc3RydWN0b3IoXG4gICAgICAgIHByaXZhdGUgaHR0cDogSHR0cENsaWVudCxcbiAgICAgICAgcHJpdmF0ZSBhc3NldHNMb2FkZXI6IEFzc2V0c0xvYWRlclxuICAgICkge1xuICAgICAgICBpZiAoZ2V0QXBwbGljYXRpb25TZXJ2aWNlKCkpIHtcbiAgICAgICAgICAgIHRocm93IG5ldyBFcnJvcignUGxhbmV0QXBwbGljYXRpb25TZXJ2aWNlIGhhcyBiZWVuIGluamVjdGVkIGluIHRoZSBwb3J0YWwsIHJlcGVhdGVkIGluamVjdGlvbiBpcyBub3QgYWxsb3dlZCcpO1xuICAgICAgICB9XG4gICAgfVxuXG4gICAgcmVnaXN0ZXI8VEV4dHJhPihhcHBPckFwcHM6IFBsYW5ldEFwcGxpY2F0aW9uPFRFeHRyYT4gfCBQbGFuZXRBcHBsaWNhdGlvbjxURXh0cmE+W10pIHtcbiAgICAgICAgY29uc3QgYXBwcyA9IGNvZXJjZUFycmF5KGFwcE9yQXBwcyk7XG4gICAgICAgIGFwcHMuZm9yRWFjaChhcHAgPT4ge1xuICAgICAgICAgICAgaWYgKHRoaXMuYXBwc01hcFthcHAubmFtZV0pIHtcbiAgICAgICAgICAgICAgICB0aHJvdyBuZXcgRXJyb3IoYCR7YXBwLm5hbWV9IGhhcyBiZSByZWdpc3RlcmVkLmApO1xuICAgICAgICAgICAgfVxuICAgICAgICAgICAgdGhpcy5hcHBzLnB1c2goYXBwKTtcbiAgICAgICAgICAgIHRoaXMuYXBwc01hcFthcHAubmFtZV0gPSBhcHA7XG4gICAgICAgIH0pO1xuICAgIH1cblxuICAgIHJlZ2lzdGVyQnlVcmwodXJsOiBzdHJpbmcpOiBPYnNlcnZhYmxlPHZvaWQ+IHtcbiAgICAgICAgY29uc3QgcmVzdWx0ID0gdGhpcy5odHRwLmdldChgJHt1cmx9YCkucGlwZShcbiAgICAgICAgICAgIG1hcChhcHBzID0+IHtcbiAgICAgICAgICAgICAgICBpZiAoYXBwcyAmJiBBcnJheS5pc0FycmF5KGFwcHMpKSB7XG4gICAgICAgICAgICAgICAgICAgIHRoaXMucmVnaXN0ZXIoYXBwcyk7XG4gICAgICAgICAgICAgICAgfSBlbHNlIHtcbiAgICAgICAgICAgICAgICAgICAgdGhpcy5yZWdpc3RlcihhcHBzIGFzIFBsYW5ldEFwcGxpY2F0aW9uKTtcbiAgICAgICAgICAgICAgICB9XG4gICAgICAgICAgICB9KSxcbiAgICAgICAgICAgIHNoYXJlUmVwbGF5KClcbiAgICAgICAgKTtcbiAgICAgICAgcmVzdWx0LnN1YnNjcmliZSgpO1xuICAgICAgICByZXR1cm4gcmVzdWx0O1xuICAgIH1cblxuICAgIHVucmVnaXN0ZXIobmFtZTogc3RyaW5nKSB7XG4gICAgICAgIGlmICh0aGlzLmFwcHNNYXBbbmFtZV0pIHtcbiAgICAgICAgICAgIGRlbGV0ZSB0aGlzLmFwcHNNYXBbbmFtZV07XG4gICAgICAgICAgICB0aGlzLmFwcHMgPSB0aGlzLmFwcHMuZmlsdGVyKGFwcCA9PiB7XG4gICAgICAgICAgICAgICAgcmV0dXJuIGFwcC5uYW1lICE9PSBuYW1lO1xuICAgICAgICAgICAgfSk7XG4gICAgICAgIH1cbiAgICB9XG5cbiAgICBnZXRBcHBzQnlNYXRjaGVkVXJsPFRFeHRyYSA9IHVua25vd24+KHVybDogc3RyaW5nKTogUGxhbmV0QXBwbGljYXRpb248VEV4dHJhPltdIHtcbiAgICAgICAgcmV0dXJuIHRoaXMuZ2V0QXBwcygpLmZpbHRlcihhcHAgPT4ge1xuICAgICAgICAgICAgaWYgKGFwcC5yb3V0ZXJQYXRoUHJlZml4IGluc3RhbmNlb2YgUmVnRXhwKSB7XG4gICAgICAgICAgICAgICAgcmV0dXJuIGFwcC5yb3V0ZXJQYXRoUHJlZml4LnRlc3QodXJsKTtcbiAgICAgICAgICAgIH0gZWxzZSB7XG4gICAgICAgICAgICAgICAgcmV0dXJuIChcbiAgICAgICAgICAgICAgICAgICAgdXJsID09PSBhcHAucm91dGVyUGF0aFByZWZpeCB8fFxuICAgICAgICAgICAgICAgICAgICAodXJsLnN0YXJ0c1dpdGgoYXBwLnJvdXRlclBhdGhQcmVmaXgpICYmIFsnLycsICc/J10uaW5jbHVkZXModXJsW2FwcC5yb3V0ZXJQYXRoUHJlZml4Lmxlbmd0aF0pKVxuICAgICAgICAgICAgICAgICk7XG4gICAgICAgICAgICB9XG4gICAgICAgIH0pO1xuICAgIH1cblxuICAgIGdldEFwcEJ5TmFtZShuYW1lOiBzdHJpbmcpIHtcbiAgICAgICAgcmV0dXJuIHRoaXMuYXBwc01hcFtuYW1lXTtcbiAgICB9XG5cbiAgICBnZXRBcHBzVG9QcmVsb2FkKGV4Y2x1ZGVBcHBOYW1lcz86IHN0cmluZ1tdKSB7XG4gICAgICAgIHJldHVybiB0aGlzLmdldEFwcHMoKS5maWx0ZXIoYXBwID0+IHtcbiAgICAgICAgICAgIGlmIChleGNsdWRlQXBwTmFtZXMpIHtcbiAgICAgICAgICAgICAgICByZXR1cm4gYXBwLnByZWxvYWQgJiYgIWV4Y2x1ZGVBcHBOYW1lcy5pbmNsdWRlcyhhcHAubmFtZSk7XG4gICAgICAgICAgICB9IGVsc2Uge1xuICAgICAgICAgICAgICAgIHJldHVybiBhcHAucHJlbG9hZDtcbiAgICAgICAgICAgIH1cbiAgICAgICAgfSk7XG4gICAgfVxuXG4gICAgZ2V0QXBwcygpIHtcbiAgICAgICAgcmV0dXJuIHRoaXMuYXBwcztcbiAgICB9XG59XG4iXX0=
|
|
@@ -1179,12 +1179,20 @@ class NgPlanetApplicationRef {
|
|
|
1179
1179
|
if (router) {
|
|
1180
1180
|
router.events.subscribe(event => {
|
|
1181
1181
|
if (event instanceof NavigationEnd) {
|
|
1182
|
+
const currentNavigation = router.getCurrentNavigation();
|
|
1182
1183
|
this.ngZone?.onStable
|
|
1183
1184
|
.asObservable()
|
|
1184
1185
|
.pipe(take(1))
|
|
1185
1186
|
.subscribe(() => {
|
|
1186
1187
|
this.portalApp.ngZone.run(() => {
|
|
1187
|
-
|
|
1188
|
+
if (currentNavigation?.extras?.browserUrl) {
|
|
1189
|
+
this.portalApp.router.navigateByUrl(event.url, {
|
|
1190
|
+
browserUrl: currentNavigation.extras.browserUrl
|
|
1191
|
+
});
|
|
1192
|
+
}
|
|
1193
|
+
else {
|
|
1194
|
+
this.portalApp.router.navigateByUrl(event.url);
|
|
1195
|
+
}
|
|
1188
1196
|
});
|
|
1189
1197
|
});
|
|
1190
1198
|
}
|
|
@@ -1218,10 +1226,10 @@ class NgPlanetApplicationRef {
|
|
|
1218
1226
|
getCurrentRouterStateUrl() {
|
|
1219
1227
|
return this.getRouter()?.routerState.snapshot.url;
|
|
1220
1228
|
}
|
|
1221
|
-
navigateByUrl(url) {
|
|
1229
|
+
navigateByUrl(url, extras) {
|
|
1222
1230
|
const router = this.getRouter();
|
|
1223
1231
|
this.ngZone?.run(() => {
|
|
1224
|
-
router?.navigateByUrl(url);
|
|
1232
|
+
router?.navigateByUrl(url, extras);
|
|
1225
1233
|
});
|
|
1226
1234
|
}
|
|
1227
1235
|
getComponentFactory() {
|
|
@@ -1355,7 +1363,8 @@ class PlanetApplicationService {
|
|
|
1355
1363
|
return app.routerPathPrefix.test(url);
|
|
1356
1364
|
}
|
|
1357
1365
|
else {
|
|
1358
|
-
return url
|
|
1366
|
+
return (url === app.routerPathPrefix ||
|
|
1367
|
+
(url.startsWith(app.routerPathPrefix) && ['/', '?'].includes(url[app.routerPathPrefix.length])));
|
|
1359
1368
|
}
|
|
1360
1369
|
});
|
|
1361
1370
|
}
|