@coolon/angular-ui-powerups 0.0.66 → 0.0.67
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/bundles/coolon-angular-ui-powerups.umd.js +51 -8
- package/bundles/coolon-angular-ui-powerups.umd.js.map +1 -1
- package/bundles/coolon-angular-ui-powerups.umd.min.js +1 -1
- package/bundles/coolon-angular-ui-powerups.umd.min.js.map +1 -1
- package/coolon-angular-ui-powerups.metadata.json +1 -1
- package/esm2015/lib/place/guards/leave-place.guard.js +57 -22
- package/esm2015/lib/place/place-router.js +4 -1
- package/esm5/lib/place/guards/leave-place.guard.js +52 -10
- package/esm5/lib/place/place-router.js +4 -1
- package/fesm2015/coolon-angular-ui-powerups.js +58 -22
- package/fesm2015/coolon-angular-ui-powerups.js.map +1 -1
- package/fesm5/coolon-angular-ui-powerups.js +53 -10
- package/fesm5/coolon-angular-ui-powerups.js.map +1 -1
- package/lib/place/guards/leave-place.guard.d.ts +1 -0
- package/lib/place/place-router.d.ts +1 -0
- package/package.json +1 -1
|
@@ -5,8 +5,10 @@
|
|
|
5
5
|
import * as tslib_1 from "tslib";
|
|
6
6
|
import { Location } from '@angular/common';
|
|
7
7
|
import { Injectable, Injector } from '@angular/core';
|
|
8
|
-
import { Router } from '@angular/router';
|
|
8
|
+
import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
|
|
9
|
+
import { Trace } from '@coolon/pectin';
|
|
9
10
|
import { InteractionContext } from '../../interaction/interaction-context';
|
|
11
|
+
import { PlaceComponent } from '../place-component';
|
|
10
12
|
import { PlaceRouter } from '../place-router';
|
|
11
13
|
import * as i0 from "@angular/core";
|
|
12
14
|
import * as i1 from "@angular/router";
|
|
@@ -21,6 +23,22 @@ var LeavePlaceGuard = /** @class */ (function () {
|
|
|
21
23
|
this.interactionContext = interactionContext;
|
|
22
24
|
this.angularLocation = angularLocation;
|
|
23
25
|
}
|
|
26
|
+
/**
|
|
27
|
+
* @private
|
|
28
|
+
* @param {?} nextState
|
|
29
|
+
* @param {?} placeDefinitionPath
|
|
30
|
+
* @return {?}
|
|
31
|
+
*/
|
|
32
|
+
LeavePlaceGuard.prototype.isLeavingTheCurrentPlace = /**
|
|
33
|
+
* @private
|
|
34
|
+
* @param {?} nextState
|
|
35
|
+
* @param {?} placeDefinitionPath
|
|
36
|
+
* @return {?}
|
|
37
|
+
*/
|
|
38
|
+
function (nextState, placeDefinitionPath) {
|
|
39
|
+
// TODO: this will break with child routes... need to examine the router states properly.
|
|
40
|
+
return !nextState.url.startsWith(placeDefinitionPath);
|
|
41
|
+
};
|
|
24
42
|
/**
|
|
25
43
|
* @param {?} component
|
|
26
44
|
* @param {?} currentRoute
|
|
@@ -43,23 +61,42 @@ var LeavePlaceGuard = /** @class */ (function () {
|
|
|
43
61
|
case 0:
|
|
44
62
|
placeDefinitionPath = "/" + component.placeDefinition.path;
|
|
45
63
|
if (!this.placeRouter.navigationSession.alreadyAccepted(component)) return [3 /*break*/, 1];
|
|
64
|
+
// We'll get called multiple times if there's any parameter sanitisation so
|
|
65
|
+
// we always return true if we accepted on a previous cycle of the current
|
|
66
|
+
// navigation session.
|
|
46
67
|
return [2 /*return*/, true];
|
|
47
68
|
case 1:
|
|
48
|
-
if (!!nextState.url.startsWith(placeDefinitionPath)) return [3 /*break*/, 3];
|
|
49
69
|
self_1 = this;
|
|
70
|
+
canLeave = true;
|
|
71
|
+
if (!this.isLeavingTheCurrentPlace(nextState, placeDefinitionPath)) return [3 /*break*/, 4];
|
|
72
|
+
// we check the interaction first, so that components that don't need to check if they're in an
|
|
73
|
+
// interaction during the canDeactivate cycle.
|
|
74
|
+
if (this.interactionContext.isActive()) {
|
|
75
|
+
canLeave = false;
|
|
76
|
+
console.log("cancelling", { activity: this.interactionContext.currentActivity });
|
|
77
|
+
this.interactionContext.currentActivity.cancel(null);
|
|
78
|
+
}
|
|
79
|
+
if (!canLeave) return [3 /*break*/, 3];
|
|
50
80
|
return [4 /*yield*/, component.canDeactivate()];
|
|
51
81
|
case 2:
|
|
52
82
|
canLeave = _a.sent();
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
83
|
+
_a.label = 3;
|
|
84
|
+
case 3: return [3 /*break*/, 5];
|
|
85
|
+
case 4:
|
|
86
|
+
// this is a parameter change.
|
|
87
|
+
if (this.interactionContext.isActive()) {
|
|
57
88
|
console.log("cancelling", { activity: this.interactionContext.currentActivity });
|
|
58
89
|
this.interactionContext.currentActivity.cancel(null);
|
|
90
|
+
canLeave = false;
|
|
91
|
+
}
|
|
92
|
+
else {
|
|
93
|
+
canLeave = true;
|
|
59
94
|
}
|
|
60
|
-
|
|
61
|
-
|
|
95
|
+
_a.label = 5;
|
|
96
|
+
case 5:
|
|
62
97
|
if (canLeave) {
|
|
98
|
+
// We'll get called multiple times if there's any parameter sanitisation so
|
|
99
|
+
// we remember the acceptance for the duration of the current routing session.
|
|
63
100
|
self_1.placeRouter.navigationSession.rememberAcceptanceOf(component);
|
|
64
101
|
}
|
|
65
102
|
else {
|
|
@@ -71,7 +108,6 @@ var LeavePlaceGuard = /** @class */ (function () {
|
|
|
71
108
|
}
|
|
72
109
|
}
|
|
73
110
|
return [2 /*return*/, canLeave];
|
|
74
|
-
case 3: return [2 /*return*/, true];
|
|
75
111
|
}
|
|
76
112
|
});
|
|
77
113
|
});
|
|
@@ -90,6 +126,12 @@ var LeavePlaceGuard = /** @class */ (function () {
|
|
|
90
126
|
{ type: Location }
|
|
91
127
|
]; };
|
|
92
128
|
/** @nocollapse */ LeavePlaceGuard.ngInjectableDef = i0.ɵɵdefineInjectable({ factory: function LeavePlaceGuard_Factory() { return new LeavePlaceGuard(i0.ɵɵinject(i1.Router), i0.ɵɵinject(i0.INJECTOR), i0.ɵɵinject(i2.PlaceRouter), i0.ɵɵinject(i3.InteractionContext), i0.ɵɵinject(i4.Location)); }, token: LeavePlaceGuard, providedIn: "root" });
|
|
129
|
+
tslib_1.__decorate([
|
|
130
|
+
Trace(),
|
|
131
|
+
tslib_1.__metadata("design:type", Function),
|
|
132
|
+
tslib_1.__metadata("design:paramtypes", [PlaceComponent, ActivatedRouteSnapshot, RouterStateSnapshot, RouterStateSnapshot]),
|
|
133
|
+
tslib_1.__metadata("design:returntype", Promise)
|
|
134
|
+
], LeavePlaceGuard.prototype, "canDeactivate", null);
|
|
93
135
|
return LeavePlaceGuard;
|
|
94
136
|
}());
|
|
95
137
|
export { LeavePlaceGuard };
|
|
@@ -114,4 +156,4 @@ if (false) {
|
|
|
114
156
|
/** @type {?} */
|
|
115
157
|
LeavePlaceGuard.prototype.angularLocation;
|
|
116
158
|
}
|
|
117
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"leave-place.guard.js","sourceRoot":"ng://@coolon/angular-ui-powerups/","sources":["lib/place/guards/leave-place.guard.ts"],"names":[],"mappings":";;;;;AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EAAyC,MAAM,EAAuB,MAAM,iBAAiB,CAAC;AACrG,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAE3E,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;;;;;;AAE9C;IAKE,yBAAoB,MAAc,EACd,QAAkB,EAClB,WAAwB,EACvB,kBAAsC,EAAW,eAAyB;QAH3E,WAAM,GAAN,MAAM,CAAQ;QACd,aAAQ,GAAR,QAAQ,CAAU;QAClB,gBAAW,GAAX,WAAW,CAAa;QACvB,uBAAkB,GAAlB,kBAAkB,CAAoB;QAAW,oBAAe,GAAf,eAAe,CAAU;IAC/F,CAAC;;;;;;;;IAEK,uCAAa;;;;;;;IAAnB,UAAoB,SAAyB,EAAE,YAAoC,EAAE,YAAiC,EAAE,SAA+B;;;;;;wBAC/I,mBAAmB,GAAG,MAAI,SAAS,CAAC,eAAe,CAAC,IAAM;6BA+C5D,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC,eAAe,CAAC,SAAS,CAAC,EAA7D,wBAA6D;wBAC/D,sBAAO,IAAI,EAAC;;6BAGR,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,mBAAmB,CAAC,EAA9C,wBAA8C;wBAC1C,SAAO,IAAI;wBACF,qBAAM,SAAS,CAAC,aAAa,EAAE,EAAA;;wBAA1C,QAAQ,GAAG,SAA+B;wBAC9C,+EAA+E;wBAC/E,+CAA+C;wBAC/C,IAAI,QAAQ,IAAI,IAAI,CAAC,kBAAkB,CAAC,QAAQ,EAAE,EAAE;4BAClD,QAAQ,GAAG,KAAK,CAAC;4BACjB,OAAO,CAAC,GAAG,CAAC,YAAY,EAAE,EAAC,QAAQ,EAAE,IAAI,CAAC,kBAAkB,CAAC,eAAe,EAAC,CAAC,CAAC;4BAC/E,IAAI,CAAC,kBAAkB,CAAC,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;yBACtD;wBACD,uFAAuF;wBACvF,2DAA2D;wBAC3D,IAAI,QAAQ,EAAE;4BACZ,MAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAC;yBACpE;6BAAM;4BACL,yEAAyE;4BACzE,6EAA6E;4BAC7E,IAAI,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC,UAAU,EAAE;gCACjD,OAAO,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAC;gCACzC,IAAI,CAAC,eAAe,CAAC,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;6BACxE;yBACF;wBACD,sBAAO,QAAQ,EAAC;4BAEhB,sBAAO,IAAI,EAAC;;;;KAGjB;;gBA1FF,UAAU,SAAC;oBACV,UAAU,EAAE,MAAM;iBACnB;;;;gBAP+C,MAAM;gBADjC,QAAQ;gBAIpB,WAAW;gBAFX,kBAAkB;gBAHlB,QAAQ;;;0BAAjB;CAmGC,AA5FD,IA4FC;SAzFY,eAAe;;;;;;IAEd,iCAAsB;;;;;IACtB,mCAA0B;;;;;IAC1B,sCAAgC;;IAChC,6CAA+C;;IAAE,0CAAkC","sourcesContent":["import { Location } from '@angular/common';\nimport { Injectable, Injector } from '@angular/core';\nimport { ActivatedRouteSnapshot, CanDeactivate, Router, RouterStateSnapshot } from '@angular/router';\nimport { InteractionContext } from '../../interaction/interaction-context';\nimport { PlaceComponent } from '../place-component';\nimport { PlaceRouter } from '../place-router';\n\n@Injectable({\n  providedIn: 'root'\n})\nexport class LeavePlaceGuard implements CanDeactivate<PlaceComponent> {\n\n  constructor(private router: Router,\n              private injector: Injector,\n              private placeRouter: PlaceRouter,\n              readonly interactionContext: InteractionContext, readonly angularLocation: Location) {\n  }\n\n  async canDeactivate(component: PlaceComponent, currentRoute: ActivatedRouteSnapshot, currentState: RouterStateSnapshot, nextState?: RouterStateSnapshot): Promise<boolean> {\n    const placeDefinitionPath = `/${component.placeDefinition.path}`;\n    // console.log('canDeactivate', {\n    //   staticPath: placeDefinitionPath,\n    //   currentStateUrl: currentState.url,\n    //   nextStateUrl: nextState.url\n    //   // alreadyDeclined: this._alreadyAccepted\n    // });\n    // Example of the above when navigating to a different child route.\n    // canDeactivate {staticPath: \"/hero-details\",\n    //    currentStateUrl: \"/route-parameters/-1;dv=A;dl=a,b,c;rdv=A;rdl=a,b,c/hero-details\",\n    //    nextStateUrl: \"/route-parameters/-1;dv=A;dl=a,b,c;rdv=A;rdl=a,b,c/hero-stats\"\n    // }\n\n    // Example clicking on router tab of the parent component (de-activates the parent due to route param changes)\n    // canDeactivate {\n    //    staticPath: \"/hero-stats\",\n    //    currentStateUrl: \"/route-parameters/-1;dv=A;dl=a,b,c;rdv=A;rdl=a,b,c/hero-stats\",\n    //    nextStateUrl: \"/route-parameters/\"\n    // }\n    // canDeactivate {\n    //    staticPath: \"/route-parameters\",\n    //    currentStateUrl: \"/route-parameters/-1;dv=A;dl=a,b,c;rdv=A;rdl=a,b,c/hero-stats\",\n    //    nextStateUrl: \"/route-parameters/\"\n    // }\n    // logger.class.js:54 ParameterSnapshot.sanitise -> {idModel: -1, pv: undefined, pl: Array(0), dv: undefined, dl: Array(0), …}\n    // parameter-snapshot.ts:20 {name: \"idModel\", mine: -1, theirs: null}\n    // place-router.ts:28 redirect path (3) [\"route-parameters\", \"-1\", {…}]\n    // canDeactivate {\n    //    staticPath: \"/hero-stats\",\n    //    currentStateUrl: \"/route-parameters/-1;dv=A;dl=a,b,c;rdv=A;rdl=a,b,c/hero-stats\",\n    //    nextStateUrl: \"/route-parameters/-1\"\n    // }\n    // canDeactivate {\n    //    staticPath: \"/route-parameters\",\n    //    currentStateUrl: \"/route-parameters/-1;dv=A;dl=a,b,c;rdv=A;rdl=a,b,c/hero-stats\",\n    //    nextStateUrl: \"/route-parameters/-1\"\n    // }\n    // logger.class.js:54 ParameterSnapshot.sanitise -> {idModel: -1, pv: undefined, pl: Array(0), dv: \"A\", dl: Array(3), …}\n    // parameter-snapshot.ts:20 {name: \"dv\", mine: \"A\", theirs: undefined}\n    // place-router.ts:28 redirect path (3) [\"route-parameters\", \"-1\", {…}]\n    // canDeactivate {\n    //    staticPath: \"/hero-stats\",\n    //    currentStateUrl: \"/route-parameters/-1;dv=A;dl=a,b,c;rdv=A;rdl=a,b,c/hero-stats\",\n    //    nextStateUrl: \"/route-parameters/-1;dv=A;dl=a,b,c;rdv=A;rdl=a,b,c\"\n    // }\n\n\n    if (this.placeRouter.navigationSession.alreadyAccepted(component)) {\n      return true;\n    } else {\n      // TODO: this will break with child routes... need to examine the router states properly.\n      if (!nextState.url.startsWith(placeDefinitionPath)) {\n        const self = this;\n        let canLeave = await component.canDeactivate();\n        // component is happy to leave but we need to check if it's left an interaction\n        // open.  If so we close and stay where we are.\n        if (canLeave && this.interactionContext.isActive()) {\n          canLeave = false;\n          console.log(\"cancelling\", {activity: this.interactionContext.currentActivity});\n          this.interactionContext.currentActivity.cancel(null);\n        }\n        // If we're still leaving then remember it since angular will call this method multiple\n        // times if any route parameters are changed along the way.\n        if (canLeave) {\n          self.placeRouter.navigationSession.rememberAcceptanceOf(component);\n        } else {\n          // Angular doesn't preserve the url when a guard cancels the back button.\n          // See https://github.com/angular/angular/issues/13586#issuecomment-432795720\n          if (this.placeRouter.navigationSession.isPopState) {\n            console.log('cancelled during popstate');\n            this.angularLocation.go(this.placeRouter.navigationSession.initialUrl);\n          }\n        }\n        return canLeave;\n      } else {\n        return true;\n      }\n    }\n  }\n\n}\n"]}
|
|
159
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"leave-place.guard.js","sourceRoot":"ng://@coolon/angular-ui-powerups/","sources":["lib/place/guards/leave-place.guard.ts"],"names":[],"mappings":"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","sourcesContent":["import { Location } from '@angular/common';\nimport { Injectable, Injector } from '@angular/core';\nimport { ActivatedRouteSnapshot, CanDeactivate, Router, RouterStateSnapshot } from '@angular/router';\nimport { Trace } from '@coolon/pectin';\nimport { InteractionContext } from '../../interaction/interaction-context';\nimport { PlaceComponent } from '../place-component';\nimport { PlaceRouter } from '../place-router';\n\n@Injectable({\n  providedIn: 'root'\n})\nexport class LeavePlaceGuard implements CanDeactivate<PlaceComponent> {\n\n  constructor(private router: Router,\n              private injector: Injector,\n              private placeRouter: PlaceRouter,\n              readonly interactionContext: InteractionContext, readonly angularLocation: Location) {\n  }\n\n  private isLeavingTheCurrentPlace(nextState: RouterStateSnapshot, placeDefinitionPath: string) {\n    // TODO: this will break with child routes... need to examine the router states properly.\n    return !nextState.url.startsWith(placeDefinitionPath);\n  }\n\n  @Trace()\n  async canDeactivate(component: PlaceComponent, currentRoute: ActivatedRouteSnapshot, currentState: RouterStateSnapshot, nextState?: RouterStateSnapshot): Promise<boolean> {\n    const placeDefinitionPath = `/${component.placeDefinition.path}`;\n    // console.log('canDeactivate', {\n    //   staticPath: placeDefinitionPath,\n    //   currentStateUrl: currentState.url,\n    //   nextStateUrl: nextState.url\n    //   // alreadyDeclined: this._alreadyAccepted\n    // });\n    // Example of the above when navigating to a different child route.\n    // canDeactivate {staticPath: \"/hero-details\",\n    //    currentStateUrl: \"/route-parameters/-1;dv=A;dl=a,b,c;rdv=A;rdl=a,b,c/hero-details\",\n    //    nextStateUrl: \"/route-parameters/-1;dv=A;dl=a,b,c;rdv=A;rdl=a,b,c/hero-stats\"\n    // }\n\n    // Example clicking on router tab of the parent component (de-activates the parent due to route param changes)\n    // canDeactivate {\n    //    staticPath: \"/hero-stats\",\n    //    currentStateUrl: \"/route-parameters/-1;dv=A;dl=a,b,c;rdv=A;rdl=a,b,c/hero-stats\",\n    //    nextStateUrl: \"/route-parameters/\"\n    // }\n    // canDeactivate {\n    //    staticPath: \"/route-parameters\",\n    //    currentStateUrl: \"/route-parameters/-1;dv=A;dl=a,b,c;rdv=A;rdl=a,b,c/hero-stats\",\n    //    nextStateUrl: \"/route-parameters/\"\n    // }\n    // logger.class.js:54 ParameterSnapshot.sanitise -> {idModel: -1, pv: undefined, pl: Array(0), dv: undefined, dl: Array(0), …}\n    // parameter-snapshot.ts:20 {name: \"idModel\", mine: -1, theirs: null}\n    // place-router.ts:28 redirect path (3) [\"route-parameters\", \"-1\", {…}]\n    // canDeactivate {\n    //    staticPath: \"/hero-stats\",\n    //    currentStateUrl: \"/route-parameters/-1;dv=A;dl=a,b,c;rdv=A;rdl=a,b,c/hero-stats\",\n    //    nextStateUrl: \"/route-parameters/-1\"\n    // }\n    // canDeactivate {\n    //    staticPath: \"/route-parameters\",\n    //    currentStateUrl: \"/route-parameters/-1;dv=A;dl=a,b,c;rdv=A;rdl=a,b,c/hero-stats\",\n    //    nextStateUrl: \"/route-parameters/-1\"\n    // }\n    // logger.class.js:54 ParameterSnapshot.sanitise -> {idModel: -1, pv: undefined, pl: Array(0), dv: \"A\", dl: Array(3), …}\n    // parameter-snapshot.ts:20 {name: \"dv\", mine: \"A\", theirs: undefined}\n    // place-router.ts:28 redirect path (3) [\"route-parameters\", \"-1\", {…}]\n    // canDeactivate {\n    //    staticPath: \"/hero-stats\",\n    //    currentStateUrl: \"/route-parameters/-1;dv=A;dl=a,b,c;rdv=A;rdl=a,b,c/hero-stats\",\n    //    nextStateUrl: \"/route-parameters/-1;dv=A;dl=a,b,c;rdv=A;rdl=a,b,c\"\n    // }\n\n\n    if (this.placeRouter.navigationSession.alreadyAccepted(component)) {\n      // We'll get called multiple times if there's any parameter sanitisation so\n      // we always return true if we accepted on a previous cycle of the current\n      // navigation session.\n      return true;\n    } else {\n      const self = this;\n      let canLeave = true;\n\n      if (this.isLeavingTheCurrentPlace(nextState, placeDefinitionPath)) {\n        // we check the interaction first, so that components that don't need to check if they're in an\n        // interaction during the canDeactivate cycle.\n        if (this.interactionContext.isActive()) {\n          canLeave = false;\n          console.log(\"cancelling\", {activity: this.interactionContext.currentActivity});\n          this.interactionContext.currentActivity.cancel(null);\n        }\n        // No interaction in progress, so ask the component .\n        // This may start an interaction, hence checking the interaction context above. I.e. if the place pops up the dialog, and\n        // the user clicks back again, we'll re-enter here and go bang when the component tries to open another\n        // dialog.\n        if (canLeave) {\n          canLeave = await component.canDeactivate();\n        }\n      } else {\n        // this is a parameter change.\n        if (this.interactionContext.isActive()) {\n          console.log(\"cancelling\", {activity: this.interactionContext.currentActivity});\n          this.interactionContext.currentActivity.cancel(null);\n          canLeave = false\n        } else {\n          canLeave = true;\n        }\n      }\n\n      if (canLeave) {\n        // We'll get called multiple times if there's any parameter sanitisation so\n        // we remember the acceptance for the duration of the current routing session.\n        self.placeRouter.navigationSession.rememberAcceptanceOf(component);\n      } else {\n        // Angular doesn't preserve the url when a guard cancels the back button.\n        // See https://github.com/angular/angular/issues/13586#issuecomment-432795720\n        if (this.placeRouter.navigationSession.isPopState) {\n          console.log('cancelled during popstate');\n          this.angularLocation.go(this.placeRouter.navigationSession.initialUrl);\n        }\n      }\n\n      return canLeave;\n    }\n  }\n}\n"]}
|
|
@@ -56,6 +56,7 @@ var PlaceRouter = /** @class */ (function () {
|
|
|
56
56
|
function PlaceRouter(router, angularLocation) {
|
|
57
57
|
var _this = this;
|
|
58
58
|
this.router = router;
|
|
59
|
+
this.angularLocation = angularLocation;
|
|
59
60
|
this._navigationSession = new MutableValueModel();
|
|
60
61
|
angularLocation.onUrlChange((/**
|
|
61
62
|
* @param {?} url
|
|
@@ -199,5 +200,7 @@ if (false) {
|
|
|
199
200
|
* @private
|
|
200
201
|
*/
|
|
201
202
|
PlaceRouter.prototype.router;
|
|
203
|
+
/** @type {?} */
|
|
204
|
+
PlaceRouter.prototype.angularLocation;
|
|
202
205
|
}
|
|
203
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
206
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"place-router.js","sourceRoot":"ng://@coolon/angular-ui-powerups/","sources":["lib/place/place-router.ts"],"names":[],"mappings":"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","sourcesContent":["import { Location } from '@angular/common';\nimport { Injectable } from '@angular/core';\nimport {\n  ActivatedRoute,\n  ActivatedRouteSnapshot,\n  NavigationEnd,\n  NavigationError,\n  NavigationStart,\n  Router,\n  UrlTree\n} from '@angular/router';\nimport { MutableValueModel, Trace } from '@coolon/pectin';\nimport _ from 'lodash';\nimport { PlaceComponent } from './place-component';\nimport { ParameterSnapshot } from './route/parameter-snapshot';\n\nclass NavigationSession {\n  private _alreadyAccepted: PlaceComponent[] = [];\n\n  constructor(readonly isPopState: boolean, readonly initialUrl: string) {\n    console.log('NavigationSession', { isPopState, initialUrl });\n  }\n\n  alreadyAccepted(placeComponent: PlaceComponent): boolean {\n    return this._alreadyAccepted.includes(placeComponent);\n  }\n\n  rememberAcceptanceOf(component: PlaceComponent) {\n    this._alreadyAccepted.push(component);\n  }\n}\n\n\n@Injectable({\n  providedIn: 'root'\n})\nexport class PlaceRouter {\n\n  private readonly _navigationSession = new MutableValueModel<NavigationSession>();\n\n  constructor(private readonly router: Router, readonly angularLocation: Location) {\n    angularLocation.onUrlChange(url => {\n      console.log(`### ${url}`);\n    });\n    this.router.events.subscribe(event => {\n      // console.log(`${event.constructor.name}`, location.pathname, angularLocation.getState());\n      // NavigationStart -> .... -> NavigationCancel === redirect (so don't ask again)\n      // NavigationStart -> .... -> NavigationEnd === navigated (so ask next time)\n      // NavigationStart -> .... -> NavigationError === canceled (guard cancelled so ask next time)\n      if (event instanceof NavigationStart && !this.navigationSession) {\n        this._navigationSession.value = new NavigationSession(event.navigationTrigger === 'popstate', this.router.routerState.snapshot.url);\n      }\n      if (event instanceof NavigationEnd) {\n        console.log('navigation ended');\n        this._navigationSession.value = null;\n      }\n      if (event instanceof NavigationError) {\n        console.log('navigation errored');\n        this._navigationSession.value = null;\n      }\n    });\n  }\n\n  get navigationSession(): NavigationSession {\n    return this._navigationSession.value;\n  }\n\n  pushParameterChangesToRoute(activatedRoute: ActivatedRoute, previous: ParameterSnapshot, next: ParameterSnapshot) {\n    const relativePath = !!previous.hasRouteId() ? '..' : '.';\n    this.router.navigate([relativePath].concat(this.createRouteParameters(next), this.getChildPath(activatedRoute.snapshot)), {\n      relativeTo: activatedRoute\n    });\n  }\n\n  // @Trace()\n  getRedirectUrlTree(activatedRoute: ActivatedRouteSnapshot, sanitised: ParameterSnapshot): UrlTree {\n    const urlSegments = activatedRoute.url;\n    const weHaveARouteId = sanitised.hasRouteId() && sanitised.getFormattedRouteId();\n    const commands = (weHaveARouteId) ?\n      [urlSegments[0].path, sanitised.getFormattedRouteId(), sanitised.getFormattedParameters()] :\n      [urlSegments[0].path, sanitised.getFormattedParameters()];\n    return this.router.createUrlTree(commands);\n  }\n\n  protected getChildPath(activatedRoute: ActivatedRouteSnapshot): any[] {\n    return _.flatten(activatedRoute.children.map(child => child.url));\n  }\n\n  protected createRouteParameters(parameters: ParameterSnapshot): any[] {\n    const routeId = parameters.getFormattedRouteId();\n    return routeId ?\n      [routeId, parameters.getFormattedParameters()] :\n      [parameters.getFormattedParameters()];\n  }\n}\n"]}
|
|
@@ -5,7 +5,7 @@ import { MatDialog, MatButtonModule, MatDialogModule, MatTabsModule, MatProgress
|
|
|
5
5
|
import { MatTabsModule as MatTabsModule$1 } from '@angular/material/tabs';
|
|
6
6
|
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
|
|
7
7
|
import { __decorate, __metadata, __awaiter } from 'tslib';
|
|
8
|
-
import { GarbageCollector, DelegatingFormValueModel, UseDelegate, ValueModel, ListModel, StoreInListModel, assert, UnaryCommand, lang, Dsl, Logger, DelegatingValueModel, MutableStream, MutableListModel, DelegatingListModel, StoreInValueModel, Binding, MutableValueModel, Guard as Guard$1, OptionsHelper, ValueHolder } from '@coolon/pectin';
|
|
8
|
+
import { GarbageCollector, DelegatingFormValueModel, UseDelegate, ValueModel, ListModel, StoreInListModel, assert, UnaryCommand, lang, Dsl, Logger, DelegatingValueModel, MutableStream, MutableListModel, DelegatingListModel, StoreInValueModel, Binding, MutableValueModel, Guard as Guard$1, OptionsHelper, ValueHolder, Trace } from '@coolon/pectin';
|
|
9
9
|
import { PortalModule } from '@angular/cdk/portal';
|
|
10
10
|
import ___default, { last, isNil } from 'lodash';
|
|
11
11
|
import { assert as assert$1, Klass, Opts } from '@coolon/typescript-utilities';
|
|
@@ -14,7 +14,7 @@ import { v1 } from 'uuid';
|
|
|
14
14
|
import { MatIconModule } from '@angular/material/icon';
|
|
15
15
|
import { MatListModule } from '@angular/material/list';
|
|
16
16
|
import { MatTooltipModule } from '@angular/material/tooltip';
|
|
17
|
-
import { Router, NavigationStart, NavigationEnd, NavigationError, RouterModule } from '@angular/router';
|
|
17
|
+
import { Router, NavigationStart, NavigationEnd, NavigationError, RouterModule, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
|
|
18
18
|
import { Memoize as Memoize$1 } from '@typescript-plus/fast-memoize-decorator/dist/src';
|
|
19
19
|
import { Memoize } from '@typescript-plus/fast-memoize-decorator';
|
|
20
20
|
import 'reflect-metadata';
|
|
@@ -2247,6 +2247,7 @@ class PlaceRouter {
|
|
|
2247
2247
|
*/
|
|
2248
2248
|
constructor(router, angularLocation) {
|
|
2249
2249
|
this.router = router;
|
|
2250
|
+
this.angularLocation = angularLocation;
|
|
2250
2251
|
this._navigationSession = new MutableValueModel();
|
|
2251
2252
|
angularLocation.onUrlChange((/**
|
|
2252
2253
|
* @param {?} url
|
|
@@ -2360,6 +2361,8 @@ if (false) {
|
|
|
2360
2361
|
* @private
|
|
2361
2362
|
*/
|
|
2362
2363
|
PlaceRouter.prototype.router;
|
|
2364
|
+
/** @type {?} */
|
|
2365
|
+
PlaceRouter.prototype.angularLocation;
|
|
2363
2366
|
}
|
|
2364
2367
|
|
|
2365
2368
|
/**
|
|
@@ -4041,6 +4044,16 @@ class LeavePlaceGuard {
|
|
|
4041
4044
|
this.interactionContext = interactionContext;
|
|
4042
4045
|
this.angularLocation = angularLocation;
|
|
4043
4046
|
}
|
|
4047
|
+
/**
|
|
4048
|
+
* @private
|
|
4049
|
+
* @param {?} nextState
|
|
4050
|
+
* @param {?} placeDefinitionPath
|
|
4051
|
+
* @return {?}
|
|
4052
|
+
*/
|
|
4053
|
+
isLeavingTheCurrentPlace(nextState, placeDefinitionPath) {
|
|
4054
|
+
// TODO: this will break with child routes... need to examine the router states properly.
|
|
4055
|
+
return !nextState.url.startsWith(placeDefinitionPath);
|
|
4056
|
+
}
|
|
4044
4057
|
/**
|
|
4045
4058
|
* @param {?} component
|
|
4046
4059
|
* @param {?} currentRoute
|
|
@@ -4096,40 +4109,57 @@ class LeavePlaceGuard {
|
|
|
4096
4109
|
// nextStateUrl: "/route-parameters/-1;dv=A;dl=a,b,c;rdv=A;rdl=a,b,c"
|
|
4097
4110
|
// }
|
|
4098
4111
|
if (this.placeRouter.navigationSession.alreadyAccepted(component)) {
|
|
4112
|
+
// We'll get called multiple times if there's any parameter sanitisation so
|
|
4113
|
+
// we always return true if we accepted on a previous cycle of the current
|
|
4114
|
+
// navigation session.
|
|
4099
4115
|
return true;
|
|
4100
4116
|
}
|
|
4101
4117
|
else {
|
|
4102
|
-
|
|
4103
|
-
|
|
4104
|
-
|
|
4105
|
-
|
|
4106
|
-
|
|
4107
|
-
|
|
4108
|
-
//
|
|
4109
|
-
|
|
4110
|
-
if (canLeave && this.interactionContext.isActive()) {
|
|
4118
|
+
/** @type {?} */
|
|
4119
|
+
const self = this;
|
|
4120
|
+
/** @type {?} */
|
|
4121
|
+
let canLeave = true;
|
|
4122
|
+
if (this.isLeavingTheCurrentPlace(nextState, placeDefinitionPath)) {
|
|
4123
|
+
// we check the interaction first, so that components that don't need to check if they're in an
|
|
4124
|
+
// interaction during the canDeactivate cycle.
|
|
4125
|
+
if (this.interactionContext.isActive()) {
|
|
4111
4126
|
canLeave = false;
|
|
4112
4127
|
console.log("cancelling", { activity: this.interactionContext.currentActivity });
|
|
4113
4128
|
this.interactionContext.currentActivity.cancel(null);
|
|
4114
4129
|
}
|
|
4115
|
-
//
|
|
4116
|
-
//
|
|
4130
|
+
// No interaction in progress, so ask the component .
|
|
4131
|
+
// This may start an interaction, hence checking the interaction context above. I.e. if the place pops up the dialog, and
|
|
4132
|
+
// the user clicks back again, we'll re-enter here and go bang when the component tries to open another
|
|
4133
|
+
// dialog.
|
|
4117
4134
|
if (canLeave) {
|
|
4118
|
-
|
|
4135
|
+
canLeave = yield component.canDeactivate();
|
|
4136
|
+
}
|
|
4137
|
+
}
|
|
4138
|
+
else {
|
|
4139
|
+
// this is a parameter change.
|
|
4140
|
+
if (this.interactionContext.isActive()) {
|
|
4141
|
+
console.log("cancelling", { activity: this.interactionContext.currentActivity });
|
|
4142
|
+
this.interactionContext.currentActivity.cancel(null);
|
|
4143
|
+
canLeave = false;
|
|
4119
4144
|
}
|
|
4120
4145
|
else {
|
|
4121
|
-
|
|
4122
|
-
// See https://github.com/angular/angular/issues/13586#issuecomment-432795720
|
|
4123
|
-
if (this.placeRouter.navigationSession.isPopState) {
|
|
4124
|
-
console.log('cancelled during popstate');
|
|
4125
|
-
this.angularLocation.go(this.placeRouter.navigationSession.initialUrl);
|
|
4126
|
-
}
|
|
4146
|
+
canLeave = true;
|
|
4127
4147
|
}
|
|
4128
|
-
|
|
4148
|
+
}
|
|
4149
|
+
if (canLeave) {
|
|
4150
|
+
// We'll get called multiple times if there's any parameter sanitisation so
|
|
4151
|
+
// we remember the acceptance for the duration of the current routing session.
|
|
4152
|
+
self.placeRouter.navigationSession.rememberAcceptanceOf(component);
|
|
4129
4153
|
}
|
|
4130
4154
|
else {
|
|
4131
|
-
|
|
4155
|
+
// Angular doesn't preserve the url when a guard cancels the back button.
|
|
4156
|
+
// See https://github.com/angular/angular/issues/13586#issuecomment-432795720
|
|
4157
|
+
if (this.placeRouter.navigationSession.isPopState) {
|
|
4158
|
+
console.log('cancelled during popstate');
|
|
4159
|
+
this.angularLocation.go(this.placeRouter.navigationSession.initialUrl);
|
|
4160
|
+
}
|
|
4132
4161
|
}
|
|
4162
|
+
return canLeave;
|
|
4133
4163
|
}
|
|
4134
4164
|
});
|
|
4135
4165
|
}
|
|
@@ -4148,6 +4178,12 @@ LeavePlaceGuard.ctorParameters = () => [
|
|
|
4148
4178
|
{ type: Location }
|
|
4149
4179
|
];
|
|
4150
4180
|
/** @nocollapse */ LeavePlaceGuard.ngInjectableDef = ɵɵdefineInjectable({ factory: function LeavePlaceGuard_Factory() { return new LeavePlaceGuard(ɵɵinject(Router), ɵɵinject(INJECTOR), ɵɵinject(PlaceRouter), ɵɵinject(InteractionContext), ɵɵinject(Location)); }, token: LeavePlaceGuard, providedIn: "root" });
|
|
4181
|
+
__decorate([
|
|
4182
|
+
Trace(),
|
|
4183
|
+
__metadata("design:type", Function),
|
|
4184
|
+
__metadata("design:paramtypes", [PlaceComponent, ActivatedRouteSnapshot, RouterStateSnapshot, RouterStateSnapshot]),
|
|
4185
|
+
__metadata("design:returntype", Promise)
|
|
4186
|
+
], LeavePlaceGuard.prototype, "canDeactivate", null);
|
|
4151
4187
|
if (false) {
|
|
4152
4188
|
/**
|
|
4153
4189
|
* @type {?}
|