@coolon/angular-ui-powerups 0.0.104 → 0.0.105
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 +11 -46
- 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/interaction/interaction-context-base.js +2 -2
- package/esm2015/lib/interaction/interaction-context.js +5 -28
- package/esm2015/lib/place/guards/navigation-state.js +2 -2
- package/esm2015/lib/place/guards/place-component-deactivation-handler.js +3 -3
- package/esm5/lib/interaction/interaction-context-base.js +2 -2
- package/esm5/lib/interaction/interaction-context.js +12 -44
- package/esm5/lib/place/guards/navigation-state.js +2 -2
- package/esm5/lib/place/guards/place-component-deactivation-handler.js +3 -3
- package/fesm2015/coolon-angular-ui-powerups.js +8 -31
- package/fesm2015/coolon-angular-ui-powerups.js.map +1 -1
- package/fesm5/coolon-angular-ui-powerups.js +12 -47
- package/fesm5/coolon-angular-ui-powerups.js.map +1 -1
- package/lib/interaction/interaction-context-base.d.ts +1 -1
- package/lib/interaction/interaction-context.d.ts +2 -3
- package/package.json +1 -1
|
@@ -5,7 +5,7 @@ import { MatInputModule, MatFormFieldModule, MatSelectModule, MatButtonModule, M
|
|
|
5
5
|
import { MatTabsModule } from '@angular/material/tabs';
|
|
6
6
|
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
|
|
7
7
|
import { __extends, __decorate, __metadata, __awaiter, __generator, __assign, __spread } from 'tslib';
|
|
8
|
-
import { DelegatingValueModel, assert, UnaryCommand, lang, Dsl, GarbageCollector, Logger, DelegatingFormValueModel, UseDelegate, ValueModel, ListModel, StoreInListModel,
|
|
8
|
+
import { DelegatingValueModel, assert, UnaryCommand, lang, Dsl, GarbageCollector, Logger, DelegatingFormValueModel, UseDelegate, ValueModel, ListModel, StoreInListModel, DelegatingListModel, Deferred, MutableStream, MutableValueModel, MutableListModel, Binding, Trace, Guard, StoreInValueModel, Command, OptionsHelper, ValueHolder } from '@coolon/pectin';
|
|
9
9
|
import { PortalModule } from '@angular/cdk/portal';
|
|
10
10
|
import { RouterModule, NavigationStart, NavigationCancel, UrlSegment, NavigationEnd, NavigationError, Router, UrlSerializer } from '@angular/router';
|
|
11
11
|
import { assert as assert$1, Opts, Klass } from '@coolon/typescript-utilities';
|
|
@@ -1100,7 +1100,10 @@ if (false) {
|
|
|
1100
1100
|
/**
|
|
1101
1101
|
* @abstract
|
|
1102
1102
|
*/
|
|
1103
|
-
var
|
|
1103
|
+
var /**
|
|
1104
|
+
* @abstract
|
|
1105
|
+
*/
|
|
1106
|
+
InteractionContext = /** @class */ (function (_super) {
|
|
1104
1107
|
__extends(InteractionContext, _super);
|
|
1105
1108
|
function InteractionContext() {
|
|
1106
1109
|
return _super !== null && _super.apply(this, arguments) || this;
|
|
@@ -1140,7 +1143,7 @@ var InteractionContext = /** @class */ (function (_super) {
|
|
|
1140
1143
|
* there is still another activity running.
|
|
1141
1144
|
* @return {?}
|
|
1142
1145
|
*/
|
|
1143
|
-
InteractionContext.prototype.
|
|
1146
|
+
InteractionContext.prototype.cancelActiveActivity = /**
|
|
1144
1147
|
* Cancels the current activity and returns true the context is no longer active, false if
|
|
1145
1148
|
* there is still another activity running.
|
|
1146
1149
|
* @return {?}
|
|
@@ -1153,7 +1156,7 @@ var InteractionContext = /** @class */ (function (_super) {
|
|
|
1153
1156
|
switch (_a.label) {
|
|
1154
1157
|
case 0:
|
|
1155
1158
|
when = Dsl.disposeWith(this).when;
|
|
1156
|
-
return [4 /*yield*/, this.
|
|
1159
|
+
return [4 /*yield*/, this.getActiveActivity()];
|
|
1157
1160
|
case 1:
|
|
1158
1161
|
activity = _a.sent();
|
|
1159
1162
|
return [2 /*return*/, new Promise((/**
|
|
@@ -1175,43 +1178,6 @@ var InteractionContext = /** @class */ (function (_super) {
|
|
|
1175
1178
|
});
|
|
1176
1179
|
});
|
|
1177
1180
|
};
|
|
1178
|
-
/**
|
|
1179
|
-
* @return {?}
|
|
1180
|
-
*/
|
|
1181
|
-
InteractionContext.prototype.abort = /**
|
|
1182
|
-
* @return {?}
|
|
1183
|
-
*/
|
|
1184
|
-
function () {
|
|
1185
|
-
return __awaiter(this, void 0, void 0, function () {
|
|
1186
|
-
var count;
|
|
1187
|
-
return __generator(this, function (_a) {
|
|
1188
|
-
switch (_a.label) {
|
|
1189
|
-
case 0:
|
|
1190
|
-
assert.isTruthy(this.isActive());
|
|
1191
|
-
count = 1;
|
|
1192
|
-
return [4 /*yield*/, this.cancelCurrentActivity()];
|
|
1193
|
-
case 1:
|
|
1194
|
-
_a.sent();
|
|
1195
|
-
console.log("aborted -> " + count++);
|
|
1196
|
-
_a.label = 2;
|
|
1197
|
-
case 2:
|
|
1198
|
-
if (!this.isActive()) return [3 /*break*/, 4];
|
|
1199
|
-
return [4 /*yield*/, this.cancelCurrentActivity()];
|
|
1200
|
-
case 3:
|
|
1201
|
-
_a.sent();
|
|
1202
|
-
console.log("aborted -> " + count++);
|
|
1203
|
-
return [3 /*break*/, 2];
|
|
1204
|
-
case 4: return [2 /*return*/];
|
|
1205
|
-
}
|
|
1206
|
-
});
|
|
1207
|
-
});
|
|
1208
|
-
};
|
|
1209
|
-
__decorate([
|
|
1210
|
-
Trace(),
|
|
1211
|
-
__metadata("design:type", Function),
|
|
1212
|
-
__metadata("design:paramtypes", []),
|
|
1213
|
-
__metadata("design:returntype", Promise)
|
|
1214
|
-
], InteractionContext.prototype, "abort", null);
|
|
1215
1181
|
return InteractionContext;
|
|
1216
1182
|
}(GarbageCollector));
|
|
1217
1183
|
if (false) {
|
|
@@ -1225,10 +1191,9 @@ if (false) {
|
|
|
1225
1191
|
* Returns the activity that is currently active.
|
|
1226
1192
|
* This model is only updated in the next tick after the view has been updated.
|
|
1227
1193
|
* @abstract
|
|
1228
|
-
* @protected
|
|
1229
1194
|
* @return {?}
|
|
1230
1195
|
*/
|
|
1231
|
-
InteractionContext.prototype.
|
|
1196
|
+
InteractionContext.prototype.getActiveActivity = function () { };
|
|
1232
1197
|
/**
|
|
1233
1198
|
* @abstract
|
|
1234
1199
|
* @template D, R, E
|
|
@@ -1489,7 +1454,7 @@ InteractionContextBase = /** @class */ (function (_super) {
|
|
|
1489
1454
|
* This model is only updated in the next tick after the view has been updated.
|
|
1490
1455
|
* @return {?}
|
|
1491
1456
|
*/
|
|
1492
|
-
InteractionContextBase.prototype.
|
|
1457
|
+
InteractionContextBase.prototype.getActiveActivity = /**
|
|
1493
1458
|
* Returns the activity that is currently active.
|
|
1494
1459
|
* This model is only updated in the next tick after the view has been updated.
|
|
1495
1460
|
* @return {?}
|
|
@@ -3717,14 +3682,14 @@ var PlaceComponentDeactivationHandler = /** @class */ (function () {
|
|
|
3717
3682
|
routeIds = this.placeRouter.getActiveInteractionIdsFromUrl(nextState.url);
|
|
3718
3683
|
currentIds = this.interactionService.activeInteractionContextIds.value;
|
|
3719
3684
|
if (!!isEqual(currentIds, routeIds)) return [3 /*break*/, 2];
|
|
3720
|
-
return [4 /*yield*/, this.interactionService.getActiveContext().
|
|
3685
|
+
return [4 /*yield*/, this.interactionService.getActiveContext().cancelActiveActivity()];
|
|
3721
3686
|
case 1:
|
|
3722
3687
|
_a.sent();
|
|
3723
3688
|
return [2 /*return*/, currentUrl.updateInteractionIds(this.interactionService.activeInteractionContextIds.value)];
|
|
3724
3689
|
case 2: return [3 /*break*/, 5];
|
|
3725
3690
|
case 3:
|
|
3726
3691
|
if (!(this.component.interactionContext && this.component.interactionContext.isActive())) return [3 /*break*/, 5];
|
|
3727
|
-
return [4 /*yield*/, this.component.interactionContext.
|
|
3692
|
+
return [4 /*yield*/, this.component.interactionContext.cancelActiveActivity()];
|
|
3728
3693
|
case 4:
|
|
3729
3694
|
_a.sent();
|
|
3730
3695
|
return [2 /*return*/, currentUrl
|
|
@@ -4247,7 +4212,7 @@ if (false) {
|
|
|
4247
4212
|
var when = Dsl.disposeWith(navigationInteraction).when;
|
|
4248
4213
|
// TODO: I need to make the exclusive interaction context disallow nested activities or
|
|
4249
4214
|
// that would mess things up entirely. Or, can I do a context.abortAll().then(..)
|
|
4250
|
-
navigationInteraction.
|
|
4215
|
+
navigationInteraction.cancelActiveActivity().then((/**
|
|
4251
4216
|
* @return {?}
|
|
4252
4217
|
*/
|
|
4253
4218
|
function () {
|