@coolon/angular-ui-powerups 0.0.58 → 0.0.59

package/fesm5/coolon-angular-ui-powerups.js

@@ -5,11 +5,10 @@ import { MatDialog, MatButtonModule, MatDialogModule, MatTabsModule, MatProgress
 import { MatTabsModule as MatTabsModule$1 } from '@angular/material/tabs';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { __extends, __decorate, __metadata, __assign, __awaiter, __generator } from 'tslib';
-import { GarbageCollector, DelegatingFormValueModel, UseDelegate, ValueModel, ListModel, StoreInListModel, assert, UnaryCommand, lang, Dsl, Logger, EventListenerList, DelegatingValueModel, MutableListModel, StoreInValueModel, Binding, MutableValueModel, Guard, OptionsHelper, ValueHolder } from '@coolon/pectin';
+import { GarbageCollector, DelegatingFormValueModel, UseDelegate, ValueModel, ListModel, StoreInListModel, assert, UnaryCommand, lang, Dsl, Logger, Trace, DelegatingValueModel, MutableListModel, StoreInValueModel, Binding, MutableValueModel, Guard, OptionsHelper, ValueHolder } from '@coolon/pectin';
 import { PortalModule } from '@angular/cdk/portal';
-import { Deferred } from '@coolon/pectin/lib/promise/deferred.class';
-import { MatDialogConfig, MAT_DIALOG_DEFAULT_OPTIONS, MatDialog as MatDialog$1 } from '@angular/material/dialog';
 import { assert as assert$1, Klass, Opts } from '@coolon/typescript-utilities';
+import { MatDialogConfig, MAT_DIALOG_DEFAULT_OPTIONS, MatDialog as MatDialog$1 } from '@angular/material/dialog';
 import { MatIconModule } from '@angular/material/icon';
 import { MatListModule } from '@angular/material/list';
 import { MatTooltipModule } from '@angular/material/tooltip';
@@ -848,15 +847,10 @@ if (false) {
     /** @type {?} */
     Activity.prototype.busy;
     /**
-     * @param {?} callback
-     * @return {?}
-     */
-    Activity.prototype.onDone = function (callback) { };
-    /**
-     * @param {?} callback
+     * @param {?} activityContext
      * @return {?}
      */
-    Activity.prototype.onCancel = function (callback) { };
+    Activity.prototype.initialise = function (activityContext) { };
 }
 
 /**
@@ -921,8 +915,7 @@ var ActivityOutletComponent = /** @class */ (function () {
         var componentFactory = this.componentFactoryResolver.resolveComponentFactory(activityContext.activityClass);
         this.viewContainerRef.clear();
         this.activityComponentRef = this.viewContainerRef.createComponent(componentFactory, 0, injector);
-        this.activityComponentRef.instance.onDone(activityContext.onDone);
-        this.activityComponentRef.instance.onCancel(activityContext.onCancel);
+        this.activityComponentRef.instance.initialise(activityContext);
     };
     /**
      * @param {?} alert
@@ -989,6 +982,12 @@ var ActivityOutletComponent = /** @class */ (function () {
         interactionContext: [{ type: Input }],
         activityContext: [{ type: Input }]
     };
+    __decorate([
+        Trace(),
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", [Object]),
+        __metadata("design:returntype", void 0)
+    ], ActivityOutletComponent.prototype, "loadActivity", null);
     return ActivityOutletComponent;
 }());
 if (false) {
@@ -1083,40 +1082,24 @@ if (false) {
 /**
  * @template D, R, E
  */
-var  /**
- * @template D, R, E
- */
-AbstractActivity = /** @class */ (function (_super) {
+var AbstractActivity = /** @class */ (function (_super) {
     __extends(AbstractActivity, _super);
     function AbstractActivity() {
         var _this = _super !== null && _super.apply(this, arguments) || this;
-        _this._doneListeners = new EventListenerList();
-        _this._cancelListeners = new EventListenerList();
-        _this._finishListeners = new EventListenerList();
         _this._busyModel = new DelegatingValueModel().withDefault(false);
         return _this;
     }
     /**
-     * @param {?} callback
-     * @return {?}
-     */
-    AbstractActivity.prototype.onDone = /**
-     * @param {?} callback
-     * @return {?}
-     */
-    function (callback) {
-        this._doneListeners.add(callback);
-    };
-    /**
-     * @param {?} callback
+     * @param {?} activityContext
      * @return {?}
      */
-    AbstractActivity.prototype.onCancel = /**
-     * @param {?} callback
+    AbstractActivity.prototype.initialise = /**
+     * @param {?} activityContext
      * @return {?}
      */
-    function (callback) {
-        this._cancelListeners.add(callback);
+    function (activityContext) {
+        assert$1.isNil(this.activityContext);
+        this.activityContext = activityContext;
     };
     /**
      * @param {?=} result
@@ -1127,17 +1110,7 @@ AbstractActivity = /** @class */ (function (_super) {
      * @return {?}
      */
     function (result) {
-        var _this = this;
-        return this._doneListeners
-            .fireAndWait((/**
-         * @param {?} l
-         * @return {?}
-         */
-        function (l) { return l(result); }))
-            .finally((/**
-         * @return {?}
-         */
-        function () { return _this.finalizeAndDispose(); }));
+        return this.activityContext.onDone(result);
     };
     /**
      * @param {?=} error
@@ -1148,57 +1121,39 @@ AbstractActivity = /** @class */ (function (_super) {
      * @return {?}
      */
     function (error) {
-        var _this = this;
-        return this._cancelListeners
-            .fireAndWait((/**
-         * @param {?} l
-         * @return {?}
-         */
-        function (l) { return l(error); }))
-            .finally((/**
+        this.activityContext.onCancel(error);
+    };
+    Object.defineProperty(AbstractActivity.prototype, "data", {
+        get: /**
          * @return {?}
          */
-        function () { return _this.finalizeAndDispose(); }));
-    };
+        function () {
+            return this.activityContext.activityData;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    // get interactionContext(): InteractionContext {
+    //   return this.activityContext.interactionContext;
+    // }
     // @Trace()
+    // get interactionContext(): InteractionContext {
+    //   return this.activityContext.interactionContext;
+    // }
     // @Trace()
     /**
      * @return {?}
      */
     AbstractActivity.prototype.onActivityReady = 
+    // get interactionContext(): InteractionContext {
+    //   return this.activityContext.interactionContext;
+    // }
     // @Trace()
     /**
      * @return {?}
      */
     function () {
     };
-    /**
-     * @private
-     * @return {?}
-     */
-    AbstractActivity.prototype.finalizeAndDispose = /**
-     * @private
-     * @return {?}
-     */
-    function () {
-        // this._activeModel.value = false;
-        this._finishListeners.fire((/**
-         * @param {?} l
-         * @return {?}
-         */
-        function (l) { return l(); }));
-        // this._interactionContext = null;
-        // this._initialized = false;
-        [
-            this._finishListeners,
-            this._doneListeners,
-            this._cancelListeners
-        ].forEach((/**
-         * @param {?} l
-         * @return {?}
-         */
-        function (l) { return l.dispose(); }));
-    };
     Object.defineProperty(AbstractActivity.prototype, "busy", {
         get: /**
          * @return {?}
@@ -1229,6 +1184,12 @@ AbstractActivity = /** @class */ (function (_super) {
     function () {
         return this._busyModel.value;
     };
+    __decorate([
+        Trace(),
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", [Object]),
+        __metadata("design:returntype", void 0)
+    ], AbstractActivity.prototype, "initialise", null);
     return AbstractActivity;
 }(DisposableComponent));
 if (false) {
@@ -1236,22 +1197,12 @@ if (false) {
      * @type {?}
      * @private
      */
-    AbstractActivity.prototype._doneListeners;
-    /**
-     * @type {?}
-     * @private
-     */
-    AbstractActivity.prototype._cancelListeners;
-    /**
-     * @type {?}
-     * @private
-     */
-    AbstractActivity.prototype._finishListeners;
+    AbstractActivity.prototype._busyModel;
     /**
      * @type {?}
      * @private
      */
-    AbstractActivity.prototype._busyModel;
+    AbstractActivity.prototype.activityContext;
 }
 
 /**
@@ -1323,7 +1274,7 @@ var ConfirmationDialogComponent = /** @class */ (function (_super) {
     ConfirmationDialogComponent.decorators = [
         { type: Component, args: [{
                     selector: 'angular-ui-powerups-confirmation-dialog',
-                    template: "<h3 matDialogTitle *ngIf=\"confirm.title\">{{confirm.title()}}</h3>\n<div matDialogContent>\n  <p *ngFor=\"let line of confirm.content()\">{{line}}</p>\n</div>\n<p matDialogActions>\n  <button mat-button (click)=\"cancel()\">{{confirm.cancel()}}</button>\n  <button mat-raised-button [color]=\"isDestructive() ? 'warn' : 'primary'\"\n          (click)=\"done(true)\">{{confirm.ok()}}</button>\n</p>\n\n",
+                    template: "<h3 matDialogTitle *ngIf=\"confirm.title\">{{confirm.title()}}</h3>\n<div matDialogContent>\n  <p *ngFor=\"let line of confirm.content()\">{{line}}</p>\n</div>\n<p matDialogActions>\n  <button mat-button (click)=\"cancel()\">{{confirm.cancel()}}</button>\n  <button mat-raised-button [color]=\"isDestructive() ? 'warn' : 'primary'\"\n          (click)=\"done()\">{{confirm.ok()}}</button>\n</p>\n\n",
                     styles: [":host{display:block;padding:var(--angular-ui-powerups-default-padding)}.mat-dialog-actions{justify-content:flex-end}"]
                 }] }
     ];
@@ -1348,8 +1299,7 @@ var ActivityContainerComponent = /** @class */ (function (_super) {
         var _this = _super.call(this) || this;
         _this.activityOutletTabs = new MutableListModel();
         _this.obsoleteTabs = [];
-        var _a = Dsl.disposeWith(_this), chain = _a.chain, valueOf = _a.valueOf, before = _a.before, when = _a.when, after = _a.after, observe = _a.observe, switchOn = _a.switchOn;
-        _this.lastActivityTab = chain(_this.activityOutletTabs).last().otherwise(_this.initialActivityOutlet);
+        _this.finished = false;
         return _this;
     }
     /**
@@ -1376,16 +1326,38 @@ var ActivityContainerComponent = /** @class */ (function (_super) {
     };
     /**
      * @template D, R, E
-     * @param {?} options
+     * @param {?} initialContext
      * @return {?}
      */
     ActivityContainerComponent.prototype.initialise = /**
      * @template D, R, E
-     * @param {?} options
+     * @param {?} initialContext
      * @return {?}
      */
-    function (options) {
-        this.initialActivityOutlet = __assign({}, options, { interactionContext: this });
+    function (initialContext) {
+        /** @type {?} */
+        var self = this;
+        this.initialActivityOutletContext = {
+            activityClass: initialContext.activityClass,
+            activityData: initialContext.activityData,
+            onDone: (/**
+             * @param {?} result
+             * @return {?}
+             */
+            function (result) {
+                self.finished = true;
+                return initialContext.onDone(result);
+            }),
+            onCancel: (/**
+             * @param {?} error
+             * @return {?}
+             */
+            function (error) {
+                self.finished = true;
+                return initialContext.onCancel(error);
+            }),
+            interactionContext: this
+        };
     };
     /**
      * @template D, R, E
@@ -1402,23 +1374,49 @@ var ActivityContainerComponent = /** @class */ (function (_super) {
     function (activityType, data) {
         var _this = this;
         /** @type {?} */
-        var deferred = Deferred.defer();
-        /** @type {?} */
-        var context = {
-            interactionContext: this,
-            activityClass: activityType,
-            activityData: data,
-            onDone: deferred.resolve,
-            onCancel: deferred.reject
-        };
-        this.activityOutletTabs.push(context);
-        this.tabs.selectedIndex = this.activityOutletTabs.length;
-        return deferred.promise.finally((/**
+        var self = this;
+        return new Promise((/**
+         * @param {?} resolve
+         * @param {?} reject
          * @return {?}
          */
-        function () {
-            _this.obsoleteTabs.push(context);
-            _this.tabs.selectedIndex = _this.activityOutletTabs.length - 1;
+        function (resolve, reject) {
+            /** @type {?} */
+            var context = {
+                interactionContext: self,
+                activityClass: activityType,
+                activityData: data,
+                onDone: (/**
+                 * @param {?} result
+                 * @return {?}
+                 */
+                function (result) {
+                    self.obsoleteTabs.push(context);
+                    // animating on the next tick gives chained done's a chance to
+                    // finished before we start an animations
+                    resolve(result);
+                    setTimeout((/**
+                     * @return {?}
+                     */
+                    function () { return self.animateTabs(); }));
+                }),
+                onCancel: (/**
+                 * @param {?} error
+                 * @return {?}
+                 */
+                function (error) {
+                    self.obsoleteTabs.push(context);
+                    // finished before we start an animations
+                    reject(error);
+                    // animating on the next tick gives chained done's a chance to complete before we animate
+                    setTimeout((/**
+                     * @return {?}
+                     */
+                    function () { return self.animateTabs(); }));
+                })
+            };
+            self.activityOutletTabs.push(context);
+            self.tabs.selectedIndex = _this.activityOutletTabs.length;
         }));
     };
     /**
@@ -1460,12 +1458,26 @@ var ActivityContainerComponent = /** @class */ (function (_super) {
         function (tab) {
             return !_this.obsoleteTabs.includes(tab);
         }));
+        this.obsoleteTabs = [];
         this.outlets.toArray()[this.tabs.selectedIndex].notifyReady();
     };
+    /**
+     * @private
+     * @return {?}
+     */
+    ActivityContainerComponent.prototype.animateTabs = /**
+     * @private
+     * @return {?}
+     */
+    function () {
+        if (!this.finished) {
+            this.tabs.selectedIndex = this.activityOutletTabs.length - this.obsoleteTabs.length;
+        }
+    };
     ActivityContainerComponent.decorators = [
         { type: Component, args: [{
                     selector: 'angular-ui-powerups-activity-container',
-                    template: "<mat-tab-group #tabs no-tab-header [dynamicHeight]=\"true\">\n  <mat-tab>\n    <angular-ui-powerups-activity-outlet [interactionContext]=\"this\"\n                                         [activityContext]=\"initialActivityOutlet\"></angular-ui-powerups-activity-outlet>\n  </mat-tab>\n  <mat-tab *ngFor=\"let tab of activityOutletTabs.value\">\n    <angular-ui-powerups-activity-outlet [interactionContext]=\"this\"\n                                         [activityContext]=\"tab\"></angular-ui-powerups-activity-outlet>\n  </mat-tab>\n</mat-tab-group>\n",
+                    template: "<mat-tab-group #tabs no-tab-header [dynamicHeight]=\"true\">\n  <mat-tab>\n    <angular-ui-powerups-activity-outlet [interactionContext]=\"this\"\n                                         [activityContext]=\"initialActivityOutletContext\"></angular-ui-powerups-activity-outlet>\n  </mat-tab>\n  <mat-tab *ngFor=\"let tab of activityOutletTabs.value\">\n    <angular-ui-powerups-activity-outlet [interactionContext]=\"this\"\n                                         [activityContext]=\"tab\"></angular-ui-powerups-activity-outlet>\n  </mat-tab>\n</mat-tab-group>\n",
                     styles: [":host{display:block}"]
                 }] }
     ];
@@ -1473,7 +1485,7 @@ var ActivityContainerComponent = /** @class */ (function (_super) {
     ActivityContainerComponent.ctorParameters = function () { return []; };
     ActivityContainerComponent.propDecorators = {
         parentInteractionContext: [{ type: Input }],
-        initialActivityOutlet: [{ type: Input }],
+        initialActivityOutletContext: [{ type: Input }],
         tabs: [{ type: ViewChild, args: ['tabs', { static: true },] }],
         outlets: [{ type: ViewChildren, args: [ActivityOutletComponent,] }]
     };
@@ -1483,7 +1495,7 @@ if (false) {
     /** @type {?} */
     ActivityContainerComponent.prototype.parentInteractionContext;
     /** @type {?} */
-    ActivityContainerComponent.prototype.initialActivityOutlet;
+    ActivityContainerComponent.prototype.initialActivityOutletContext;
     /** @type {?} */
     ActivityContainerComponent.prototype.tabs;
     /** @type {?} */
@@ -1499,7 +1511,7 @@ if (false) {
      * @type {?}
      * @private
      */
-    ActivityContainerComponent.prototype.lastActivityTab;
+    ActivityContainerComponent.prototype.finished;
 }
 (function (ActivityContainerComponent) {
     /**
@@ -1528,10 +1540,10 @@ if (false) {
 var DIALOG_INTERACTION_SERVICE_DEFAULTS = new InjectionToken('DIALOG_INTERACTION_SERVICE_DEFAULTS');
 var DialogInteractionService = /** @class */ (function (_super) {
     __extends(DialogInteractionService, _super);
-    function DialogInteractionService(dialogService, dialogDefaults, matDialogDefaultConfig) {
+    function DialogInteractionService(dialogService, dialogServiceDefaults, matDialogDefaultConfig) {
         var _this = _super.call(this) || this;
         _this.dialogService = dialogService;
-        _this.dialogDefaults = dialogDefaults;
+        _this.dialogServiceDefaults = dialogServiceDefaults;
         _this.matDialogDefaultConfig = matDialogDefaultConfig;
         assert$1.notNil(dialogService);
         return _this;
@@ -1571,7 +1583,7 @@ var DialogInteractionService = /** @class */ (function (_super) {
         var _this = this;
         if (disableClose === void 0) { disableClose = true; }
         /** @type {?} */
-        var config = __assign({ autoFocus: false }, this.matDialogDefaultConfig, this.dialogDefaults, {
+        var config = __assign({ autoFocus: false, hasBackdrop: true }, this.matDialogDefaultConfig, this.dialogServiceDefaults, {
             data: data,
             disableClose: disableClose,
             panelClass: 'dialog-interaction-service'
@@ -1655,7 +1667,7 @@ if (false) {
      */
     DialogInteractionService.prototype.dialogService;
     /** @type {?} */
-    DialogInteractionService.prototype.dialogDefaults;
+    DialogInteractionService.prototype.dialogServiceDefaults;
     /** @type {?} */
     DialogInteractionService.prototype.matDialogDefaultConfig;
 }